Line 94... |
Line 94... |
94 |
import org.openconcerto.erp.core.reports.stat.action.EvolutionCACumulAction;
|
94 |
import org.openconcerto.erp.core.reports.stat.action.EvolutionCACumulAction;
|
95 |
import org.openconcerto.erp.core.reports.stat.action.EvolutionCmdAction;
|
95 |
import org.openconcerto.erp.core.reports.stat.action.EvolutionCmdAction;
|
96 |
import org.openconcerto.erp.core.reports.stat.action.EvolutionCmdCumulAction;
|
96 |
import org.openconcerto.erp.core.reports.stat.action.EvolutionCmdCumulAction;
|
97 |
import org.openconcerto.erp.core.reports.stat.action.EvolutionMargeAction;
|
97 |
import org.openconcerto.erp.core.reports.stat.action.EvolutionMargeAction;
|
98 |
import org.openconcerto.erp.core.reports.stat.action.ReportingCommercialAction;
|
98 |
import org.openconcerto.erp.core.reports.stat.action.ReportingCommercialAction;
|
- |
|
99 |
import org.openconcerto.erp.core.reports.stat.action.ReportingCommercialFournisseurAction;
|
99 |
import org.openconcerto.erp.core.reports.stat.action.VenteArticleFamilleGraphAction;
|
100 |
import org.openconcerto.erp.core.reports.stat.action.VenteArticleFamilleGraphAction;
|
100 |
import org.openconcerto.erp.core.reports.stat.action.VenteArticleGraphAction;
|
101 |
import org.openconcerto.erp.core.reports.stat.action.VenteArticleGraphAction;
|
101 |
import org.openconcerto.erp.core.reports.stat.action.VenteArticleMargeGraphAction;
|
102 |
import org.openconcerto.erp.core.reports.stat.action.VenteArticleMargeGraphAction;
|
102 |
import org.openconcerto.erp.core.sales.credit.action.ListeDesAvoirsClientsAction;
|
103 |
import org.openconcerto.erp.core.sales.credit.action.ListeDesAvoirsClientsAction;
|
103 |
import org.openconcerto.erp.core.sales.credit.action.NouveauAvoirClientAction;
|
104 |
import org.openconcerto.erp.core.sales.credit.action.NouveauAvoirClientAction;
|
Line 115... |
Line 116... |
115 |
import org.openconcerto.erp.core.sales.invoice.action.ListeSaisieVenteFactureAction;
|
116 |
import org.openconcerto.erp.core.sales.invoice.action.ListeSaisieVenteFactureAction;
|
116 |
import org.openconcerto.erp.core.sales.invoice.action.ListesFacturesClientsImpayeesAction;
|
117 |
import org.openconcerto.erp.core.sales.invoice.action.ListesFacturesClientsImpayeesAction;
|
117 |
import org.openconcerto.erp.core.sales.invoice.action.NouveauSaisieVenteComptoirAction;
|
118 |
import org.openconcerto.erp.core.sales.invoice.action.NouveauSaisieVenteComptoirAction;
|
118 |
import org.openconcerto.erp.core.sales.invoice.action.NouveauSaisieVenteFactureAction;
|
119 |
import org.openconcerto.erp.core.sales.invoice.action.NouveauSaisieVenteFactureAction;
|
119 |
import org.openconcerto.erp.core.sales.invoice.report.ReportingClientPanel;
|
120 |
import org.openconcerto.erp.core.sales.invoice.report.ReportingClientPanel;
|
- |
|
121 |
import org.openconcerto.erp.core.sales.invoice.report.SituationCompteClientPanel;
|
120 |
import org.openconcerto.erp.core.sales.order.action.ListeDesCommandesClientAction;
|
122 |
import org.openconcerto.erp.core.sales.order.action.ListeDesCommandesClientAction;
|
121 |
import org.openconcerto.erp.core.sales.order.action.ListeDesCommandesClientItemsAction;
|
123 |
import org.openconcerto.erp.core.sales.order.action.ListeDesCommandesClientItemsAction;
|
122 |
import org.openconcerto.erp.core.sales.order.action.ListeDesElementsACommanderClientAction;
|
124 |
import org.openconcerto.erp.core.sales.order.action.ListeDesElementsACommanderClientAction;
|
123 |
import org.openconcerto.erp.core.sales.order.action.ListeDesFacturationCommandesClientAction;
|
125 |
import org.openconcerto.erp.core.sales.order.action.ListeDesFacturationCommandesClientAction;
|
124 |
import org.openconcerto.erp.core.sales.order.action.NouvelleCommandeClientAction;
|
126 |
import org.openconcerto.erp.core.sales.order.action.NouvelleCommandeClientAction;
|
Line 389... |
Line 391... |
389 |
gCustomer.addItem("customer.payment.report");
|
391 |
gCustomer.addItem("customer.payment.report");
|
390 |
gCustomer.addItem("customer.dept.list");
|
392 |
gCustomer.addItem("customer.dept.list");
|
391 |
gCustomer.addItem("customer.payment.list");
|
393 |
gCustomer.addItem("customer.payment.list");
|
392 |
gCustomer.addItem("customer.payment.followup.list");
|
394 |
gCustomer.addItem("customer.payment.followup.list");
|
393 |
gCustomer.addItem("customer.payment.check.pending.list");
|
395 |
gCustomer.addItem("customer.payment.check.pending.list");
|
394 |
gCustomer.addItem("customer.payment.check.deposit.list");
|
- |
|
395 |
gCustomer.addItem("customer.payment.check.pending.create");
|
396 |
gCustomer.addItem("customer.payment.check.pending.create");
|
396 |
gCustomer.addItem("customer.payment.check.deposit.list");
|
397 |
gCustomer.addItem("customer.payment.check.deposit.list");
|
397 |
gCustomer.addItem("customer.credit.check.list");
|
398 |
gCustomer.addItem("customer.credit.check.list");
|
398 |
gCustomer.addItem("customer.credit.check.create");
|
399 |
gCustomer.addItem("customer.credit.check.create");
|
399 |
group.add(gCustomer);
|
400 |
group.add(gCustomer);
|
Line 421... |
Line 422... |
421 |
group.addItem("sales.list.stock.report");
|
422 |
group.addItem("sales.list.stock.report");
|
422 |
group.addItem("sales.list.reporting");
|
423 |
group.addItem("sales.list.reporting");
|
423 |
group.addItem("order.list.reporting");
|
424 |
group.addItem("order.list.reporting");
|
424 |
group.addItem("sales.list.report");
|
425 |
group.addItem("sales.list.report");
|
425 |
group.addItem("sales.list.salesman.report");
|
426 |
group.addItem("sales.list.salesman.report");
|
- |
|
427 |
group.addItem("sales.list.salesman.supplier.report");
|
426 |
group.addItem("sales.product.graph");
|
428 |
group.addItem("sales.product.graph");
|
427 |
group.addItem("sales.product.margin.graph");
|
429 |
group.addItem("sales.product.margin.graph");
|
428 |
group.addItem("sales.product.family.graph");
|
430 |
group.addItem("sales.product.family.graph");
|
429 |
group.addItem("sales.list.graph");
|
431 |
group.addItem("sales.list.graph");
|
430 |
group.addItem("sales.report.ecocontribution");
|
432 |
group.addItem("sales.report.ecocontribution");
|
Line 729... |
Line 731... |
729 |
|
731 |
|
730 |
mManager.putAction(new EvolutionCmdAction(), "sales.graph.cmd");
|
732 |
mManager.putAction(new EvolutionCmdAction(), "sales.graph.cmd");
|
731 |
mManager.putAction(new EvolutionCmdCumulAction(), "sales.graph.cmd.cumulate");
|
733 |
mManager.putAction(new EvolutionCmdCumulAction(), "sales.graph.cmd.cumulate");
|
732 |
|
734 |
|
733 |
mManager.putAction(new ReportingCommercialAction(conf.getRootSociete()), "sales.list.salesman.report");
|
735 |
mManager.putAction(new ReportingCommercialAction(conf.getRootSociete()), "sales.list.salesman.report");
|
- |
|
736 |
mManager.putAction(new ReportingCommercialFournisseurAction(conf), "sales.list.salesman.supplier.report");
|
734 |
|
737 |
|
735 |
mManager.putAction(new EvolutionMargeAction(), "sales.margin.graph");
|
738 |
mManager.putAction(new EvolutionMargeAction(), "sales.margin.graph");
|
736 |
mManager.putAction(new GenReportingVenteAction(false), "sales.list.reporting");
|
739 |
mManager.putAction(new GenReportingVenteAction(false), "sales.list.reporting");
|
737 |
mManager.putAction(new GenReportingVenteAction(true), "order.list.reporting");
|
740 |
mManager.putAction(new GenReportingVenteAction(true), "order.list.reporting");
|
738 |
// mManager.putAction("sales.list.reporting", new GenReportingVenteAction());
|
741 |
// mManager.putAction("sales.list.reporting", new GenReportingVenteAction());
|
Line 786... |
Line 789... |
786 |
PanelFrame frame = new PanelFrame(new ReportingClientPanel(), "Reporting client");
|
789 |
PanelFrame frame = new PanelFrame(new ReportingClientPanel(), "Reporting client");
|
787 |
frame.setVisible(true);
|
790 |
frame.setVisible(true);
|
788 |
|
791 |
|
789 |
}
|
792 |
}
|
790 |
}, "customer.payment.report");
|
793 |
}, "customer.payment.report");
|
- |
|
794 |
mManager.putAction(new AbstractAction("Situation Client") {
|
- |
|
795 |
@Override
|
- |
|
796 |
public void actionPerformed(ActionEvent arg0) {
|
- |
|
797 |
|
- |
|
798 |
PanelFrame frame = new PanelFrame(new SituationCompteClientPanel(conf), "Situation client");
|
- |
|
799 |
frame.setVisible(true);
|
- |
|
800 |
|
- |
|
801 |
}
|
- |
|
802 |
}, "customer.payment.details");
|
791 |
mManager.putAction(new ListeDesEncaissementsAction(), "customer.payment.list");
|
803 |
mManager.putAction(new ListeDesEncaissementsAction(), "customer.payment.list");
|
792 |
mManager.putAction(new ListeDesRelancesAction(), "customer.payment.followup.list");
|
804 |
mManager.putAction(new ListeDesRelancesAction(), "customer.payment.followup.list");
|
793 |
mManager.putAction(new ListeDesChequesAEncaisserAction(), "customer.payment.check.pending.list");
|
805 |
mManager.putAction(new ListeDesChequesAEncaisserAction(), "customer.payment.check.pending.list");
|
794 |
mManager.putAction(new ListeDesDepostChequesAction(), "customer.payment.check.deposit.list");
|
806 |
mManager.putAction(new ListeDesDepostChequesAction(), "customer.payment.check.deposit.list");
|
795 |
mManager.putAction(new NouveauListeDesChequesAEncaisserAction(conf), "customer.payment.check.pending.create");
|
807 |
mManager.putAction(new NouveauListeDesChequesAEncaisserAction(conf), "customer.payment.check.pending.create");
|