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

 import org.openconcerto.erp.core.common.element.NumerotationAutoSQLElement;
 import org.openconcerto.erp.core.finance.accounting.element.ComptePCESQLElement;
 import org.openconcerto.erp.core.finance.accounting.element.JournalSQLElement;
 import org.openconcerto.erp.core.finance.accounting.element.MouvementSQLElement;
 import org.openconcerto.erp.core.finance.payment.element.ModeDeReglementSQLElement;
+import org.openconcerto.erp.core.finance.payment.element.SEPAMandateSQLElement;
 import org.openconcerto.erp.core.finance.payment.element.TypeReglementSQLElement;
 import org.openconcerto.erp.model.PrixTTC;
 import org.openconcerto.erp.preferences.GestionCommercialeGlobalPreferencePanel;
 import org.openconcerto.sql.Configuration;
 import org.openconcerto.sql.element.SQLElement;
     private static final SQLTable tablePrefCompte = base.getTable("PREFS_COMPTE");
     private static final SQLRow rowPrefsCompte = tablePrefCompte.getRow(2);
     public SQLRow ecrClient = null;
-    public GenerationReglementVenteNG(String label, SQLRow rowClient, PrixTTC ttc, Date d, SQLRow modeReglement, SQLRow source, SQLRow mvtSource) throws Exception {
+    public GenerationReglementVenteNG(String label, SQLRow rowClient, PrixTTC ttc, Date d, SQLRow modeReglement, SQLRow source, SQLRow mvtSource) throws SQLException {
         this(label, rowClient, ttc, d, modeReglement, source, mvtSource, true);
+    }
-    public GenerationReglementVenteNG(String label, SQLRow rowClient, PrixTTC ttc, Date d, SQLRow modeReglement, SQLRow source, SQLRow mvtSource, boolean createEncaisse) throws Exception {
+    public GenerationReglementVenteNG(String label, SQLRow rowClient, PrixTTC ttc, Date d, SQLRow modeReglement, SQLRow source, SQLRow mvtSource, boolean createEncaisse) throws SQLException {
         this(label, rowClient, ttc, d, modeReglement, source, mvtSource, createEncaisse, false);
+    }
     public GenerationReglementVenteNG(String label, SQLRow rowClient, PrixTTC ttc, Date d, SQLRow modeReglement, SQLRow source, SQLRow mvtSource, boolean createEncaisse, boolean avance)
-            throws Exception {
+            throws SQLException {
         this(label, rowClient, ttc, d, modeReglement, source, mvtSource, createEncaisse, avance, rowClient.getString("NOM"), null);
+    }
     public GenerationReglementVenteNG(String label, SQLRow rowClient, PrixTTC ttc, Date d, SQLRow modeReglement, SQLRow source, SQLRow mvtSource, boolean createEncaisse, boolean avance, String tiers,
-            SQLRowAccessor cptTiers) throws Exception {
+            SQLRowAccessor cptTiers) throws SQLException {
         SQLRow typeRegRow = modeReglement.getForeignRow("ID_TYPE_REGLEMENT");
         setRowAnalytiqueSource(source);
         // iniatilisation des valeurs de la map
         this.date = d;
                 Date dateTmp = this.date;
                 if (modeReglement.getObject("DATE") != null) {
                     dateTmp = modeReglement.getDate("DATE").getTime();
+                }
-                // On fixe la date du règlement de la facture
+                // On fixe la date du règlement de la facture à reception du cheque
-                setDateReglement(source, dateTmp);
+                setDateReglement(source, this.date);
                 Calendar c = modeReglement.getDate("DATE_DEPOT");
                 if (c != null) {
                     paiementCheque(c.getTime(), source, ttc, rowClient, modeReglement, mvtSource.getTable().getRow(idMvt), avance, tiers, cptTiers);
                 } else {
+                }
                 if (typeRegRow.getID() == TypeReglementSQLElement.ESPECE) {
                     this.putValue("ID_JOURNAL", JournalSQLElement.CAISSES);
+                }
+                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"));
+                }
                 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) {
                         idCompteClient = ComptePCESQLElement.getIdComptePceDefault("AvanceClients");
                         idCompteRegl = ComptePCESQLElement.getIdComptePceDefault("VenteEspece");
+                    }
                     this.putValue("ID_COMPTE_PCE", Integer.valueOf(idCompteRegl));
                 } else {
+                    try {
-                    fillCompteBanqueFromRow(modeReglement, "VenteCB", false);
+                        fillCompteBanqueFromRow(modeReglement, "VenteCB", false);
+                    } catch (Exception e) {
+                        throw new SQLException(e);
+                    }
+                }
+                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));
                 ajoutEcriture();
                 List<Integer> pieceIDs = new ArrayList<Integer>();
                 valEcheance.put("TIERS", tiers);
                 valEcheance.put("ID_COMPTE_PCE_TIERS", cptTiers == null || !cptTiers.isUndefined() ? null : 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"));
+                }
+                if (modeReglement.getForeign("ID_TYPE_REGLEMENT").getBoolean("SEPA")) {
+                    final String foreignBanqueFieldName = "ID_" + BanqueSQLElement.TABLENAME;
+                    if (valEcheance.getTable().contains(foreignBanqueFieldName))
+                        valEcheance.put(foreignBanqueFieldName, modeReglement.getInt(foreignBanqueFieldName));
+                    valEcheance.put("ETS", modeReglement.getObject("ETS"));
+                    if (!modeReglement.isForeignEmpty("ID_SEPA_MANDATE")) {
+                        valEcheance.put("ID_SEPA_MANDATE", modeReglement.getForeignID("ID_SEPA_MANDATE"));
+                    } else if (rowClient != null && !rowClient.isForeignEmpty("ID_SEPA_MANDATE_DEFAULT")) {
+                        valEcheance.put("ID_SEPA_MANDATE", rowClient.getForeignID("ID_SEPA_MANDATE_DEFAULT"));
+                    } else {
+                        SEPAMandateSQLElement mandateElem = ComptaPropsConfiguration.getInstanceCompta().getDirectory().getElement(SEPAMandateSQLElement.class);
+                        final String mandateID = mandateElem.generateMandateIdentification("Facturation", '0', true, true);
+                        // TODO gestion si pas de client (ex : don ou cotisation association)
+                        if (rowClient != null) {
+                            final SQLRowValues newVals = mandateElem.createRecurrent(rowClient.getID(), mandateID, source.getDate("DATE").getTime());
+                            SQLRow rowMandate = newVals.commit();
+                            valEcheance.put("ID_SEPA_MANDATE", rowMandate.getID());
+                            rowClient.createEmptyUpdateRow().put("ID_SEPA_MANDATE_DEFAULT", rowMandate.getID()).commit();
+                        }
+                    }
+                }
                 // ajout de l'ecriture
                 SQLRow row = valEcheance.insert();
                 SQLRowValues rowVals = new SQLRowValues(tableMouvement);
                 rowVals.put("IDSOURCE", row.getID());
         } catch (SQLException e) {
             e.printStackTrace();
+        }
+    }
-    private void paiementCheque(Date dateEch, SQLRow source, PrixTTC ttc, SQLRow rowClient, SQLRow modeRegl, SQLRow mvtSource, boolean avance, String tiers, SQLRowAccessor cptTiers) throws Exception {
+    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"));
         SQLPreferences prefs = SQLPreferences.getMemCached(valCheque.getTable().getDBRoot());
         boolean createEcr = prefs.getBoolean(GestionCommercialeGlobalPreferencePanel.CREATE_ECR_CHQ, true);

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 174 → 177