WebSVN - OpenConcerto - Diff - Rev 180 and 182 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/supplychain/order/component/CommandeSQLComponent.java

 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
- * Copyright 2011 OpenConcerto, by ILM Informatique. All rights reserved.
+ * Copyright 2011-2019 OpenConcerto, by ILM Informatique. All rights reserved.
+ *
  * The contents of this file are subject to the terms of the GNU General Public License Version 3
  * only ("GPL"). You may not use this file except in compliance with the License. You can obtain a
  * copy of the License at http://www.gnu.org/licenses/gpl-3.0.html See the License for the specific
  * language governing permissions and limitations under the License.
 import org.openconcerto.erp.core.common.ui.AbstractVenteArticleItemTable;
 import org.openconcerto.erp.core.common.ui.DeviseField;
 import org.openconcerto.erp.core.common.ui.TotalPanel;
 import org.openconcerto.erp.core.finance.tax.model.TaxeCache;
 import org.openconcerto.erp.core.sales.product.element.ReferenceArticleSQLElement;
+import org.openconcerto.erp.core.supplychain.order.element.CommandeSQLElement;
 import org.openconcerto.erp.core.supplychain.order.element.DemandeAchatItemSQLElement;
 import org.openconcerto.erp.core.supplychain.order.ui.CommandeItemTable;
 import org.openconcerto.erp.core.supplychain.stock.element.StockItemsUpdater;
 import org.openconcerto.erp.core.supplychain.stock.element.StockItemsUpdater.TypeStockUpdate;
 import org.openconcerto.erp.core.supplychain.stock.element.StockLabel;
         JTextField poids = new JTextField();
         if (b) {
             final JPanel panelPoids = new JPanel(new GridBagLayout());
             GridBagConstraints cPoids = new DefaultGridBagConstraints();
             cPoids.weightx = 0;
-            panelPoids.add(new JLabel(getLabelFor("T_POIDS")), cPoids);
+            panelPoids.add(new JLabel(getLabelFor("T_POIDS"), SwingConstants.RIGHT), cPoids);
             cPoids.weightx = 1;
             textPoidsTotal.setEnabled(false);
             textPoidsTotal.setHorizontalAlignment(JTextField.RIGHT);
             textPoidsTotal.setDisabledTextColor(Color.BLACK);
             cPoids.gridx++;
         DeviseField textPortHT = new DeviseField();
         DeviseField textRemiseHT = new DeviseField();
         ElementComboBox comboTaxePort = new ElementComboBox(false, 10);
         if (getTable().contains("PORT_HT")) {
-            addSQLObject(textPortHT, "PORT_HT");
             final JPanel panelPoids = new JPanel(new GridBagLayout());
             GridBagConstraints cPort = new DefaultGridBagConstraints();
             cPort.gridx = 0;
+            cPort.fill = GridBagConstraints.HORIZONTAL;
+            cPort.weightx = 0;
+            // Condition frais de port
+            if (getTable().getForeignTable("ID_FOURNISSEUR").contains("CONDITIONS_PORT")) {
+                cPort.gridwidth = 2;
+                final JLabel labelConditionPort = new JLabel();
+                labelConditionPort.setVisible(false);
+                panelPoids.add(labelConditionPort, cPort);
+                fourn.addModelListener("wantedID", (evt) -> {
+                    int wantedID = fourn.getWantedID();
+                    if (wantedID != SQLRow.NONEXISTANT_ID && wantedID >= SQLRow.MIN_VALID_ID) {
+                        final SQLRow rowF = getTable().getForeignTable("ID_FOURNISSEUR").getRow(wantedID);
+                        final String conditions = rowF.getString("CONDITIONS_PORT");
+                        if (conditions.trim().length() > 0) {
+                            labelConditionPort.setText(conditions);
+                            labelConditionPort.setVisible(true);
+                        } else {
+                            labelConditionPort.setText("");
+                            labelConditionPort.setVisible(false);
+                        }
+                    } else {
+                        labelConditionPort.setText("");
+                        labelConditionPort.setVisible(false);
+                    }
+                });
+                cPort.gridwidth = 1;
+                cPort.gridy++;
+            }
+            addSQLObject(textPortHT, "PORT_HT");
+            cPort.gridx = 0;
-            cPort.fill = GridBagConstraints.NONE;
+            cPort.fill = GridBagConstraints.HORIZONTAL;
             cPort.weightx = 0;
-            panelPoids.add(new JLabel(getLabelFor("PORT_HT")), cPort);
+            panelPoids.add(new JLabel(getLabelFor("PORT_HT"), SwingConstants.RIGHT), cPort);
             textPortHT.setHorizontalAlignment(JTextField.RIGHT);
             cPort.gridx++;
             cPort.weightx = 1;
             panelPoids.add(textPortHT, cPort);
             cPort.gridy++;
             cPort.gridx = 0;
             cPort.weightx = 0;
             addRequiredSQLObject(comboTaxePort, "ID_TAXE_PORT");
-            panelPoids.add(new JLabel(getLabelFor("ID_TAXE_PORT")), cPort);
+            panelPoids.add(new JLabel(getLabelFor("ID_TAXE_PORT"), SwingConstants.RIGHT), cPort);
             cPort.gridx++;
             cPort.weightx = 1;
             panelPoids.add(comboTaxePort, cPort);
             addSQLObject(textRemiseHT, "REMISE_HT");
             cPort.gridy++;
             cPort.gridx = 0;
-            cPort.fill = GridBagConstraints.NONE;
+            cPort.fill = GridBagConstraints.HORIZONTAL;
             cPort.weightx = 0;
-            panelPoids.add(new JLabel(getLabelFor("REMISE_HT")), cPort);
+            panelPoids.add(new JLabel(getLabelFor("REMISE_HT"), SwingConstants.RIGHT), cPort);
             textRemiseHT.setHorizontalAlignment(JTextField.RIGHT);
             cPort.gridx++;
             cPort.weightx = 1;
             panelPoids.add(textRemiseHT, cPort);
             } catch (SQLException e) {
                 ExceptionHandler.handle("Erreur lors de la mise à jour du stock!", e);
+            }
             // generation du document
+            final SQLRow row = getTable().getRow(idCommande);
-            final CommandeXmlSheet sheet = new CommandeXmlSheet(getTable().getRow(idCommande));
+            final CommandeXmlSheet sheet = new CommandeXmlSheet(row);
             sheet.createDocumentAsynchronous();
-            sheet.showPrintAndExportAsynchronous(this.panelOO.isVisualisationSelected(), this.panelOO.isImpressionSelected(), true);
+            sheet.showPrintAndExportAsynchronous(this.panelOO.isVisualisationSelected(), this.panelOO.isImpressionSelected(), true, getElement(), row);
             // incrémentation du numéro auto
             if (NumerotationAutoSQLElement.getNextNumero(getElement().getClass()).equalsIgnoreCase(this.numeroUniqueCommande.getText().trim())) {
                 SQLRowValues rowVals = new SQLRowValues(this.tableNum);
                 int val = this.tableNum.getRow(2).getInt(NumerotationAutoSQLElement.getLabelNumberFor(getElement().getClass()));
+                }
+            }
             DemandeAchatItemSQLElement elt = getElement().getDirectory().getElement(DemandeAchatItemSQLElement.class);
             elt.updateStatus(getTable(), getTable().getTable("COMMANDE_ELEMENT"), idCommande);
