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

 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.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.core.sales.shipment.element.BonDeLivraisonSQLElement;
 import org.openconcerto.erp.core.sales.shipment.report.BonLivraisonXmlSheet;
 import org.openconcerto.erp.core.sales.shipment.ui.BonDeLivraisonItemTable;
 import org.openconcerto.erp.core.supplychain.stock.element.StockLabel;
 import org.openconcerto.erp.panel.PanelOOSQLComponent;
 import org.openconcerto.erp.preferences.GestionArticleGlobalPreferencePanel;
 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.SQLRow;
 import org.openconcerto.sql.model.SQLRowAccessor;
 import org.openconcerto.sql.model.SQLRowValues;
+        }
         if (getTable().contains("ID_TAXE_PORT")) {
             SQLRow taxeDefault = TaxeCache.getCache().getFirstTaxe();
             rowVals.put("ID_TAXE_PORT", taxeDefault.getID());
+        }
+        if (getTable().contains("ID_TAXE_FRAIS_DOCUMENT")) {
+            SQLRow taxeDefault = TaxeCache.getCache().getFirstTaxe();
+            rowVals.put("ID_TAXE_FRAIS_DOCUMENT", taxeDefault.getID());
+        }
         return rowVals;
+    }
     public void addViews() {
         this.textTotalHT.setOpaque(false);
                     if (wantedID != SQLRow.NONEXISTANT_ID && wantedID >= SQLRow.MIN_VALID_ID) {
                         final SQLRow rowClient = getTable().getForeignTable("ID_CLIENT").getRow(wantedID);
                         int idClient = rowClient.getID();
                         comboContact.getRequest().setWhere(new Where(contactElement.getTable().getField("ID_CLIENT"), "=", idClient));
+                        if (rowClient.getObject("ID_CATEGORIE_COMPTABLE") != null && !rowClient.isForeignEmpty("ID_CATEGORIE_COMPTABLE")) {
+                            tableBonItem.setRowCatComptable(rowClient.getForeign("ID_CATEGORIE_COMPTABLE"));
+                        } else {
+                            tableBonItem.setRowCatComptable(null);
+                        }
                     } else {
                         comboContact.getRequest().setWhere(Where.FALSE);
+                        tableBonItem.setRowCatComptable(null);
                         // DevisSQLComponent.this.table.setTarif(null, false);
+                    }
+                }
             });
                         //
                         // }
                         // tableBonItem.setTarif(foreignRow, true);
                         SQLRowAccessor foreignRow = row.getForeignRow("ID_TARIF");
                         if (!foreignRow.isUndefined() && (boxTarif.getSelectedRow() == null || boxTarif.getSelectedId() != foreignRow.getID())
-                                && JOptionPane.showConfirmDialog(null, "Appliquer les tarifs associés au client?") == JOptionPane.YES_OPTION) {
+                                && JOptionPane.showConfirmDialog(null, TM.tr("deliveryForm.applyClientRates")) == JOptionPane.YES_OPTION) { //$NON-NLS-1$
                             boxTarif.setValue(foreignRow.getID());
                             // SaisieVenteFactureSQLComponent.this.tableFacture.setTarif(foreignRow,
                             // true);
                         } else {
                             boxTarif.setValue(foreignRow.getID());
+                }
+            }
         });
         // Bouton tout livrer
-        JButton boutonAll = new JButton("Tout livrer");
+        JButton boutonAll = new JButton(TM.tr("deliveryForm.shipAll")); //$NON-NLS-1$
         boutonAll.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 RowValuesTableModel m = BonDeLivraisonSQLComponent.this.tableBonItem.getModel();
         this.allowEditable("TOTAL_TVA", false);
         this.allowEditable("TOTAL_TTC", false);
         this.allowEditable("TOTAL_POIDS", false);
         final TotalPanel panelTotal = new TotalPanel(tableBonItem, fieldEco, textTotalHT, textTotalTVA, textTotalTTC, textPortHT, textRemiseHT, fieldService, fieldHA, fieldDevise, this.textPoidsTotal,
                 null, (getTable().contains("ID_TAXE_PORT") ? boxTaxePort : null), null);
         // if (b) {
         JPanel panel = new JPanel(new GridBagLayout());
         GridBagConstraints cFrais = new DefaultGridBagConstraints();
         panel.add(new JLabel(getLabelFor("TOTAL_POIDS")), cFrais);
