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



/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 * 
 * Copyright 2011-2019 OpenConcerto, by ILM Informatique. All rights reserved.
 * 
 * The contents of this file are subject to the terms of the GNU General Public License Version 3
 * only ("GPL"). You may not use this file except in compliance with the License. You can obtain a
 * copy of the License at http://www.gnu.org/licenses/gpl-3.0.html See the License for the specific
 * language governing permissions and limitations under the License.

import org.openconcerto.erp.core.finance.accounting.action.ExportRelationExpertAction;
import org.openconcerto.erp.core.finance.accounting.action.GenerePointageAction;
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.ImportEcritureFECAction;
import org.openconcerto.erp.core.finance.accounting.action.ImportEcritureRImportAction;
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.humanresources.employe.action.ListeDesCaissesCotisationsAction;
import org.openconcerto.erp.core.humanresources.employe.action.ListeDesCommerciauxAction;
import org.openconcerto.erp.core.humanresources.employe.action.ListeDesContratsPrevoyanceAction;
import org.openconcerto.erp.core.humanresources.employe.action.ListeDesSalariesAction;
import org.openconcerto.erp.core.humanresources.employe.action.ListeDesSecretairesAction;
 
import org.openconcerto.erp.core.humanresources.payroll.action.ClotureMensuellePayeAction;
import org.openconcerto.erp.core.humanresources.payroll.action.EditionFichePayeAction;
import org.openconcerto.erp.core.humanresources.payroll.action.ListeDesInfosSalariePayeAction;
import org.openconcerto.erp.core.humanresources.payroll.action.ListeDesProfilsPayeAction;
import org.openconcerto.erp.core.humanresources.payroll.action.ListeDesRubriquesDePayeAction;

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.order.element.CommandeClientSQLElement;
import org.openconcerto.erp.core.sales.pos.action.ListeDesCaissesTicketAction;
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;

    public Group createFilesMenuGroup() {
        Group group = new Group(MainFrame.FILE_MENU);
        if (UserRightsManager.getCurrentUserRights().haveRight(BackupPanel.RIGHT_CODE))
            group.addItem("backup");
        group.addItem("modules");
 
        group.addItem(MainFrame.PREFS_MENU_ITEM);
        group.addItem(MainFrame.QUIT_MENU_ITEM);
 
        return group;
    }
 
    public Group createCreationMenuGroup() {
        final Group group = new Group(MainFrame.CREATE_MENU);

        return group;
    }
 
    public Group createHelpMenuGroup() {
        final Group group = new Group(MainFrame.HELP_MENU);
        group.addItem(MainFrame.ABOUT_MENU_ITEM);
        group.addItem("tips");
        return group;
    }
 
    public Group createOrganizationMenuGroup() {

        final Group group = new Group(MainFrame.DECLARATION_MENU);
        // group.addItem("accounting.vat.report");
        group.addItem("accounting.costs.report");
        group.addItem("accounting.balance.report");
        // group.addItem("accounting.2050Report");
        // group.addItem("employe.social.report");
        return group;
    }
 
    public Group createAccountingMenuGroup() {
        final Group group = new Group(MainFrame.STATE_MENU);

        group.addItem("accounting.entries.list");
 
        final Group gIO = new Group("menu.accounting.io", LayoutHints.DEFAULT_NOLABEL_SEPARATED_GROUP_HINTS);
        gIO.addItem("accounting.import");
        gIO.addItem("accounting.import.fec");
        if (this.configuration.isExperimental()) {
            gIO.addItem("accounting.import.rimport");
        }
        gIO.addItem("accounting.export");
        group.add(gIO);
 
        final Group gClosing = new Group("menu.accounting.closing", LayoutHints.DEFAULT_NOLABEL_SEPARATED_GROUP_HINTS);
        gClosing.addItem("accounting.validating");

 
            gCustomer.addItem("customer.invoice.list");
        }
 
        gCustomer.addItem("customer.credit.list");
        gCustomer.addItem("sales.quote.element.list");
        gCustomer.addItem("customer.invoice.details.list");
 
        final Group gSupplier = new Group("menu.list.supplier", LayoutHints.DEFAULT_NOLABEL_SEPARATED_GROUP_HINTS);
            gSupplier.addItem("supplier.list");
            gSupplier.addItem("supplier.contact.list");

        return group;
    }
 
    public Group createTestMenuGroup() {
        final Group group = new Group("menu.test");
        group.addItem("test.checkReplannedCmd");
        group.addItem("test.checkReplannedMultiCmd");
 
        group.addItem("test.lettrage.fact");
        group.addItem("test.lettrage.compt");
        group.addItem("test.lettrage.achat");
        // group.addItem("test.export.ecrp");
 

                }
                this.frame.setLocationRelativeTo(null);
                FrameUtil.show(this.frame);
            }
        }, "modules");
        mManager.putAction(new PreferencesAction(getConfiguration().getModuleManager()), MainFrame.PREFS_MENU_ITEM);
        mManager.putAction(new AbstractAction() {
            @Override
            public void actionPerformed(ActionEvent e) {
                MainFrame.getInstance().quit();
            }
        }, MainFrame.QUIT_MENU_ITEM);
    }
 
    public void registerCreationMenuActions(final MenuAndActions mManager) {
        final Boolean bModeVenteComptoir = DefaultNXProps.getInstance().getBooleanValue("ArticleVenteComptoir", true);
        final UserRights rights = UserRightsManager.getCurrentUserRights();

            mManager.putAction(new ListeSaisieVenteFactureAction(), "customer.invoice.list");
        }
 
        mManager.putAction(new ListeDesAvoirsClientsAction(conf), "customer.credit.list");
        mManager.putAction(new ListeDesFactureItemsAction(conf), "customer.invoice.details.list");
        mManager.putAction(new ListeDesElementsDevisAction(conf), "sales.quote.element.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 NouvelleValidationAction(), "accounting.validating");
        mManager.putAction(new NouveauClotureAction(), "accounting.closing");
        mManager.putAction(new ImportEcritureAction(), "accounting.import");
        mManager.putAction(new ExportRelationExpertAction(), "accounting.export");
        mManager.putAction(new ImportEcritureFECAction(), "accounting.import.fec");
        mManager.putAction(new ImportEcritureRImportAction(), "accounting.import.rimport");
    }
 
    public void registerStatsDocumentsActions(final MenuAndActions mManager) {
        // mManager.putAction("accounting.vat.report", new DeclarationTVAAction());
        mManager.putAction(new EtatChargeAction(), "accounting.costs.report");
        mManager.putAction(new CompteResultatBilanAction(), "accounting.balance.report");
        // mManager.putAction(new N4DSAction(), "employe.social.report");
        // mManager.putAction("accounting.2050Report", new CompteResultatBilan2050Action());
    }
 
    public void registerStatsMenuActions(final MenuAndActions mManager) {
        final ComptaPropsConfiguration conf = getConfiguration();

        mManager.putAction(new ListeBanqueAction(), "divison.bank.list");
            mManager.putAction(new NouvelleSocieteAction(this.getConfiguration()), "enterprise.create");
    }
 
    public void registerHelpMenuActions(final MenuAndActions mManager) {
        mManager.putAction(new AboutAction(getConfiguration()), MainFrame.ABOUT_MENU_ITEM);
        mManager.putAction(new AstuceAction(), "tips");
    }
 
    public void registerHelpTestActions(final MenuAndActions mManager) {
 

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 180 → 182

Rev 180		Rev 182
Line 1...		Line 1...
1	`/*`	1	`/*`
2	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.`	2	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.`
3	`*`	3	`*`
4	`* Copyright 2011 OpenConcerto, by ILM Informatique. All rights reserved.`	4	`* Copyright 2011-2019 OpenConcerto, by ILM Informatique. All rights reserved.`
5	`*`	5	`*`
6	`* The contents of this file are subject to the terms of the GNU General Public License Version 3`	6	`* The contents of this file are subject to the terms of the GNU General Public License Version 3`
7	`* only ("GPL"). You may not use this file except in compliance with the License. You can obtain a`	7	`* only ("GPL"). You may not use this file except in compliance with the License. You can obtain a`
8	`* copy of the License at http://www.gnu.org/licenses/gpl-3.0.html See the License for the specific`	8	`* copy of the License at http://www.gnu.org/licenses/gpl-3.0.html See the License for the specific`
9	`* language governing permissions and limitations under the License.`	9	`* language governing permissions and limitations under the License.`
Line 38...		Line 38...
38	`import org.openconcerto.erp.core.finance.accounting.action.ExportRelationExpertAction;`	38	`import org.openconcerto.erp.core.finance.accounting.action.ExportRelationExpertAction;`
39	`import org.openconcerto.erp.core.finance.accounting.action.GenerePointageAction;`	39	`import org.openconcerto.erp.core.finance.accounting.action.GenerePointageAction;`
40	`import org.openconcerto.erp.core.finance.accounting.action.GestionPlanComptableEAction;`	40	`import org.openconcerto.erp.core.finance.accounting.action.GestionPlanComptableEAction;`
41	`import org.openconcerto.erp.core.finance.accounting.action.ImportEcritureAction;`	41	`import org.openconcerto.erp.core.finance.accounting.action.ImportEcritureAction;`
42	`import org.openconcerto.erp.core.finance.accounting.action.ImportEcritureFECAction;`	42	`import org.openconcerto.erp.core.finance.accounting.action.ImportEcritureFECAction;`
-		43	`import org.openconcerto.erp.core.finance.accounting.action.ImportEcritureRImportAction;`
43	`import org.openconcerto.erp.core.finance.accounting.action.ImpressionJournauxAnalytiqueAction;`	44	`import org.openconcerto.erp.core.finance.accounting.action.ImpressionJournauxAnalytiqueAction;`
44	`import org.openconcerto.erp.core.finance.accounting.action.ImpressionLivrePayeAction;`	45	`import org.openconcerto.erp.core.finance.accounting.action.ImpressionLivrePayeAction;`
45	`import org.openconcerto.erp.core.finance.accounting.action.ImpressionRepartitionAnalytiqueAction;`	46	`import org.openconcerto.erp.core.finance.accounting.action.ImpressionRepartitionAnalytiqueAction;`
46	`import org.openconcerto.erp.core.finance.accounting.action.ListeDesCategorieComptableAction;`	47	`import org.openconcerto.erp.core.finance.accounting.action.ListeDesCategorieComptableAction;`
47	`import org.openconcerto.erp.core.finance.accounting.action.ListeDesComptesAction;`	48	`import org.openconcerto.erp.core.finance.accounting.action.ListeDesComptesAction;`
Line 78...		Line 79...
78	`import org.openconcerto.erp.core.humanresources.employe.action.ListeDesCaissesCotisationsAction;`	79	`import org.openconcerto.erp.core.humanresources.employe.action.ListeDesCaissesCotisationsAction;`
79	`import org.openconcerto.erp.core.humanresources.employe.action.ListeDesCommerciauxAction;`	80	`import org.openconcerto.erp.core.humanresources.employe.action.ListeDesCommerciauxAction;`
80	`import org.openconcerto.erp.core.humanresources.employe.action.ListeDesContratsPrevoyanceAction;`	81	`import org.openconcerto.erp.core.humanresources.employe.action.ListeDesContratsPrevoyanceAction;`
81	`import org.openconcerto.erp.core.humanresources.employe.action.ListeDesSalariesAction;`	82	`import org.openconcerto.erp.core.humanresources.employe.action.ListeDesSalariesAction;`
82	`import org.openconcerto.erp.core.humanresources.employe.action.ListeDesSecretairesAction;`	83	`import org.openconcerto.erp.core.humanresources.employe.action.ListeDesSecretairesAction;`
83	`import org.openconcerto.erp.core.humanresources.employe.action.N4DSAction;`	-
84	`import org.openconcerto.erp.core.humanresources.payroll.action.ClotureMensuellePayeAction;`	84	`import org.openconcerto.erp.core.humanresources.payroll.action.ClotureMensuellePayeAction;`
85	`import org.openconcerto.erp.core.humanresources.payroll.action.EditionFichePayeAction;`	85	`import org.openconcerto.erp.core.humanresources.payroll.action.EditionFichePayeAction;`
86	`import org.openconcerto.erp.core.humanresources.payroll.action.ListeDesInfosSalariePayeAction;`	86	`import org.openconcerto.erp.core.humanresources.payroll.action.ListeDesInfosSalariePayeAction;`
87	`import org.openconcerto.erp.core.humanresources.payroll.action.ListeDesProfilsPayeAction;`	87	`import org.openconcerto.erp.core.humanresources.payroll.action.ListeDesProfilsPayeAction;`
88	`import org.openconcerto.erp.core.humanresources.payroll.action.ListeDesRubriquesDePayeAction;`	88	`import org.openconcerto.erp.core.humanresources.payroll.action.ListeDesRubriquesDePayeAction;`
Line 122...		Line 122...
122	`import org.openconcerto.erp.core.sales.order.action.ListeDesCommandesClientAction;`	122	`import org.openconcerto.erp.core.sales.order.action.ListeDesCommandesClientAction;`
123	`import org.openconcerto.erp.core.sales.order.action.ListeDesCommandesClientItemsAction;`	123	`import org.openconcerto.erp.core.sales.order.action.ListeDesCommandesClientItemsAction;`
124	`import org.openconcerto.erp.core.sales.order.action.ListeDesElementsACommanderClientAction;`	124	`import org.openconcerto.erp.core.sales.order.action.ListeDesElementsACommanderClientAction;`
125	`import org.openconcerto.erp.core.sales.order.action.ListeDesFacturationCommandesClientAction;`	125	`import org.openconcerto.erp.core.sales.order.action.ListeDesFacturationCommandesClientAction;`
126	`import org.openconcerto.erp.core.sales.order.action.NouvelleCommandeClientAction;`	126	`import org.openconcerto.erp.core.sales.order.action.NouvelleCommandeClientAction;`
-		127	`import org.openconcerto.erp.core.sales.order.element.CommandeClientSQLElement;`
127	`import org.openconcerto.erp.core.sales.pos.action.ListeDesCaissesTicketAction;`	128	`import org.openconcerto.erp.core.sales.pos.action.ListeDesCaissesTicketAction;`
128	`import org.openconcerto.erp.core.sales.product.action.FamilleArticleAction;`	129	`import org.openconcerto.erp.core.sales.product.action.FamilleArticleAction;`
129	`import org.openconcerto.erp.core.sales.product.action.ListeDesArticlesAction;`	130	`import org.openconcerto.erp.core.sales.product.action.ListeDesArticlesAction;`
130	`import org.openconcerto.erp.core.sales.product.action.ListeEcoContributionAction;`	131	`import org.openconcerto.erp.core.sales.product.action.ListeEcoContributionAction;`
131	`import org.openconcerto.erp.core.sales.product.action.ListeHistoCodeClientArticleAction;`	132	`import org.openconcerto.erp.core.sales.product.action.ListeHistoCodeClientArticleAction;`
Line 258...		Line 259...
258	`public Group createFilesMenuGroup() {`	259	`public Group createFilesMenuGroup() {`
259	`Group group = new Group(MainFrame.FILE_MENU);`	260	`Group group = new Group(MainFrame.FILE_MENU);`
260	`if (UserRightsManager.getCurrentUserRights().haveRight(BackupPanel.RIGHT_CODE))`	261	`if (UserRightsManager.getCurrentUserRights().haveRight(BackupPanel.RIGHT_CODE))`
261	`group.addItem("backup");`	262	`group.addItem("backup");`
262	`group.addItem("modules");`	263	`group.addItem("modules");`
263	`if (!Gestion.MAC_OS_X) {`	-
264	`group.addItem("preferences");`	264	`group.addItem(MainFrame.PREFS_MENU_ITEM);`
265	`group.addItem("quit");`	265	`group.addItem(MainFrame.QUIT_MENU_ITEM);`
266	`}`	-
267	`return group;`	266	`return group;`
268	`}`	267	`}`
269		268
270	`public Group createCreationMenuGroup() {`	269	`public Group createCreationMenuGroup() {`
271	`final Group group = new Group(MainFrame.CREATE_MENU);`	270	`final Group group = new Group(MainFrame.CREATE_MENU);`
Line 308...		Line 307...
308	`return group;`	307	`return group;`
309	`}`	308	`}`
310		309
311	`public Group createHelpMenuGroup() {`	310	`public Group createHelpMenuGroup() {`
312	`final Group group = new Group(MainFrame.HELP_MENU);`	311	`final Group group = new Group(MainFrame.HELP_MENU);`
313	`group.addItem("information");`	312	`group.addItem(MainFrame.ABOUT_MENU_ITEM);`
314	`group.addItem("tips");`	313	`group.addItem("tips");`
315	`return group;`	314	`return group;`
316	`}`	315	`}`
317		316
318	`public Group createOrganizationMenuGroup() {`	317	`public Group createOrganizationMenuGroup() {`
Line 439...		Line 438...
439	`final Group group = new Group(MainFrame.DECLARATION_MENU);`	438	`final Group group = new Group(MainFrame.DECLARATION_MENU);`
440	`// group.addItem("accounting.vat.report");`	439	`// group.addItem("accounting.vat.report");`
441	`group.addItem("accounting.costs.report");`	440	`group.addItem("accounting.costs.report");`
442	`group.addItem("accounting.balance.report");`	441	`group.addItem("accounting.balance.report");`
443	`// group.addItem("accounting.2050Report");`	442	`// group.addItem("accounting.2050Report");`
444	`group.addItem("employe.social.report");`	443	`// group.addItem("employe.social.report");`
445	`return group;`	444	`return group;`
446	`}`	445	`}`
447		446
448	`public Group createAccountingMenuGroup() {`	447	`public Group createAccountingMenuGroup() {`
449	`final Group group = new Group(MainFrame.STATE_MENU);`	448	`final Group group = new Group(MainFrame.STATE_MENU);`
Line 461...		Line 460...
461	`group.addItem("accounting.entries.list");`	460	`group.addItem("accounting.entries.list");`
462		461
463	`final Group gIO = new Group("menu.accounting.io", LayoutHints.DEFAULT_NOLABEL_SEPARATED_GROUP_HINTS);`	462	`final Group gIO = new Group("menu.accounting.io", LayoutHints.DEFAULT_NOLABEL_SEPARATED_GROUP_HINTS);`
464	`gIO.addItem("accounting.import");`	463	`gIO.addItem("accounting.import");`
465	`gIO.addItem("accounting.import.fec");`	464	`gIO.addItem("accounting.import.fec");`
-		465	`if (this.configuration.isExperimental()) {`
-		466	`gIO.addItem("accounting.import.rimport");`
-		467	`}`
466	`gIO.addItem("accounting.export");`	468	`gIO.addItem("accounting.export");`
467	`group.add(gIO);`	469	`group.add(gIO);`
468		470
469	`final Group gClosing = new Group("menu.accounting.closing", LayoutHints.DEFAULT_NOLABEL_SEPARATED_GROUP_HINTS);`	471	`final Group gClosing = new Group("menu.accounting.closing", LayoutHints.DEFAULT_NOLABEL_SEPARATED_GROUP_HINTS);`
470	`gClosing.addItem("accounting.validating");`	472	`gClosing.addItem("accounting.validating");`
Line 514...		Line 516...
514		516
515	`gCustomer.addItem("customer.invoice.list");`	517	`gCustomer.addItem("customer.invoice.list");`
516	`}`	518	`}`
517		519
518	`gCustomer.addItem("customer.credit.list");`	520	`gCustomer.addItem("customer.credit.list");`
-		521	`gCustomer.addItem("sales.quote.element.list");`
519	`gCustomer.addItem("customer.invoice.details.list");`	522	`gCustomer.addItem("customer.invoice.details.list");`
520		523
521	`final Group gSupplier = new Group("menu.list.supplier", LayoutHints.DEFAULT_NOLABEL_SEPARATED_GROUP_HINTS);`	524	`final Group gSupplier = new Group("menu.list.supplier", LayoutHints.DEFAULT_NOLABEL_SEPARATED_GROUP_HINTS);`
522	`gSupplier.addItem("supplier.list");`	525	`gSupplier.addItem("supplier.list");`
523	`gSupplier.addItem("supplier.contact.list");`	526	`gSupplier.addItem("supplier.contact.list");`
Line 553...		Line 556...
553	`return group;`	556	`return group;`
554	`}`	557	`}`
555		558
556	`public Group createTestMenuGroup() {`	559	`public Group createTestMenuGroup() {`
557	`final Group group = new Group("menu.test");`	560	`final Group group = new Group("menu.test");`
-		561	`group.addItem("test.checkReplannedCmd");`
-		562	`group.addItem("test.checkReplannedMultiCmd");`
-		563
558	`group.addItem("test.lettrage.fact");`	564	`group.addItem("test.lettrage.fact");`
559	`group.addItem("test.lettrage.compt");`	565	`group.addItem("test.lettrage.compt");`
560	`group.addItem("test.lettrage.achat");`	566	`group.addItem("test.lettrage.achat");`
561	`// group.addItem("test.export.ecrp");`	567	`// group.addItem("test.export.ecrp");`
562		568
Line 579...		Line 585...
579	`}`	585	`}`
580	`this.frame.setLocationRelativeTo(null);`	586	`this.frame.setLocationRelativeTo(null);`
581	`FrameUtil.show(this.frame);`	587	`FrameUtil.show(this.frame);`
582	`}`	588	`}`
583	`}, "modules");`	589	`}, "modules");`
584	`mManager.putAction(new PreferencesAction(getConfiguration().getModuleManager()), "preferences");`	590	`mManager.putAction(new PreferencesAction(getConfiguration().getModuleManager()), MainFrame.PREFS_MENU_ITEM);`
585	`mManager.putAction(new AbstractAction() {`	591	`mManager.putAction(new AbstractAction() {`
586	`@Override`	592	`@Override`
587	`public void actionPerformed(ActionEvent e) {`	593	`public void actionPerformed(ActionEvent e) {`
588	`MainFrame.getInstance().quit();`	594	`MainFrame.getInstance().quit();`
589	`}`	595	`}`
590	`}, "quit");`	596	`}, MainFrame.QUIT_MENU_ITEM);`
591	`}`	597	`}`
592		598
593	`public void registerCreationMenuActions(final MenuAndActions mManager) {`	599	`public void registerCreationMenuActions(final MenuAndActions mManager) {`
594	`final Boolean bModeVenteComptoir = DefaultNXProps.getInstance().getBooleanValue("ArticleVenteComptoir", true);`	600	`final Boolean bModeVenteComptoir = DefaultNXProps.getInstance().getBooleanValue("ArticleVenteComptoir", true);`
595	`final UserRights rights = UserRightsManager.getCurrentUserRights();`	601	`final UserRights rights = UserRightsManager.getCurrentUserRights();`
Line 666...		Line 672...
666	`mManager.putAction(new ListeSaisieVenteFactureAction(), "customer.invoice.list");`	672	`mManager.putAction(new ListeSaisieVenteFactureAction(), "customer.invoice.list");`
667	`}`	673	`}`
668		674
669	`mManager.putAction(new ListeDesAvoirsClientsAction(conf), "customer.credit.list");`	675	`mManager.putAction(new ListeDesAvoirsClientsAction(conf), "customer.credit.list");`
670	`mManager.putAction(new ListeDesFactureItemsAction(conf), "customer.invoice.details.list");`	676	`mManager.putAction(new ListeDesFactureItemsAction(conf), "customer.invoice.details.list");`
-		677	`mManager.putAction(new ListeDesElementsDevisAction(conf), "sales.quote.element.list");`
671		678
672	`mManager.putAction(new ListeDesFournisseursAction(), "supplier.list");`	679	`mManager.putAction(new ListeDesFournisseursAction(), "supplier.list");`
673	`mManager.putAction(new ListeDesContactsFournisseursAction(), "supplier.contact.list");`	680	`mManager.putAction(new ListeDesContactsFournisseursAction(), "supplier.contact.list");`
674	`mManager.putAction(new NouvelHistoriqueListeFournAction(), "supplier.history");`	681	`mManager.putAction(new NouvelHistoriqueListeFournAction(), "supplier.history");`
675	`if (rights.haveRight(NXRights.LOCK_MENU_ACHAT.getCode())) {`	682	`if (rights.haveRight(NXRights.LOCK_MENU_ACHAT.getCode())) {`
Line 711...		Line 718...
711	`mManager.putAction(new NouvelleValidationAction(), "accounting.validating");`	718	`mManager.putAction(new NouvelleValidationAction(), "accounting.validating");`
712	`mManager.putAction(new NouveauClotureAction(), "accounting.closing");`	719	`mManager.putAction(new NouveauClotureAction(), "accounting.closing");`
713	`mManager.putAction(new ImportEcritureAction(), "accounting.import");`	720	`mManager.putAction(new ImportEcritureAction(), "accounting.import");`
714	`mManager.putAction(new ExportRelationExpertAction(), "accounting.export");`	721	`mManager.putAction(new ExportRelationExpertAction(), "accounting.export");`
715	`mManager.putAction(new ImportEcritureFECAction(), "accounting.import.fec");`	722	`mManager.putAction(new ImportEcritureFECAction(), "accounting.import.fec");`
-		723	`mManager.putAction(new ImportEcritureRImportAction(), "accounting.import.rimport");`
716	`}`	724	`}`
717		725
718	`public void registerStatsDocumentsActions(final MenuAndActions mManager) {`	726	`public void registerStatsDocumentsActions(final MenuAndActions mManager) {`
719	`// mManager.putAction("accounting.vat.report", new DeclarationTVAAction());`	727	`// mManager.putAction("accounting.vat.report", new DeclarationTVAAction());`
720	`mManager.putAction(new EtatChargeAction(), "accounting.costs.report");`	728	`mManager.putAction(new EtatChargeAction(), "accounting.costs.report");`
721	`mManager.putAction(new CompteResultatBilanAction(), "accounting.balance.report");`	729	`mManager.putAction(new CompteResultatBilanAction(), "accounting.balance.report");`
722	`mManager.putAction(new N4DSAction(), "employe.social.report");`	730	`// mManager.putAction(new N4DSAction(), "employe.social.report");`
723	`// mManager.putAction("accounting.2050Report", new CompteResultatBilan2050Action());`	731	`// mManager.putAction("accounting.2050Report", new CompteResultatBilan2050Action());`
724	`}`	732	`}`
725		733
726	`public void registerStatsMenuActions(final MenuAndActions mManager) {`	734	`public void registerStatsMenuActions(final MenuAndActions mManager) {`
727	`final ComptaPropsConfiguration conf = getConfiguration();`	735	`final ComptaPropsConfiguration conf = getConfiguration();`
Line 879...		Line 887...
879	`mManager.putAction(new ListeBanqueAction(), "divison.bank.list");`	887	`mManager.putAction(new ListeBanqueAction(), "divison.bank.list");`
880	`mManager.putAction(new NouvelleSocieteAction(this.getConfiguration()), "enterprise.create");`	888	`mManager.putAction(new NouvelleSocieteAction(this.getConfiguration()), "enterprise.create");`
881	`}`	889	`}`
882		890
883	`public void registerHelpMenuActions(final MenuAndActions mManager) {`	891	`public void registerHelpMenuActions(final MenuAndActions mManager) {`
884	`mManager.putAction(new AboutAction(getConfiguration()), "information");`	892	`mManager.putAction(new AboutAction(getConfiguration()), MainFrame.ABOUT_MENU_ITEM);`
885	`mManager.putAction(new AstuceAction(), "tips");`	893	`mManager.putAction(new AstuceAction(), "tips");`
886	`}`	894	`}`
887		895
888	`public void registerHelpTestActions(final MenuAndActions mManager) {`	896	`public void registerHelpTestActions(final MenuAndActions mManager) {`
889		897