WebSVN - OpenConcerto - Diff - Rev 182 and 185 - /trunk/OpenConcerto/src/org/openconcerto/erp/config/InstallationPanel.java

  */
  package org.openconcerto.erp.config;
 import org.openconcerto.erp.config.update.Updater_1_5;
+import org.openconcerto.erp.core.common.element.ComptaSQLConfElement;
 import org.openconcerto.erp.core.humanresources.payroll.report.LignePayeSimplifiee;
 import org.openconcerto.erp.core.sales.order.ui.EtatCommandeClient;
 import org.openconcerto.erp.core.sales.quote.element.EtatDevisSQLElement;
 import org.openconcerto.erp.modules.ModuleManager;
 import org.openconcerto.erp.modules.ModuleReference;
 import javax.swing.SwingUtilities;
 public class InstallationPanel extends JPanel {
     private static final boolean DEBUG_FK = false;
+    public static final String METADATA_VERSION = "OpenConcerto_Version";
     public static void insertUndef(final SQLCreateTable ct) throws SQLException {
         // check that we can use insertReturnFirstField()
         if (ct.getPrimaryKey().size() != 1)
             throw new IllegalStateException("Not one and only one field in the PK : " + ct.getPrimaryKey());
         final Insertion<?> insertion = new Inserter(ct).insertReturnFirstField("(" + SQLBase.quoteIdentifier(SQLSyntax.ORDER_NAME) + ") VALUES(" + ReOrder.MIN_ORDER + ")", false);
             if (!alter.isEmpty())
                 alters.add(alter);
+        }
+        {
+            List<String> tables = Arrays.asList("FACTURE_FOURNISSEUR_ELEMENT", "DEVIS_ELEMENT", "COMMANDE_ELEMENT", "BON_RECEPTION_ELEMENT", "COMMANDE_CLIENT_ELEMENT", "BON_DE_LIVRAISON_ELEMENT",
+                    "SAISIE_VENTE_FACTURE_ELEMENT", "AVOIR_CLIENT_ELEMENT", "DEMANDE_PRIX_ELEMENT"
+            );
+            for (String string : tables) {
+                final String fName = "T_POIDS_COLIS_NET";
+                if (root.getTable(string).contains(fName)) {
+                    SQLField fieldRepFacture = root.getTable(string).getField(fName);
+                    if (fieldRepFacture.getType().getSize() > 500) {
+                        final AlterTable alter = new AlterTable(root.getTable(string));
+                        alter.alterColumn(fName, EnumSet.allOf(Properties.class), "numeric(16,8)", "1", false);
+                        alter.alterColumn("POIDS_COLIS_NET", EnumSet.allOf(Properties.class), "numeric(16,8)", "1", false);
+                        alters.add(alter);
+                    }
+                }
+            }
+        }
         if (alters.size() > 0) {
             final SQLDataSource ds = root.getDBSystemRoot().getDataSource();
             for (UpdateBuilder updateBuilder : builds) {
                 ds.execute(updateBuilder.asString());
             rowValsUserRight.put("ID_RIGHT", row.getID());
             rowValsUserRight.put("HAVE_RIGHT", Boolean.TRUE);
             rowValsUserRight.commit();
+        }
+        if (!codes.contains(ComptaSQLConfElement.NON_RESTREINT_PAR_COMMERCIAL_RIGHT)) {
+            SQLRowValues rowVals = new SQLRowValues(table);
+            rowVals.put("CODE", ComptaSQLConfElement.NON_RESTREINT_PAR_COMMERCIAL_RIGHT);
+            rowVals.put("NOM", "Non restreint aux éléments liés au commercial de l'utilisateur");
+            String desc = "Liste non restreinte aux éléments liés au commercial de l'utilisateur";
+            rowVals.put("DESCRIPTION", desc);
+            SQLRow row = rowVals.commit();
+            SQLRowValues rowValsUserRight = new SQLRowValues(table.getTable("USER_RIGHT"));
+            rowValsUserRight.put("ID_RIGHT", row.getID());
+            rowValsUserRight.put("HAVE_RIGHT", Boolean.TRUE);
+            rowValsUserRight.commit();
+        }
+    }
     private void findBadForeignKey(DBRoot root) {
         Set<SQLTable> tables = root.getTables();
         for (SQLTable table : tables) {
             rowVals.put("NOM", "PortVenteNonSoumisTVA");
             rowVals.put("NUMERO_DEFAULT", "708520");
             rowVals.commit();
+        }
+        if (!prefs.contains("PortAchatSoumisTVA")) {
+            SQLRowValues rowVals = new SQLRowValues(table);
+            rowVals.put("NOM", "PortAchatSoumisTVA");
+            rowVals.put("NUMERO_DEFAULT", "608510");
+            rowVals.commit();
+        }
+        if (!prefs.contains("PortAchatNonSoumisTVA")) {
+            SQLRowValues rowVals = new SQLRowValues(table);
+            rowVals.put("NOM", "PortAchatNonSoumisTVA");
+            rowVals.put("NUMERO_DEFAULT", "608520");
+            rowVals.commit();
+        }
         if (!prefs.contains("AvanceClients")) {
             SQLRowValues rowVals = new SQLRowValues(table);
             rowVals.put("NOM", "AvanceClients");
             rowVals.put("NUMERO_DEFAULT", "4191");
             rowVals.commit();
             String req = "UPDATE " + tableAdresse.getSQLName().quote() + " SET \"VILLE\"= trim (both ' ' from substring(\"VILLE\" from 0 for (position('(' in \"VILLE\")))) ";
             req += ", \"CODE_POSTAL\"=substring(\"VILLE\" from (position('(' in \"VILLE\")+1) for length(\"VILLE\")-position('(' in \"VILLE\")-1) WHERE \"VILLE\" LIKE '% (%)'";
             tableAdresse.getDBRoot().getDBSystemRoot().getDataSource().execute(req);
+        }
+    }
     private void updateVariablePaye(SQLTable table, String var, double value) throws SQLException {
         if (table == null) {
             throw new IllegalArgumentException("null table");
                         pos++;
+                    }
+                }
                 final SQLTable tableRB = conf.getRoot().getTable("RUBRIQUE_BRUT");
+                if (!tableRB.contains("PART_CSG_SANS_ABATTEMENT")) {
+                    final AlterTable alter = new AlterTable(tableRB);
+                    alter.addBooleanColumn("PART_CSG_SANS_ABATTEMENT", Boolean.FALSE, false);
+                    final String req = alter.asString();
+                    conf.getRoot().getDBSystemRoot().getDataSource().execute(req);
+                    conf.getRoot().refetchTable(tableRB.getName());
+                    conf.getRoot().getSchema().updateVersion();
+                }
                 if (!tableRB.contains("AVANTAGE_NATURE")) {
                     final AlterTable alter = new AlterTable(tableRB);
                     alter.addBooleanColumn("AVANTAGE_NATURE", Boolean.FALSE, false);
                     final String req = alter.asString();
                     conf.getRoot().getDBSystemRoot().getDataSource().execute(req);
                     mergeIDCC.change(table);
+                }
+            }
             // final Set<String> childrenNames = conf.getSystemRoot().getChildrenNames();
+            conf.getRoot().setMetadata(METADATA_VERSION, ProductInfo.getInstance().getVersion());
             SwingUtilities.invokeLater(new Runnable() {
                 @Override
                 public void run() {
                     bar.setIndeterminate(false);
+                            }
                             // at the end to let Updater_1_5 change field types from varchar to text
                             fixUnboundedVarchar(root);
+                            root.setMetadata(METADATA_VERSION, ProductInfo.getInstance().getVersion());
                             return null;
+                        }
                     });
+                }

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/config/InstallationPanel.java @ 177 - Rev 182 → 185