+            }
+        }
         final String num = this.textNumeroUnique.getText();
         if (attempt == JUniqueTextField.RETRY_COUNT) {
             idBon = getSelectedID();
-            ExceptionHandler.handle("Impossible d'ajouter, numéro de bon existant.");
+            ExceptionHandler.handle(TM.tr("deliveryForm.cannotAdd.existingNumber")); //$NON-NLS-1$
             final Object root = SwingUtilities.getRoot(this);
             if (root instanceof EditFrame) {
                 final EditFrame frame = (EditFrame) root;
                 frame.getPanel().setAlwaysVisible(true);
+            }
         } else {
+            if (getTable().getDBRoot().contains("TARIF_AGENCE")) {
+                final List<ProductComponent> comps = checkStock();
+                if (comps.size() > 0) {
+                    String article = "";
+                    for (ProductComponent comp : comps) {
+                        article += "\n " + comp.getProduct().getString("CODE") + " --- " + comp.getProduct().getString("NOM");
+                    }
+                    JOptionPane.showMessageDialog(null, TM.tr("deliveryForm.cannotCreate.notInStock") + article); //$NON-NLS-1$
+                    final Object root = SwingUtilities.getRoot(this);
+                    if (root instanceof EditFrame) {
+                        final EditFrame frame = (EditFrame) root;
+                        frame.getPanel().setAlwaysVisible(true);
+                    }
+                    return -1;
+                }
+            }
             idBon = super.insert(order);
             if (this.tableBonReliquatItem != null) {
                 this.tableBonReliquatItem.updateField("ID_BON_DE_LIVRAISON_ORIGINE", idBon);
+            }
             this.tableBonItem.updateField("ID_BON_DE_LIVRAISON", idBon);
             this.tableBonItem.createArticle(idBon, this.getElement());
+            final List<Object> cmdDourceTrRowsFrom = ((BonDeLivraisonSQLElement) getElement()).getSourceTrRowsFrom(idBon, "COMMANDE_CLIENT_ELEMENT", "COMMANDE_CLIENT");
-            ((BonDeLivraisonSQLElement) getElement()).updateCmdClientElement(((BonDeLivraisonSQLElement) getElement()).getCmdClientFrom(idBon), idBon);
+            ((BonDeLivraisonSQLElement) getElement()).updateQteLivree(cmdDourceTrRowsFrom, "COMMANDE_CLIENT_ELEMENT", "COMMANDE_CLIENT");
+            final List<Object> devisSourceTrRowsFrom = ((BonDeLivraisonSQLElement) getElement()).getSourceTrRowsFrom(idBon, "DEVIS_ELEMENT", "DEVIS");
+            ((BonDeLivraisonSQLElement) getElement()).updateQteLivree(devisSourceTrRowsFrom, "DEVIS_ELEMENT", "DEVIS");
             // generation du document
             BonLivraisonXmlSheet bSheet = new BonLivraisonXmlSheet(getTable().getRow(idBon));
             bSheet.createDocumentAsynchronous();
             bSheet.showPrintAndExportAsynchronous(this.panelOO.isVisualisationSelected(), this.panelOO.isImpressionSelected(), true);
+            }
             // updateQte(idBon);
             if (attempt > 0) {
                 SwingUtilities.invokeLater(new Runnable() {
                     public void run() {
-                        JOptionPane.showMessageDialog(null, "Le numéro a été actualisé en " + num);
+                        JOptionPane.showMessageDialog(null, TM.tr("deliveryForm.numberRefreshed", num)); //$NON-NLS-1$
+                    }
                 });
+            }
+        }
         return idBon;
