WebSVN - OpenConcerto - Diff - Rev 156 and 174 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/shipment/component/BonDeLivraisonSQLComponent.java

 import org.openconcerto.erp.core.common.element.NumerotationAutoSQLElement;
 import org.openconcerto.erp.core.common.ui.DeviseField;
 import org.openconcerto.erp.core.common.ui.TotalPanel;
 import org.openconcerto.erp.core.customerrelationship.customer.ui.AddressChoiceUI;
 import org.openconcerto.erp.core.customerrelationship.customer.ui.AdresseType;
+import org.openconcerto.erp.core.customerrelationship.customer.ui.CategorieComptableChoiceUI;
 import org.openconcerto.erp.core.finance.tax.model.TaxeCache;
 import org.openconcerto.erp.core.sales.invoice.element.SaisieVenteFactureItemSQLElement;
 import org.openconcerto.erp.core.sales.product.model.ProductComponent;
 import org.openconcerto.erp.core.sales.product.ui.ReliquatRowValuesTable;
 import org.openconcerto.erp.core.sales.shipment.element.BonDeLivraisonItemSQLElement;
 import org.openconcerto.erp.preferences.GestionClientPreferencePanel;
 import org.openconcerto.erp.preferences.GestionCommercialeGlobalPreferencePanel;
 import org.openconcerto.erp.utils.TM;
 import org.openconcerto.sql.Configuration;
 import org.openconcerto.sql.element.SQLElement;
+import org.openconcerto.sql.model.SQLBackgroundTableCache;
 import org.openconcerto.sql.model.SQLRow;
 import org.openconcerto.sql.model.SQLRowAccessor;
 import org.openconcerto.sql.model.SQLRowValues;
 import org.openconcerto.sql.model.SQLSelect;
 import org.openconcerto.sql.model.SQLTable;
 import org.openconcerto.sql.model.Where;
 import org.openconcerto.sql.preferences.SQLPreferences;
 import org.openconcerto.sql.sqlobject.ElementComboBox;
 import org.openconcerto.sql.sqlobject.JUniqueTextField;
 import org.openconcerto.sql.sqlobject.SQLRequestComboBox;
+import org.openconcerto.sql.sqlobject.SQLTextCombo;
+import org.openconcerto.sql.users.UserManager;
 import org.openconcerto.sql.view.EditFrame;
 import org.openconcerto.sql.view.list.RowValuesTable;
 import org.openconcerto.sql.view.list.RowValuesTableModel;
 import org.openconcerto.ui.DefaultGridBagConstraints;
 import org.openconcerto.ui.FormLayouter;
     private final JTextField textPoidsTotal = new JTextField(6);
     private final JTextField textNom = new JTextField(25);
     private final JDate date = new JDate(true);
     private final boolean displayDpt;
     private final ElementComboBox comboDpt = new ElementComboBox();
+    private ElementComboBox comboCommercial;
     public BonDeLivraisonSQLComponent() {
         super(Configuration.getInstance().getDirectory().getElement("BON_DE_LIVRAISON"));
         SQLPreferences prefs = SQLPreferences.getMemCached(getTable().getDBRoot());
         this.displayDpt = prefs.getBoolean(GestionClientPreferencePanel.DISPLAY_CLIENT_DPT, false);
         this.tableBonItem.getModel().clearRows();
         SQLRowValues rowVals = super.createDefaults();
         if (rowVals == null) {
             rowVals = new SQLRowValues(getTable());
+        }
+        SQLElement eltComm = getElement().getForeignElement("ID_COMMERCIAL");
+        int idUser = UserManager.getInstance().getCurrentUser().getId();
+        SQLRow rowsComm = SQLBackgroundTableCache.getInstance().getCacheForTable(eltComm.getTable()).getFirstRowContains(idUser, eltComm.getTable().getField("ID_USER_COMMON"));
+        if (rowsComm != null) {
+            rowVals.put("ID_COMMERCIAL", rowsComm.getID());
+        }
         if (getTable().contains("CREATE_VIRTUAL_STOCK")) {
             rowVals.put("CREATE_VIRTUAL_STOCK", Boolean.TRUE);
+        }
         if (getTable().contains("ID_TAXE_PORT")) {
             SQLRow taxeDefault = TaxeCache.getCache().getFirstTaxe();
                         addressUI.getComboAdrL().getRequest().setWhere(Where.FALSE);
+                    }
+                }
             });
