WebSVN - OpenConcerto - Diff - Rev 149 and 156 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/common/ui/TotalPanel.java

  package org.openconcerto.erp.core.common.ui;
 import org.openconcerto.erp.config.ComptaPropsConfiguration;
 import org.openconcerto.erp.core.finance.accounting.element.ComptePCESQLElement;
 import org.openconcerto.erp.preferences.DefaultNXProps;
+import org.openconcerto.erp.utils.TM;
 import org.openconcerto.sql.Configuration;
 import org.openconcerto.sql.model.SQLField;
 import org.openconcerto.sql.model.SQLRow;
 import org.openconcerto.sql.model.SQLRowAccessor;
 import org.openconcerto.sql.model.SQLRowValues;
     private JTextField textPoids;
     private DeviseField textTotalDevise, textTotalDeviseSel;
     private DeviseField textService, textServiceSel;
     private DeviseField textHA, textHASel;
     private JTextField marge, margeSel;
+    private DeviseField textFraisDoc, textFraisDocSel;
     private boolean gestionHA = false;
     private PropertyChangeSupport supp;
     private int columnIndexEchHT = -1;
     private int columnIndexEchTTC = -1;
     private SQLTableElement ha;
     private SQLRequestComboBox selPortTVA;
+    private SQLRequestComboBox selFraisDocTVA = null;
     private AcompteField facturable;
     private boolean intraComm = false;
     AbstractArticleItemTable articleTable;
         this.textTotalTVA = textTotalTVA;
         this.textTotalTTC = textTotalTTC;
         this.textPortHT = textPortHT;
         this.textRemiseHT = textRemiseHT;
         this.textService = textService;
+        this.textFraisDoc = new DeviseField();
+        this.textFraisDocSel = new DeviseField();
         this.textTotalHTSel = new DeviseField(true);
         this.textServiceSel = new DeviseField();
         this.textTotalEcoSel = new DeviseField();
         this.textTotalTTCSel = new DeviseField();
         this.textTotalTVASel = new DeviseField();
         reconfigure(this.textTotalTTC);
         reconfigure(this.textService);
         reconfigure(this.textHA);
         reconfigure(this.marge);
         reconfigure(this.textTotalHTSel);
+        reconfigure(this.textFraisDoc);
+        reconfigure(this.textFraisDocSel);
         reconfigure(this.textTotalEcoSel);
         reconfigure(this.textTotalTVASel);
         reconfigure(this.textTotalTTCSel);
         reconfigure(this.textServiceSel);
         reconfigure(this.textHASel);
         c.weighty = 0;
         c.fill = GridBagConstraints.HORIZONTAL;
         // Collone 1 : Selection
         c.gridx++;
