WebSVN - OpenConcerto - Diff - Rev 156 and 174 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/accounting/ui/CompteGestCommPreferencePanel.java

  package org.openconcerto.erp.core.finance.accounting.ui;
 import org.openconcerto.erp.config.ComptaPropsConfiguration;
 import org.openconcerto.erp.core.finance.accounting.element.ComptePCESQLElement;
+import org.openconcerto.erp.core.finance.accounting.element.JournalSQLElement;
 import org.openconcerto.erp.generationEcritures.GenerationMvtSaisieVenteFacture;
 import org.openconcerto.erp.model.ISQLCompteSelector;
 import org.openconcerto.erp.preferences.DefaultNXProps;
 import org.openconcerto.sql.Configuration;
 import org.openconcerto.sql.model.SQLBase;
 public class CompteGestCommPreferencePanel extends DefaultPreferencePanel {
     private ISQLCompteSelector selCompteTVAIntraComm, selCompteFourn, selCompteAchat, selCompteValeurEncaissement, selCompteAvanceClient, selCompteClient, selCompteVenteProduits,
             selCompteVenteService, selCompteTVACol, selCompteTVADed, selCompteTVAImmo, selCompteAchatIntra, selCompteFactor, selComptePortSoumis, selComptePortNonSoumis;
-    private ElementComboBox selJrnlFactor;
+    private ElementComboBox selJrnlFactor, selJrnlValEnc;
     private final static SQLBase base = ((ComptaPropsConfiguration) Configuration.getInstance()).getSQLBaseSociete();
     private static final SQLTable tablePrefCompte = base.getTable("PREFS_COMPTE");
     private SQLRowValues rowPrefCompteVals = new SQLRowValues(tablePrefCompte);
     private JCheckBox checkLettrageAuto = new JCheckBox("Activer le lettrage automatique.");
     private JCheckBox checkHideCompteFacture = new JCheckBox("Ne pas afficher les comptes dans les factures.");
         this.selCompteValeurEncaissement = new ISQLCompteSelector();
         this.selCompteValeurEncaissement.init();
         this.add(this.selCompteValeurEncaissement, c);
+        // Journal
+        c.gridy++;
+        c.weightx = 0;
+        c.gridx = 0;
+        this.add(new JLabel("Journal dépôt chèque"), c);
+        c.weightx = 1;
+        c.gridx++;
+        this.selJrnlValEnc = new ElementComboBox();
+        this.selJrnlValEnc.init(Configuration.getInstance().getDirectory().getElement("JOURNAL"));
+        this.add(this.selJrnlValEnc, c);
         // Compte vente produits
         c.gridy++;
         c.weightx = 0;
         c.gridx = 0;
         this.add(new JLabel("Compte Vente de produits"), c);
         this.rowPrefCompteVals.put("ID_COMPTE_PCE_VENTE_PRODUIT", this.selCompteVenteProduits.getValue());
         this.rowPrefCompteVals.put("ID_COMPTE_PCE_VENTE_SERVICE", this.selCompteVenteService.getValue());
         this.rowPrefCompteVals.put("ID_COMPTE_PCE_FACTOR", this.selCompteFactor.getValue());
         final int selectedId = this.selJrnlFactor.getSelectedId();
         this.rowPrefCompteVals.put("ID_JOURNAL_FACTOR", (selectedId > 1) ? selectedId : 1);
+        final int selectedIdEnc = this.selJrnlValEnc.getSelectedId();
+        this.rowPrefCompteVals.put("ID_JOURNAL_VALEUR_ENCAISSEMENT", (selectedIdEnc > 1) ? selectedIdEnc : 1);
         this.rowPrefCompteVals.put("ID_COMPTE_PCE_FOURNISSEUR", this.selCompteFourn.getValue());
         this.rowPrefCompteVals.put("ID_COMPTE_PCE_CLIENT", this.selCompteClient.getValue());
         this.rowPrefCompteVals.put("ID_COMPTE_PCE_AVANCE_CLIENT", this.selCompteAvanceClient.getValue());
         this.rowPrefCompteVals.put("ID_COMPTE_PCE_VALEUR_ENCAISSEMENT", this.selCompteValeurEncaissement.getValue());
         this.rowPrefCompteVals.put("ID_COMPTE_PCE_TVA_ACHAT", this.selCompteTVADed.getValue());
             compte = ComptePCESQLElement.getComptePceDefault("Factor");
             value = ComptePCESQLElement.getId(compte);
             this.selCompteFactor.setValue(value);
             this.selJrnlFactor.setValue(GenerationMvtSaisieVenteFacture.journal);
+            this.selJrnlValEnc.setValue(JournalSQLElement.BANQUES);
             // Fournisseurs
             compte = ComptePCESQLElement.getComptePceDefault("Fournisseurs");
             value = ComptePCESQLElement.getId(compte);
             this.selCompteFourn.setValue(value);
             setComboValues(selCompteAchatIntra, "ID_COMPTE_PCE_ACHAT_INTRA", "AchatsIntra");
             setComboValues(selCompteVenteProduits, "ID_COMPTE_PCE_VENTE_PRODUIT", "VentesProduits");
             setComboValues(selCompteVenteService, "ID_COMPTE_PCE_VENTE_SERVICE", "VentesServices");
             setComboValues(selCompteFactor, "ID_COMPTE_PCE_FACTOR", "Factor");
+            {
-            // Journal Factor
+                // Journal Factor
-            int value = (this.rowPrefCompteVals.getObject("ID_JOURNAL_FACTOR") == null ? 1 : this.rowPrefCompteVals.getInt("ID_JOURNAL_FACTOR"));
+                int value = (this.rowPrefCompteVals.getObject("ID_JOURNAL_FACTOR") == null ? 1 : this.rowPrefCompteVals.getInt("ID_JOURNAL_FACTOR"));
-            if (value <= 1) {
+                if (value <= 1) {
-                value = GenerationMvtSaisieVenteFacture.journal;
+                    value = GenerationMvtSaisieVenteFacture.journal;
+                }
-            this.selJrnlFactor.setValue(value);
+                this.selJrnlFactor.setValue(value);
+            }
+            {
+                // Journal Val enc
+                int value = (this.rowPrefCompteVals.getObject("ID_JOURNAL_VALEUR_ENCAISSEMENT") == null ? 1 : this.rowPrefCompteVals.getInt("ID_JOURNAL_VALEUR_ENCAISSEMENT"));
+                if (value <= 1) {
+                    value = JournalSQLElement.BANQUES;
+                }
+                this.selJrnlValEnc.setValue(value);
+            }
             setComboValues(selCompteFourn, "ID_COMPTE_PCE_FOURNISSEUR", "Fournisseurs");
             setComboValues(selCompteClient, "ID_COMPTE_PCE_CLIENT", "Clients");
             setComboValues(selCompteAvanceClient, "ID_COMPTE_PCE_AVANCE_CLIENT", "AvanceClients");
             setComboValues(selCompteValeurEncaissement, "ID_COMPTE_PCE_VALEUR_ENCAISSEMENT", "ValeurEncaissement");
             setComboValues(selComptePortSoumis, "ID_COMPTE_PCE_PORT_SOUMIS", "PortVenteSoumisTVA");

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/accounting/ui/CompteGestCommPreferencePanel.java @ 177 - Rev 156 → 174