+            ((CommandeSQLElement) getElement()).fireInsertedCmdListener(row);
             if (attempt > 0) {
                 SwingUtilities.invokeLater(new Runnable() {
                     public void run() {
                         JOptionPane.showMessageDialog(null, "Le numéro a été actualisé en " + num);
+                    }
         DemandeAchatItemSQLElement elt = getElement().getDirectory().getElement(DemandeAchatItemSQLElement.class);
         elt.updateStatus(getTable(), getTable().getTable("COMMANDE_ELEMENT"), getSelectedID());
         // generation du document
+        final SQLRow row = getTable().getRow(id);
-        final CommandeXmlSheet sheet = new CommandeXmlSheet(getTable().getRow(id));
+        final CommandeXmlSheet sheet = new CommandeXmlSheet(row);
         sheet.createDocumentAsynchronous();
-        sheet.showPrintAndExportAsynchronous(this.panelOO.isVisualisationSelected(), this.panelOO.isImpressionSelected(), true);
+        sheet.showPrintAndExportAsynchronous(this.panelOO.isVisualisationSelected(), this.panelOO.isImpressionSelected(), true, getElement(), row);
+    }
     protected String getLibelleStock(SQLRowAccessor row, SQLRowAccessor rowElt) {
         return "Commande fournisseur N°" + row.getString("NUMERO");

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/core/supplychain/order/component/CommandeSQLComponent.java - Rev 180 → 182