WebSVN - OpenConcerto - Diff - Rev 93 and 156 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/customerrelationship/customer/element/ClientNormalSQLComponent.java

  * When distributing the software, include this License Header Notice in each file.
  */
  package org.openconcerto.erp.core.customerrelationship.customer.element;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.sql.SQLException;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import javax.swing.ButtonGroup;
-import javax.swing.Icon;
-import javax.swing.JCheckBox;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTabbedPane;
-import javax.swing.JTextField;
-import javax.swing.SwingConstants;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
 import org.openconcerto.erp.config.ComptaPropsConfiguration;
+import org.openconcerto.erp.core.common.component.AdresseSQLComponent;
 import org.openconcerto.erp.core.common.element.BanqueSQLElement;
 import org.openconcerto.erp.core.common.element.ComptaSQLConfElement;
 import org.openconcerto.erp.core.common.element.NumerotationAutoSQLElement;
 import org.openconcerto.erp.core.common.ui.DeviseField;
 import org.openconcerto.erp.core.customerrelationship.customer.ui.AdresseClientItemTable;
 import org.openconcerto.ui.TitledSeparator;
 import org.openconcerto.ui.component.ComboLockedMode;
 import org.openconcerto.ui.component.ITextArea;
 import org.openconcerto.ui.component.InteractionMode;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.swing.ButtonGroup;
+import javax.swing.Icon;
+import javax.swing.JCheckBox;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTabbedPane;
+import javax.swing.JTextField;
+import javax.swing.SwingConstants;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
 // Client without CTech link (i.e. there's one and only table in the DB)
 public class ClientNormalSQLComponent extends BaseSQLComponent {
     private int idDefaultCompteClient = 1;
-    private JCheckBox checkAdrLivraison, checkAdrFacturation;
+    private JCheckBox checkAdrFacturation;
     private final SQLTable tableNum = getTable().getBase().getTable("NUMEROTATION_AUTO");
     private ElementComboBox boxPays = null;
     private final ElementComboBox boxTarif = new ElementComboBox();
     protected boolean showMdr = true;
-    private ElementSQLObject componentPrincipale, componentLivraison, componentFacturation;
+    private ElementSQLObject componentPrincipale, componentFacturation;
     private AdresseClientItemTable adresseTable = new AdresseClientItemTable();
     private JCheckBox boxGestionAutoCompte;
     private Map<SQLField, JCheckBox> mapCheckLivraison = new HashMap<SQLField, JCheckBox>();
     private JCheckBox boxAffacturage, boxComptant;
         this.add(textType, c);
         // Code
         JLabel labelCode = new JLabel(getLabelFor("CODE"));
         labelCode.setHorizontalAlignment(SwingConstants.RIGHT);
-        this.textCode = new JUniqueTextField();
+        this.textCode = new JUniqueTextField() {
+            @Override
+            public String getAutoRefreshNumber() {
+                if (getMode() == Mode.INSERTION) {
+                    return NumerotationAutoSQLElement.getNextNumero(getElement().getClass());
+                } else {
+                    return null;
+                }
+            }
+        };
         c.gridx++;
         c.weightx = 0;
         c.weighty = 0;
         c.gridwidth = 1;
         c.fill = GridBagConstraints.HORIZONTAL;
         c.gridy++;
         c.weighty = 0.3;
         c.fill = GridBagConstraints.BOTH;
         this.add(textInfos, c);
-        this.checkAdrLivraison.addActionListener(new ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent e) {
-                boolean b = checkAdrLivraison.isSelected();
-                componentLivraison.setEditable((!b) ? InteractionMode.READ_WRITE : InteractionMode.DISABLED);
-                componentLivraison.setCreated(!b);
-            };
-        });
         this.checkAdrFacturation.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 boolean b = checkAdrFacturation.isSelected();
                 componentFacturation.setEditable((!b) ? InteractionMode.READ_WRITE : InteractionMode.DISABLED);
                 componentFacturation.setCreated(!b);
         this.addSQLObject(textNumIntracomm, "NUMERO_TVA");
         this.addSQLObject(textResp, "RESPONSABLE");
         this.addSQLObject(textInfos, "INFOS");
         this.addSQLObject(this.compteSel, "ID_COMPTE_PCE");
