WebSVN - OpenConcerto - Diff - Rev 156 and 174 - /trunk/OpenConcerto/src/org/openconcerto/erp/config/ComptaPropsConfiguration.java

 import org.openconcerto.erp.core.common.element.PaysSQLElement;
 import org.openconcerto.erp.core.common.element.SocieteCommonSQLElement;
 import org.openconcerto.erp.core.common.element.StyleSQLElement;
 import org.openconcerto.erp.core.common.element.TitrePersonnelSQLElement;
 import org.openconcerto.erp.core.customerrelationship.customer.element.ClientDepartementSQLElement;
+import org.openconcerto.erp.core.customerrelationship.customer.element.ComptaContactSQLElement.ContactAdministratifSQLElement;
+import org.openconcerto.erp.core.customerrelationship.customer.element.ComptaContactSQLElement.ContactFournisseurSQLElement;
+import org.openconcerto.erp.core.customerrelationship.customer.element.ComptaContactSQLElement.ContactSQLElement;
+import org.openconcerto.erp.core.customerrelationship.customer.element.ComptaContactSQLElement.ContactSalarieSQLElement;
 import org.openconcerto.erp.core.customerrelationship.customer.element.CompteClientTransactionSQLELement;
-import org.openconcerto.erp.core.customerrelationship.customer.element.ContactSQLElement;
-import org.openconcerto.erp.core.customerrelationship.customer.element.ContactSQLElement.ContactAdministratifSQLElement;
-import org.openconcerto.erp.core.customerrelationship.customer.element.ContactSQLElement.ContactFournisseurSQLElement;
 import org.openconcerto.erp.core.customerrelationship.customer.element.CourrierClientSQLElement;
 import org.openconcerto.erp.core.customerrelationship.customer.element.CustomerCategorySQLElement;
 import org.openconcerto.erp.core.customerrelationship.customer.element.CustomerSQLElement;
 import org.openconcerto.erp.core.customerrelationship.customer.element.ModeleCourrierClientSQLElement;
 import org.openconcerto.erp.core.customerrelationship.customer.element.ReferenceClientSQLElement;
 import org.openconcerto.erp.core.customerrelationship.customer.element.RelanceSQLElement;
 import org.openconcerto.erp.core.customerrelationship.customer.element.TypeLettreRelanceSQLElement;
+import org.openconcerto.erp.core.customerrelationship.mail.EmailTemplateSQLElement;
 import org.openconcerto.erp.core.edm.AttachmentSQLElement;
 import org.openconcerto.erp.core.finance.accounting.element.AssociationAnalytiqueSQLElement;
 import org.openconcerto.erp.core.finance.accounting.element.AssociationCompteAnalytiqueSQLElement;
 import org.openconcerto.erp.core.finance.accounting.element.AxeAnalytiqueSQLElement;
 import org.openconcerto.erp.core.finance.accounting.element.CategorieComptableSQLElement;
 import org.openconcerto.erp.core.sales.product.element.ArticleCodeClientSQLElement;
 import org.openconcerto.erp.core.sales.product.element.ArticleDesignationSQLElement;
 import org.openconcerto.erp.core.sales.product.element.ArticleFournisseurSecondaireSQLElement;
 import org.openconcerto.erp.core.sales.product.element.ArticleTarifSQLElement;
 import org.openconcerto.erp.core.sales.product.element.CoutRevientSQLElement;
+import org.openconcerto.erp.core.sales.product.element.CustomerProductQtyPriceSQLElement;
 import org.openconcerto.erp.core.sales.product.element.EcoContributionSQLElement;
 import org.openconcerto.erp.core.sales.product.element.FamilleArticleSQLElement;
 import org.openconcerto.erp.core.sales.product.element.FamilleEcoContributionSQLElement;
 import org.openconcerto.erp.core.sales.product.element.MetriqueSQLElement;
 import org.openconcerto.erp.core.sales.product.element.ModeVenteArticleSQLElement;
 import org.openconcerto.erp.generationDoc.provider.AdresseRueClientValueProvider;
 import org.openconcerto.erp.generationDoc.provider.AdresseVilleCPClientValueProvider;
 import org.openconcerto.erp.generationDoc.provider.AdresseVilleClientValueProvider;
 import org.openconcerto.erp.generationDoc.provider.AdresseVilleNomClientValueProvider;
 import org.openconcerto.erp.generationDoc.provider.ArticleCodeClientProvider;