+        }
+        if (prefs.getBoolean(GestionCommercialeGlobalPreferencePanel.CATEGORIE_COMPTABLE_SPEC, false)) {
+            // cat spe
+            final CategorieComptableChoiceUI catUI = new CategorieComptableChoiceUI();
+            catUI.addToUI(this, c);
+            catUI.getCombo().addModelListener("wantedID", new PropertyChangeListener() {
+                @Override
+                public void propertyChange(PropertyChangeEvent evt) {
+                    int wantedID = catUI.getCombo().getWantedID();
+                    if (wantedID != SQLRow.NONEXISTANT_ID && wantedID >= SQLRow.MIN_VALID_ID) {
+                        tableBonItem.setRowCatComptable(catUI.getCombo().getElement().getTable().getRow(wantedID));
+                    } else {
+                        tableBonItem.setRowCatComptable(null);
+                    }
+                }
+            });
+        }
         if (getTable().contains("SPEC_LIVRAISON")) {
             // Date livraison
             c.gridx++;
             c.fill = GridBagConstraints.HORIZONTAL;
             c.weightx = 0;
                         if (rowClient.getObject("ID_CATEGORIE_COMPTABLE") != null && !rowClient.isForeignEmpty("ID_CATEGORIE_COMPTABLE")) {
                             tableBonItem.setRowCatComptable(rowClient.getForeign("ID_CATEGORIE_COMPTABLE"));
                         } else {
                             tableBonItem.setRowCatComptable(null);
+                        }
+                        if (!isFilling()) {
+                            tableBonItem.setClient(rowClient, true);
+                        }
                     } else {
                         comboContact.getRequest().setWhere(Where.FALSE);
                         tableBonItem.setRowCatComptable(null);
+                        if (!isFilling()) {
+                            tableBonItem.setClient(null, true);
+                        }
                         // DevisSQLComponent.this.table.setTarif(null, false);
+                    }
+                }
             });
+            // Commercial
+            JLabel labelCommercial = new JLabel(getLabelFor("ID_COMMERCIAL"));
+            labelCommercial.setHorizontalAlignment(SwingConstants.RIGHT);
+            c.gridx++;
+            c.weightx = 0;
+            this.add(labelCommercial, c);
+            this.comboCommercial = new ElementComboBox(false, 25);
+            this.comboCommercial.setListIconVisible(false);
+            c.gridx++;
+            c.fill = GridBagConstraints.NONE;
+            c.weightx = 1;
+            this.add(this.comboCommercial, c);
+            addRequiredSQLObject(this.comboCommercial, "ID_COMMERCIAL");
+        }
         final ElementComboBox boxTarif = new ElementComboBox();
         this.comboClient.addValueListener(new PropertyChangeListener() {
             @Override
                 public void propertyChange(PropertyChangeEvent evt) {
                     SQLRow selectedRow = boxTarif.getRequest().getPrimaryTable().getRow(boxTarif.getWantedID());
                     tableBonItem.setTarif(selectedRow, !isFilling());
+                }
             });
+            if (getTable().contains("SERVI_PAR")) {
+                // Commercial
+                JLabel labelServi = new JLabel("Servi par");
+                labelServi.setHorizontalAlignment(SwingConstants.RIGHT);
+                c.gridx++;
+                c.weightx = 0;
+                this.add(labelServi, c);
+                SQLTextCombo comboServiPar = new SQLTextCombo();
+                c.gridx++;
+                c.fill = GridBagConstraints.NONE;
+                c.weightx = 1;
+                this.add(comboServiPar, c);
+                addRequiredSQLObject(comboServiPar, "SERVI_PAR");
+            }
+        }
         if (getTable().contains("A_ATTENTION")) {
             // Date livraison
             c.gridx++;

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