OpenConcerto

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

svn://code.openconcerto.org/openconcerto

Rev

Rev 149 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 149 Rev 156
Line 107... Line 107...
107
    public static final String ARTICLE_SHOW_DEVISE = "ArticleShowDevise";
107
    public static final String ARTICLE_SHOW_DEVISE = "ArticleShowDevise";
108
    public static final String ARTICLE_SERVICE = "ArticleService";
108
    public static final String ARTICLE_SERVICE = "ArticleService";
109
 
109
 
110
    public static final String EDIT_PRIX_VENTE_CODE = "CORPS_EDITER_PRIX_VENTE";
110
    public static final String EDIT_PRIX_VENTE_CODE = "CORPS_EDITER_PRIX_VENTE";
111
    public static final String SHOW_PRIX_ACHAT_CODE = "CORPS_VOIR_PRIX_ACHAT";
111
    public static final String SHOW_PRIX_ACHAT_CODE = "CORPS_VOIR_PRIX_ACHAT";
-
 
112
    public static final String SHOW_PRIX_VENTE_CODE = "CORPS_VOIR_PRIX_VENTE";
112
    public static final String LOCK_PRIX_MIN_VENTE_CODE = "CORPS_VERROU_PRIX_MIN_VENTE";
113
    public static final String LOCK_PRIX_MIN_VENTE_CODE = "CORPS_VERROU_PRIX_MIN_VENTE";
113
 
114
 
114
    public AbstractVenteArticleItemTable() {
115
    public AbstractVenteArticleItemTable() {
115
        super();
116
        super();
116
    }
117
    }
Line 262... Line 263...
262
        SQLPreferences prefs = SQLPreferences.getMemCached(getSQLElement().getTable().getDBRoot());
263
        SQLPreferences prefs = SQLPreferences.getMemCached(getSQLElement().getTable().getDBRoot());
263
        final boolean selectArticle = prefs.getBoolean(GestionArticleGlobalPreferencePanel.USE_CREATED_ARTICLE, false);
264
        final boolean selectArticle = prefs.getBoolean(GestionArticleGlobalPreferencePanel.USE_CREATED_ARTICLE, false);
264
        final boolean filterFamilleArticle = prefs.getBoolean(GestionArticleGlobalPreferencePanel.FILTER_BY_FAMILY, false);
265
        final boolean filterFamilleArticle = prefs.getBoolean(GestionArticleGlobalPreferencePanel.FILTER_BY_FAMILY, false);
265
        final boolean createAuto = prefs.getBoolean(GestionArticleGlobalPreferencePanel.CREATE_ARTICLE_AUTO, true);
266
        final boolean createAuto = prefs.getBoolean(GestionArticleGlobalPreferencePanel.CREATE_ARTICLE_AUTO, true);
266
        final boolean showEco = prefs.getBoolean(AbstractVenteArticleItemTable.SHOW_ECO_CONTRIBUTION_COLUMNS, false);
267
        final boolean showEco = prefs.getBoolean(AbstractVenteArticleItemTable.SHOW_ECO_CONTRIBUTION_COLUMNS, false);
-
 
268
        final boolean showDevise = prefs.getBoolean(AbstractVenteArticleItemTable.ARTICLE_SHOW_DEVISE, false);
267
 
269
 
268
        final UserRights rights = UserRightsManager.getCurrentUserRights();
270
        final UserRights rights = UserRightsManager.getCurrentUserRights();
269
        final boolean editVTPrice = rights.haveRight(EDIT_PRIX_VENTE_CODE);
271
        final boolean editVTPrice = rights.haveRight(EDIT_PRIX_VENTE_CODE);
270
        final boolean showHAPrice = rights.haveRight(SHOW_PRIX_ACHAT_CODE);
272
        final boolean showHAPrice = rights.haveRight(SHOW_PRIX_ACHAT_CODE);
271
        final boolean lockVTMinPrice = rights.haveRight(LOCK_PRIX_MIN_VENTE_CODE);
273
        final boolean lockVTMinPrice = rights.haveRight(LOCK_PRIX_MIN_VENTE_CODE);
Line 287... Line 289...
287
 
289
 
288
        final SQLTableElement tableFamille = new SQLTableElement(e.getTable().getField("ID_FAMILLE_ARTICLE"));