-        this.add(new JLabelBold("Sélection"), c);
+        this.add(new JLabelBold(TM.tr("TotalPanel.selection")), c); //$NON-NLS-1$
         c.gridy++;
         c.gridx = 1;
         c.gridwidth = 2;
         c.weightx = 1;
         c.fill = GridBagConstraints.BOTH;
         c.gridwidth = 1;
         c.weightx = 0;
         c.fill = GridBagConstraints.HORIZONTAL;
         if (this.gestionHA) {
-            final JLabel labelMarge = new JLabel("Marge");
+            final JLabel labelMarge = new JLabel(TM.tr("TotalPanel.margin")); //$NON-NLS-1$
-            final JLabel labelHA = new JLabel((this.ha == articleItemTable.getPrebilanElement()) ? "Budget prévisionnel" : "Total achat HT");
+            final JLabel labelHA = new JLabel((this.ha == articleItemTable.getPrebilanElement()) ? TM.tr("TotalPanel.estimatedBudget") : TM.tr("TotalPanel.purchaseTotal.taxExcluded"));   //$NON-NLS-1$//$NON-NLS-2$
             // Total HA HT
             c.gridy++;
             this.add(labelHA, c);
             labelHA.setVisible(showHA);
         // Total HT
         c.gridy++;
         c.gridx = 1;
         c.weightx = 0;
         c.fill = GridBagConstraints.HORIZONTAL;
-        this.add(getLabelBoldFor(textTotalHT.getField(), "Total HT"), c);
+        this.add(getLabelBoldFor(textTotalHT.getField(), TM.tr("TotalPanel.total.taxExcluded")), c); //$NON-NLS-1$
         c.gridx++;
         c.weightx = 1;
         this.add(this.textTotalHTSel, c);
         // Service
         if (DefaultNXProps.getInstance().getBooleanValue(AbstractVenteArticleItemTable.ARTICLE_SERVICE, false)) {
             c.gridx = 1;
             c.gridy++;
             c.weightx = 0;
-            this.add(new JLabel("Service HT inclus "), c);
+            this.add(new JLabel(TM.tr("TotalPanel.service.taxExcluded")), c); //$NON-NLS-1$
             c.gridx++;
             c.weightx = 1;
             this.add(this.textServiceSel, c);
+        }
         // TVA
         c.gridx = 1;
         c.gridy++;
         c.weightx = 0;
-        this.add(getLabelFor(textTotalTVA.getField(), "Total TVA"), c);
+        this.add(getLabelFor(textTotalTVA.getField(), TM.tr("TotalPanel.total.VAT")), c); //$NON-NLS-1$
         c.gridx++;
         c.weightx = 1;
         this.add(this.textTotalTVASel, c);
         c.gridx = 1;
             c.gridwidth = 1;
             c.gridx = 1;
             c.gridy++;
             c.weightx = 0;
             c.fill = GridBagConstraints.HORIZONTAL;
-            this.add(getLabelFor(textTotalDevise.getField(), "Total Devise"), c);
+            this.add(getLabelFor(textTotalDevise.getField(), TM.tr("TotalPanel.currencyTotal")), c); //$NON-NLS-1$
             c.gridx++;
             c.weightx = 1;
             this.add(this.textTotalDeviseSel, c);
+        }
         final boolean showEco = prefs.getBoolean(AbstractVenteArticleItemTable.SHOW_TOTAL_ECO_CONTRIBUTION, false);
         if (showEco) {
             c.gridx = 1;
             c.gridy++;
             c.weightx = 0;
-            this.add(new JLabel("Dont Eco-Contrib."), c);
+            this.add(new JLabel(TM.tr("TotalPanel.ecoTax")), c); //$NON-NLS-1$
             c.gridx++;
             c.weightx = 1;
             this.add(this.textTotalEcoSel, c);
+        }
         c.gridwidth = 1;
         c.gridx = 1;
         c.gridy++;
         c.weightx = 0;
         c.fill = GridBagConstraints.HORIZONTAL;
-        this.add(getLabelFor(textTotalTTC.getField(), "Total TTC"), c);
+        this.add(getLabelFor(textTotalTTC.getField(), TM.tr("TotalPanel.total.taxIncluded")), c); //$NON-NLS-1$
         c.gridx++;
         c.weightx = 1;
         this.add(this.textTotalTTCSel, c);
         // Global
         c.gridheight = 1;
         c.fill = GridBagConstraints.HORIZONTAL;
         c.weighty = 0;
         c.gridx++;
