Line 26... |
Line 26... |
26 |
import org.openconcerto.erp.core.customerrelationship.customer.action.ListeDesClientsAction;
|
26 |
import org.openconcerto.erp.core.customerrelationship.customer.action.ListeDesClientsAction;
|
27 |
import org.openconcerto.erp.core.customerrelationship.customer.action.ListeDesContactsAction;
|
27 |
import org.openconcerto.erp.core.customerrelationship.customer.action.ListeDesContactsAction;
|
28 |
import org.openconcerto.erp.core.customerrelationship.customer.action.ListeDesDepartementsClientsAction;
|
28 |
import org.openconcerto.erp.core.customerrelationship.customer.action.ListeDesDepartementsClientsAction;
|
29 |
import org.openconcerto.erp.core.customerrelationship.customer.action.NouvelHistoriqueListeClientAction;
|
29 |
import org.openconcerto.erp.core.customerrelationship.customer.action.NouvelHistoriqueListeClientAction;
|
30 |
import org.openconcerto.erp.core.customerrelationship.mail.action.ListeDesCourriersClientsAction;
|
30 |
import org.openconcerto.erp.core.customerrelationship.mail.action.ListeDesCourriersClientsAction;
|
- |
|
31 |
import org.openconcerto.erp.core.customerrelationship.mail.action.ListeDesModelesEmailAction;
|
31 |
import org.openconcerto.erp.core.finance.accounting.action.BalanceAgeeAction;
|
32 |
import org.openconcerto.erp.core.finance.accounting.action.BalanceAgeeAction;
|
32 |
import org.openconcerto.erp.core.finance.accounting.action.CompteResultatBilanAction;
|
33 |
import org.openconcerto.erp.core.finance.accounting.action.CompteResultatBilanAction;
|
33 |
import org.openconcerto.erp.core.finance.accounting.action.EtatBalanceAction;
|
34 |
import org.openconcerto.erp.core.finance.accounting.action.EtatBalanceAction;
|
34 |
import org.openconcerto.erp.core.finance.accounting.action.EtatChargeAction;
|
35 |
import org.openconcerto.erp.core.finance.accounting.action.EtatChargeAction;
|
35 |
import org.openconcerto.erp.core.finance.accounting.action.EtatGrandLivreAction;
|
36 |
import org.openconcerto.erp.core.finance.accounting.action.EtatGrandLivreAction;
|
Line 66... |
Line 67... |
66 |
import org.openconcerto.erp.core.finance.payment.action.ListeDesRelancesAction;
|
67 |
import org.openconcerto.erp.core.finance.payment.action.ListeDesRelancesAction;
|
67 |
import org.openconcerto.erp.core.finance.payment.action.ListeDesTraitesFournisseursAction;
|
68 |
import org.openconcerto.erp.core.finance.payment.action.ListeDesTraitesFournisseursAction;
|
68 |
import org.openconcerto.erp.core.finance.payment.action.NouveauDecaissementChequeAvoirAction;
|
69 |
import org.openconcerto.erp.core.finance.payment.action.NouveauDecaissementChequeAvoirAction;
|
69 |
import org.openconcerto.erp.core.finance.payment.action.NouveauListeDesChequesADecaisserAction;
|
70 |
import org.openconcerto.erp.core.finance.payment.action.NouveauListeDesChequesADecaisserAction;
|
70 |
import org.openconcerto.erp.core.finance.payment.action.NouveauListeDesChequesAEncaisserAction;
|
71 |
import org.openconcerto.erp.core.finance.payment.action.NouveauListeDesChequesAEncaisserAction;
|
- |
|
72 |
import org.openconcerto.erp.core.finance.payment.element.EncaisserMontantSQLElement;
|
71 |
import org.openconcerto.erp.core.finance.tax.action.ReportingEcoContributionPanel;
|
73 |
import org.openconcerto.erp.core.finance.tax.action.ReportingEcoContributionPanel;
|
72 |
import org.openconcerto.erp.core.finance.tax.action.ReportingTaxeComplementairePanel;
|
74 |
import org.openconcerto.erp.core.finance.tax.action.ReportingTaxeComplementairePanel;
|
73 |
import org.openconcerto.erp.core.humanresources.ListeDesContactsAdministratif;
|
75 |
import org.openconcerto.erp.core.humanresources.ListeDesContactsAdministratif;
|
74 |
import org.openconcerto.erp.core.humanresources.employe.action.ListeDesAyantsDroitsAction;
|
76 |
import org.openconcerto.erp.core.humanresources.employe.action.ListeDesAyantsDroitsAction;
|
75 |
import org.openconcerto.erp.core.humanresources.employe.action.ListeDesCaissesCotisationsAction;
|
77 |
import org.openconcerto.erp.core.humanresources.employe.action.ListeDesCaissesCotisationsAction;
|
Line 90... |
Line 92... |
90 |
import org.openconcerto.erp.core.reports.stat.action.EvolutionCAAction;
|
92 |
import org.openconcerto.erp.core.reports.stat.action.EvolutionCAAction;
|
91 |
import org.openconcerto.erp.core.reports.stat.action.EvolutionCACumulAction;
|
93 |
import org.openconcerto.erp.core.reports.stat.action.EvolutionCACumulAction;
|
92 |
import org.openconcerto.erp.core.reports.stat.action.EvolutionCmdAction;
|
94 |
import org.openconcerto.erp.core.reports.stat.action.EvolutionCmdAction;
|
93 |
import org.openconcerto.erp.core.reports.stat.action.EvolutionCmdCumulAction;
|
95 |
import org.openconcerto.erp.core.reports.stat.action.EvolutionCmdCumulAction;
|
94 |
import org.openconcerto.erp.core.reports.stat.action.EvolutionMargeAction;
|
96 |
import org.openconcerto.erp.core.reports.stat.action.EvolutionMargeAction;
|
- |
|
97 |
import org.openconcerto.erp.core.reports.stat.action.ReportingCommercialAction;
|
95 |
import org.openconcerto.erp.core.reports.stat.action.VenteArticleFamilleGraphAction;
|
98 |
import org.openconcerto.erp.core.reports.stat.action.VenteArticleFamilleGraphAction;
|
96 |
import org.openconcerto.erp.core.reports.stat.action.VenteArticleGraphAction;
|
99 |
import org.openconcerto.erp.core.reports.stat.action.VenteArticleGraphAction;
|
97 |
import org.openconcerto.erp.core.reports.stat.action.VenteArticleMargeGraphAction;
|
100 |
import org.openconcerto.erp.core.reports.stat.action.VenteArticleMargeGraphAction;
|
98 |
import org.openconcerto.erp.core.sales.credit.action.ListeDesAvoirsClientsAction;
|
101 |
import org.openconcerto.erp.core.sales.credit.action.ListeDesAvoirsClientsAction;
|
99 |
import org.openconcerto.erp.core.sales.credit.action.NouveauAvoirClientAction;
|
102 |
import org.openconcerto.erp.core.sales.credit.action.NouveauAvoirClientAction;
|
100 |
import org.openconcerto.erp.core.sales.invoice.action.EtatVenteAction;
|
103 |
import org.openconcerto.erp.core.sales.invoice.action.EtatVenteAction;
|
101 |
import org.openconcerto.erp.core.sales.invoice.action.GenEtatStockAction;
|
104 |
import org.openconcerto.erp.core.sales.invoice.action.GenEtatStockAction;
|
102 |
import org.openconcerto.erp.core.sales.invoice.action.GenListeVenteAction;
|
105 |
import org.openconcerto.erp.core.sales.invoice.action.GenListeVenteAction;
|
103 |
import org.openconcerto.erp.core.sales.invoice.action.GenReportingVenteAction;
|
106 |
import org.openconcerto.erp.core.sales.invoice.action.GenReportingVenteAction;
|
- |
|
107 |
import org.openconcerto.erp.core.sales.invoice.action.ImportReglementSageAction;
|
104 |
import org.openconcerto.erp.core.sales.invoice.action.ListeDebiteursAction;
|
108 |
import org.openconcerto.erp.core.sales.invoice.action.ListeDebiteursAction;
|
105 |
import org.openconcerto.erp.core.sales.invoice.action.ListeDesElementsFactureAction;
|
109 |
import org.openconcerto.erp.core.sales.invoice.action.ListeDesElementsFactureAction;
|
106 |
import org.openconcerto.erp.core.sales.invoice.action.ListeDesFactureItemsAction;
|
110 |
import org.openconcerto.erp.core.sales.invoice.action.ListeDesFactureItemsAction;
|
107 |
import org.openconcerto.erp.core.sales.invoice.action.ListeDesVentesAction;
|
111 |
import org.openconcerto.erp.core.sales.invoice.action.ListeDesVentesAction;
|
108 |
import org.openconcerto.erp.core.sales.invoice.action.ListeSDDMessageAction;
|
112 |
import org.openconcerto.erp.core.sales.invoice.action.ListeSDDMessageAction;
|
Line 119... |
Line 123... |
119 |
import org.openconcerto.erp.core.sales.pos.action.ListeDesCaissesTicketAction;
|
123 |
import org.openconcerto.erp.core.sales.pos.action.ListeDesCaissesTicketAction;
|
120 |
import org.openconcerto.erp.core.sales.product.action.FamilleArticleAction;
|
124 |
import org.openconcerto.erp.core.sales.product.action.FamilleArticleAction;
|
121 |
import org.openconcerto.erp.core.sales.product.action.ListeDesArticlesAction;
|
125 |
import org.openconcerto.erp.core.sales.product.action.ListeDesArticlesAction;
|
122 |
import org.openconcerto.erp.core.sales.product.action.ListeEcoContributionAction;
|
126 |
import org.openconcerto.erp.core.sales.product.action.ListeEcoContributionAction;
|
123 |
import org.openconcerto.erp.core.sales.product.action.ListeHistoCodeClientArticleAction;
|
127 |
import org.openconcerto.erp.core.sales.product.action.ListeHistoCodeClientArticleAction;
|
- |
|
128 |
import org.openconcerto.erp.core.sales.product.action.TransfertStockAction;
|
124 |
import org.openconcerto.erp.core.sales.quote.action.ListeDesDevisAction;
|
129 |
import org.openconcerto.erp.core.sales.quote.action.ListeDesDevisAction;
|
125 |
import org.openconcerto.erp.core.sales.quote.action.ListeDesDevisActionTCP;
|
130 |
import org.openconcerto.erp.core.sales.quote.action.ListeDesDevisActionTCP;
|
126 |
import org.openconcerto.erp.core.sales.quote.action.ListeDesElementsDevisAction;
|
131 |
import org.openconcerto.erp.core.sales.quote.action.ListeDesElementsDevisAction;
|
127 |
import org.openconcerto.erp.core.sales.quote.action.NouveauDevisAction;
|
132 |
import org.openconcerto.erp.core.sales.quote.action.NouveauDevisAction;
|
128 |
import org.openconcerto.erp.core.sales.shipment.action.ListeDesBonsDeLivraisonAction;
|
133 |
import org.openconcerto.erp.core.sales.shipment.action.ListeDesBonsDeLivraisonAction;
|
Line 292... |
Line 297... |
292 |
supplierGroup.addItem("supplier.purchase.create");
|
297 |
supplierGroup.addItem("supplier.purchase.create");
|
293 |
supplierGroup.addItem("supplier.invoice.purchase.create");
|
298 |
supplierGroup.addItem("supplier.invoice.purchase.create");
|
294 |
supplierGroup.addItem("supplier.credit.create");
|
299 |
supplierGroup.addItem("supplier.credit.create");
|
295 |
group.addItem("stock.io.create");
|
300 |
group.addItem("stock.io.create");
|
296 |
}
|
301 |
}
|
- |
|
302 |
group.addItem("product.stock.transfert");
|
297 |
|
303 |
|
298 |
return group;
|
304 |
return group;
|
299 |
}
|
305 |
}
|
300 |
|
306 |
|
301 |
public Group createHelpMenuGroup() {
|
307 |
public Group createHelpMenuGroup() {
|
Line 326... |
Line 332... |
326 |
gUser.addItem("user.list");
|
332 |
gUser.addItem("user.list");
|
327 |
gUser.addItem("user.right.list");
|
333 |
gUser.addItem("user.right.list");
|
328 |
gUser.addItem("user.task.right");
|
334 |
gUser.addItem("user.task.right");
|
329 |
group.add(gUser);
|
335 |
group.add(gUser);
|
330 |
}
|
336 |
}
|
331 |
|
- |
|
- |
|
337 |
group.addItem("email.template.list");
|
332 |
group.addItem("product.ecotax");
|
338 |
group.addItem("product.ecotax");
|
333 |
group.addItem("office.contact.list");
|
339 |
group.addItem("office.contact.list");
|
334 |
group.addItem("salesman.list");
|
340 |
group.addItem("salesman.list");
|
335 |
|
341 |
|
336 |
final Group gPos = new Group("menu.organization.pos", LayoutHints.DEFAULT_NOLABEL_SEPARATED_GROUP_HINTS);
|
342 |
final Group gPos = new Group("menu.organization.pos", LayoutHints.DEFAULT_NOLABEL_SEPARATED_GROUP_HINTS);
|
Line 412... |
Line 418... |
412 |
group.addItem("sales.margin.graph");
|
418 |
group.addItem("sales.margin.graph");
|
413 |
group.addItem("sales.list.stock.report");
|
419 |
group.addItem("sales.list.stock.report");
|
414 |
group.addItem("sales.list.reporting");
|
420 |
group.addItem("sales.list.reporting");
|
415 |
group.addItem("order.list.reporting");
|
421 |
group.addItem("order.list.reporting");
|
416 |
group.addItem("sales.list.report");
|
422 |
group.addItem("sales.list.report");
|
- |
|
423 |
group.addItem("sales.list.salesman.report");
|
417 |
group.addItem("sales.product.graph");
|
424 |
group.addItem("sales.product.graph");
|
418 |
group.addItem("sales.product.margin.graph");
|
425 |
group.addItem("sales.product.margin.graph");
|
419 |
group.addItem("sales.product.family.graph");
|
426 |
group.addItem("sales.product.family.graph");
|
420 |
group.addItem("sales.list.graph");
|
427 |
group.addItem("sales.list.graph");
|
421 |
group.addItem("sales.report.ecocontribution");
|
428 |
group.addItem("sales.report.ecocontribution");
|
Line 597... |
Line 604... |
597 |
mManager.putAction(new NouveauSaisieVenteComptoirAction(conf), "pos.sale.create");
|
604 |
mManager.putAction(new NouveauSaisieVenteComptoirAction(conf), "pos.sale.create");
|
598 |
}
|
605 |
}
|
599 |
mManager.putAction(new NouveauSaisieVenteFactureAction(conf), "customer.invoice.create");
|
606 |
mManager.putAction(new NouveauSaisieVenteFactureAction(conf), "customer.invoice.create");
|
600 |
|
607 |
|
601 |
mManager.putAction(new NouveauAvoirClientAction(conf), "customer.credit.create");
|
608 |
mManager.putAction(new NouveauAvoirClientAction(conf), "customer.credit.create");
|
- |
|
609 |
mManager.putAction(new TransfertStockAction(conf), "product.stock.transfert");
|
602 |
|
610 |
|
603 |
if (rights.haveRight(NXRights.LOCK_MENU_ACHAT.getCode())) {
|
611 |
if (rights.haveRight(NXRights.LOCK_MENU_ACHAT.getCode())) {
|
604 |
mManager.putAction(new NouvelleDemandePrixAction(conf), "supplier.order.ask.create");
|
612 |
mManager.putAction(new NouvelleDemandePrixAction(conf), "supplier.order.ask.create");
|
605 |
mManager.putAction(new NouvelleCommandeAction(conf), "supplier.order.create");
|
613 |
mManager.putAction(new NouvelleCommandeAction(conf), "supplier.order.create");
|
606 |
mManager.putAction(new NouveauBonReceptionAction(conf), "supplier.receipt.create");
|
614 |
mManager.putAction(new NouveauBonReceptionAction(conf), "supplier.receipt.create");
|
Line 708... |
Line 716... |
708 |
mManager.putAction(new N4DSAction(), "employe.social.report");
|
716 |
mManager.putAction(new N4DSAction(), "employe.social.report");
|
709 |
// mManager.putAction("accounting.2050Report", new CompteResultatBilan2050Action());
|
717 |
// mManager.putAction("accounting.2050Report", new CompteResultatBilan2050Action());
|
710 |
}
|
718 |
}
|
711 |
|
719 |
|
712 |
public void registerStatsMenuActions(final MenuAndActions mManager) {
|
720 |
public void registerStatsMenuActions(final MenuAndActions mManager) {
|
713 |
|
- |
|
- |
|
721 |
final ComptaPropsConfiguration conf = getConfiguration();
|
714 |
|
722 |
|
715 |
mManager.putAction(new EvolutionCAAction(), "sales.graph");
|
723 |
mManager.putAction(new EvolutionCAAction(), "sales.graph");
|
716 |
mManager.putAction(new EvolutionCACumulAction(), "sales.graph.cumulate");
|
724 |
mManager.putAction(new EvolutionCACumulAction(), "sales.graph.cumulate");
|
717 |
|
725 |
|
718 |
mManager.putAction(new EvolutionCmdAction(), "sales.graph.cmd");
|
726 |
mManager.putAction(new EvolutionCmdAction(), "sales.graph.cmd");
|
719 |
mManager.putAction(new EvolutionCmdCumulAction(), "sales.graph.cmd.cumulate");
|
727 |
mManager.putAction(new EvolutionCmdCumulAction(), "sales.graph.cmd.cumulate");
|
720 |
|
728 |
|
- |
|
729 |
mManager.putAction(new ReportingCommercialAction(conf.getRootSociete()), "sales.list.salesman.report");
|
- |
|
730 |
|
721 |
mManager.putAction(new EvolutionMargeAction(), "sales.margin.graph");
|
731 |
mManager.putAction(new EvolutionMargeAction(), "sales.margin.graph");
|
722 |
mManager.putAction(new GenReportingVenteAction(false), "sales.list.reporting");
|
732 |
mManager.putAction(new GenReportingVenteAction(false), "sales.list.reporting");
|
723 |
mManager.putAction(new GenReportingVenteAction(true), "order.list.reporting");
|
733 |
mManager.putAction(new GenReportingVenteAction(true), "order.list.reporting");
|
724 |
// mManager.putAction("sales.list.reporting", new GenReportingVenteAction());
|
734 |
// mManager.putAction("sales.list.reporting", new GenReportingVenteAction());
|
725 |
mManager.putAction(new GenListeVenteAction(), "sales.list.report");
|
735 |
mManager.putAction(new GenListeVenteAction(), "sales.list.report");
|
Line 761... |
Line 771... |
761 |
mManager.putAction(new NouveauLettrageAction(), "payment.reconciliation.create");
|
771 |
mManager.putAction(new NouveauLettrageAction(), "payment.reconciliation.create");
|
762 |
}
|
772 |
}
|
763 |
|
773 |
|
764 |
if (rights.haveRight(NXRights.GESTION_ENCAISSEMENT.getCode())) {
|
774 |
if (rights.haveRight(NXRights.GESTION_ENCAISSEMENT.getCode())) {
|
765 |
mManager.putAction(new ListesFacturesClientsImpayeesAction(), "customer.invoice.unpaid.list");
|
775 |
mManager.putAction(new ListesFacturesClientsImpayeesAction(), "customer.invoice.unpaid.list");
|
- |
|
776 |
mManager.putAction(new ImportReglementSageAction(conf.getDirectory().getElement(EncaisserMontantSQLElement.class)), "customer.invoice.payment.xml.sage.import");
|
766 |
mManager.putAction(new ListeDebiteursAction(), "customer.dept.list");
|
777 |
mManager.putAction(new ListeDebiteursAction(), "customer.dept.list");
|
767 |
mManager.putAction(new AbstractAction("Relevé client") {
|
778 |
mManager.putAction(new AbstractAction("Relevé client") {
|
768 |
@Override
|
779 |
@Override
|
769 |
public void actionPerformed(ActionEvent arg0) {
|
780 |
public void actionPerformed(ActionEvent arg0) {
|
770 |
|
781 |
|
Line 837... |
Line 848... |
837 |
if (rights.haveRight(LockAdminUserRight.LOCK_MENU_ADMIN)) {
|
848 |
if (rights.haveRight(LockAdminUserRight.LOCK_MENU_ADMIN)) {
|
838 |
mManager.putAction(new ListeDesUsersCommonAction(), "user.list");
|
849 |
mManager.putAction(new ListeDesUsersCommonAction(), "user.list");
|
839 |
mManager.putAction(new GestionDroitsAction(), "user.right.list");
|
850 |
mManager.putAction(new GestionDroitsAction(), "user.right.list");
|
840 |
mManager.putAction(new TaskAdminAction(), "user.task.right");
|
851 |
mManager.putAction(new TaskAdminAction(), "user.task.right");
|
841 |
}
|
852 |
}
|
842 |
|
- |
|
- |
|
853 |
mManager.putAction(new ListeDesModelesEmailAction(), "email.template.list");
|
843 |
mManager.putAction(new ListeDesContactsAdministratif(), "office.contact.list");
|
854 |
mManager.putAction(new ListeDesContactsAdministratif(), "office.contact.list");
|
844 |
mManager.putAction(new ListeDesCommerciauxAction(), "salesman.list");
|
855 |
mManager.putAction(new ListeDesCommerciauxAction(), "salesman.list");
|
845 |
mManager.putAction(new ListeDesCaissesTicketAction(), "pos.list");
|
856 |
mManager.putAction(new ListeDesCaissesTicketAction(), "pos.list");
|
846 |
|
857 |
|
847 |
|
858 |
|