290
        final SQLTableElement tableFamille = new SQLTableElement(e.getTable().getField("ID_FAMILLE_ARTICLE"));
289
        list.add(tableFamille);
291
        list.add(tableFamille);
290
 
292
 
291
        // Article
293
        // Article
-
 
294
        SQLTableElement tableElementDepot = new SQLTableElement(e.getTable().getField("ID_DEPOT_STOCK"), true, true, true);
-
 
295
        list.add(tableElementDepot);
-
 
296
 
-
 
297
        // Article
292
        SQLTableElement tableElementArticle = new SQLTableElement(e.getTable().getField("ID_ARTICLE"), true, true, true);
298
        SQLTableElement tableElementArticle = new SQLTableElement(e.getTable().getField("ID_ARTICLE"), true, true, true);
293
        list.add(tableElementArticle);
299
        list.add(tableElementArticle);
294
 
300
 
295
        if (e.getTable().getFieldsName().contains("ID_ECO_CONTRIBUTION")) {
301
        if (e.getTable().getFieldsName().contains("ID_ECO_CONTRIBUTION")) {
296
            this.tableElementEcoID = new SQLTableElement(e.getTable().getField("ID_ECO_CONTRIBUTION"));
302
            this.tableElementEcoID = new SQLTableElement(e.getTable().getField("ID_ECO_CONTRIBUTION"));
Line 319... Line 325...
319
        if (e.getTable().getFieldsName().contains("DELAI")) {
325
        if (e.getTable().getFieldsName().contains("DELAI")) {
320
            final SQLTableElement tableElementDelai = new SQLTableElement(e.getTable().getField("DELAI"));
326
            final SQLTableElement tableElementDelai = new SQLTableElement(e.getTable().getField("DELAI"));
321
            list.add(tableElementDelai);
327
            list.add(tableElementDelai);
322
        }
328
        }
323
 
329
 
324
        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
330
        if (showDevise) {
325
            // Code Douanier
331
            // Code Douanier
326
            final SQLTableElement tableElementCodeDouane = new SQLTableElement(e.getTable().getField("CODE_DOUANIER"));
332
            final SQLTableElement tableElementCodeDouane = new SQLTableElement(e.getTable().getField("CODE_DOUANIER"));
327
            list.add(tableElementCodeDouane);
333
            list.add(tableElementCodeDouane);
328
        }
-
 
329
        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
-
 
330
            final SQLTableElement tableElementPays = new SQLTableElement(e.getTable().getField("ID_PAYS"));
334
            final SQLTableElement tableElementPays = new SQLTableElement(e.getTable().getField("ID_PAYS"));
331
            list.add(tableElementPays);
335
            list.add(tableElementPays);
332
        }
336
        }
333
 
337
 
334
        // Valeur des métriques
338
        // Valeur des métriques
Line 425... Line 429...
425
        tableElement_PrixMetrique1_AchatHT.setRenderer(new CurrencyWithSymbolRenderer());
429
        tableElement_PrixMetrique1_AchatHT.setRenderer(new CurrencyWithSymbolRenderer());
426
        list.add(tableElement_PrixMetrique1_AchatHT);
430
        list.add(tableElement_PrixMetrique1_AchatHT);
427
 
431
 
428
        SQLTableElement eltDevise = null;
432
        SQLTableElement eltDevise = null;
429
        SQLTableElement eltUnitDevise = null;
433
        SQLTableElement eltUnitDevise = null;
430
        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
