WebSVN - OpenConcerto - Diff - Rev 151 and 156 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/shipment/ui/BonDeLivraisonItemTable.java

         SQLPreferences prefs = new SQLPreferences(getSQLElement().getTable().getDBRoot());
         final boolean selectArticle = prefs.getBoolean(GestionArticleGlobalPreferencePanel.USE_CREATED_ARTICLE, false);
         final boolean createAuto = prefs.getBoolean(GestionArticleGlobalPreferencePanel.CREATE_ARTICLE_AUTO, true);
         final boolean filterFamilleArticle = prefs.getBoolean(GestionArticleGlobalPreferencePanel.FILTER_BY_FAMILY, false);
         final boolean showEco = prefs.getBoolean(AbstractVenteArticleItemTable.SHOW_ECO_CONTRIBUTION_COLUMNS, false);
+        final boolean showDevise = prefs.getBoolean(AbstractVenteArticleItemTable.ARTICLE_SHOW_DEVISE, false);
         final UserRights rights = UserRightsManager.getCurrentUserRights();
         final boolean editVTPrice = rights.haveRight(EDIT_PRIX_VENTE_CODE);
         final boolean showHAPrice = rights.haveRight(SHOW_PRIX_ACHAT_CODE);
         final boolean lockVTMinPrice = rights.haveRight(LOCK_PRIX_MIN_VENTE_CODE);
             list.add(this.tableElementEco);
+        }
         SQLTableElement eltDevise = null;
         SQLTableElement eltUnitDevise = null;
-        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
+        if (showDevise) {
             // Devise
             eltDevise = new SQLTableElement(e.getTable().getField("ID_DEVISE"));
             list.add(eltDevise);
             // Prix vente devise
         // Service
         // this.service = new SQLTableElement(e.getTable().getField("SERVICE"), Boolean.class);
         // list.add(this.service);
-        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
+        if (showDevise) {
             // Total HT
             this.tableElementTotalDevise = new SQLTableElement(e.getTable().getField("PV_T_DEVISE"), BigDecimal.class) {
                 @Override
                 public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
                     return isCellNiveauEditable(vals, rowIndex, columnIndex);
         SQLRowValues defautRow = new SQLRowValues(UndefinedRowValuesCache.getInstance().getDefaultRowValues(e.getTable()));
         defautRow.put("ID_TAXE", TaxeCache.getCache().getFirstTaxe().getID());
         defautRow.put("CODE", "");
         defautRow.put("NOM", "");
-        final RowValuesTableModel model = new RowValuesTableModel(e, list, e.getTable().getField("NOM"), false, defautRow);
+        final RowValuesTableModel model = new RowValuesTableModel(e, list, e.getTable().getField("NOM"), false, defautRow) {
+            @Override
+            public void commitData() {
+                int size = getRowCount();
+                for (int i = 0; i < size; i++) {
+                    SQLRowValues rowVals = getRowValuesAt(i);
+                    if (rowVals.getObject("PV_U_DEVISE") == null) {
+                        rowVals.put("PV_U_DEVISE", rowVals.getObject("PRIX_METRIQUE_VT_1"));
+                        final BigDecimal globalQty = rowVals.getBigDecimal("QTE_UNITAIRE").multiply(new BigDecimal(rowVals.getInt("QTE")));
+                        rowVals.put("PV_T_DEVISE", rowVals.getBigDecimal("PRIX_METRIQUE_VT_1").multiply(globalQty));
+                    }
+                }
+                super.commitData();
+            }
+        };
         this.setModel(model);
         this.table = new RowValuesTable(model, getConfigurationFile());
         ToolTipManager.sharedInstance().unregisterComponent(this.table);
         ToolTipManager.sharedInstance().unregisterComponent(this.table.getTableHeader());
             ((SQLTextComboTableCellEditor) tableElementArticle.getTableCellEditor(this.table)).setDynamicWhere(e.getTable().getTable("ARTICLE").getField("ID_FAMILLE_ARTICLE"));
+        }
         List<String> completionField = new ArrayList<String>();
         final SQLTable sqlTableArticle = ((ComptaPropsConfiguration) Configuration.getInstance()).getRootSociete().getTable("ARTICLE");
-        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
+        if (showDevise) {
             completionField.add("CODE_DOUANIER");
-        }
-        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
             completionField.add("ID_PAYS");
+        }
         if (e.getTable().getFieldsName().contains("ID_ECO_CONTRIBUTION")) {
             completionField.add("ID_ECO_CONTRIBUTION");
+        }
         completionField.add("ID_UNITE_VENTE");
+        completionField.add("QTE_UNITAIRE");
         completionField.add("PA_HT");
         completionField.add("PV_HT");
         completionField.add("ID_TAXE");
         completionField.add("POIDS");
         completionField.add("PRIX_METRIQUE_HA_1");
         completionField.add("SERVICE");
         completionField.add("ID_FAMILLE_ARTICLE");
         if (getSQLElement().getTable().getFieldsName().contains("DESCRIPTIF")) {
             completionField.add("DESCRIPTIF");
+        }
-        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
+        if (showDevise) {
             completionField.add("ID_DEVISE");
-        }
-        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
             completionField.add("PV_U_DEVISE");
+        }
         if (getSQLElement().getTable().getFieldsName().contains("QTE_ACHAT") && sqlTableArticle.getTable().getFieldsName().contains("QTE_ACHAT")) {
             completionField.add("QTE_ACHAT");
+        }
+                }
+            }
         });
-        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
+        if (showDevise) {
             if (eltUnitDevise != null) {
                 eltUnitDevise.addModificationListener(tableElement_PrixMetrique1_VenteHT);
+            }
             if (eltUnitDevise != null) {
         final boolean gestionUV = prefs.getBoolean(GestionArticleGlobalPreferencePanel.UNITE_VENTE, true);
         setColumnVisible(model.getColumnForField("QTE_UNITAIRE"), gestionUV);
         setColumnVisible(model.getColumnForField("ID_UNITE_VENTE"), gestionUV);
         setColumnVisible(model.getColumnForField("PRIX_METRIQUE_HA_1"), showHAPrice);
+        setColumnVisible(model.getColumnForField("MARGE_HT"), showHAPrice);
         setColumnVisible(model.getColumnForField("T_PA_HT"), showHAPrice);
         if (e.getTable().contains("ID_COMMANDE_CLIENT_ELEMENT")) {
             setColumnVisible(model.getColumnForField("ID_COMMANDE_CLIENT_ELEMENT"), false);
+        }

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/shipment/ui/BonDeLivraisonItemTable.java @ 174 - Rev 151 → 156