+    }
+    private List<ProductComponent> checkStock() {
+        List<ProductComponent> comps = new ArrayList<ProductComponent>();
+        final RowValuesTableModel rowValuesTableModel = this.tableBonItem.getRowValuesTable().getRowValuesTableModel();
+        for (int i = 0; i < rowValuesTableModel.getRowCount(); i++) {
+            final SQLRowValues rowValuesAt = rowValuesTableModel.getRowValuesAt(i);
+            if (rowValuesAt.getInt("QTE_LIVREE") > 0 && rowValuesAt != null && rowValuesAt.getObject("ID_ARTICLE") != null && !rowValuesAt.isForeignEmpty("ID_ARTICLE")) {
+                SQLRowAccessor article = rowValuesAt.getForeign("ID_ARTICLE");
+                if (article.getBoolean("GESTION_STOCK")) {
+                    ProductComponent comp = ProductComponent.createFrom(rowValuesAt);
+                    if (comp.getStock() != null && !comp.getStock().isUndefined() && comp.getStock().getFloat("QTE_REEL") < 0) {
+                        comps.add(comp);
+                    }
+                }
+            }
+        }
+        return comps;
+    }
     @Override
     public void select(SQLRowAccessor r) {
         if (r == null || r.getIDNumber() == null)
             super.select(r);
         else {
+    }
     @Override
     public void update() {
         if (!this.textNumeroUnique.checkValidation()) {
-            ExceptionHandler.handle("Impossible d'ajouter, numéro de bon de livraison existant.");
+            ExceptionHandler.handle(TM.tr("deliveryForm.cannotAdd.existingNumber")); //$NON-NLS-1$
             Object root = SwingUtilities.getRoot(this);
             if (root instanceof EditFrame) {
                 EditFrame frame = (EditFrame) root;
                 frame.getPanel().setAlwaysVisible(true);
+            }
+        }
         super.update();
         if (tableBonReliquatItem != null) {
             this.tableBonReliquatItem.updateField("ID_BON_DE_LIVRAISON_ORIGINE", getSelectedID());
+        }
+        final List<Object> cmdClientFrom = ((BonDeLivraisonSQLElement) getElement()).getSourceTrRowsFrom(getSelectedID(), "COMMANDE_CLIENT_ELEMENT", "COMMANDE_CLIENT");
-        final List<Object> cmdClientFrom = ((BonDeLivraisonSQLElement) getElement()).getCmdClientFrom(getSelectedID());
+        final List<Object> devisFrom = ((BonDeLivraisonSQLElement) getElement()).getSourceTrRowsFrom(getSelectedID(), "DEVIS_ELEMENT", "DEVIS");
         this.tableBonItem.updateField("ID_BON_DE_LIVRAISON", getSelectedID());
         this.tableBonItem.createArticle(getSelectedID(), this.getElement());
-        ((BonDeLivraisonSQLElement) getElement()).updateCmdClientElement(cmdClientFrom, getSelectedID());
+        ((BonDeLivraisonSQLElement) getElement()).updateQteLivree(devisFrom, "DEVIS_ELEMENT", "DEVIS");
+        ((BonDeLivraisonSQLElement) getElement()).updateQteLivree(cmdClientFrom, "COMMANDE_CLIENT_ELEMENT", "COMMANDE_CLIENT");
         // generation du document
         BonLivraisonXmlSheet bSheet = new BonLivraisonXmlSheet(getTable().getRow(getSelectedID()));
         bSheet.createDocumentAsynchronous();
         bSheet.showPrintAndExportAsynchronous(this.panelOO.isVisualisationSelected(), this.panelOO.isImpressionSelected(), true);
         SQLPreferences prefs = new SQLPreferences(getTable().getDBRoot());
-        SQLElement eltMvtStock = Configuration.getInstance().getDirectory().getElement("MOUVEMENT_STOCK");
         if (!prefs.getBoolean(GestionArticleGlobalPreferencePanel.STOCK_FACT, true)) {
             try {
                 updateStock(getSelectedID());
             } catch (SQLException e) {
     /**
      * Chargement des qtés restantes à livrer
+     *
      * @param l
      */
-    public void loadQuantity(List<SQLRowValues> l) {
+    public void loadQuantity(List<SQLRowValues> l, final String fromTableElt) {
         Map<Integer, SQLRowValues> map = new HashMap<Integer, SQLRowValues>();
         for (SQLRowValues sqlRowValues : l) {
+            // On ne prend en compte que les articles ou les lignes différentes de 0, autres lignes
+            // considérées comme commentaires
+            if (!sqlRowValues.isForeignEmpty("ID_ARTICLE") || sqlRowValues.getBigDecimal("PV_HT").signum() != 0) {
-            if (!sqlRowValues.isForeignEmpty("ID_ARTICLE")) {
+                if (!sqlRowValues.isForeignEmpty("ID_" + fromTableElt)) {
-                final int foreignID = sqlRowValues.getForeignID("ID_ARTICLE");
+                    final int foreignID = sqlRowValues.getForeignID("ID_" + fromTableElt);
-                if (!map.containsKey(foreignID)) {
+                    if (!map.containsKey(foreignID)) {
-                    map.put(foreignID, sqlRowValues);
+                        map.put(foreignID, sqlRowValues);
-                } else {
+                    } else {
-                    SQLRowValues vals = map.get(foreignID);
+                        SQLRowValues vals = map.get(foreignID);
-                    if (sqlRowValues.getInt("QTE_LIVREE") > 0) {
+                        if (sqlRowValues.getInt("QTE_LIVREE") > 0) {
+                            }
+                        }
+                    }
+                }
+            }
+        }
         int count = this.tableBonItem.getModel().getRowCount();
         for (int i = 0; i < count; i++) {
             final SQLRowValues rowValuesAt = this.tableBonItem.getModel().getRowValuesAt(i);
             rowValuesAt.put("QTE_LIVREE", rowValuesAt.getObject("QTE"));
+        }
         for (int i = 0; i < count; i++) {
             SQLRowValues r = this.tableBonItem.getModel().getRowValuesAt(i);
-            SQLRowValues rowTR = map.get(r.getForeignID("ID_ARTICLE"));
+            SQLRowValues rowTR = map.get(r.getForeignID("ID_" + fromTableElt));
             if (rowTR != null && !rowTR.isUndefined()) {
                 if (r.getInt("QTE_LIVREE") > 0 && rowTR.getInt("QTE_LIVREE") > 0) {
                     if (NumberUtils.areNumericallyEqual(r.getBigDecimal("QTE_UNITAIRE"), BigDecimal.ONE) || r.getInt("QTE_LIVREE") > 1) {
                         this.tableBonItem.getModel().putValue(r.getInt("QTE_LIVREE") - rowTR.getInt("QTE_LIVREE"), i, "QTE_LIVREE");
                     } else {
      * @param idBon id du bon de livraison
      * @throws SQLException
      */
     public void updateQte(int idBon) throws SQLException {
-        SQLTable tableFactureElem = new SaisieVenteFactureItemSQLElement().getTable();
+        SQLTable tableFactureElem = getDirectory().getElement(SaisieVenteFactureItemSQLElement.class).getTable();
-        SQLSelect selBonItem = new SQLSelect(getTable().getBase());
+        SQLSelect selBonItem = new SQLSelect();
-        BonDeLivraisonItemSQLElement bonElt = new BonDeLivraisonItemSQLElement();
+        BonDeLivraisonItemSQLElement bonElt = getDirectory().getElement(BonDeLivraisonItemSQLElement.class);
         selBonItem.addSelect(bonElt.getTable().getField("ID_SAISIE_VENTE_FACTURE_ELEMENT"));
         selBonItem.addSelect(bonElt.getTable().getField("QTE_LIVREE"));
         selBonItem.setWhere(bonElt.getTable().getField("ID_BON_DE_LIVRAISON"), "=", idBon);
         String reqBonItem = selBonItem.asString();
      * @param idBon id du bon de livraison
      * @throws SQLException
      */
     public void cancelUpdateQte(int idBon) throws SQLException {
-        SQLTable tableFactureElem = new SaisieVenteFactureItemSQLElement().getTable();
+        SQLTable tableFactureElem = getDirectory().getElement(SaisieVenteFactureItemSQLElement.class).getTable();
-        SQLSelect selBonItem = new SQLSelect(getTable().getBase());
+        SQLSelect selBonItem = new SQLSelect();
-        BonDeLivraisonItemSQLElement bonElt = new BonDeLivraisonItemSQLElement();
+        BonDeLivraisonItemSQLElement bonElt = getDirectory().getElement(BonDeLivraisonItemSQLElement.class);
         selBonItem.addSelect(bonElt.getTable().getField("ID_SAISIE_VENTE_FACTURE_ELEMENT"));
         selBonItem.addSelect(bonElt.getTable().getField("QTE_LIVREE"));
         selBonItem.setWhere(bonElt.getTable().getField("ID_BON_DE_LIVRAISON"), "=", idBon);
         String reqBonItem = selBonItem.asString();
             stockUpdater.update();
+        }
+    }
+    public void duplicate(final int idCmd) {
+        final SQLElement cmd = Configuration.getInstance().getDirectory().getElement("BON_DE_LIVRAISON");
+        final SQLElement cmdElt = Configuration.getInstance().getDirectory().getElement("BON_DE_LIVRAISON_ELEMENT");
+        if (idCmd > 1) {
+            final SQLRow row = cmd.getTable().getRow(idCmd);
+            final SQLRowValues rowVals = new SQLRowValues(cmd.getTable());
+            rowVals.put("ID_CLIENT", row.getInt("ID_CLIENT"));
+            rowVals.put("NUMERO", NumerotationAutoSQLElement.getNextNumero(getElement().getClass()));
+            this.select(rowVals);
+        }
+        final List<SQLRow> myListItem = cmd.getTable().getRow(idCmd).getReferentRows(cmdElt.getTable());
+        if (myListItem.size() != 0) {
+            getRowValuesTable().getRowValuesTableModel().clearRows();
+            for (final SQLRow rowElt : myListItem) {
+                final SQLRowValues rowVals = rowElt.createUpdateRow();
+                rowVals.clearPrimaryKeys();
+                rowVals.putEmptyLink("ID_COMMANDE_CLIENT_ELEMENT");
+                getRowValuesTable().getRowValuesTableModel().addRow(rowVals);
+                final int rowIndex = getRowValuesTable().getRowValuesTableModel().getRowCount() - 1;
+                getRowValuesTable().getRowValuesTableModel().fireTableModelModified(rowIndex);
+            }
+        } else {
+            getRowValuesTable().getRowValuesTableModel().clearRows();
+        }
+        getRowValuesTable().getRowValuesTableModel().fireTableDataChanged();
+        getRowValuesTable().repaint();
+    }
     public void loadFromReliquat(List<SQLRowValues> l) {
         this.tableBonItem.insertFromReliquat(l);
         this.tableBonItem.setEnabled(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/component/BonDeLivraisonSQLComponent.java - Rev 142 → 156