-        this.add(new JLabelBold("Global"), c);
+        this.add(new JLabelBold(TM.tr("TotalPanel.global")), c); //$NON-NLS-1$
         c.gridy++;
         c.gridx = 4;
         c.gridwidth = 2;
         c.weightx = 1;
         this.add(createSeparator(), c);
         c.gridwidth = 1;
         c.weightx = 0;
         if (this.gestionHA) {
-            final JLabel labelMarge = new JLabel("Marge");
+            final JLabel labelMarge = new JLabel(TM.tr("TotalPanel.margin")); //$NON-NLS-1$
-            final JLabel labelHA = new JLabel((this.ha == articleItemTable.getPrebilanElement()) ? "Budget prévisionnel" : "Total achat HT");
+            final JLabel labelHA = new JLabel((this.ha == articleItemTable.getPrebilanElement()) ? TM.tr("TotalPanel.estimatedBudget") : TM.tr("TotalPanel.purchaseTotal.taxExcluded"));  //$NON-NLS-1$//$NON-NLS-2$
             // Total HA HT
             c.gridy++;
             this.add(labelHA, c);
             labelHA.setVisible(showHA);
         // Total HT
         c.gridy++;
         c.gridx = 4;
         c.weightx = 0;
-        this.add(getLabelBoldFor(textTotalHT.getField(), "Total HT"), c);
+        this.add(getLabelBoldFor(textTotalHT.getField(), TM.tr("TotalPanel.total.taxExcluded")), c); //$NON-NLS-1$
         c.gridx++;
         c.weightx = 1;
         this.add(textTotalHT, c);
         if (DefaultNXProps.getInstance().getBooleanValue(AbstractVenteArticleItemTable.ARTICLE_SERVICE, false)) {
             // Service
             c.gridx = 4;
             c.gridy++;
             c.weightx = 0;
-            this.add(new JLabelBold("Service HT inclus "), c);
+            this.add(new JLabelBold(TM.tr("TotalPanel.service.taxExcluded")), c); //$NON-NLS-1$
             c.gridx++;
             c.weightx = 1;
             this.add(this.textService, c);
+        }
         // TVA
         c.gridx = 4;
         c.gridy++;
         c.weightx = 0;
-        this.add(getLabelBoldFor(textTotalTVA.getField(), "Total TVA"), c);
+        this.add(getLabelBoldFor(textTotalTVA.getField(), TM.tr("TotalPanel.total.VAT")), c); //$NON-NLS-1$
         c.gridx++;
         c.weightx = 1;
         this.add(textTotalTVA, c);
         // Sep
             c.gridwidth = 1;
             c.gridx = 4;
             c.gridy++;
             c.weightx = 0;
             c.fill = GridBagConstraints.HORIZONTAL;
-            this.add(getLabelBoldFor(textTotalDevise.getField(), "Total Devise"), c);
+            this.add(getLabelBoldFor(textTotalDevise.getField(), TM.tr("TotalPanel.currencyTotal")), c); //$NON-NLS-1$
             c.gridx++;
             c.weightx = 1;
             textTotalDevise.setFont(textTotalHT.getFont());
             this.add(textTotalDevise, c);
+        }
         // Eco-contribution
         if (showEco) {
             c.gridx = 4;
             c.gridy++;
             c.weightx = 0;
-            this.add(new JLabel("Dont Eco-Contrib."), c);
+            this.add(new JLabel(TM.tr("TotalPanel.ecoTax")), c); //$NON-NLS-1$
             c.gridx++;
             c.weightx = 1;
             this.add(this.textTotalEco, c);
+        }
         c.gridwidth = 1;
         c.gridx = 4;
         c.gridy++;
         c.weightx = 0;
         c.fill = GridBagConstraints.HORIZONTAL;
-        this.add(getLabelBoldFor(textTotalTTC.getField(), "Total TTC"), c);
+        this.add(getLabelBoldFor(textTotalTTC.getField(), TM.tr("TotalPanel.total.taxIncluded")), c); //$NON-NLS-1$
         c.gridx++;
         c.weightx = 1;
         textTotalTTC.setFont(textTotalHT.getFont());
         this.add(textTotalTTC, c);
                 updateTotal();
+            }
         });
