WebSVN - OpenConcerto - Diff - Rev 177 and 180 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/order/component/CommandeClientSQLComponent.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.customerrelationship.customer.ui.CategorieComptableChoiceUI;
 import org.openconcerto.erp.core.finance.tax.model.TaxeCache;
+import org.openconcerto.erp.core.sales.order.element.CommandeClientSQLElement;
 import org.openconcerto.erp.core.sales.order.report.CommandeClientXmlSheet;
 import org.openconcerto.erp.core.sales.order.ui.CommandeClientItemTable;
 import org.openconcerto.erp.core.sales.order.ui.EtatCommandeClient;
 import org.openconcerto.erp.core.sales.order.ui.EtatCommandeClientComboBox;
 import org.openconcerto.erp.core.sales.order.ui.EtatCommandeRowItemView;
 import org.openconcerto.ui.FormLayouter;
 import org.openconcerto.ui.JDate;
 import org.openconcerto.ui.TitledSeparator;
 import org.openconcerto.ui.component.ITextArea;
 import org.openconcerto.utils.ExceptionHandler;
-import org.openconcerto.utils.text.SimpleDocumentListener;
 import java.awt.Color;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.sql.SQLException;
 import java.util.Date;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
                             // foreignRow = rowValsD;
                             //
                             // }
                             // table.setTarif(foreignRow, true);
+                        }
-                        if (!isFilling()) {
-                            table.setClient(row, true);
+                        table.setClient(row, !isFilling());
-                        }
                     } else {
                         if (!isFilling()) {
                             table.setClient(null, true);
+                        }
         pane.add("Eléments", this.table);
         this.tableFacturationItem = new FacturationCommandeTable(this);
         pane.add("Facturation", this.tableFacturationItem);
         if (prefs.getBoolean(GestionCommercialeGlobalPreferencePanel.CHIFFRAGE_COMMANDE_CLIENT, false)) {
             this.tableChiffrageItem = new ChiffrageCommandeTable(this);
+            this.tableChiffrageItem.getRowValuesTable().setEditable(((CommandeClientSQLElement) getElement()).isChiffrageEditableInUI());
             pane.add("Chiffrage", this.tableChiffrageItem);
+        }
+        if (this.getTable().contains("INFOS_DEVIS")) {
+            JPanel panelInfosDevis = new JPanel(new GridBagLayout());
+            DefaultGridBagConstraints cI = new DefaultGridBagConstraints();
+            cI.weightx = 1;
+            cI.weighty = 1;
+            cI.fill = GridBagConstraints.BOTH;
+            ITextArea infosDevis = new ITextArea();
+            panelInfosDevis.add(new JScrollPane(infosDevis), cI);
+            this.addView(infosDevis, "INFOS_DEVIS");
+            pane.add("Informations devis", panelInfosDevis);
+        }
         this.add(pane, c);
         DeviseField textPortHT = new DeviseField(5);
         DeviseField textRemiseHT = new DeviseField();
             public void tableChanged(TableModelEvent e) {
                 textPoidsTotal.setText(String.valueOf(CommandeClientSQLComponent.this.table.getPoidsTotal()));
+            }
         });
+        this.addView(this.table.getRowValuesTable(), "");
         DefaultGridBagConstraints.lockMinimumSize(comboClient);
         DefaultGridBagConstraints.lockMinimumSize(comboCommercial);
         DefaultGridBagConstraints.lockMinimumSize(comboDevis);
         DefaultGridBagConstraints.lockMinimumSize(totalTTC);
         DefaultGridBagConstraints.lockMaximumSize(totalTTC);
     protected void refreshAfterSelect(SQLRowAccessor r) {
         if (this.dateCommande.getValue() != null && r.getObject("DATE") != null) {
             this.table.setDateDevise(r.getDate("DATE").getTime());
+        }
+    }
+    /**
+     * Création d'une commande à partir d'un devis existant
+     *
+     * @param idCommande
+     *
+     */
+    public void loadCommandeExistant(final int idCommande) {
+        final SQLElement commande =getElement();
+        final SQLElement commandeElt = getElement().getDirectory().getElement("COMMANDE_CLIENT_ELEMENT");
+        // On duplique la commande
+        if (idCommande > 1) {
+            final SQLRow row = getTable().getRow(idCommande);
+            final SQLRowValues rowVals = new SQLRowValues(getTable());
+            rowVals.put("ID_CLIENT", row.getInt("ID_CLIENT"));
+            if (row.getObject("ID_TARIF") != null && !row.isForeignEmpty("ID_TARIF")) {
+                rowVals.put("ID_TARIF", row.getInt("ID_TARIF"));
+            }
+            rowVals.put("NUMERO", NumerotationAutoSQLElement.getNextNumero(getElement().getClass()));
+            this.select(rowVals);
+        }
+        // On duplique les elements des commandes
+        final List<SQLRow> myListItem = getTable().getRow(idCommande).getReferentRows(commandeElt.getTable());
+        if (myListItem.size() != 0) {
+            this.table.getModel().clearRows();
+            for (final SQLRow rowElt : myListItem) {
+                final SQLRowValues rowVals = rowElt.createUpdateRow();
+                rowVals.clearPrimaryKeys();
+                this.table.getModel().addRow(rowVals);
+                final int rowIndex = this.table.getModel().getRowCount() - 1;
+                this.table.getModel().fireTableModelModified(rowIndex);
+            }
+        } else {
+            this.table.getModel().clearRows();
+        }
+        this.table.getModel().fireTableDataChanged();
+        this.table.repaint();
+    }
+}

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/order/component/CommandeClientSQLComponent.java - Rev 177 → 180