434
        if (showDevise) {
431
            // Devise
435
            // Devise
432
            eltDevise = new SQLTableElement(e.getTable().getField("ID_DEVISE"));
436
            eltDevise = new SQLTableElement(e.getTable().getField("ID_DEVISE"));
433
            list.add(eltDevise);
437
            list.add(eltDevise);
434
 
438
 
435
            // Prix vente devise
439
            // Prix vente devise
Line 725... Line 729...
725
        this.totalHA = new SQLTableElement(e.getTable().getField("T_PA_HT"), BigDecimal.class);
729
        this.totalHA = new SQLTableElement(e.getTable().getField("T_PA_HT"), BigDecimal.class);
726
        this.totalHA.setRenderer(new CurrencyWithSymbolRenderer());
730
        this.totalHA.setRenderer(new CurrencyWithSymbolRenderer());
727
        this.totalHA.setEditable(false);
731
        this.totalHA.setEditable(false);
728
        list.add(this.totalHA);
732
        list.add(this.totalHA);
729
 
733
 
730
        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
734
        if (showDevise) {
731
            // Total HT
735
            // Total HT
732
            this.tableElementTotalDevise = new SQLTableElement(e.getTable().getField("PV_T_DEVISE"), BigDecimal.class) {
736
            this.tableElementTotalDevise = new SQLTableElement(e.getTable().getField("PV_T_DEVISE"), BigDecimal.class) {
733
                @Override
737
                @Override
734
                public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
738
                public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
735
                    return isCellNiveauEditable(vals, rowIndex, columnIndex);
739
                    return isCellNiveauEditable(vals, rowIndex, columnIndex);
Line 836... Line 840...
836
 
840
 
837
        this.defaultRowVals = new SQLRowValues(UndefinedRowValuesCache.getInstance().getDefaultRowValues(e.getTable()));
841
        this.defaultRowVals = new SQLRowValues(UndefinedRowValuesCache.getInstance().getDefaultRowValues(e.getTable()));
838
        defaultRowVals.put("ID_TAXE", TaxeCache.getCache().getFirstTaxe().getID());
842
        defaultRowVals.put("ID_TAXE", TaxeCache.getCache().getFirstTaxe().getID());
839
        defaultRowVals.put("CODE", "");
843
        defaultRowVals.put("CODE", "");
840
        defaultRowVals.put("NOM", "");
844
        defaultRowVals.put("NOM", "");
841
        final RowValuesTableModel model = new RowValuesTableModel(e, list, e.getTable().getField("ID_TAXE"), false, defaultRowVals);
845
        final RowValuesTableModel model = new RowValuesTableModel(e, list, e.getTable().getField("ID_TAXE"), false, defaultRowVals) {
-
 
846
            @Override
-
 
847
            public void commitData() {
-
 
848
                int size = getRowCount();
-
 
849
                for (int i = 0; i < size; i++) {
-
 
850
                    SQLRowValues rowVals = getRowValuesAt(i);
-
 
851
                    if (rowVals.getObject("PV_U_DEVISE") == null) {
-
 
852
                        rowVals.put("PV_U_DEVISE", rowVals.getObject("PRIX_METRIQUE_VT_1"));
-
 
853
                        final BigDecimal globalQty = rowVals.getBigDecimal("QTE_UNITAIRE").multiply(new BigDecimal(rowVals.getInt("QTE")));
-
 
854
                        rowVals.put("PV_T_DEVISE", rowVals.getBigDecimal("PRIX_METRIQUE_VT_1").multiply(globalQty));
-
 
855
                    }
-
 
856
                }
-
 
857
                super.commitData();
-
 
858
            }
-
 
859
        };
842
        setModel(model);
860
        setModel(model);
843
 
861
 
844
        this.table = new RowValuesTable(model, getConfigurationFile());
862
        this.table = new RowValuesTable(model, getConfigurationFile());
845
        ToolTipManager.sharedInstance().unregisterComponent(this.table);
863
        ToolTipManager.sharedInstance().unregisterComponent(this.table);
846
        ToolTipManager.sharedInstance().unregisterComponent(this.table.getTableHeader());
864
        ToolTipManager.sharedInstance().unregisterComponent(this.table.getTableHeader());
Line 853... Line 871...
853
        final SQLTable sqlTableArticle = ((ComptaPropsConfiguration) Configuration.getInstance()).getRootSociete().getTable("ARTICLE");
871
        final SQLTable sqlTableArticle = ((ComptaPropsConfiguration) Configuration.getInstance()).getRootSociete().getTable("ARTICLE");
854
        List<String> completionField = new ArrayList<String>();
872
        List<String> completionField = new ArrayList<String>();
855
        if (e.getTable().getFieldsName().contains("ID_ECO_CONTRIBUTION")) {
873
        if (e.getTable().getFieldsName().contains("ID_ECO_CONTRIBUTION")) {
856
            completionField.add("ID_ECO_CONTRIBUTION");
874
            completionField.add("ID_ECO_CONTRIBUTION");
857
        }
875
        }
858
        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
-
 
859
            completionField.add("POURCENT_REMISE");
876
        if (showDevise) {
860
 
-
 
861
            completionField.add("CODE_DOUANIER");
877
            completionField.add("CODE_DOUANIER");
862
        }
-
 
863
        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
-
 
864
            completionField.add("ID_PAYS");
878
            completionField.add("ID_PAYS");
865
        }
879
        }
-
 
880
        completionField.add("POURCENT_REMISE");
866
        completionField.add("ID_UNITE_VENTE");
881
        completionField.add("ID_UNITE_VENTE");
-
 
882
        completionField.add("QTE_UNITAIRE");
867
        completionField.add("PA_HT");
883
        completionField.add("PA_HT");
868
        completionField.add("PV_HT");
884
        completionField.add("PV_HT");
869
        completionField.add("ID_TAXE");
885
        completionField.add("ID_TAXE");
870
        completionField.add("POIDS");
886
        completionField.add("POIDS");
871
        completionField.add("PRIX_METRIQUE_HA_1");
887
        completionField.add("PRIX_METRIQUE_HA_1");
Line 881... Line 897...
881
        completionField.add("SERVICE");
897
        completionField.add("SERVICE");
882
        completionField.add("ID_FAMILLE_ARTICLE");
898
        completionField.add("ID_FAMILLE_ARTICLE");
883
        if (getSQLElement().getTable().getFieldsName().contains("DESCRIPTIF")) {
899
        if (getSQLElement().getTable().getFieldsName().contains("DESCRIPTIF")) {
884
            completionField.add("DESCRIPTIF");
900
            completionField.add("DESCRIPTIF");
885
        }
901
        }
886
        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
902
        if (showDevise) {
887
            completionField.add("ID_DEVISE");
903
            completionField.add("ID_DEVISE");
888
        }
-
 
889
        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
-
 
890
            completionField.add("PV_U_DEVISE");
904
            completionField.add("PV_U_DEVISE");
891
        }
905
        }