+    }
+    public void setTextFraisDoc(DeviseField textFraisDoc, SQLRequestComboBox boxTVA) {
+        this.textFraisDoc = textFraisDoc;
+        this.selFraisDocTVA = boxTVA;
+    }
     public void setIntraComm(boolean intraComm) {
         this.intraComm = intraComm;
         updateTotal();
+    }
     public void setDefaultCompteProduit(SQLRowAccessor row) {
         this.defaultRowCompteProduit = row;
+    }
+    private SQLRowAccessor rowCatComptable = null;
+    public void setCategorieComptable(SQLRowAccessor row) {
+        this.rowCatComptable = row;
+    }
     /**
+     *
      */
     public void updateTotal() {
         final long valRemiseHT;
-        final BigDecimal valPortHT;
+        final BigDecimal valPortHT, fraisDoc;
         clearTextField();
         // Clone rows to be thread safe
         final List<SQLRowValues> vals = articleTable.getRowValuesAtLevel(1);
         final List<SQLRowValues> list = new ArrayList<SQLRowValues>(vals.size());
             putRowValues.put("ID_COMPTE_PCE", rowDefaultCptPort.getID());
             putRowValues.put("ID_COMPTE_PCE_ACHAT", rowDefaultCptPort.getID());
         } else {
             rowValsPort = null;
+        }
+        // Frais documents
+        if (textFraisDoc.getText().trim().length() > 0) {
+            if (!textFraisDoc.getText().trim().equals("-")) {
+                long p = GestionDevise.parseLongCurrency(textFraisDoc.getText().trim());
+                fraisDoc = new BigDecimal(p).movePointLeft(2);
+            } else {
+                fraisDoc = BigDecimal.ZERO;
+            }
+        } else {
+            fraisDoc = BigDecimal.ZERO;
+        }
+        final SQLRow tvafraisDoc = selFraisDocTVA == null ? null : selFraisDocTVA.getSelectedRow();
+        final SQLRowValues rowValsFraisDoc;
+        if (tvafraisDoc != null && fraisDoc.signum() != 0 && !tvafraisDoc.isUndefined()) {
+            rowValsFraisDoc = new SQLRowValues(articleTable.getSQLElement().getTable());
+            rowValsFraisDoc.put(articleTable.getPrixTotalHTElement().getField().getName(), fraisDoc);
+            rowValsFraisDoc.put("QTE", 1);
+            rowValsFraisDoc.put("ID_TAXE", tvafraisDoc.getIDNumber());
+            rowValsFraisDoc.put("SERVICE", Boolean.TRUE);
+        } else {
+            rowValsFraisDoc = null;
+        }
         final Boolean isServiceActive = bServiceActive;
         if (worker != null) {
             worker.cancel(true);
+        }
                 SQLTableElement tableElementTotalHA = (articleTable.getPrebilanElement() == null) ? articleTable.getTotalHaElement() : articleTable.getPrebilanElement();
                 String fieldHA = (tableElementTotalHA == null ? null : tableElementTotalHA.getField().getName());
                 SQLTableElement tableElementTotalHT = articleTable.getPrixTotalHTElement();
                 String fieldHT = (tableElementTotalHT == null ? null : tableElementTotalHT.getField().getName());
-                final TotalCalculator calc = new TotalCalculator(fieldHA, fieldHT, fieldDevise, achat, null);
+                final TotalCalculator calc = new TotalCalculator(fieldHA, fieldHT, fieldDevise, achat, null, rowCatComptable);
                 calc.setIntraComm(intraComm);
                 if (defaultRowCompteProduit != null) {
                     calc.setRowDefaultCptProduit(defaultRowCompteProduit);
+                }
                 calc.setSelectedRows(selectedRows);
                 // TVA Port inclus
                 if (rowValsPort != null) {
                     calc.addLine(rowValsPort, rowValsPort.getForeign("ID_ARTICLE"), 0, false);
+                }
+                if (rowValsFraisDoc != null) {
+                    calc.addLine(rowValsFraisDoc, null, 0, false);
+                }
                 // Verification du resultat ht +tva = ttc
                 calc.checkResult();
                 if (Thread.currentThread().isInterrupted()) {
                     throw new InterruptedException();
+                }

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/core/common/ui/TotalPanel.java - Rev 149 → 156