WebSVN - OpenConcerto - Diff - Rev 149 and 151 - /trunk/OpenConcerto/src/org/openconcerto/erp/config/update/Updater_1

  */
  package org.openconcerto.erp.config.update;
 import org.openconcerto.erp.config.InstallationPanel;
+import org.openconcerto.erp.core.finance.payment.element.SDDMessageSQLElement;
+import org.openconcerto.erp.core.finance.payment.element.SEPAMandateSQLElement;
+import org.openconcerto.erp.core.finance.payment.element.TypeReglementSQLElement;
+import org.openconcerto.erp.core.sales.invoice.element.SaisieVenteFactureSQLElement;
 import org.openconcerto.erp.core.sales.order.ui.TypeFactureCommandeClient;
 import org.openconcerto.erp.core.sales.pos.element.TicketCaisseSQLElement;
 import org.openconcerto.erp.core.sales.product.element.ReferenceArticleSQLElement;
 import org.openconcerto.erp.core.sales.quote.element.DevisLogMailSQLElement;
 import org.openconcerto.sql.changer.convert.AddMDFields;
 import org.openconcerto.sql.request.UpdateBuilder;
 import org.openconcerto.sql.utils.AlterTable;
 import org.openconcerto.sql.utils.ChangeTable;
 import org.openconcerto.sql.utils.SQLCreateTable;
 import org.openconcerto.sql.utils.UniqueConstraintCreatorHelper;
+import org.openconcerto.utils.CollectionUtils;
 import java.math.BigDecimal;
 import java.sql.SQLException;
 import java.sql.Types;
 import java.util.Arrays;
             alterClient.addDecimalColumn("SOLDE_COMPTE", 16, 6, BigDecimal.valueOf(0), false);
             tClient.getBase().getDataSource().execute(alterClient.asString());
             tClient.getSchema().updateVersion();
             tClient.fetchFields();
