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

 import org.openconcerto.erp.core.finance.accounting.action.GestionPlanComptableEAction;
 import org.openconcerto.erp.core.finance.accounting.action.ImportEcritureAction;
 import org.openconcerto.erp.core.finance.accounting.action.ImpressionJournauxAnalytiqueAction;
 import org.openconcerto.erp.core.finance.accounting.action.ImpressionLivrePayeAction;
 import org.openconcerto.erp.core.finance.accounting.action.ImpressionRepartitionAnalytiqueAction;
+import org.openconcerto.erp.core.finance.accounting.action.ListeDesCategorieComptableAction;
 import org.openconcerto.erp.core.finance.accounting.action.ListeDesComptesAction;
 import org.openconcerto.erp.core.finance.accounting.action.ListeDesDevisesAction;
 import org.openconcerto.erp.core.finance.accounting.action.ListeDesEcrituresAction;
 import org.openconcerto.erp.core.finance.accounting.action.ListeDesEcrituresAnalytiquesAction;
 import org.openconcerto.erp.core.finance.accounting.action.ListeDesJournauxAction;
 import org.openconcerto.erp.core.finance.accounting.action.ListeDesPostesAnalytiquesAction;
 import org.openconcerto.erp.core.finance.accounting.action.ListeDesTauxDeChangeAction;
 import org.openconcerto.erp.core.finance.accounting.action.ListeEcritureParClasseAction;
 import org.openconcerto.erp.core.finance.accounting.action.NouveauClotureAction;
+import org.openconcerto.erp.core.finance.accounting.action.NouveauClotureSansAnouveauxAction;
 import org.openconcerto.erp.core.finance.accounting.action.NouveauLettrageAction;
 import org.openconcerto.erp.core.finance.accounting.action.NouveauPointageAction;
 import org.openconcerto.erp.core.finance.accounting.action.NouvelleValidationAction;
 import org.openconcerto.erp.core.finance.accounting.action.ResultatAnalytiqueAction;
 import org.openconcerto.erp.core.finance.accounting.ui.SaisieJournalAction;
 import org.openconcerto.erp.core.finance.payment.action.ListeDesChequesAEncaisserAction;
 import org.openconcerto.erp.core.finance.payment.action.ListeDesChequesAvoirAction;
 import org.openconcerto.erp.core.finance.payment.action.ListeDesChequesFournisseursAction;
+import org.openconcerto.erp.core.finance.payment.action.ListeDesDepostChequesAction;
 import org.openconcerto.erp.core.finance.payment.action.ListeDesEncaissementsAction;
 import org.openconcerto.erp.core.finance.payment.action.ListeDesReferencesAction;
 import org.openconcerto.erp.core.finance.payment.action.ListeDesRelancesAction;
 import org.openconcerto.erp.core.finance.payment.action.ListeDesTraitesFournisseursAction;
 import org.openconcerto.erp.core.finance.payment.action.NouveauDecaissementChequeAvoirAction;
 import org.openconcerto.erp.core.sales.invoice.action.ListeSDDMessageAction;
 import org.openconcerto.erp.core.sales.invoice.action.ListeSaisieVenteFactureAction;
 import org.openconcerto.erp.core.sales.invoice.action.ListesFacturesClientsImpayeesAction;
 import org.openconcerto.erp.core.sales.invoice.action.NouveauSaisieVenteComptoirAction;
 import org.openconcerto.erp.core.sales.invoice.action.NouveauSaisieVenteFactureAction;
+import org.openconcerto.erp.core.sales.invoice.report.ReportingClientPanel;
 import org.openconcerto.erp.core.sales.order.action.ListeDesCommandesClientAction;
 import org.openconcerto.erp.core.sales.order.action.ListeDesCommandesClientItemsAction;
 import org.openconcerto.erp.core.sales.order.action.ListeDesElementsACommanderClientAction;
 import org.openconcerto.erp.core.sales.order.action.ListeDesFacturationCommandesClientAction;
 import org.openconcerto.erp.core.sales.order.action.NouvelleCommandeClientAction;
 import org.openconcerto.erp.core.sales.product.action.FamilleArticleAction;
 import org.openconcerto.erp.core.sales.product.action.ListeDesArticlesAction;
 import org.openconcerto.erp.core.sales.product.action.ListeEcoContributionAction;
 import org.openconcerto.erp.core.sales.product.action.ListeHistoCodeClientArticleAction;
 import org.openconcerto.erp.core.sales.quote.action.ListeDesDevisAction;