+import org.openconcerto.erp.generationDoc.provider.ArticleCodeFournisseurProvider;
 import org.openconcerto.erp.generationDoc.provider.ConditionsReglementDetailsProvider;
 import org.openconcerto.erp.generationDoc.provider.DateBLProvider;
 import org.openconcerto.erp.generationDoc.provider.DateProvider;
 import org.openconcerto.erp.generationDoc.provider.FacturableValueProvider;
 import org.openconcerto.erp.generationDoc.provider.FormatedGlobalQtyTotalProvider;
 import org.openconcerto.erp.generationDoc.provider.PaiementRemainedDevisProvider;
 import org.openconcerto.erp.generationDoc.provider.PaiementRemainedProvider;
 import org.openconcerto.erp.generationDoc.provider.PrixUVProvider;
 import org.openconcerto.erp.generationDoc.provider.PrixUnitaireProvider;
 import org.openconcerto.erp.generationDoc.provider.PrixUnitaireRemiseProvider;
+import org.openconcerto.erp.generationDoc.provider.QteTotalDocProvider;
 import org.openconcerto.erp.generationDoc.provider.QteTotalProvider;
 import org.openconcerto.erp.generationDoc.provider.RecapFactureProvider;
 import org.openconcerto.erp.generationDoc.provider.RefClientValueProvider;
 import org.openconcerto.erp.generationDoc.provider.RemiseProvider;
 import org.openconcerto.erp.generationDoc.provider.RemiseTotalProvider;
 import org.openconcerto.erp.injector.CommandeBrEltSQLInjector;
 import org.openconcerto.erp.injector.CommandeBrSQLInjector;
 import org.openconcerto.erp.injector.CommandeCliCommandeSQLInjector;
 import org.openconcerto.erp.injector.CommandeFactureAchatSQLInjector;
 import org.openconcerto.erp.injector.CommandeFactureClientSQLInjector;
+import org.openconcerto.erp.injector.CommandeFactureEltSQLInjector;
+import org.openconcerto.erp.injector.CommandeFactureFournisseurSQLInjector;
 import org.openconcerto.erp.injector.DevisBlEltSQLInjector;
 import org.openconcerto.erp.injector.DevisBlSQLInjector;
 import org.openconcerto.erp.injector.DevisCommandeFournisseurSQLInjector;
 import org.openconcerto.erp.injector.DevisCommandeSQLInjector;
 import org.openconcerto.erp.injector.DevisEltFactureEltSQLInjector;
 import org.openconcerto.sql.element.SharedSQLElement;
 import org.openconcerto.sql.model.DBRoot;
 import org.openconcerto.sql.model.DBStructureItemNotFound;
 import org.openconcerto.sql.model.DBSystemRoot;
 import org.openconcerto.sql.model.FieldMapper;
-import org.openconcerto.sql.model.LoadingListener;
 import org.openconcerto.sql.model.SQLDataSource;
 import org.openconcerto.sql.model.SQLRow;
 import org.openconcerto.sql.model.SQLServer;
 import org.openconcerto.sql.model.SQLSystem;
 import org.openconcerto.sql.model.SQLTable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Properties;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
 import javax.imageio.ImageIO;
