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

 import org.openconcerto.erp.core.sales.pos.io.BarcodeReader;
 import org.openconcerto.erp.core.sales.pos.ui.BarcodeListener;
 import org.openconcerto.erp.core.sales.product.element.ReferenceArticleSQLElement;
 import org.openconcerto.erp.core.sales.product.element.UniteVenteArticleSQLElement;
 import org.openconcerto.erp.core.sales.product.ui.CurrencyWithSymbolRenderer;
+import org.openconcerto.erp.core.sales.product.ui.DeliveredQtyRowValuesRenderer;
 import org.openconcerto.erp.core.sales.product.ui.QteUnitRowValuesRenderer;
 import org.openconcerto.erp.preferences.DefaultNXProps;
 import org.openconcerto.erp.preferences.GestionArticleGlobalPreferencePanel;
 import org.openconcerto.sql.Configuration;
 import org.openconcerto.sql.element.SQLElement;
 import org.openconcerto.sql.view.list.ValidStateChecker;
 import org.openconcerto.utils.DecimalUtils;
 import org.openconcerto.utils.Tuple3;
 import org.openconcerto.utils.i18n.TranslationManager;
+import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.HierarchyEvent;
 import java.awt.event.HierarchyListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.util.Set;
 import java.util.Vector;
 import javax.swing.AbstractAction;
 import javax.swing.JFrame;
+import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPopupMenu;
 import javax.swing.JTable;
 import javax.swing.SwingUtilities;
 import javax.swing.ToolTipManager;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
+import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.TableCellRenderer;
 public abstract class AbstractAchatArticleItemTable extends AbstractArticleItemTable {
     private AutoCompletionManager m;
         if (showDmdAchat && e.getTable().contains("ID_DEMANDE_ACHAT_ELEMENT")) {
             dmdElt = new SQLTableElement(e.getTable().getField("ID_DEMANDE_ACHAT_ELEMENT"));
             list.add(dmdElt);
+        }
+        if (e.getTable().contains("ID_AFFAIRE")) {
+            list.add(new SQLTableElement(e.getTable().getField("ID_AFFAIRE")));
+        }
         SQLTableElement tableElementCodeFournisseur = null;
         if (e.getTable().contains("ID_CODE_FOURNISSEUR") && supplierCode) {
             tableElementCodeFournisseur = new SQLTableElement(e.getTable().getField("ID_CODE_FOURNISSEUR"), true, true, true);
             list.add(tableElementCodeFournisseur);
+        }
+        if (e.getTable().contains("ID_COMPTE_PCE")) {
+            list.add(new SQLTableElement(e.getTable().getField("ID_COMPTE_PCE")));
+        }
         SQLTableElement tableElementArticle = new SQLTableElement(e.getTable().getField("ID_ARTICLE"), true, true, true) {
             @Override
             public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
                 boolean b = super.isCellEditable(vals, rowIndex, columnIndex);
                 if (vals.getTable().contains("ID_COMMANDE_ELEMENT")) {
+            }
         };
         list.add(tableElementNom);
-        SQLTableElement tableCmdElt = null;
-        if (e.getTable().contains("ID_COMMANDE_ELEMENT")) {
-            tableCmdElt = new SQLTableElement(e.getTable().getField("ID_COMMANDE_ELEMENT"));
-            list.add(tableCmdElt);
-        }
         if (e.getTable().getFieldsName().contains("DESCRIPTIF")) {
             final SQLTableElement tableElementDesc = new SQLTableElement(e.getTable().getField("DESCRIPTIF"));
             list.add(tableElementDesc);
+        }
         if (e.getTable().getFieldsName().contains("COLORIS")) {
         list.add(qteU);
         SQLTableElement uniteVente = new SQLTableElement(e.getTable().getField("ID_UNITE_VENTE"));
         list.add(uniteVente);
+        SQLTableElement tableCmdElt = null;
+        if (e.getTable().contains("ID_COMMANDE_ELEMENT")) {
+            tableCmdElt = new SQLTableElement(e.getTable().getField("ID_COMMANDE_ELEMENT"));
+            tableCmdElt.setRenderer(new DefaultTableCellRenderer() {
+                @Override
+                public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
+                    SQLRowValues rowVals = getRowValuesTable().getRowValuesTableModel().getRowValuesAt(row);
+                    JLabel tableCellRendererComponent = (JLabel) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+                    tableCellRendererComponent.setText("");
+                    if (rowVals.getObject("ID_COMMANDE_ELEMENT") != null && !rowVals.isForeignEmpty("ID_COMMANDE_ELEMENT")) {
+                        SQLRowAccessor rowCmdItem = rowVals.getForeign("ID_COMMANDE_ELEMENT");
+                        int qte = rowCmdItem.getInt("QTE");
+                        BigDecimal qteU = rowCmdItem.getBigDecimal("QTE_UNITAIRE");
+                        BigDecimal qteR = rowCmdItem.getBigDecimal("QTE_RECUE");
+                        qteU = qteU.multiply(new BigDecimal(qte));
+                        if (qteR != null) {
+                            tableCellRendererComponent.setText(qteU.subtract(qteR).setScale(2, RoundingMode.HALF_UP).toString());
+                        } else {
+                            tableCellRendererComponent.setText(qteU.setScale(2, RoundingMode.HALF_UP).toString());
+                        }
+                    }
+                    return tableCellRendererComponent;
+                }
+            });
+            tableCmdElt.setEditable(false);
+            list.add(tableCmdElt);
+        }
         if (e.getTable().getFieldsName().contains("QTE_ORIGINE")) {
             final SQLTableElement tableQteO = new SQLTableElement(e.getTable().getField("QTE_ORIGINE"));
             tableQteO.setEditable(false);
             list.add(tableQteO);
+        }
         final SQLTableElement qteElement = new SQLTableElement(e.getTable().getField("QTE"), Integer.class) {
             protected Object getDefaultNullValue() {
                 return Integer.valueOf(0);
+            }
         };
+        if (e.getTable().getFieldsName().contains("QTE_ORIGINE")) {
+            qteElement.setRenderer(new DeliveredQtyRowValuesRenderer(false));
+        }
         list.add(qteElement);
         // TVA
         this.tableElementTVA = new SQLTableElement(e.getTable().getField("ID_TAXE"));
         list.add(this.tableElementTVA);
         // Poids piece
+        }
         if (showDevise) {
             // Prix d'achat HT devise
             this.tableElementTotalDevise = new SQLTableElement(e.getTable().getField("PA_DEVISE_T"), BigDecimal.class);
-            this.tableElementTotalDevise.setRenderer(new CurrencyWithSymbolRenderer(new FieldPath(p, "CODE")));
+            CurrencyWithSymbolRenderer deviseTotalRenderer = new CurrencyWithSymbolRenderer(new FieldPath(p, "CODE"));
+            deviseTotalRenderer.setHideZeroValue(true);
+            this.tableElementTotalDevise.setRenderer(deviseTotalRenderer);
             list.add(tableElementTotalDevise);
+        }
         SQLTableElement tableElementRemise = null;
         if (e.getTable().contains("POURCENT_REMISE")) {
             list.add(this.tableElementEcoTotal);
+        }
         // Total HT
         this.totalHT = new SQLTableElement(e.getTable().getField("T_PA_HT"), BigDecimal.class);