-        this.checkAdrFacturation.setSelected(true);
-        this.checkAdrLivraison.setSelected(true);
+    }
     private Component createAdressesComponent() {
         final JTabbedPane tabbedAdresse = new JTabbedPane() {
             public void insertTab(String title, Icon icon, Component component, String tip, int index) {
         this.addView("ID_ADRESSE", REQ + ";" + DEC + ";" + SEP);
         this.componentPrincipale = (ElementSQLObject) this.getView("ID_ADRESSE");
         this.componentPrincipale.setOpaque(false);
         tabbedAdresse.add(getLabelFor("ID_ADRESSE"), this.componentPrincipale);
         tabbedAdresse.setOpaque(false);
         // Adr facturation
         JPanel panelFacturation = new JPanel(new GridBagLayout());
         panelFacturation.setOpaque(false);
         GridBagConstraints cPanelF = new GridBagConstraints(0, 0, 1, 1, 1, 0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(2, 1, 2, 1), 0, 0);
         this.addView("ID_ADRESSE_F", DEC + ";" + SEP);
         this.componentFacturation = (ElementSQLObject) this.getView("ID_ADRESSE_F");
         this.componentFacturation.setOpaque(false);
-        this.componentFacturation.setCreatedUIVisible(false);
+        ((AdresseSQLComponent) componentFacturation.getSQLChild()).setDestinataireVisible(true);
         panelFacturation.add(this.componentFacturation, cPanelF);
         this.checkAdrFacturation = new JCheckBox("Adresse de facturation identique à la principale");
         this.checkAdrFacturation.setOpaque(false);
         cPanelF.gridy++;
         panelFacturation.add(this.checkAdrFacturation, cPanelF);
-            tabbedAdresse.add(getLabelFor("ID_ADRESSE_F"), panelFacturation);
+        tabbedAdresse.add(getLabelFor("ID_ADRESSE_F"), panelFacturation);
+        this.checkAdrFacturation.addActionListener(new ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent e) {
+                boolean b = checkAdrFacturation.isSelected();
+                componentFacturation.setEditable(!b ? InteractionMode.READ_WRITE : InteractionMode.DISABLED);
+                componentFacturation.setCreated(!b);
+            }
+        });
+        checkAdrFacturation.setSelected(true);
             Set<SQLField> fieldsAdr = getTable().getForeignKeys("ADRESSE");
             List<SQLField> fieldsAdrOrder = new ArrayList<SQLField>(fieldsAdr);
             Collections.sort(fieldsAdrOrder, new Comparator<SQLField>() {
                 @Override
                 public int compare(SQLField o1, SQLField o2) {
                     JPanel panelLivraison = new JPanel(new GridBagLayout());
                     panelLivraison.setOpaque(false);
                     GridBagConstraints cPanelL = new GridBagConstraints(0, 0, 1, 1, 1, 0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(2, 1, 2, 1), 0, 0);
                     this.addView(fieldName, DEC + ";" + SEP);
-                    this.componentLivraison = (ElementSQLObject) this.getView(fieldName);
-                    this.componentLivraison.setOpaque(false);
-                    this.componentLivraison.setCreatedUIVisible(false);
+                    final ElementSQLObject componentLivraison = (ElementSQLObject) this.getView(fieldName);
+                    componentLivraison.setOpaque(false);
+                    ((AdresseSQLComponent) componentLivraison.getSQLChild()).setDestinataireVisible(true);
-                    panelLivraison.add(this.componentLivraison, cPanelL);
+                    panelLivraison.add(componentLivraison, cPanelL);
-                    checkAdrLivraison = new JCheckBox("Adresse de livraison identique à l'adresse principale");
+                    final JCheckBox checkAdrLivraison = new JCheckBox("Adresse de livraison identique à l'adresse principale");
                     checkAdrLivraison.setOpaque(false);
                     cPanelL.gridy++;
                     panelLivraison.add(checkAdrLivraison, cPanelL);
                     tabbedAdresse.add(getLabelFor(fieldName) + (val == 1 ? "" : " " + val), panelLivraison);
                     val++;
                     checkAdrLivraison.addActionListener(new ActionListener() {
                         public void actionPerformed(java.awt.event.ActionEvent e) {
                             boolean b = checkAdrLivraison.isSelected();
                             componentLivraison.setEditable((!b) ? InteractionMode.READ_WRITE : InteractionMode.DISABLED);
                             componentLivraison.setCreated(!b);
+                        }
                     });
                     checkAdrLivraison.setSelected(true);
                 public void actionPerformed(ActionEvent e) {
                     setCompteVisible(!(boxGestionAutoCompte.isSelected() && getSelectedID() <= 1));
+                }
             });
+            c.gridwidth = 1;
+            c.gridy++;
+            c.gridx = 0;
+            c.weightx = 0;
+            p.add(new JLabel(getLabelFor("ID_COMPTE_PCE_SERVICE")), c);
+            c.gridwidth = GridBagConstraints.REMAINDER;
+            c.gridx++;
+            c.weightx = 1;
+            ISQLCompteSelector compteSelService = new ISQLCompteSelector();
+            p.add(compteSelService, c);
+            this.addView(compteSelService, "ID_COMPTE_PCE_SERVICE");
+        }
         return p;
+    }
     private void setCompteVisible(boolean b) {
     @Override
     public int insert(SQLRow order) {
         // incrémentation du numéro auto
-        if (NumerotationAutoSQLElement.getNextNumero(ClientNormalSQLElement.class, new Date()).equalsIgnoreCase(this.textCode.getText().trim())) {
+        if (NumerotationAutoSQLElement.getNextNumero(getElement().getClass(), new Date()).equalsIgnoreCase(this.textCode.getText().trim())) {
             SQLRowValues rowVals = new SQLRowValues(this.tableNum);
+            final SQLRow rowNumAuto = this.tableNum.getRow(2);
+            if (rowNumAuto.getObject("CLIENT_START") != null) {
-            int val = this.tableNum.getRow(2).getInt("CLIENT_START");
+                int val = rowNumAuto.getInt("CLIENT_START");
-            val++;
+                val++;
-            rowVals.put("CLIENT_START", new Integer(val));
+                rowVals.put("CLIENT_START", new Integer(val));
-            try {
+                try {
-                rowVals.update(2);
+                    rowVals.update(2);
-            } catch (SQLException e) {
+                } catch (SQLException e) {
-                e.printStackTrace();
+                    e.printStackTrace();
+                }
+            }
+        }
         int id = super.insert(order);
         this.table.updateField("ID_CLIENT", id);
         this.adresseTable.updateField("ID_CLIENT", id);
     protected SQLRowValues createDefaults() {
         SQLRowValues vals = new SQLRowValues(this.getTable());
         SQLRow r;
         vals.put("MARCHE_PUBLIC", Boolean.TRUE);
-        vals.put("CODE", NumerotationAutoSQLElement.getNextNumero(ClientNormalSQLElement.class, new Date()));
+        vals.put("CODE", NumerotationAutoSQLElement.getNextNumero(getElement().getClass(), new Date()));
         // Mode de règlement par defaut
         try {
             r = ModeReglementDefautPrefPanel.getDefaultRow(true);
             SQLElement eltModeReglement = Configuration.getInstance().getDirectory().getElement("MODE_REGLEMENT");

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/core/customerrelationship/customer/element/ClientNormalSQLComponent.java - Rev 93 → 156