WebSVN - OpenConcerto - Diff - Rev 182 and 185 - /trunk/OpenConcerto/src/org/openconcerto/erp/generationEcritures/GenerationMvtSaisieVenteFacture.java

  package org.openconcerto.erp.generationEcritures;
 import org.openconcerto.erp.core.common.ui.TotalCalculator;
 import org.openconcerto.erp.core.finance.accounting.element.ComptePCESQLElement;
 import org.openconcerto.erp.core.finance.accounting.element.JournalSQLElement;
-import org.openconcerto.erp.generationDoc.SheetXml;
+import org.openconcerto.erp.core.finance.payment.element.TypeReglementSQLElement;
 import org.openconcerto.erp.core.finance.tax.model.TaxeCache;
+import org.openconcerto.erp.generationDoc.SheetXml;
 import org.openconcerto.erp.generationEcritures.provider.AccountingRecordsProvider;
 import org.openconcerto.erp.generationEcritures.provider.AccountingRecordsProviderManager;
 import org.openconcerto.erp.model.PrixTTC;
+import org.openconcerto.erp.preferences.DefaultNXProps;
+import org.openconcerto.erp.preferences.GestionCommercialeGlobalPreferencePanel;
 import org.openconcerto.sql.model.SQLRow;
 import org.openconcerto.sql.model.SQLRowAccessor;
 import org.openconcerto.sql.model.SQLRowValues;
 import org.openconcerto.sql.model.SQLTable;