892
        if (getSQLElement().getTable().getFieldsName().contains("QTE_ACHAT") && sqlTableArticle.getTable().getFieldsName().contains("QTE_ACHAT")) {
906
        if (getSQLElement().getTable().getFieldsName().contains("QTE_ACHAT") && sqlTableArticle.getTable().getFieldsName().contains("QTE_ACHAT")) {
893
            completionField.add("QTE_ACHAT");
907
            completionField.add("QTE_ACHAT");
894
        }
908
        }
Line 919... Line 933...
919
                // FIXME utiliser le stock sélectionné sur la ligne et non le stock par défaut de
933
                // FIXME utiliser le stock sélectionné sur la ligne et non le stock par défaut de
920
                // l'article
934
                // l'article
921
                final SQLTable tableStock = sqlTableArticle.getTable("STOCK");
935
                final SQLTable tableStock = sqlTableArticle.getTable("STOCK");
922
                input.andWhere(new Where(tableStock.getKey(), "=", sqlTableArticle.getField("ID_STOCK")));
936
                input.andWhere(new Where(tableStock.getKey(), "=", sqlTableArticle.getField("ID_STOCK")));
923
                input.setExcludeUndefined(false, tableStock);
937
                input.setExcludeUndefined(false, tableStock);
924
                Where w = new Where(sqlTableArticle.getField("OBSOLETE"), "=", Boolean.FALSE).or(new Where(input.getAlias(tableStock.getKey()), "=", tableStock.getUndefinedID()))
938
                Where w = new Where(sqlTableArticle.getField("OBSOLETE"), "=", Boolean.FALSE)
925
                        .or(new Where(input.getAlias(tableStock.getField("QTE_REEL")), ">", 0));
939
                        .or(new Where(input.getAlias(tableStock.getKey()), "!=", tableStock.getUndefinedID()).and(new Where(input.getAlias(tableStock.getField("QTE_REEL")), ">", 0)));
926
 
940
 
927
                if (input.getWhere() != null) {
941
                if (input.getWhere() != null) {
928
                    input.setWhere(input.getWhere().and(w));
942
                    input.setWhere(input.getWhere().and(w));
929
                } else {
943
                } else {
930
                    input.setWhere(w);
944
                    input.setWhere(w);
Line 1187... Line 1201...
1187
            public void setValueFrom(SQLRowValues row, Object value) {
1201
            public void setValueFrom(SQLRowValues row, Object value) {
1188
                super.setValueFrom(row, value);
1202
                super.setValueFrom(row, value);
1189
            }
1203
            }
1190
        });
