WebSVN - OpenConcerto - Diff - Rev 177 and 180 - /trunk/OpenConcerto/src/org/openconcerto/erp/config/update/Updater_1

 import org.openconcerto.erp.core.sales.quote.element.DevisLogMailSQLElement;
 import org.openconcerto.erp.core.supplychain.stock.element.ComposedItemStockUpdater;
 import org.openconcerto.erp.core.supplychain.stock.element.DepotStockSQLElement;
 import org.openconcerto.erp.core.supplychain.stock.element.StockItem;
 import org.openconcerto.sql.changer.convert.AddMDFields;
+import org.openconcerto.sql.model.AliasedTable;
 import org.openconcerto.sql.model.DBRoot;
 import org.openconcerto.sql.model.SQLField;
 import org.openconcerto.sql.model.SQLField.Properties;
 import org.openconcerto.sql.model.SQLName;
 import org.openconcerto.sql.model.SQLRow;
             tableCompte.getBase().getDataSource().execute(alter.asString());
             tableCompte.getSchema().updateVersion();
             tableCompte.fetchFields();
+        }
+        // Champ obsolete sur compte
+        SQLTable tableTitre = root.getTable("TITRE_PERSONNEL");
+        if (!tableTitre.contains("OBSOLETE")) {
+            final AlterTable alter = new AlterTable(tableTitre);
+            alter.addBooleanColumn("OBSOLETE", Boolean.FALSE, false);
+            tableTitre.getBase().getDataSource().execute(alter.asString());
+            tableTitre.getSchema().updateVersion();
+            tableTitre.fetchFields();
+            final UpdateBuilder updBuilder = new UpdateBuilder(tableTitre).setObject(tableTitre.getField("OBSOLETE"), Boolean.TRUE);
+            updBuilder.setWhere(new Where(tableTitre.getField("CODE"), "=", "Mlle"));
+            tableTitre.getBase().getDataSource().execute(updBuilder.asString());
+            final UpdateBuilder updBuilder2 = new UpdateBuilder(tableTitre).setObject(tableTitre.getField("CODE"), "M.");
+            updBuilder2.setWhere(new Where(tableTitre.getField("CODE"), "=", "Mr"));
+            tableTitre.getBase().getDataSource().execute(updBuilder2.asString());
+        }
         // Transaction du solde
         if (!root.contains(COMPTE_CLIENT_TRANSACTION)) {
             final SQLCreateTable createTable = new SQLCreateTable(root, COMPTE_CLIENT_TRANSACTION);
             createTable.addForeignColumn("CLIENT");
             createTable.addDateAndTimeColumn("DATE");
             createTable.addIntegerColumn("THUMBNAIL_WIDTH", 32);
             createTable.addIntegerColumn("THUMBNAIL_HEIGHT", 32);
             createTable.addVarCharColumn("TAG", 128);
             createTable.addIntegerColumn("VERSION", 0);
             createTable.addVarCharColumn("HASH", 32);
+            createTable.addBooleanColumn("ENCRYPTED", Boolean.FALSE, false);
             try {
                 root.getBase().getDataSource().execute(createTable.asString());
                 InstallationPanel.insertUndef(createTable);
                 root.refetchTable("ATTACHMENT");
                 root.getSchema().updateVersion();
             alter.addVarCharColumn("INFOS", 8000);
             tableAttachment.getBase().getDataSource().execute(alter.asString());
             tableAttachment.getSchema().updateVersion();
             tableAttachment.fetchFields();
+        }
+        if (!tableAttachment.contains("ENCRYPTED")) {
+            final AlterTable alter = new AlterTable(tableAttachment);
+            alter.addBooleanColumn("ENCRYPTED", Boolean.FALSE, false);
+            tableAttachment.getBase().getDataSource().execute(alter.asString());
+            tableAttachment.getSchema().updateVersion();
+            tableAttachment.fetchFields();
+        }
         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);
                     tableCmdFElt.getBase().getDataSource().execute(t.asString());
                     root.refetchTable(tableCmdFElt.getName());
                     root.getSchema().updateVersion();
                     UpdateBuilder build = new UpdateBuilder(tableCmdFElt);
                     build.setObject("RECU", Boolean.FALSE);