+        }
+        if (!tClient.contains("DATE")) {
+            final AlterTable alterClient = new AlterTable(tClient);
+            alterClient.addColumn("DATE", "date");
+            tClient.getBase().getDataSource().execute(alterClient.asString());
+            tClient.getSchema().updateVersion();
+            tClient.fetchFields();
+        }
         if (!tClient.contains("COMMENTAIRES")) {
             final AlterTable alterClient = new AlterTable(tClient);
             alterClient.addVarCharColumn("COMMENTAIRES", 2048);
             tClient.getBase().getDataSource().execute(alterClient.asString());
             tClient.getSchema().updateVersion();
             tableAttachment.getBase().getDataSource().execute(alter.asString());
             tableAttachment.getSchema().updateVersion();
             tableAttachment.fetchFields();
+        }
-        List<String> gedTable = Arrays.asList("CLIENT", "MOUVEMENT", "FOURNISSEUR", "ARTICLE", "SALARIE");
+        List<String> gedTable = Arrays.asList("CLIENT", "MOUVEMENT", "FOURNISSEUR", "ARTICLE", "FACTURE_FOURNISSEUR", "SAISIE_VENTE_FACTURE", "SALARIE");
         for (String string : gedTable) {
             SQLTable tableGED = root.getTable(string);
             if (!tableGED.contains("ATTACHMENTS")) {
                 final AlterTable alter = new AlterTable(tableGED);
                 alter.addIntegerColumn("ATTACHMENTS", 0);
             SQLTable tableCmdElt = root.getTable("COMMANDE_CLIENT_ELEMENT");
             if (!tableCmdElt.contains("LIVRE")) {
                 AlterTable t = new AlterTable(tableCmdElt);
                 t.addBooleanColumn("LIVRE_FORCED", Boolean.FALSE, false);
-                t.addBooleanColumn("LIVRE", Boolean.TRUE, false);
+                t.addBooleanColumn("LIVRE", Boolean.FALSE, false);
                 t.addDecimalColumn("QTE_LIVREE", 16, 6, BigDecimal.ZERO, true);
                 tableCmdElt.getBase().getDataSource().execute(t.asString());
                 root.refetchTable(tableCmdElt.getName());
                 root.getSchema().updateVersion();
                 // tableCmdElt.getName()).quote()
                 // + " SET \"QTE_LIVREE\"=\"QTE\"*\"QTE_UNITAIRE\", \"LIVRE_FORCED\"=true WHERE
                 // \"ID_COMMANDE_CLIENT\" IN []";
+            }
+            // Fix bad default value
+            if (tableCmdElt.contains("LIVRE")) {
+                AlterTable t = new AlterTable(tableCmdElt);
+                t.alterColumnDefault("LIVRE", "false");
+                tableCmdElt.getBase().getDataSource().execute(t.asString());
+                root.refetchTable(tableCmdElt.getName());
+                root.getSchema().updateVersion();
+            }
             // Achat
             SQLTable tableBRElt = root.getTable("BON_RECEPTION_ELEMENT");
             if (!tableBRElt.contains("ID_COMMANDE_ELEMENT")) {
                 AlterTable t = new AlterTable(tableBRElt);
             tableArt.getBase().getDataSource().execute(alterArt.asString());
             tableArt.getSchema().updateVersion();
             tableArt.fetchFields();
+        }
+        if (!tableArt.contains("ADDITIONAL_TICKET_COPY")) {
+            final AlterTable alterArt = new AlterTable(tableArt);
+            alterArt.addBooleanColumn("ADDITIONAL_TICKET_COPY", Boolean.FALSE, false);
+            tableArt.getBase().getDataSource().execute(alterArt.asString());
+            tableArt.getSchema().updateVersion();
+            tableArt.fetchFields();
+        }
         SQLTable tableDevisAcompte = root.getTable("DEVIS");
         if (!tableDevisAcompte.contains("T_ACOMPTE")) {
             final AlterTable alterB = new AlterTable(tableDevisAcompte);
             alterB.addLongColumn("T_ACOMPTE", 0L, false);
             alterRegisterLog.getTable().fetchFields();
             alterRegister.getTable().fetchFields();
+        }
         // Prefs compte AN
         SQLTable table = root.findTable("PREFS_COMPTE");
-        AlterTable t = new AlterTable(table);
         if (!table.getFieldsName().contains("ID_JOURNAL_AN")) {
+            AlterTable t = new AlterTable(table);
             t.addForeignColumn("ID_JOURNAL_AN", root.getTable("JOURNAL"));
             t.addBooleanColumn("CREATE_NUL_SOLDE_ECR", Boolean.TRUE, false);
             table.getBase().getDataSource().execute(t.asString());
             table.getSchema().updateVersion();
             table.fetchFields();
+        }
+        if (!table.getFieldsName().contains("AUTO_LETTRAGE")) {
+            AlterTable t = new AlterTable(table);
+            t.addBooleanColumn("AUTO_LETTRAGE", Boolean.FALSE, false);
+            table.getBase().getDataSource().execute(t.asString());
+            table.getSchema().updateVersion();
+            table.fetchFields();
+        }
         SQLTable tableEcr = root.getTable("ECRITURE");
         if (!tableEcr.contains("CLOTURE")) {
             final AlterTable alter = new AlterTable(tableEcr);
             alter.addBooleanColumn("CLOTURE", Boolean.FALSE, false);
             alter.addBooleanColumn("RAN", Boolean.FALSE, false);
             alterKmElt.addIntegerColumn("JOUR", 1);
             tkmElt.getBase().getDataSource().execute(alterKmElt.asString());
             tkmElt.getSchema().updateVersion();
             tkmElt.fetchFields();
+        }
-        // Ref bancaires fournisseurs
+        // Ref bancaires fournisseurs et clients
+        for (final SQLTable bankT : Arrays.asList(tableFournisseur, tClient)) {
-        if (!tableFournisseur.contains("IBAN")) {
+            if (!bankT.contains("IBAN")) {
-            final AlterTable alter = new AlterTable(tableFournisseur);
+                final AlterTable alter = new AlterTable(bankT);
-            alter.addVarCharColumn("IBAN", 128);
+                alter.addVarCharColumn("IBAN", 128);
-            alter.addVarCharColumn("BIC", 128);
+                alter.addVarCharColumn("BIC", 128);
-            tableFournisseur.getBase().getDataSource().execute(alter.asString());
+                bankT.getDBSystemRoot().getDataSource().execute(alter.asString());
-            tableFournisseur.getSchema().updateVersion();
+                bankT.getSchema().updateVersion();
-            tableFournisseur.fetchFields();
+                bankT.fetchFields();
+            }
+        }
+        final SQLTable typeReglT = root.getTable("TYPE_REGLEMENT");
+        if (typeReglT.getRow(TypeReglementSQLElement.PRELEVEMENT) == null) {
+            final SQLRowValues directDebitVals = new SQLRowValues(typeReglT).put("NOM", "Prélèvement");
+            directDebitVals.put("COMPTANT", Boolean.FALSE).put("ECHEANCE", Boolean.FALSE);
+            directDebitVals.setID(TypeReglementSQLElement.PRELEVEMENT).insertVerbatim();
+        }
+        if (!tableClient.contains("ACCEPTE_EMAIL")) {
+            final AlterTable alter = new AlterTable(tableClient);
+            alter.addBooleanColumn("ACCEPTE_EMAIL", Boolean.FALSE, false);
+            alter.addBooleanColumn("ACCEPTE_COURRIER", Boolean.FALSE, false);
+            alter.addBooleanColumn("ACCEPTE_SMS", Boolean.FALSE, false);
+            alter.addBooleanColumn("ACCEPTE_TEL", Boolean.FALSE, false);
+            exec(alter);
+        }
+        final SQLTable contactT = root.getTable("CONTACT");
+        if (!contactT.contains("DATE_NAISSANCE")) {
+            final AlterTable alter = new AlterTable(contactT);
+            alter.addColumn("DATE_NAISSANCE", "date");
+            exec(alter);
+        }
+        final SQLCreateTable createSDDMsgTable = SDDMessageSQLElement.getCreateTable(root);
+        if (createSDDMsgTable != null) {
+            final SQLCreateTable createMandate = SEPAMandateSQLElement.getCreateTable(root);
+            root.createTables(createSDDMsgTable, createMandate);
+            final SQLTable msgT = root.getTable(createSDDMsgTable.getName());
+            final SQLTable mandateT = root.getTable(createMandate.getName());
+            final AlterTable alterFact = new AlterTable(root.getTable(SaisieVenteFactureSQLElement.TABLENAME));
+            alterFact.addForeignColumn(SaisieVenteFactureSQLElement.MESSAGE_FIELD_NAME, msgT);
+            alterFact.addVarCharColumn(SaisieVenteFactureSQLElement.END2END_FIELD_NAME, 35);
+            final AlterTable alterModeRegl = new AlterTable(root.getTable("MODE_REGLEMENT"));
+            alterModeRegl.addForeignColumn(null, mandateT);
+            for (final String sql : ChangeTable.cat(Arrays.asList(alterFact, alterModeRegl))) {
+                root.getDBSystemRoot().getDataSource().execute(sql);
+            }
+            root.getSchema().updateVersion();
+            root.refetch(CollectionUtils.createSet(alterFact.getName(), alterModeRegl.getName()));
+            root.setMetadata(SDDMessageSQLElement.SERIAL_MD, "0");
+        }
+        final SQLTable vcT = root.getTable("SAISIE_VENTE_COMPTOIR");
+        if (!vcT.contains("ID_COMPTE_PCE_PRODUIT")) {
+            final AlterTable alter = new AlterTable(vcT);
+            alter.addForeignColumn("ID_COMPTE_PCE_PRODUIT", root.getTable("COMPTE_PCE"));
+            alter.addForeignColumn("ID_COMPTE_PCE_SERVICE", root.getTable("COMPTE_PCE"));
+            exec(alter);
+        }
+    }
+    public static void exec(final AlterTable alter) throws SQLException {
+        alter.getTable().getDBSystemRoot().getDataSource().execute(alter.asString());
+        alter.getTable().getSchema().updateVersion();
+        alter.getTable().fetchFields();
+    }
+}

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/config/update/Updater_1_5.java @ 156 - Rev 149 → 151