+import org.openconcerto.erp.core.sales.quote.action.ListeDesDevisActionTCP;
 import org.openconcerto.erp.core.sales.quote.action.ListeDesElementsDevisAction;
-import org.openconcerto.erp.core.sales.quote.action.ListeDesElementsPropositionsAction;
 import org.openconcerto.erp.core.sales.quote.action.NouveauDevisAction;
-import org.openconcerto.erp.core.sales.quote.action.NouvellePropositionAction;
 import org.openconcerto.erp.core.sales.shipment.action.ListeDesBonsDeLivraisonAction;
 import org.openconcerto.erp.core.sales.shipment.action.ListeDesReliquatsBonsLivraisonsAction;
 import org.openconcerto.erp.core.sales.shipment.action.NouveauBonLivraisonAction;
 import org.openconcerto.erp.core.supplychain.credit.action.ListeDesAvoirsFournisseurAction;
 import org.openconcerto.erp.core.supplychain.credit.action.NouvelAvoirFournisseurAction;
 import org.openconcerto.erp.core.supplychain.order.action.ListeDesElementsACommanderAction;
 import org.openconcerto.erp.core.supplychain.order.action.ListeDesFacturesFournisseurAction;
 import org.openconcerto.erp.core.supplychain.order.action.ListeSaisieAchatAction;
 import org.openconcerto.erp.core.supplychain.order.action.NouveauSaisieAchatAction;
 import org.openconcerto.erp.core.supplychain.order.action.NouvelleCommandeAction;
+import org.openconcerto.erp.core.supplychain.order.action.NouvelleDemandePrixAction;
 import org.openconcerto.erp.core.supplychain.order.action.NouvelleFactureFournisseurAction;
 import org.openconcerto.erp.core.supplychain.product.action.ListeDesArticlesFournisseurAction;
 import org.openconcerto.erp.core.supplychain.receipt.action.ListeDesBonsReceptionsAction;
 import org.openconcerto.erp.core.supplychain.receipt.action.ListeDesReliquatsBonsReceptionsAction;
 import org.openconcerto.erp.core.supplychain.receipt.action.NouveauBonReceptionAction;
+import org.openconcerto.erp.core.supplychain.stock.action.ListeDesDepotsStocksAction;
+import org.openconcerto.erp.core.supplychain.stock.action.ListeDesEtatsStocksAction;
 import org.openconcerto.erp.core.supplychain.stock.action.ListeDesMouvementsStockAction;
+import org.openconcerto.erp.core.supplychain.stock.action.ListeDesStocksAction;
 import org.openconcerto.erp.core.supplychain.stock.action.NouvelleSaisieMouvementStockAction;
 import org.openconcerto.erp.core.supplychain.supplier.action.ListeDesContactsFournisseursAction;
 import org.openconcerto.erp.core.supplychain.supplier.action.ListeDesFournisseursAction;
 import org.openconcerto.erp.core.supplychain.supplier.action.ListesFacturesFournImpayeesAction;
 import org.openconcerto.erp.core.supplychain.supplier.action.NouvelHistoriqueListeFournAction;
 import org.openconcerto.erp.modules.ModuleFrame;
 import org.openconcerto.erp.preferences.DefaultNXProps;