+import org.openconcerto.sql.preferences.SQLPreferences;
+import org.openconcerto.utils.DecimalUtils;
 import org.openconcerto.utils.ExceptionHandler;
 import org.openconcerto.utils.StringUtils;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
  * reglement de la vente
  */
 public class GenerationMvtSaisieVenteFacture extends GenerationEcritures implements Runnable {
     public static final String ID = "accounting.records.invoice.sales";
+    public static final String NOT_GEN_ECRITURE = "accounting.invoice.generation.disable";
     private static final String source = "SAISIE_VENTE_FACTURE";
     public static final Integer journal = Integer.valueOf(JournalSQLElement.VENTES);
     private int idSaisieVenteFacture;
     private boolean useComptePCEVente;
     private static final SQLTable saisieVFTable = base.getTable("SAISIE_VENTE_FACTURE");
     public final void genereMouvement() throws Exception {
         SQLRow saisieRow = GenerationMvtSaisieVenteFacture.saisieVFTable.getRow(this.idSaisieVenteFacture);
         setRowAnalytiqueSource(saisieRow);
-        SQLRow clientRow = saisieRow.getForeignRow("ID_CLIENT");
-        // Calcul des montants
-        PrixTTC prixTTC = new PrixTTC(((Long) saisieRow.getObject("T_TTC")).longValue());
+        boolean genEcrDisabled = DefaultNXProps.getInstance().getBooleanValue(GenerationMvtSaisieVenteFacture.NOT_GEN_ECRITURE, false);
-        // Total des acomptes déjà versés sur la facture
-        long montantAcompteTTC = 0;
+        this.putValue("ID_JOURNAL", GenerationMvtSaisieVenteFacture.journal);
+        SQLRow clientRow = saisieRow.getForeignRow("ID_CLIENT");
         int idCompteClient = clientRow.getInt("ID_COMPTE_PCE");
         Boolean acompte = saisieRow.getBoolean("ACOMPTE");
         if (acompte != null && acompte) {
             this.nom = "Fact. acompte client" + saisieRow.getObject("NUMERO").toString();
         } else {
             this.nom = "Fact. vente " + saisieRow.getObject("NUMERO").toString();
+        }
+        boolean typeCaisse = false;
+        SQLRow modeRegl = saisieRow.getForeignRow("ID_MODE_REGLEMENT");
+        final SQLRow typeRegRow = modeRegl.getForeignRow("ID_TYPE_REGLEMENT");
+        final SQLRowAccessor nonEmptyForeign = modeRegl.getNonEmptyForeign("ID_BANQUE");
+        if (nonEmptyForeign != null && nonEmptyForeign.getTable().contains("TYPE_CAISSE") && nonEmptyForeign.getBoolean("TYPE_CAISSE")) {
+            typeCaisse = true;
+            idCompteClient = nonEmptyForeign.getForeignID("ID_COMPTE_PCE");
+            Number idJournal = nonEmptyForeign.getNonEmptyForeignIDNumber("ID_JOURNAL");
+            if (idJournal != null) {
+                this.putValue("ID_JOURNAL", idJournal);
+            } else {
+                this.putValue("ID_JOURNAL", JournalSQLElement.CAISSES);
+            }
+            this.nom += " (" + typeRegRow.getString("NOM") + ") " + StringUtils.limitLength(clientRow.getString("NOM"), 20);
+        } else {
-        this.nom += " " + StringUtils.limitLength(clientRow.getString("NOM"), 20);
+            this.nom += " " + StringUtils.limitLength(clientRow.getString("NOM"), 20);
+        }
+        if (SQLPreferences.getMemCached(saisieRow.getTable().getDBRoot()).getBoolean(GestionCommercialeGlobalPreferencePanel.ECRITURE_FACTURE_REF_LIBELLE, false)) {
+            if (saisieRow.getString("NOM") != null && saisieRow.getString("NOM").trim().length() > 0)
+                this.nom += " " + StringUtils.limitLength(saisieRow.getString("NOM"), 30);
+        }
+        // Calcul des montants
+        PrixTTC prixTTC = new PrixTTC(((Long) saisieRow.getObject("T_TTC")).longValue());
+        // Total des acomptes déjà versés sur la facture
+        long montantAcompteTTC = 0;
         this.putValue("NOM", this.nom);
         // iniatilisation des valeurs de la map
         this.date = (Date) saisieRow.getObject("DATE");
         AccountingRecordsProvider provider = AccountingRecordsProviderManager.get(ID);
         provider.putLabel(saisieRow, this.mEcritures);
         this.putValue("DATE", this.date);
-        this.putValue("ID_JOURNAL", GenerationMvtSaisieVenteFacture.journal);
         this.putValue("ID_MOUVEMENT", Integer.valueOf(1));
         // on calcule le nouveau numero de mouvement
         if (this.idMvt == 1) {
             SQLRowValues rowValsPiece = new SQLRowValues(pieceTable);
                             if (compl.get(rowCompl) != null) {
                                 long taxeC = compl.get(rowCompl).multiply(rowCompl.getBigDecimal("POURCENT").movePointLeft(2)).setScale(2, RoundingMode.HALF_UP).movePointRight(2).longValue();
                                 this.putValue("ID_COMPTE_PCE", rowCompl.getForeignID("ID_COMPTE_PCE"));
                                 this.putValue("DEBIT", Long.valueOf(0));
                                 this.putValue("CREDIT", Long.valueOf(taxeC));
+                                if (!genEcrDisabled) {
-                                ajoutEcriture();
+                                    ajoutEcriture();
+                                }
                                 taxe += taxeC;
                                 // this.putValue("ID_COMPTE_PCE",
                                 // rowCompl.getForeignID("ID_COMPTE_PCE_PRODUITS"));
                                 // this.putValue("DEBIT", Long.valueOf(taxeC));
                                 // this.putValue("CREDIT", Long.valueOf(0));
+                    }
                     this.putValue("ID_COMPTE_PCE", idComptePCE);
                     this.putValue("DEBIT", Long.valueOf(0));
                     this.putValue("CREDIT", Long.valueOf(b - taxe));
+                    if (!genEcrDisabled) {
-                    ajoutEcriture();
+                        ajoutEcriture();
+                    }
+                }
+            }
             Map<SQLRowAccessor, BigDecimal> tvaMap = calc.getMapHtTVA();
             for (SQLRowAccessor rowAc : tvaMap.keySet()) {
                 long longValue = tvaMap.get(rowAc).setScale(2, RoundingMode.HALF_UP).movePointRight(2).longValue();
                 if (longValue != 0) {
                     this.putValue("ID_COMPTE_PCE", rowAc.getID());
                     this.putValue("DEBIT", Long.valueOf(0));
                     this.putValue("CREDIT", longValue);
+                    if (!genEcrDisabled) {
-                    ajoutEcriture();
+                        ajoutEcriture();
+                    }
+                }
+            }
             // compte Clients
             if (idCompteClient <= 1) {
                 idCompteClient = rowPrefsCompte.getInt("ID_COMPTE_PCE_CLIENT");
             if (ecrTable.contains("CODE_CLIENT")) {
                 this.putValue("CODE_CLIENT", clientRow.getString("CODE"));
+            }
             this.putValue("DEBIT", ttcLongValue);
             this.putValue("CREDIT", Long.valueOf(0));
+            if (!genEcrDisabled) {
-            ajoutEcriture();
+                ajoutEcriture();
+            }
             // TODO Gestion des factures d'acomptes
             // Solde des acomptes
             // List<SQLRow> rowsAcompte =
             // saisieRow.getReferentRows(saisieVFTable.getField("ID_SAISIE_VENTE_FACTURE_ACOMPTE"));
             valSasieVF.update(this.idSaisieVenteFacture);
+        }
             if (genereReglement) {
                 // Génération du reglement
-                SQLRow modeRegl = saisieRow.getForeignRow("ID_MODE_REGLEMENT");
-                final SQLRow typeRegRow = modeRegl.getForeignRow("ID_TYPE_REGLEMENT");
-                String label = this.nom + " (" + typeRegRow.getString("NOM") + ") " + StringUtils.limitLength(clientRow.getString("NOM"), 20);
+                String label = this.nom + " (" + typeRegRow.getString("NOM") + ") ";
                 int idAvoir = saisieRow.getInt("ID_AVOIR_CLIENT");
                 if (idAvoir > 1) {
                     // SQLRow avoirRow = base.getTable("AVOIR_CLIENT").getRow(idAvoir);
                     long l = ((Number) saisieRow.getObject("T_AVOIR_TTC")).longValue();
                     prixTTC = new PrixTTC(((Long) saisieRow.getObject("T_TTC")).longValue() - l);
+                }
-                prixTTC = new PrixTTC(saisieRow.getLong("NET_A_PAYER"));
+                final long totalNet = saisieRow.getLong("NET_A_PAYER");
+                final SQLRow rowClient;
+                final SQLRow rowCptTiers;
+                if (typeCaisse) {
+                    rowClient = null;
+                    rowCptTiers = modeRegl.getForeign("ID_BANQUE").getForeign("ID_COMPTE_PCE");
+                } else {
+                    rowClient = clientRow;
+                    rowCptTiers = null;
+                }
+                final String tiers = clientRow.getString("NOM");
+                if (saisieRow.contains("POURCENT_RG") && saisieRow.getBigDecimal("POURCENT_RG") != null && saisieRow.getBigDecimal("POURCENT_RG").signum() != 0) {
+                    long totalRG = new BigDecimal(totalNet).multiply(saisieRow.getBigDecimal("POURCENT_RG"), DecimalUtils.HIGH_PRECISION).movePointLeft(2).setScale(0, RoundingMode.HALF_UP)
+                            .longValue();
+                    PrixTTC prixRG = new PrixTTC(totalRG);
+                    prixTTC = new PrixTTC(totalNet - totalRG);
-                if (prixTTC.getLongValue() > 0) {
+                    if (prixTTC.getLongValue() > 0) {
-                    new GenerationReglementVenteNG(label.trim(), clientRow, prixTTC, this.date, modeRegl, saisieRow, mvtTable.getRow(idMvt));
+                        new GenerationReglementVenteNG(label.trim(), rowClient, prixTTC, this.date, modeRegl, saisieRow, mvtTable.getRow(idMvt), true, false, tiers, rowCptTiers);
+                    }
+                    if (prixRG.getLongValue() > 0) {
+                        SQLRowValues rowValsMdrRg = new SQLRowValues(modeRegl.getTable());
+                        rowValsMdrRg.put("AJOURS", 365);
+                        rowValsMdrRg.put("LENJOUR", 0);
+                        rowValsMdrRg.put("COMPTANT", Boolean.FALSE);
+                        rowValsMdrRg.put("FIN_MOIS", Boolean.FALSE);
+                        rowValsMdrRg.put("DATE_FACTURE", Boolean.TRUE);
+                        rowValsMdrRg.put("RG", Boolean.TRUE);
+                        rowValsMdrRg.put("ID_TYPE_REGLEMENT", TypeReglementSQLElement.INDEFINI);
+                        final SQLRow rowMdrRG = rowValsMdrRg.commit();
+                        new GenerationReglementVenteNG(label.trim(), rowClient, prixRG, this.date, rowMdrRG, saisieRow, mvtTable.getRow(idMvt), true, false, tiers, rowCptTiers);
+                    }
+                } else {
+                    prixTTC = new PrixTTC(totalNet);
+                    if (prixTTC.getLongValue() > 0) {
+                        new GenerationReglementVenteNG(label.trim(), rowClient, prixTTC, this.date, modeRegl, saisieRow, mvtTable.getRow(idMvt), true, false, tiers, rowCptTiers);
+                    }
+                }
+            }
         // Mise à jour de mouvement associé à la facture
         SQLRowValues valSasieVF = new SQLRowValues(GenerationMvtSaisieVenteFacture.saisieVFTable);
         valSasieVF.put("ID_MOUVEMENT", Integer.valueOf(this.idMvt));

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/generationEcritures/GenerationMvtSaisieVenteFacture.java - Rev 182 → 185