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

 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
- * Copyright 2011 OpenConcerto, by ILM Informatique. All rights reserved.
+ * Copyright 2011-2019 OpenConcerto, by ILM Informatique. All rights reserved.
+ *
  * The contents of this file are subject to the terms of the GNU General Public License Version 3
  * only ("GPL"). You may not use this file except in compliance with the License. You can obtain a
  * copy of the License at http://www.gnu.org/licenses/gpl-3.0.html See the License for the specific
  * language governing permissions and limitations under the License.
 import org.openconcerto.erp.core.finance.payment.element.TypeReglementSQLElement;
 import org.openconcerto.erp.core.finance.tax.model.TaxeCache;
 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.Configuration;
 import org.openconcerto.sql.element.SQLElement;
 import org.openconcerto.sql.model.SQLRow;
 import org.openconcerto.sql.model.SQLRowAccessor;
+            }
             // Cheque
             if (typeRegRow.getID() == TypeReglementSQLElement.CHEQUE) {
+                final SQLRowAccessor nonEmptyForeign = modeReglement.getNonEmptyForeign("ID_BANQUE");
+                if (nonEmptyForeign != null && nonEmptyForeign.getTable().contains("TYPE_CAISSE") && nonEmptyForeign.getBoolean("TYPE_CAISSE")) {
+                    rowClient = null;
+                    cptTiers = nonEmptyForeign.getForeign("ID_COMPTE_PCE");
+                }
                 Date dateTmp = this.date;
                 if (modeReglement.getObject("DATE") != null) {
                     dateTmp = modeReglement.getDate("DATE").getTime();
+                }
                 // On fixe la date du règlement de la facture à reception du cheque
                 if (typeRegRow.getID() == TypeReglementSQLElement.CB && this.rowPrefsCompte.getTable().contains("ID_JOURNAL_CB_ATTENTE")
                         && !this.rowPrefsCompte.isForeignEmpty("ID_JOURNAL_CB_ATTENTE")) {
                     this.putValue("ID_JOURNAL", this.rowPrefsCompte.getForeignID("ID_JOURNAL_CB_ATTENTE"));
+                }
+                if (typeRegRow.contains("ID_COMPTE_PCE_CAISSE") && (rowClient == null || rowClient.isUndefined()) && !typeRegRow.isForeignEmpty("ID_COMPTE_PCE_CAISSE")) {
+                    this.putValue("ID_JOURNAL", JournalSQLElement.CAISSES);
+                }
                 int idCompteClient = cptTiers != null && !cptTiers.isUndefined() ? cptTiers.getID() : rowClient.getInt("ID_COMPTE_PCE");
                 if (avance) {
                     idCompteClient = rowPrefsCompte.getInt("ID_COMPTE_PCE_AVANCE_CLIENT");
                     if (idCompteClient <= 1) {
                         if (idCompteClient <= 1) {
                             idCompteClient = ComptePCESQLElement.getIdComptePceDefault("Clients");
+                        }
+                    }
+                }
+                boolean genEcrDisabled = DefaultNXProps.getInstance().getBooleanValue(GenerationMvtSaisieVenteFacture.NOT_GEN_ECRITURE, false);
+                if (typeRegRow.contains("ID_COMPTE_PCE_CAISSE") && (rowClient == null || rowClient.isUndefined()) && !typeRegRow.isForeignEmpty("ID_COMPTE_PCE_CAISSE")) {
+                    if (!modeReglement.isForeignEmpty("ID_BANQUE")) {
+                        rowClient = null;
+                        final SQLRow foreign = modeReglement.getForeign("ID_BANQUE");
+                        if (foreign.getBoolean("TYPE_CAISSE")) {
+                            idCompteClient = foreign.getForeignID("ID_COMPTE_PCE");
+                        }
+                    }
+                }
                 this.putValue("ID_COMPTE_PCE", idCompteClient);
                 this.putValue("DEBIT", Long.valueOf(0));
                 this.putValue("CREDIT", Long.valueOf(ttc.getLongValue()));
+                if (!genEcrDisabled) {
-                this.ecrClient = ajoutEcriture();
+                    this.ecrClient = ajoutEcriture();
+                }
                 // compte de reglement, caisse, cheque, ...
                 if (typeRegRow.getID() == TypeReglementSQLElement.ESPECE) {
                     int idCompteRegl = typeRegRow.getInt("ID_COMPTE_PCE_CLIENT");
                     if (idCompteRegl <= 1) {
                         fillCompteBanqueFromRow(modeReglement, "VenteCB", false);
                     } catch (Exception e) {
                         throw new SQLException(e);
+                    }
+                }
+                if (typeRegRow.contains("ID_COMPTE_PCE_CAISSE") && (rowClient == null || rowClient.isUndefined()) && !typeRegRow.isForeignEmpty("ID_COMPTE_PCE_CAISSE")) {
+                    this.putValue("ID_COMPTE_PCE", typeRegRow.getForeignID("ID_COMPTE_PCE_CAISSE"));
+                }
                 if (typeRegRow.getID() == TypeReglementSQLElement.CB && this.rowPrefsCompte.getTable().contains("ID_COMPTE_PCE_CB_ATTENTE")
                         && !this.rowPrefsCompte.isForeignEmpty("ID_COMPTE_PCE_CB_ATTENTE")) {
                     this.putValue("ID_COMPTE_PCE", this.rowPrefsCompte.getForeignID("ID_COMPTE_PCE_CB_ATTENTE"));
+                }
                 this.putValue("DEBIT", Long.valueOf(ttc.getLongValue()));
                 this.putValue("CREDIT", Long.valueOf(0));
+                if (!genEcrDisabled) {
-                ajoutEcriture();
+                    ajoutEcriture();
+                }
                 // FIXME remove getConf
                 SQLRow rowSoc = ComptaPropsConfiguration.getInstanceCompta().getRowSociete();
                 if (rowSoc.getTable().contains("TVA_ENCAISSEMENT") && rowSoc.getBoolean("TVA_ENCAISSEMENT")) {
                     SQLRow rowTaxe = TaxeCache.getCache().getFirstTaxe();
                     if (rowTaxe.contains("ID_COMPTE_PCE_COLLECTE_ENCAISSEMENT")) {
                             long tva = ttc.calculLongTVA(taux / 100.0);
                             this.putValue("ID_COMPTE_PCE", rowCompteTvaCol.getID());
                             this.putValue("DEBIT", Long.valueOf(tva));
                             this.putValue("CREDIT", Long.valueOf(0));
+                            if (!genEcrDisabled) {
-                            ajoutEcriture();
+                                ajoutEcriture();
+                            }
                             this.putValue("ID_COMPTE_PCE", rowCompteTvaEnc.getID());
                             this.putValue("DEBIT", Long.valueOf(0));
                             this.putValue("CREDIT", Long.valueOf(tva));
+                            if (!genEcrDisabled) {
-                            ajoutEcriture();
+                                ajoutEcriture();
+                            }
+                        }
+                    }
+                }
                 SQLRowValues valEcheance = new SQLRowValues(tableEch);
                 this.idMvt = getNewMouvement("ECHEANCE_CLIENT", 1, mvtSource.getID(), mvtSource.getInt("ID_PIECE"));
                 valEcheance.put("ID_MOUVEMENT", Integer.valueOf(this.idMvt));
                 valEcheance.put("DATE", dateEch);