+import org.openconcerto.erp.preferences.GestionArticleGlobalPreferencePanel;
 import org.openconcerto.erp.preferences.GestionClientPreferencePanel;
 import org.openconcerto.erp.rights.ComptaUserRight;
 import org.openconcerto.erp.rights.NXRights;
 import org.openconcerto.erp.utils.correct.CorrectMouvement;
 import org.openconcerto.sql.model.DBRoot;
         if (rights.haveRight(ComptaUserRight.MENU)) {
             final Group gAccounting = new Group("menu.organization.accounting", LayoutHints.DEFAULT_NOLABEL_SEPARATED_GROUP_HINTS);
             gAccounting.addItem("accounting.chart");
             gAccounting.addItem("accounting.list");
             gAccounting.addItem("accounting.journal");
+            gAccounting.addItem("accounting.category.list");
             gAccounting.addItem("accounting.checkDB");
             gAccounting.addItem("accounting.currency");
             gAccounting.addItem("accounting.currency.rates");
             group.add(gAccounting);
+        }
+        }
         if (rights.haveRight(NXRights.GESTION_ENCAISSEMENT.getCode())) {
             Group gCustomer = new Group("menu.payment.customer");
             gCustomer.addItem("customer.invoice.unpaid.list");
+            gCustomer.addItem("customer.payment.report");
             gCustomer.addItem("customer.dept.list");
             gCustomer.addItem("customer.payment.list");
             gCustomer.addItem("customer.payment.followup.list");
             gCustomer.addItem("customer.payment.check.pending.list");
+            gCustomer.addItem("customer.payment.check.deposit.list");
             gCustomer.addItem("customer.payment.check.pending.create");
+            gCustomer.addItem("customer.payment.check.deposit.list");
             gCustomer.addItem("customer.payment.sddMessage.list");
             gCustomer.addItem("customer.credit.check.list");
             gCustomer.addItem("customer.credit.check.create");
             group.add(gCustomer);
+        }
             final Group gProduct = new Group("menu.list.product", LayoutHints.DEFAULT_NOLABEL_SEPARATED_GROUP_HINTS);
             gProduct.addItem("product.list");
             // gProduct.addItem("product.customer.list");
             // gProduct.addItem("product.supplychain.list");
+            if (prefs.getBoolean(GestionArticleGlobalPreferencePanel.STOCK_MULTI_DEPOT, false)) {
+                gProduct.addItem("stock.depot.list");
+                gProduct.addItem("stock.item.list");
+            }
             gProduct.addItem("stock.io.list");