+        DeviseTableCellRenderer totalRenderer = new DeviseTableCellRenderer();
+        totalRenderer.setHideZeroValue(true);
-        this.totalHT.setRenderer(new DeviseTableCellRenderer());
+        this.totalHT.setRenderer(totalRenderer);
         this.totalHT.setEditable(false);
         if (e.getTable().contains("POURCENT_REMISE") && tableElementRemise != null) {
             tableElementRemise.addModificationListener(this.totalHT);
+        }
         list.add(this.totalHT);
         this.totalHA = this.totalHT;
         // Total TTC
         this.tableElementTotalTTC = new SQLTableElement(e.getTable().getField("T_PA_TTC"), BigDecimal.class);
-        this.tableElementTotalTTC.setRenderer(new DeviseTableCellRenderer());
+        this.tableElementTotalTTC.setRenderer(totalRenderer);
         list.add(this.tableElementTotalTTC);
         this.defaultRowVals = new SQLRowValues(UndefinedRowValuesCache.getInstance().getDefaultRowValues(e.getTable()));
         this.defaultRowVals.put("ID_TAXE", TaxeCache.getCache().getFirstTaxe().getID());
         this.defaultRowVals.put("CODE", "");
+    }
     public Object tarifCompletion(SQLRow row, String field) {
         final SQLTable tTarifFournisseur = this.getSQLElement().getTable().getDBRoot().getTable("ARTICLE_TARIF_FOURNISSEUR");
-        if (row != null && !row.isUndefined() && field.equalsIgnoreCase("PRIX_METRIQUE_HA_1") && tTarifFournisseur != null) {
+        if (row != null && !row.isUndefined() && (field.equalsIgnoreCase("PRIX_METRIQUE_HA_1") || field.equalsIgnoreCase("PA_HT")) && tTarifFournisseur != null) {
             List<String> incoTerms;
             if (this.incoterm != null && this.incoterm.equalsIgnoreCase("CPT")) {
                 incoTerms = Arrays.asList("PRIX_ACHAT", "COEF_TRANSPORT_PORT");
             } else if (this.incoterm != null && this.incoterm.equalsIgnoreCase("DDP")) {
                     boolean priceFound = false;
                     boolean tarifFound = false;
                     if (rowsT.size() > 0) {
                         BigDecimal min = BigDecimal.ZERO;
-                        BigDecimal defaultPrice = BigDecimal.ZERO;
+                        BigDecimal defaultPrice = sqlRow.getForeign("ID_ARTICLE").getBigDecimal("PRIX_METRIQUE_HA_1");
                         Calendar c = null;
                         for (SQLRow sqlRowT : rowsT) {
                             if (this.rowFournisseur != null && this.rowFournisseur.getID() == sqlRowT.getForeignID("ID_FOURNISSEUR")) {
                                 BigDecimal priceT = getPrice(sqlRowT, incoTerms);
                                 defaultPrice = priceT;
+                        }
                     });
+                }
                 return price;
             } else if (!rows.isEmpty()) {
-                BigDecimal min = BigDecimal.ZERO;
+                BigDecimal min = row.getBigDecimal("PRIX_METRIQUE_HA_1");
                 Calendar c = null;
                 for (SQLRow sqlRow : rows) {
                     if (this.rowFournisseur != null && this.rowFournisseur.getID() == sqlRow.getForeignID("ID_FOURNISSEUR")) {
                         BigDecimal price = getPrice(sqlRow, incoTerms);
                         final Calendar datePrice = sqlRow.getDate("DATE_PRIX");

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/AbstractAchatArticleItemTable.java - Rev 156 → 174