1204
        });
1191
 
1205
 
1192
        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
1206
        if (showDevise) {
1193
            this.qte.addModificationListener(tableElementTotalDevise);
1207
            this.qte.addModificationListener(tableElementTotalDevise);
1194
            qteU.addModificationListener(tableElementTotalDevise);
1208
            qteU.addModificationListener(tableElementTotalDevise);
1195
            if (eltUnitDevise != null) {
1209
            if (eltUnitDevise != null) {
1196
                eltUnitDevise.addModificationListener(tableElementTotalDevise);
1210
                eltUnitDevise.addModificationListener(tableElementTotalDevise);
1197
            }
1211
            }
Line 1328... Line 1342...
1328
                }
1342
                }
1329
            }
1343
            }
1330
 
1344
 
1331
        });
1345
        });
1332
 
1346
 
1333
        if (DefaultNXProps.getInstance().getBooleanValue(ARTICLE_SHOW_DEVISE, false)) {
1347
        if (showDevise) {
1334
            if (eltUnitDevise != null) {
1348
            if (eltUnitDevise != null) {
1335
                eltUnitDevise.addModificationListener(tableElement_PrixMetrique1_VenteHT);
1349
                eltUnitDevise.addModificationListener(tableElement_PrixMetrique1_VenteHT);
1336
            }
1350
            }
1337
 
1351
 
1338
            if (eltUnitDevise != null) {
1352
            if (eltUnitDevise != null) {
Line 1444... Line 1458...
1444
        setColumnVisible(model.getColumnForField("POURCENT_FACTURABLE"), false);
1458
        setColumnVisible(model.getColumnForField("POURCENT_FACTURABLE"), false);
1445
 
1459
 
1446
        setColumnVisible(getModel().getColumnForField("ID_FAMILLE_ARTICLE"), filterFamilleArticle);
1460
        setColumnVisible(getModel().getColumnForField("ID_FAMILLE_ARTICLE"), filterFamilleArticle);
1447
 
1461
 
1448
        setColumnVisible(model.getColumnForField("PRIX_METRIQUE_HA_1"), showHAPrice);
1462
        setColumnVisible(model.getColumnForField("PRIX_METRIQUE_HA_1"), showHAPrice);
-
 
1463
        setColumnVisible(model.getColumnForField("MARGE_HT"), showHAPrice);
1449
        setColumnVisible(model.getColumnForField("T_PA_HT"), showHAPrice);
1464
        setColumnVisible(model.getColumnForField("T_PA_HT"), showHAPrice);
1450
 
1465
 
1451
 
1466
 
-
 
1467
        setColumnVisible(model.getColumnForField("ID_DEPOT_STOCK"), prefs.getBoolean(GestionArticleGlobalPreferencePanel.STOCK_MULTI_DEPOT, false));
-
 
1468
 
1452
        for (String string : visibilityMap.keySet()) {
1469
        for (String string : visibilityMap.keySet()) {
1453
            setColumnVisible(model.getColumnForField(string), visibilityMap.get(string));
1470
            setColumnVisible(model.getColumnForField(string), visibilityMap.get(string));
1454
        }
1471
        }
1455
 
1472
 
1456
        Map<String, Boolean> mapCustom = getCustomVisibilityMap();
1473
        Map<String, Boolean> mapCustom = getCustomVisibilityMap();
Line 1537... Line 1554...
1537
        return tarifCompletion(row, field, rowDest, false);
1554
        return tarifCompletion(row, field, rowDest, false);
1538
    }
1555
    }
1539
 
1556
 
1540
    protected Object tarifCompletion(SQLRowAccessor row, String field, SQLRowAccessor rowDest, boolean fromCompletion) {
1557
    protected Object tarifCompletion(SQLRowAccessor row, String field, SQLRowAccessor rowDest, boolean fromCompletion) {
1541
 
1558
 
1542
        if (row != null && !row.isUndefined() && getSQLElement().getTable().getDBRoot().contains("ARTICLE_PRIX_REVIENT")
-
 
1543
                && (field.equalsIgnoreCase("PRIX_METRIQUE_HA_1") || field.equalsIgnoreCase("PA_HT"))) {
1559
        if (row != null && !row.isUndefined() && (field.equalsIgnoreCase("PRIX_METRIQUE_HA_1") || field.equalsIgnoreCase("PA_HT"))) {
1544
 
1560
 
-
 
1561
            if (getSQLElement().getTable().getDBRoot().contains("ARTICLE_PRIX_REVIENT")) {
1545
            final BigDecimal prc;
1562
                final BigDecimal prc;
1546
            if (row.getBoolean("AUTO_PRIX_REVIENT_NOMENCLATURE")) {
1563
                if (row.getBoolean("AUTO_PRIX_REVIENT_NOMENCLATURE")) {
1547
                ProductHelper helper = new ProductHelper(row.getTable().getDBRoot());
1564
                    ProductHelper helper = new ProductHelper(row.getTable().getDBRoot());
1548
                prc = helper.getBomPriceForQuantity(1, row.getReferentRows(row.getTable().getTable("ARTICLE_ELEMENT").getField("ID_ARTICLE_PARENT")), TypePrice.ARTICLE_PRIX_REVIENT);
1565
                    prc = helper.getBomPriceForQuantity(1, row.getReferentRows(row.getTable().getTable("ARTICLE_ELEMENT").getField("ID_ARTICLE_PARENT")), TypePrice.ARTICLE_PRIX_REVIENT);
1549
            } else {
1566
                } else {
1550
                ProductComponent productComp = new ProductComponent(row, BigDecimal.ONE);
1567
                    ProductComponent productComp = new ProductComponent(row, BigDecimal.ONE, null, null);
1551
                prc = productComp.getPRC(new Date());
1568
                    prc = productComp.getPRC(new Date());
1552
            }
1569
                }
1553
            if (prc == null) {
1570
                if (prc == null) {
1554
                return BigDecimal.ZERO;
1571
                    return BigDecimal.ZERO;
1555
            }
1572
                }
1556
            return prc;
1573
                return prc;
-
 
1574
            } else if (getSQLElement().getTable().getDBRoot().contains("COUT_REVIENT") && row.getObject("ID_COUT_REVIENT") != null && !row.isForeignEmpty("ID_COUT_REVIENT")) {
-
 
1575
                BigDecimal ha = row.getBigDecimal(field);
-
 
1576
                BigDecimal percent = row.getForeign("ID_COUT_REVIENT").getBigDecimal("POURCENT");
-
 
1577
                return ha.multiply(percent.movePointLeft(2).add(BigDecimal.ONE)).setScale(ha.precision(), RoundingMode.HALF_UP);
-
 
1578
            }
1557
        }
1579
        }
1558
 
1580
 
1559
        if (getTarif() != null && !getTarif().isUndefined()) {
1581
        if (getTarif() != null && !getTarif().isUndefined()) {
1560
            Collection<? extends SQLRowAccessor> rows = row.getReferentRows(tableArticleTarif);
1582
            Collection<? extends SQLRowAccessor> rows = row.getReferentRows(tableArticleTarif);
1561
 
1583
 
Line 1631... Line 1653...
1631
                    return remise;
1653
                    return remise;
1632
                }
1654
                }
1633
            }
1655
            }
1634
        }
1656
        }
1635
 
1657
 
-
 
1658
        if (field.equalsIgnoreCase("ID_TAXE_VENTE") && this.rowCatComptable != null) {
-
 
1659
            return this.rowCatComptable.getForeignID("ID_TAXE_VENTE");
-
 
1660
        }
-
 
1661
 
1636
        if ((field.equalsIgnoreCase("POURCENT_REMISE"))) {
1662
        if ((field.equalsIgnoreCase("POURCENT_REMISE"))) {
1637
            return new Acompte(BigDecimal.ZERO, BigDecimal.ZERO);
1663
            return new Acompte(BigDecimal.ZERO, BigDecimal.ZERO);
1638
        }
1664
        }
1639
 
1665
 
1640
        if ((field.equalsIgnoreCase("PRIX_METRIQUE_VT_1"))) {
1666
        if ((field.equalsIgnoreCase("PRIX_METRIQUE_VT_1"))) {