+            gProduct.addItem("stock.io.state");
             gProduct.addItem("customer.order.waiting");
             gProduct.addItem("supplier.order.waiting");
             group.add(gProduct);
         return group;
      * Actions
      */
     public void registerFilesMenuActions(final MenuAndActions mManager) {
         mManager.putAction(new SauvegardeBaseAction(), "backup");
         mManager.putAction(new AbstractAction() {
+            private ModuleFrame frame = null;
             @Override
             public void actionPerformed(ActionEvent e) {
+                if (this.frame == null) {
+                    this.frame = new ModuleFrame(getConfiguration().getModuleManager());
+                }
+                this.frame.setLocationRelativeTo(null);
-                FrameUtil.show(ModuleFrame.getInstance());
+                FrameUtil.show(this.frame);
+            }
         }, "modules");
-        if (!Gestion.MAC_OS_X) {
-            mManager.putAction(new PreferencesAction(), "preferences");
+        mManager.putAction(new PreferencesAction(getConfiguration().getModuleManager()), "preferences");
-            mManager.putAction(new AbstractAction() {
+        mManager.putAction(new AbstractAction() {
-                @Override
+            @Override
-                public void actionPerformed(ActionEvent e) {
+            public void actionPerformed(ActionEvent e) {
-                    MainFrame.getInstance().quit();
+                MainFrame.getInstance().quit();
+            }
-            }, "quit");
+        }, "quit");
+    }
-    }
     public void registerCreationMenuActions(final MenuAndActions mManager) {
         final Boolean bModeVenteComptoir = DefaultNXProps.getInstance().getBooleanValue("ArticleVenteComptoir", true);
         final UserRights rights = UserRightsManager.getCurrentUserRights();
+        final ComptaPropsConfiguration conf = this.getConfiguration();
         if (rights.haveRight(ComptaUserRight.MENU)) {
-            mManager.putAction(new NouvelleSaisieKmAction(), "accounting.entry.create");
+            mManager.putAction(new NouvelleSaisieKmAction(conf), "accounting.entry.create");
             mManager.putAction(new SaisieJournalAction(), "accounting.entry.ledger.create");
+        }
-        mManager.putAction(new NouveauDevisAction(), "customer.quote.create");
+        mManager.putAction(new NouveauDevisAction(conf), "customer.quote.create");
-        mManager.putAction(new NouveauBonLivraisonAction(), "customer.delivery.create");
+        mManager.putAction(new NouveauBonLivraisonAction(conf), "customer.delivery.create");
-        mManager.putAction(new NouvelleCommandeClientAction(), "customer.order.create");
+        mManager.putAction(new NouvelleCommandeClientAction(conf), "customer.order.create");
         if (bModeVenteComptoir && rights.haveRight("VENTE_COMPTOIR")) {
-            mManager.putAction(new NouveauSaisieVenteComptoirAction(), "pos.sale.create");
+            mManager.putAction(new NouveauSaisieVenteComptoirAction(conf), "pos.sale.create");
+        }
-        mManager.putAction(new NouveauSaisieVenteFactureAction(), "customer.invoice.create");
+        mManager.putAction(new NouveauSaisieVenteFactureAction(conf), "customer.invoice.create");
-        mManager.putAction(new NouveauAvoirClientAction(), "customer.credit.create");
+        mManager.putAction(new NouveauAvoirClientAction(conf), "customer.credit.create");
         if (rights.haveRight(NXRights.LOCK_MENU_ACHAT.getCode())) {
+            mManager.putAction(new NouvelleDemandePrixAction(conf), "supplier.order.ask.create");
-            mManager.putAction(new NouvelleCommandeAction(), "supplier.order.create");
+            mManager.putAction(new NouvelleCommandeAction(conf), "supplier.order.create");
-            mManager.putAction(new NouveauBonReceptionAction(), "supplier.receipt.create");
+            mManager.putAction(new NouveauBonReceptionAction(conf), "supplier.receipt.create");
-            mManager.putAction(new NouveauSaisieAchatAction(), "supplier.purchase.create");
+            mManager.putAction(new NouveauSaisieAchatAction(conf), "supplier.purchase.create");
-            mManager.putAction(new NouvelleFactureFournisseurAction(), "supplier.invoice.purchase.create");
+            mManager.putAction(new NouvelleFactureFournisseurAction(conf), "supplier.invoice.purchase.create");
-            mManager.putAction(new NouvelAvoirFournisseurAction(), "supplier.credit.create");
+            mManager.putAction(new NouvelAvoirFournisseurAction(conf), "supplier.credit.create");
-            mManager.putAction(new NouvelleSaisieMouvementStockAction(), "stock.io.create");
+            mManager.putAction(new NouvelleSaisieMouvementStockAction(conf), "stock.io.create");
+        }
+    }
     public void registerListMenuActions(final MenuAndActions mManager) {
+        final ComptaPropsConfiguration conf = this.configuration;
         final Boolean bModeVenteComptoir = DefaultNXProps.getInstance().getBooleanValue("ArticleVenteComptoir", true);
+        // FIXME conf.getCurrentUserRights();
         final UserRights rights = UserRightsManager.getCurrentUserRights();
-        mManager.putAction(new ListeDesClientsAction(), "customer.list");
+        mManager.putAction(new ListeDesClientsAction(conf), "customer.list");
-        SQLPreferences prefs = SQLPreferences.getMemCached(configuration.getRootSociete());
+        SQLPreferences prefs = SQLPreferences.getMemCached(conf.getRootSociete());
         if (prefs.getBoolean(GestionClientPreferencePanel.DISPLAY_CLIENT_DPT, false)) {
-            mManager.putAction(new ListeDesDepartementsClientsAction(), "customer.department.list");
+            mManager.putAction(new ListeDesDepartementsClientsAction(conf), "customer.department.list");
+        }
-        mManager.putAction(new ListeDesContactsAction(), "contact.list");
+        mManager.putAction(new ListeDesContactsAction(conf), "contact.list");
         if (rights.haveRight(NXRights.ACCES_HISTORIQUE.getCode())) {
             mManager.putAction(new NouvelHistoriqueListeClientAction(), "customer.history");
+        }
-            mManager.putAction(new ListeDesDevisAction(), "customer.quote.list");
+                mManager.putAction(new ListeDesDevisAction(conf), "customer.quote.list");
             mManager.putAction(new ListeDesCommandesClientAction(), "customer.order.list");
-            mManager.putAction(new ListeDesFacturationCommandesClientAction(), "customer.order.invoice.list");
+            mManager.putAction(new ListeDesFacturationCommandesClientAction(conf), "customer.order.invoice.list");
-            mManager.putAction(new ListeDesCommandesClientItemsAction(), "customer.order.list.details");
+            mManager.putAction(new ListeDesCommandesClientItemsAction(conf), "customer.order.list.details");
-            mManager.putAction(new ListeDesBonsDeLivraisonAction(), "customer.delivery.list");
+            mManager.putAction(new ListeDesBonsDeLivraisonAction(conf), "customer.delivery.list");
-            if (configuration.getRootSociete().contains("RELIQUAT_BL")) {
+            if (conf.getRootSociete().contains("RELIQUAT_BL")) {
-                mManager.registerAction("customer.delivery.reliquat.list", new ListeDesReliquatsBonsLivraisonsAction());
+                mManager.putAction(new ListeDesReliquatsBonsLivraisonsAction(), "customer.delivery.reliquat.list");
+            }
         boolean useListDesVentesAction = bModeVenteComptoir;
         if (useListDesVentesAction) {
             mManager.putAction(new ListeDesVentesAction(), "sales.list");
         } else {
             mManager.putAction(new ListeSaisieVenteFactureAction(), "customer.invoice.list");
+        }
-        mManager.putAction(new ListeDesAvoirsClientsAction(), "customer.credit.list");
+        mManager.putAction(new ListeDesAvoirsClientsAction(conf), "customer.credit.list");
-        mManager.putAction(new ListeDesFactureItemsAction(), "customer.invoice.details.list");
+        mManager.putAction(new ListeDesFactureItemsAction(conf), "customer.invoice.details.list");
             mManager.putAction(new ListeDesFournisseursAction(), "supplier.list");
             mManager.putAction(new ListeDesContactsFournisseursAction(), "supplier.contact.list");
                 mManager.putAction(new NouvelHistoriqueListeFournAction(), "supplier.history");
             if (rights.haveRight(NXRights.LOCK_MENU_ACHAT.getCode())) {
                     mManager.putAction(new ListeDesCommandesAction(), "supplier.order.list");
-                    mManager.putAction(new ListeDesDemandesPrixAction(), "supplier.order.ask");
+                    mManager.putAction(new ListeDesDemandesPrixAction(conf), "supplier.order.ask");
-                    mManager.putAction(new ListeDesDemandesAchatsAction(), "supplier.order.preview");
+                    mManager.putAction(new ListeDesDemandesAchatsAction(conf), "supplier.order.preview");
                 mManager.putAction(new ListeDesReliquatsBonsReceptionsAction(), "supplier.receipt.reliquat.list");
-                mManager.registerAction("supplier.receipt.list", new ListeDesBonsReceptionsAction());
+                mManager.putAction(new ListeDesBonsReceptionsAction(), "supplier.receipt.list");
-                mManager.registerAction("supplier.purchase.list", new ListeSaisieAchatAction());
+                mManager.putAction(new ListeSaisieAchatAction(), "supplier.purchase.list");
-                mManager.registerAction("supplier.invoice.purchase.list", new ListeDesFacturesFournisseurAction());
+                mManager.putAction(new ListeDesFacturesFournisseurAction(), "supplier.invoice.purchase.list");
-                    mManager.registerAction("supplier.credit.list", new ListeDesAvoirsFournisseurAction());
+                    mManager.putAction(new ListeDesAvoirsFournisseurAction(), "supplier.credit.list");
+            }
-            mManager.registerAction("product.list", new ListeDesArticlesAction());
+            mManager.putAction(new ListeDesArticlesAction(), "product.list");
-            mManager.registerAction("product.customer.list", new ListeHistoCodeClientArticleAction());
+            mManager.putAction(new ListeHistoCodeClientArticleAction(), "product.customer.list");
-            mManager.registerAction("product.supplychain.list", new ListeDesArticlesFournisseurAction());
+            mManager.putAction(new ListeDesArticlesFournisseurAction(), "product.supplychain.list");
+            mManager.putAction(new ListeDesDepotsStocksAction(), "stock.depot.list");
+            mManager.putAction(new ListeDesStocksAction(), "stock.item.list");
-            mManager.registerAction("stock.io.list", new ListeDesMouvementsStockAction());
+            mManager.putAction(new ListeDesMouvementsStockAction(conf), "stock.io.list");
+            mManager.putAction(new ListeDesEtatsStocksAction(conf), "stock.io.state");
-            mManager.registerAction("customer.order.waiting", new ListeDesElementsACommanderClientAction());
+            mManager.putAction(new ListeDesElementsACommanderClientAction(conf), "customer.order.waiting");
-            mManager.registerAction("supplier.order.waiting", new ListeDesElementsACommanderAction());
+            mManager.putAction(new ListeDesElementsACommanderAction(conf), "supplier.order.waiting");
+    }
     public void registerAccountingMenuActions(final MenuAndActions mManager) {
-        mManager.registerAction("accounting.balance", new EtatBalanceAction());
+        mManager.putAction(new EtatBalanceAction(), "accounting.balance");
-        mManager.registerAction("accounting.client.balance", new BalanceAgeeAction());
+        mManager.putAction(new BalanceAgeeAction(), "accounting.client.balance");
-        mManager.registerAction("accounting.analytical.ledger", new ImpressionJournauxAnalytiqueAction());
+        mManager.putAction(new ImpressionJournauxAnalytiqueAction(), "accounting.analytical.ledger");
-        mManager.registerAction("accounting.ledger", new EtatJournauxAction());
+        mManager.putAction(new EtatJournauxAction(), "accounting.ledger");
-        mManager.registerAction("accounting.general.ledger", new EtatGrandLivreAction());
+        mManager.putAction(new EtatGrandLivreAction(), "accounting.general.ledger");
-        mManager.registerAction("accounting.entries.ledger", new ListeDesEcrituresAction());
+        mManager.putAction(new ListeDesEcrituresAction(), "accounting.entries.ledger");
-        mManager.registerAction("accounting.analytical.entries.ledger", new ListeDesEcrituresAnalytiquesAction());
+        mManager.putAction(new ListeDesEcrituresAnalytiquesAction(), "accounting.analytical.entries.ledger");
-        mManager.registerAction("accounting.analytical.dpt", new ListeDesPostesAnalytiquesAction());
+        mManager.putAction(new ListeDesPostesAnalytiquesAction(), "accounting.analytical.dpt");
-        mManager.registerAction("accounting.analytical.ledger.global", new ImpressionRepartitionAnalytiqueAction());
+        mManager.putAction(new ImpressionRepartitionAnalytiqueAction(), "accounting.analytical.ledger.global");
-        mManager.registerAction("accounting.entries.list", new ListeEcritureParClasseAction());
+        mManager.putAction(new ListeEcritureParClasseAction(), "accounting.entries.list");
-        mManager.registerAction("accounting.validating", new NouvelleValidationAction());
+        mManager.putAction(new NouvelleValidationAction(), "accounting.validating");
-        mManager.registerAction("accounting.closing", new NouveauClotureAction());
+        mManager.putAction(new NouveauClotureAction(), "accounting.closing");
-        mManager.registerAction("accounting.import", new ImportEcritureAction());
+        mManager.putAction(new ImportEcritureAction(), "accounting.import");
-        mManager.registerAction("accounting.export", new ExportRelationExpertAction());
+        mManager.putAction(new ExportRelationExpertAction(), "accounting.export");
+    }
     public void registerStatsDocumentsActions(final MenuAndActions mManager) {
-        // mManager.registerAction("accounting.vat.report", new DeclarationTVAAction());
+        // mManager.putAction("accounting.vat.report", new DeclarationTVAAction());
-        mManager.registerAction("accounting.costs.report", new EtatChargeAction());
+        mManager.putAction(new EtatChargeAction(), "accounting.costs.report");
-        mManager.registerAction("accounting.balance.report", new CompteResultatBilanAction());
+        mManager.putAction(new CompteResultatBilanAction(), "accounting.balance.report");
-        mManager.registerAction("employe.social.report", new N4DSAction());
+        mManager.putAction(new N4DSAction(), "employe.social.report");
-        // mManager.registerAction("accounting.2050Report", new CompteResultatBilan2050Action());
+        // mManager.putAction("accounting.2050Report", new CompteResultatBilan2050Action());
+    }
     public void registerStatsMenuActions(final MenuAndActions mManager) {
-        mManager.registerAction("sales.graph", new EvolutionCAAction());
+        mManager.putAction(new EvolutionCAAction(), "sales.graph");
-        mManager.registerAction("sales.graph.cumulate", new EvolutionCACumulAction());
+        mManager.putAction(new EvolutionCACumulAction(), "sales.graph.cumulate");
-        mManager.registerAction("sales.graph.cmd", new EvolutionCmdAction());
+        mManager.putAction(new EvolutionCmdAction(), "sales.graph.cmd");
-        mManager.registerAction("sales.graph.cmd.cumulate", new EvolutionCmdCumulAction());
+        mManager.putAction(new EvolutionCmdCumulAction(), "sales.graph.cmd.cumulate");
-            mManager.registerAction("sales.margin.graph", new EvolutionMargeAction());
+            mManager.putAction(new EvolutionMargeAction(), "sales.margin.graph");
-        mManager.registerAction("sales.list.reporting", new GenReportingVenteAction(false));
+        mManager.putAction(new GenReportingVenteAction(false), "sales.list.reporting");
+        mManager.putAction(new GenReportingVenteAction(true), "order.list.reporting");
-        mManager.registerAction("order.list.reporting", new GenReportingVenteAction(true));
+        // mManager.putAction("sales.list.reporting", new GenReportingVenteAction());
-        mManager.registerAction("sales.list.report", new GenListeVenteAction());
+        mManager.putAction(new GenListeVenteAction(), "sales.list.report");
-        mManager.registerAction("sales.list.stock.report", new GenEtatStockAction());
+        mManager.putAction(new GenEtatStockAction(), "sales.list.stock.report");
-            mManager.registerAction("sales.product.graph", new VenteArticleGraphAction());
+            mManager.putAction(new VenteArticleGraphAction(), "sales.product.graph");
-            mManager.registerAction("sales.product.margin.graph", new VenteArticleMargeGraphAction());
+            mManager.putAction(new VenteArticleMargeGraphAction(), "sales.product.margin.graph");
-            mManager.registerAction("sales.product.family.graph", new VenteArticleFamilleGraphAction());
+            mManager.putAction(new VenteArticleFamilleGraphAction(), "sales.product.family.graph");
-        mManager.registerAction("sales.list.graph", new EtatVenteAction());
+        mManager.putAction(new EtatVenteAction(), "sales.list.graph");
-        mManager.registerAction("sales.report.ecocontribution", new AbstractAction("Reporting Eco Contribution") {
+        mManager.putAction(new AbstractAction("Reporting Eco Contribution") {
             @Override
             public void actionPerformed(ActionEvent e) {
                 PanelFrame frame = new PanelFrame(new ReportingEcoContributionPanel(), "Reporting  Eco Contribution");
                 frame.setVisible(true);
+            }
-        });
+        }, "sales.report.ecocontribution");
-        mManager.registerAction("sales.report.taxesupp", new AbstractAction("Reporting Taxes complémentaires") {
+        mManager.putAction(new AbstractAction("Reporting Taxes complémentaires") {
             @Override
             public void actionPerformed(ActionEvent e) {
                 PanelFrame frame = new PanelFrame(new ReportingTaxeComplementairePanel(), "Reporting Taxes complémentaires");
                 frame.setVisible(true);
+            }
-        });
+        }, "sales.report.taxesupp");
+    }
     public void registerPaymentMenuActions(final MenuAndActions mManager) {
         final UserRights rights = UserRightsManager.getCurrentUserRights();
+        final ComptaPropsConfiguration conf = getConfiguration();
         if (rights.haveRight(ComptaUserRight.MENU) || rights.haveRight(ComptaUserRight.POINTAGE_LETTRAGE)) {
             mManager.putAction(new NouveauPointageAction(), "payment.checking.create");
             mManager.putAction(new NouveauLettrageAction(), "payment.reconciliation.create");
+        }
         if (rights.haveRight(NXRights.GESTION_ENCAISSEMENT.getCode())) {
             mManager.putAction(new ListesFacturesClientsImpayeesAction(), "customer.invoice.unpaid.list");
             mManager.putAction(new ListeDebiteursAction(), "customer.dept.list");
+            mManager.putAction(new AbstractAction("Relevé client") {
+                @Override
+                public void actionPerformed(ActionEvent arg0) {
+                    PanelFrame frame = new PanelFrame(new ReportingClientPanel(), "Reporting client");
+                    frame.setVisible(true);
+                }
+            }, "customer.payment.report");
             mManager.putAction(new ListeDesEncaissementsAction(), "customer.payment.list");
             mManager.putAction(new ListeDesRelancesAction(), "customer.payment.followup.list");
             mManager.putAction(new ListeDesChequesAEncaisserAction(), "customer.payment.check.pending.list");
+            mManager.putAction(new ListeDesDepostChequesAction(), "customer.payment.check.deposit.list");
-            mManager.putAction(new NouveauListeDesChequesAEncaisserAction(), "customer.payment.check.pending.create");
+            mManager.putAction(new NouveauListeDesChequesAEncaisserAction(conf), "customer.payment.check.pending.create");
-            mManager.putAction(new ListeSDDMessageAction(configuration.getDirectory()), "customer.payment.sddMessage.list");
+            mManager.putAction(new ListeSDDMessageAction(conf.getDirectory()), "customer.payment.sddMessage.list");
             mManager.putAction(new ListeDesChequesAvoirAction(), "customer.credit.check.list");
-            mManager.putAction(new NouveauDecaissementChequeAvoirAction(), "customer.credit.check.create");
+            mManager.putAction(new NouveauDecaissementChequeAvoirAction(conf), "customer.credit.check.create");
+        }
         if (rights.haveRight(NXRights.LOCK_MENU_ACHAT.getCode())) {
             mManager.putAction(new ListesFacturesFournImpayeesAction(), "supplier.invoice.unpaid.list");
             mManager.putAction(new ListeDesTraitesFournisseursAction(), "supplier.bill.list");
             mManager.putAction(new ListeDesChequesFournisseursAction(), "supplier.payment.check.list");
-            mManager.putAction(new NouveauListeDesChequesADecaisserAction(), "supplier.payment.check.pending.list");
+            mManager.putAction(new NouveauListeDesChequesADecaisserAction(conf), "supplier.payment.check.pending.list");
+        }
+    }
     public void registerPayrollMenuActions(final MenuAndActions mManager) {
+        final ComptaPropsConfiguration conf = getConfiguration();
         mManager.putAction(new ImpressionLivrePayeAction(), "payroll.list.report.print");
         mManager.putAction(new ListeDesProfilsPayeAction(), "payroll.profile.list");
         mManager.putAction(new NouvelHistoriqueFichePayeAction(), "payroll.history");
         mManager.putAction(new EditionFichePayeAction(), "payroll.create");
-        mManager.putAction(new NouvelAcompteAction(), "payroll.deposit.create");
+        mManager.putAction(new NouvelAcompteAction(conf), "payroll.deposit.create");
         mManager.putAction(new ListeDesSalariesAction(), "employee.list");
         mManager.putAction(new ListeDesContratsPrevoyanceAction(), "employee.contrat.prev.list");
         mManager.putAction(new ListeDesCaissesCotisationsAction(), "payroll.caisse");
         mManager.putAction(new ListeDesAyantsDroitsAction(), "employee.contrat.prev.ayantdroit.list");
             mManager.putAction(new GestionPlanComptableEAction(), "accounting.chart");
             mManager.putAction(new ListeDesComptesAction(), "accounting.list");
             mManager.putAction(new ListeDesJournauxAction(), "accounting.journal");
             mManager.putAction(new ListeDesDevisesAction(), "accounting.currency");
+            mManager.putAction(new ListeDesCategorieComptableAction(), "accounting.category.list");
             mManager.putAction(new ListeDesTauxDeChangeAction(), "accounting.currency.rates");
             mManager.putAction(new AbstractAction("Check DB") {
                 @Override
                 public void actionPerformed(ActionEvent e) {
                     final DBRoot rootSociete = configuration.getRootSociete();
             mManager.putAction(new ListeDesSocietesCommonsAction(), "enterprise.list");
         mManager.putAction(new ListeBanqueAction(), "divison.bank.list");
-            mManager.putAction(new NouvelleSocieteAction(), "enterprise.create");
+            mManager.putAction(new NouvelleSocieteAction(this.getConfiguration()), "enterprise.create");
+    }
     public void registerHelpMenuActions(final MenuAndActions mManager) {
         mManager.putAction(AboutAction.getInstance(), "information");
         mManager.putAction(new AstuceAction(), "tips");
+    }
     public void registerHelpTestActions(final MenuAndActions mManager) {
+        mManager.putAction(new NouveauClotureSansAnouveauxAction(), "accounting.closing.sansanouveaux");
-        // mManager.registerAction("test.export.ecrp", new ExportPointageAction());
+        // mManager.putAction("test.export.ecrp", new ExportPointageAction());
+    }
+}

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

svn://code.openconcerto.org/openconcerto

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