-                    build.set("QTE_RECUE", "\"QTE\"*\"QTE_UNITAIRE\"");
                     Where w = Where.createRaw(tableCmdFElt.getField("QTE_RECUE").getQuotedName() + " < (" + tableCmdFElt.getField("QTE").getQuotedName() + "*"
                             + tableCmdFElt.getField("QTE_UNITAIRE").getQuotedName() + ")", tableCmdFElt.getField("QTE_UNITAIRE"), tableCmdFElt.getField("QTE"), tableCmdFElt.getField("QTE_RECUE"));
                     build.setWhere(w.or(new Where(tableCmdFElt.getKey(), "=", 1)));
                     System.err.println(build.asString());
             alter.addForeignColumn("ID_DEPOT_STOCK", tableDepotStock);
             tableEtatStock.getBase().getDataSource().execute(alter.asString());
             tableEtatStock.getSchema().updateVersion();
             tableEtatStock.fetchFields();
+        }
+        // Création de la table Agence
+        if (!root.contains("AGENCE")) {
+            SQLCreateTable createAgence = new SQLCreateTable(root, "AGENCE");
+            createAgence.addVarCharColumn("DESIGNATION", 256);
+            createAgence.addVarCharColumn("TEL_1", 256);
+            createAgence.addVarCharColumn("EMAIL", 256);
+            createAgence.addVarCharColumn("FAX", 256);
+            createAgence.addForeignColumn("ID_CLIENT", root.findTable("CLIENT"));
+            createAgence.addForeignColumn("ID_ADRESSE", root.findTable("ADRESSE"));
+            try {
+                // test
+                root.getBase().getDataSource().execute(createAgence.asString());
+                root.refetchTable("AGENCE");
+                SQLRowValues rowVals = new SQLRowValues(root.getTable("AGENCE"));
+                SQLRow rowInserted = rowVals.commit();
+                SQLTable.setUndefID(root.getSchema(), "AGENCE", rowInserted.getID());
+                tableDevis.getSchema().updateVersion();
+            } catch (SQLException ex) {
+                throw new IllegalStateException("Erreur lors de la création de la table AGENCE", ex);
+            }
+        }
+        // Tarification client par famille article
+        if (root.getTable("TARIF_FAMILLE_ARTICLE_CLIENT") == null) {
+            final SQLCreateTable createTableQtyTarif = new SQLCreateTable(root, "TARIF_FAMILLE_ARTICLE_CLIENT");
+            createTableQtyTarif.addForeignColumn("ID_FAMILLE_ARTICLE", root.getTable("FAMILLE_ARTICLE"));
+            createTableQtyTarif.addForeignColumn("ID_CLIENT", root.getTable("CLIENT"));
+            createTableQtyTarif.addDecimalColumn("QUANTITE", 16, 3, BigDecimal.ONE, false);
+            createTableQtyTarif.addDecimalColumn("POURCENT_REMISE", 16, 3, null, true);
+            // createTableQtyTarif.addDecimalColumn("PRIX_METRIQUE_VT_1", 16, 6, null, true);
+            try {
+                root.getBase().getDataSource().execute(createTableQtyTarif.asString());
+                InstallationPanel.insertUndef(createTableQtyTarif);
+                root.refetchTable("TARIF_FAMILLE_ARTICLE_CLIENT");
+                root.getSchema().updateVersion();
+            } catch (SQLException ex) {
+                throw new IllegalStateException("Erreur lors de la création de la table " + "TARIF_FAMILLE_ARTICLE_CLIENT", ex);
+            }
+        }
+        // Tarification client par famille article
+        if (root.getTable("TARIF_FAMILLE_ARTICLE_CLIENT") == null) {
+            final SQLCreateTable createTableQtyTarif = new SQLCreateTable(root, "TARIF_FAMILLE_ARTICLE_CLIENT");
+            createTableQtyTarif.addForeignColumn("ID_FAMILLE_ARTICLE", root.getTable("FAMILLE_ARTICLE"));
+            createTableQtyTarif.addForeignColumn("ID_CLIENT", root.getTable("CLIENT"));
+            createTableQtyTarif.addDecimalColumn("QUANTITE", 16, 3, BigDecimal.ONE, false);
+            createTableQtyTarif.addDecimalColumn("POURCENT_REMISE", 16, 3, null, true);
+            // createTableQtyTarif.addDecimalColumn("PRIX_METRIQUE_VT_1", 16, 6, null, true);
+            try {
+                root.getBase().getDataSource().execute(createTableQtyTarif.asString());
+                InstallationPanel.insertUndef(createTableQtyTarif);
+                root.refetchTable("TARIF_FAMILLE_ARTICLE_CLIENT");
+                root.getSchema().updateVersion();
+            } catch (SQLException ex) {
+                throw new IllegalStateException("Erreur lors de la création de la table " + "TARIF_FAMILLE_ARTICLE_CLIENT", ex);
+            }
+        }
+        SQLTable tableAvoirC = root.getTable("AVOIR_CLIENT");
+        if (!tableAvoirC.contains("ID_TAXE_PORT")) {
+            final AlterTable alterB = new AlterTable(tableAvoirC);
+            alterB.addForeignColumn("ID_TAXE_PORT", root.getTable("TAXE"));
+            root.getBase().getDataSource().execute(alterB.asString());
+            root.refetchTable(tableAvoirC.getName());
+            root.getSchema().updateVersion();
+        }
+        SQLTable tableVF = root.getTable("SAISIE_VENTE_FACTURE");
+        if (!tableVF.contains("ID_FACTURATION_COMMANDE_CLIENT")) {
+            final AlterTable alter = new AlterTable(tableVF);
+            final SQLTable tableFacturationCommandeClient = tableVF.getDBRoot().getTable("FACTURATION_COMMANDE_CLIENT");
+            alter.addForeignColumn("ID_FACTURATION_COMMANDE_CLIENT", tableFacturationCommandeClient);
+            tableVF.getBase().getDataSource().execute(alter.asString());
+            tableVF.getSchema().updateVersion();
+            tableVF.fetchFields();
+            // update ID_FACTURATION_COMMANDE
+            UpdateBuilder builder = new UpdateBuilder(tableVF);
+            AliasedTable ref = new AliasedTable(tableFacturationCommandeClient, "tf");
+            builder.addBackwardVirtualJoin(ref, "ID_SAISIE_VENTE_FACTURE");
+            builder.setFromVirtualJoinField("ID_FACTURATION_COMMANDE_CLIENT", "tf", tableFacturationCommandeClient.getKey().getName());
+            tableVF.getBase().getDataSource().execute(builder.asString());
+        }
+        if (!root.getTable("NUMEROTATION_AUTO").contains("CODE_LETTRAGE_PARTIEL")) {
+            final AlterTable alterNumero = new AlterTable(root.getTable("NUMEROTATION_AUTO"));
+            alterNumero.addVarCharColumn("CODE_LETTRAGE_PARTIEL", 256);
+            root.getBase().getDataSource().execute(alterNumero.asString());
+            root.refetchTable("NUMEROTATION_AUTO");
+            root.getSchema().updateVersion();
+        }
+        if (!root.getTable("ECRITURE").contains("LETTRAGE_PARTIEL")) {
+            final AlterTable alterEcriture = new AlterTable(root.getTable("ECRITURE"));
+            alterEcriture.addVarCharColumn("LETTRAGE_PARTIEL", 256);
+            root.getBase().getDataSource().execute(alterEcriture.asString());
+            root.refetchTable("ECRITURE");
+            root.getSchema().updateVersion();
+        }
+        SQLTable tableFactureF = root.getTable("FACTURE_FOURNISSEUR");
+        if (!tableFactureF.contains("ID_AVOIR_FOURNISSEUR_2")) {
+            final AlterTable alter = new AlterTable(tableFactureF);
+            final SQLTable tableAvoirF = tableVF.getDBRoot().getTable("AVOIR_FOURNISSEUR");
+            alter.addForeignColumn("ID_AVOIR_FOURNISSEUR_2", tableAvoirF);
+            tableFactureF.getBase().getDataSource().execute(alter.asString());
+            tableFactureF.getSchema().updateVersion();
+            tableVF.fetchFields();
+        }
+    }
     public static void initStock(SQLRow rowArticle, int idDepot) {
         SQLSelect selStock = new SQLSelect();

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 - Rev 177 → 180