-import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 /***************************************************************************************************
         AdresseVilleClientValueProvider.register();
         AdresseVilleCPClientValueProvider.register();
         AdresseVilleNomClientValueProvider.register();
         AdresseFullClientValueProvider.register();
         QteTotalProvider.register();
+        QteTotalDocProvider.register();
         StockLocationProvider.register();
         RefClientValueProvider.register();
         ModeDeReglementDetailsProvider.register();
         FormatedGlobalQtyTotalProvider.register();
         MergedGlobalQtyTotalProvider.register();
         DateProvider.register();
         RemiseTotalProvider.register();
         RecapFactureProvider.register();
         RestantAReglerProvider.register();
         SaledTotalNotDiscountedProvider.register();
-    }
-    @Override
-    protected void initSystemRoot(DBSystemRoot input) {
-        super.initSystemRoot(input);
-        if (!GraphicsEnvironment.isHeadless()) {
-            final JDialog f = new JOptionPane("Mise à jour des caches en cours...\nCette opération prend généralement moins d'une minute.", JOptionPane.INFORMATION_MESSAGE, JOptionPane.DEFAULT_OPTION,
-                    null, new Object[] {}).createDialog("Veuillez patienter");
-            input.addLoadingListener(new LoadingListener() {
+        ArticleCodeFournisseurProvider.register();
-                private int loadingCount = 0;
-                private final ScheduledExecutorService exec = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
-                    @Override
-                    public Thread newThread(Runnable r) {
-                        final Thread thread = new Thread(r, "Loading listener thread");
-                        thread.setDaemon(true);
-                        return thread;
-                    }
-                });
-                private ScheduledFuture<?> future = null;
-                @Override
-                public synchronized void loading(LoadingEvent evt) {
-                    this.loadingCount += evt.isStarting() ? 1 : -1;
-                    if (this.loadingCount < 0) {
-                        throw new IllegalStateException();
-                    } else if (this.loadingCount == 0) {
-                        this.future.cancel(false);
-                        this.future = null;
-                        SwingUtilities.invokeLater(new Runnable() {
-                            @Override
-                            public void run() {
-                                f.setVisible(false);
-                                f.dispose();
-                            }
-                        });
-                    } else if (this.future == null) {
-                        this.future = this.exec.schedule(new Runnable() {
-                            @Override
-                            public void run() {
-                                SwingUtilities.invokeLater(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        f.setVisible(true);
-                                    }
-                                });
-                            }
-                        }, 1, TimeUnit.SECONDS);
-                    }
-                }
-            });
-        }
+    }
     @Override
     protected void initDS(SQLDataSource ds) {
         super.initDS(ds);
+            }
             SQLElementDirectory dir = this.getDirectory();
             dir.addSQLElement(AttachmentSQLElement.class);
+            dir.addSQLElement(CustomerProductQtyPriceSQLElement.class);
             dir.addSQLElement(EtatStockSQLElement.class);
             dir.addSQLElement(EtatStockItemSQLElement.class);
             dir.addSQLElement(ArticleTarifSQLElement.class);
             dir.addSQLElement(CoutRevientSQLElement.class);
             dir.addSQLElement(ReliquatBRSQLElement.class);
             dir.addSQLElement(BanqueSQLElement.class);
             dir.addSQLElement(ClientDepartementSQLElement.class);
             dir.addSQLElement(CoefficientPrimeSQLElement.class);
             dir.addSQLElement(ContactFournisseurSQLElement.class);
             dir.addSQLElement(ContactAdministratifSQLElement.class);
+            dir.addSQLElement(ContactSalarieSQLElement.class);
             dir.addSQLElement(new TitrePersonnelSQLElement());
             dir.addSQLElement(new ContactSQLElement());
             dir.addSQLElement(new SaisieKmItemSQLElement());
             dir.addSQLElement(new EcritureSQLElement());
             dir.addSQLElement(UniteVenteArticleSQLElement.class);
             dir.addSQLElement(CalendarItemSQLElement.class);
             dir.addSQLElement(CalendarItemGroupSQLElement.class);
             dir.addSQLElement(DeviseHistoriqueSQLElement.class);
+            dir.addSQLElement(EmailTemplateSQLElement.class);
             if (getRootSociete().contains("FWK_LIST_PREFS")) {
                 dir.addSQLElement(new FWKListPrefs(getRootSociete()));
+            }
             if (getRootSociete().contains("FWK_SESSION_STATE")) {
+    }
     public static void setSocieteSQLInjector(final DBRoot rootSociete) {
         new AchatAvoirSQLInjector(rootSociete);
+        new CommandeFactureEltSQLInjector(rootSociete);
         new ArticleCommandeEltSQLInjector(rootSociete);
         new CommandeCliCommandeSQLInjector(rootSociete);
         new FactureAvoirSQLInjector(rootSociete);
         new FactureBonSQLInjector(rootSociete);
         new FactureCommandeSQLInjector(rootSociete);
         new BonFactureEltSQLInjector(rootSociete);
         new CommandeFactureClientSQLInjector(rootSociete);
         new CommandeBrSQLInjector(rootSociete);
         new BonReceptionFactureFournisseurSQLInjector(rootSociete);
         new CommandeFactureAchatSQLInjector(rootSociete);
+        new CommandeFactureFournisseurSQLInjector(rootSociete);
         new EcheanceEncaisseSQLInjector(rootSociete);
         new EcheanceRegleSQLInjector(rootSociete);
         new BrFactureAchatSQLInjector(rootSociete);
         new DevisEltFactureEltSQLInjector(rootSociete);
         showAs.show("CHEQUE_A_ENCAISSER", "MONTANT", "ID_CLIENT");
                 if (getRootSociete().getTable("CLIENT").getFieldsName().contains("LOCALISATION")) {
                     showAs.show("CLIENT", "NOM", "LOCALISATION");
                 } else {
-                    SQLPreferences prefs = new SQLPreferences(root);
+                    SQLPreferences prefs = SQLPreferences.getMemCached(root);
                     if (prefs.getBoolean(GestionClientPreferencePanel.DISPLAY_CLIENT_PCE, false)) {
                         showAs.show("CLIENT", "ID_PAYS", "GROUPE", "NOM", "ID_COMPTE_PCE");
                     } else {
                         showAs.show("CLIENT", "ID_PAYS", "GROUPE", "NOM");
+                    }
         showAs.show("ECRITURE", SQLRow.toList("NOM,DATE,ID_COMPTE_PCE,DEBIT,CREDIT"));
         showAs.show("ECHEANCE_CLIENT", SQLRow.toList("ID_CLIENT,ID_MOUVEMENT"));
         final List<String> lEchFact = new ArrayList<String>();
         lEchFact.add("NUMERO");
         lEchFact.add("DATE");
+        lEchFact.add("ID_MODE_REGLEMENT");
         lEchFact.add("ID_COMMERCIAL");
         SQLTable tableEch = root.getTable("ECHEANCE_CLIENT");
         showAs.show(tableEch.getField("ID_SAISIE_VENTE_FACTURE"), lEchFact);
         showAs.show("ECHEANCE_FOURNISSEUR", SQLRow.toList("ID_FOURNISSEUR,ID_MOUVEMENT"));
-        showAs.show("FICHE_PAYE", SQLRow.toList("ID_MOIS,ANNEE"));
+        showAs.show("FICHE_PAYE", SQLRow.toList("ID_MOIS,ANNEE,ID_PROFIL_PAYE"));
         showAs.show("FOURNISSEUR", "NOM");
         showAs.show("IDCC", "NOM");
         showAs.show("JOURNAL", "NOM");
     @Override
     public void setUpSocieteDataBaseConnexion(int base) {
         final String customerName = setUpSocieteStructure(base);
         final DBRoot rootSociete = this.getRootSociete();
+        try {
+            // create table if necessary
+            SQLPreferences.getPrefTable(rootSociete);
+            SQLPreferences.startMemCached(rootSociete);
+        } catch (Exception e) {
+            // don't die now, we might not need them
+            ExceptionHandler.handle("Impossible d'accéder aux préférences", e);
+        }
         closeSocieteConnexion();
         setSocieteDirectory();
         NumerotationAutoSQLElement.addListeners();
         loadTranslations(this.getTranslator(), rootSociete, Arrays.asList("mappingCompta", "mapping-" + customerName));
         setSocieteShowAs();
         getFieldMapper().addMapperStreamFromClass(Gestion.class);
         TemplateNXProps.getInstance();
         // Prefetch undefined
         rootSociete.getTables().iterator().next().getUndefinedID();
-        try {
-            // create table if necessary
-            SQLPreferences.getPrefTable(rootSociete);
-            SQLPreferences.startMemCached(rootSociete);
-        } catch (Exception e) {
-            // don't die now, we might not need them
-            ExceptionHandler.handle("Impossible d'accéder aux préférences", e);
-        }
         this.getModuleManager().addFactories(Gestion.MODULES_DIR);
         this.getModuleManager().setup(this.getRootSociete(), this);
+    }
     public final ModuleManager getModuleManager() {
         return this.moduleMngr;
+    }
     public void setupBarCodeIfNeeded() {
         final DBRoot rootSociete = this.getRootSociete();
-        // TODO check is the SQLPreferences returned by startMemCached() can be used
-        SQLPreferences pref = new SQLPreferences(rootSociete);
+        SQLPreferences pref = SQLPreferences.getMemCached(rootSociete);
         if (pref.getBoolean(GestionCommercialeGlobalPreferencePanel.BARCODE_INSERTION, false)) {
             this.barcodeReader = new BarcodeReader(80);
             this.barcodeReader.start();
+        }
+    }

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/config/ComptaPropsConfiguration.java - Rev 156 → 174