+                valEcheance.put("RG", modeReglement.getBoolean("RG"));
                 valEcheance.put("MONTANT", Long.valueOf(ttc.getLongValue()));
                 valEcheance.put("ID_CLIENT", rowClient == null ? null : rowClient.getID());
                 valEcheance.put("TIERS", tiers);
-                valEcheance.put("ID_COMPTE_PCE_TIERS", cptTiers == null || !cptTiers.isUndefined() ? null : cptTiers.getID());
+                valEcheance.put("ID_COMPTE_PCE_TIERS", cptTiers == null || cptTiers.isUndefined() ? mvtSource.getTable().getTable("COMPTE_PCE").getUndefinedIDNumber() : cptTiers.getID());
                 if (source.getTable().equals(tableSaisieVenteFacture)) {
                     valEcheance.put("ID_SAISIE_VENTE_FACTURE", source.getID());
+                }
                 if (source.getTable().getName().equals(valEcheance.getTable().getName())) {
                     valEcheance.put("ID_SAISIE_VENTE_FACTURE", source.getObject("ID_SAISIE_VENTE_FACTURE"));
+        }
+    }
     public void doLettrageAuto(final SQLRowAccessor source, Date dateLettrage) {
+        if (this.ecrClient != null) {
-        // A. On lettre les critures client (facture ET reglement)
+            // A. On lettre les critures client (facture ET reglement)
-        // A1. Recherche criture client de facturation
+            // A1. Recherche criture client de facturation
-        final SQLRowValues g1 = new SQLRowValues(ecritureTable);
+            final SQLRowValues g1 = new SQLRowValues(ecritureTable);
-        g1.put("DEBIT", null);
+            g1.put("DEBIT", null);
-            rowVals1.update();
+                rowVals1.update();
-        } catch (SQLException e) {
+            } catch (SQLException e) {
-            e.printStackTrace();
+                e.printStackTrace();
+            }
+        }
+    }
     private void paiementCheque(Date dateEch, SQLRow source, PrixTTC ttc, SQLRow rowClient, SQLRow modeRegl, SQLRow mvtSource, boolean avance, String tiers, SQLRowAccessor cptTiers)
             throws SQLException {
         SQLRowValues valCheque = new SQLRowValues(base.getTable("CHEQUE_A_ENCAISSER"));
             int idJournal = JournalSQLElement.BANQUES;
             if (rowPrefsCompte.getObject("ID_JOURNAL_VALEUR_ENCAISSEMENT") != null && !rowPrefsCompte.isForeignEmpty("ID_JOURNAL_VALEUR_ENCAISSEMENT")) {
                 idJournal = rowPrefsCompte.getForeignID("ID_JOURNAL_VALEUR_ENCAISSEMENT");
+            }
+            // compte de reglement, caisse, cheque, ...
+            int idCompteRegl = rowPrefsCompte.getInt("ID_COMPTE_PCE_VALEUR_ENCAISSEMENT");
+            if (idCompteRegl <= 1) {
+                idCompteRegl = ComptePCESQLElement.getIdComptePceDefault("ValeurEncaissement");
+            }
+            if (modeRegl != null) {
+                final SQLRowAccessor nonEmptyForeign = modeRegl.getNonEmptyForeign("ID_BANQUE");
+                if (nonEmptyForeign != null && nonEmptyForeign.getTable().contains("TYPE_CAISSE") && nonEmptyForeign.getBoolean("TYPE_CAISSE")) {
+                    final SQLRow rowTypeREgl = tableMouvement.getTable("TYPE_REGLEMENT").getRow(TypeReglementSQLElement.CHEQUE);
+                    if (rowTypeREgl.contains("ID_COMPTE_PCE_CAISSE") && (rowClient == null || rowClient.isUndefined()) && !rowTypeREgl.isForeignEmpty("ID_COMPTE_PCE_CAISSE")) {
+                        idCompteRegl = rowTypeREgl.getForeignID("ID_COMPTE_PCE_CAISSE");
+                        idJournal = JournalSQLElement.CAISSES;
+                    }
+                }
+            }
             this.putValue("ID_JOURNAL", idJournal);
             this.putValue("ID_COMPTE_PCE", idCompteClient);
             this.putValue("DEBIT", Long.valueOf(0));
             this.putValue("CREDIT", Long.valueOf(ttc.getLongValue()));
+            boolean genEcrDisabled = DefaultNXProps.getInstance().getBooleanValue(GenerationMvtSaisieVenteFacture.NOT_GEN_ECRITURE, false);
+            if (!genEcrDisabled) {
-            this.ecrClient = ajoutEcriture();
+                this.ecrClient = ajoutEcriture();
-            // compte de reglement, caisse, cheque, ...
-            int idCompteRegl = rowPrefsCompte.getInt("ID_COMPTE_PCE_VALEUR_ENCAISSEMENT");
-            if (idCompteRegl <= 1) {
-                idCompteRegl = ComptePCESQLElement.getIdComptePceDefault("ValeurEncaissement");
-            }
-            this.putValue("ID_COMPTE_PCE", Integer.valueOf(idCompteRegl));
+                this.putValue("ID_COMPTE_PCE", Integer.valueOf(idCompteRegl));
-            this.putValue("DEBIT", Long.valueOf(ttc.getLongValue()));
+                this.putValue("DEBIT", Long.valueOf(ttc.getLongValue()));
-            this.putValue("CREDIT", Long.valueOf(0));
+                this.putValue("CREDIT", Long.valueOf(0));
-            ajoutEcriture();
+                ajoutEcriture();
+            }
+        }
+    }
+}

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

svn://code.openconcerto.org/openconcerto

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