Line 56... |
Line 56... |
56 |
import org.openconcerto.erp.core.finance.accounting.action.NouveauClotureAction;
|
56 |
import org.openconcerto.erp.core.finance.accounting.action.NouveauClotureAction;
|
57 |
import org.openconcerto.erp.core.finance.accounting.action.NouveauClotureSansAnouveauxAction;
|
57 |
import org.openconcerto.erp.core.finance.accounting.action.NouveauClotureSansAnouveauxAction;
|
58 |
import org.openconcerto.erp.core.finance.accounting.action.NouveauLettrageAction;
|
58 |
import org.openconcerto.erp.core.finance.accounting.action.NouveauLettrageAction;
|
59 |
import org.openconcerto.erp.core.finance.accounting.action.NouveauPointageAction;
|
59 |
import org.openconcerto.erp.core.finance.accounting.action.NouveauPointageAction;
|
60 |
import org.openconcerto.erp.core.finance.accounting.action.NouvelleValidationAction;
|
60 |
import org.openconcerto.erp.core.finance.accounting.action.NouvelleValidationAction;
|
- |
|
61 |
import org.openconcerto.erp.core.finance.accounting.action.RelevesBancairesAction;
|
61 |
import org.openconcerto.erp.core.finance.accounting.action.ResultatAnalytiqueAction;
|
62 |
import org.openconcerto.erp.core.finance.accounting.action.ResultatAnalytiqueAction;
|
62 |
import org.openconcerto.erp.core.finance.accounting.ui.SaisieJournalAction;
|
63 |
import org.openconcerto.erp.core.finance.accounting.ui.SaisieJournalAction;
|
63 |
import org.openconcerto.erp.core.finance.payment.action.ListeDesChequesAEncaisserAction;
|
64 |
import org.openconcerto.erp.core.finance.payment.action.ListeDesChequesAEncaisserAction;
|
64 |
import org.openconcerto.erp.core.finance.payment.action.ListeDesChequesAvoirAction;
|
65 |
import org.openconcerto.erp.core.finance.payment.action.ListeDesChequesAvoirAction;
|
65 |
import org.openconcerto.erp.core.finance.payment.action.ListeDesChequesFournisseursAction;
|
66 |
import org.openconcerto.erp.core.finance.payment.action.ListeDesChequesFournisseursAction;
|
Line 108... |
Line 109... |
108 |
import org.openconcerto.erp.core.sales.invoice.action.GenReportingVenteAction;
|
109 |
import org.openconcerto.erp.core.sales.invoice.action.GenReportingVenteAction;
|
109 |
import org.openconcerto.erp.core.sales.invoice.action.ImportReglementSageAction;
|
110 |
import org.openconcerto.erp.core.sales.invoice.action.ImportReglementSageAction;
|
110 |
import org.openconcerto.erp.core.sales.invoice.action.ListeDebiteursAction;
|
111 |
import org.openconcerto.erp.core.sales.invoice.action.ListeDebiteursAction;
|
111 |
import org.openconcerto.erp.core.sales.invoice.action.ListeDesElementsFactureAction;
|
112 |
import org.openconcerto.erp.core.sales.invoice.action.ListeDesElementsFactureAction;
|
112 |
import org.openconcerto.erp.core.sales.invoice.action.ListeDesFactureItemsAction;
|
113 |
import org.openconcerto.erp.core.sales.invoice.action.ListeDesFactureItemsAction;
|
- |
|
114 |
import org.openconcerto.erp.core.sales.invoice.action.ListeDesFacturesPrevisionnellesOCAction;
|
113 |
import org.openconcerto.erp.core.sales.invoice.action.ListeDesVentesAction;
|
115 |
import org.openconcerto.erp.core.sales.invoice.action.ListeDesVentesAction;
|
114 |
import org.openconcerto.erp.core.sales.invoice.action.ListeEcheancePrelevementAction;
|
116 |
import org.openconcerto.erp.core.sales.invoice.action.ListeEcheancePrelevementAction;
|
115 |
import org.openconcerto.erp.core.sales.invoice.action.ListeSDDMessageAction;
|
117 |
import org.openconcerto.erp.core.sales.invoice.action.ListeSDDMessageAction;
|
116 |
import org.openconcerto.erp.core.sales.invoice.action.ListeSaisieVenteFactureAction;
|
118 |
import org.openconcerto.erp.core.sales.invoice.action.ListeSaisieVenteFactureAction;
|
117 |
import org.openconcerto.erp.core.sales.invoice.action.ListesFacturesClientsImpayeesAction;
|
119 |
import org.openconcerto.erp.core.sales.invoice.action.ListesFacturesClientsImpayeesAction;
|
Line 122... |
Line 124... |
122 |
import org.openconcerto.erp.core.sales.order.action.ListeDesCommandesClientAction;
|
124 |
import org.openconcerto.erp.core.sales.order.action.ListeDesCommandesClientAction;
|
123 |
import org.openconcerto.erp.core.sales.order.action.ListeDesCommandesClientItemsAction;
|
125 |
import org.openconcerto.erp.core.sales.order.action.ListeDesCommandesClientItemsAction;
|
124 |
import org.openconcerto.erp.core.sales.order.action.ListeDesElementsACommanderClientAction;
|
126 |
import org.openconcerto.erp.core.sales.order.action.ListeDesElementsACommanderClientAction;
|
125 |
import org.openconcerto.erp.core.sales.order.action.ListeDesFacturationCommandesClientAction;
|
127 |
import org.openconcerto.erp.core.sales.order.action.ListeDesFacturationCommandesClientAction;
|
126 |
import org.openconcerto.erp.core.sales.order.action.NouvelleCommandeClientAction;
|
128 |
import org.openconcerto.erp.core.sales.order.action.NouvelleCommandeClientAction;
|
127 |
import org.openconcerto.erp.core.sales.order.element.CommandeClientSQLElement;
|
- |
|
128 |
import org.openconcerto.erp.core.sales.pos.action.ListeDesCaissesTicketAction;
|
129 |
import org.openconcerto.erp.core.sales.pos.action.ListeDesCaissesTicketAction;
|
129 |
import org.openconcerto.erp.core.sales.product.action.FamilleArticleAction;
|
130 |
import org.openconcerto.erp.core.sales.product.action.FamilleArticleAction;
|
130 |
import org.openconcerto.erp.core.sales.product.action.ListeDesArticlesAction;
|
131 |
import org.openconcerto.erp.core.sales.product.action.ListeDesArticlesAction;
|
131 |
import org.openconcerto.erp.core.sales.product.action.ListeEcoContributionAction;
|
132 |
import org.openconcerto.erp.core.sales.product.action.ListeEcoContributionAction;
|
132 |
import org.openconcerto.erp.core.sales.product.action.ListeHistoCodeClientArticleAction;
|
133 |
import org.openconcerto.erp.core.sales.product.action.ListeHistoCodeClientArticleAction;
|
Line 134... |
Line 135... |
134 |
import org.openconcerto.erp.core.sales.quote.action.ListeDesDevisAction;
|
135 |
import org.openconcerto.erp.core.sales.quote.action.ListeDesDevisAction;
|
135 |
import org.openconcerto.erp.core.sales.quote.action.ListeDesDevisActionTCP;
|
136 |
import org.openconcerto.erp.core.sales.quote.action.ListeDesDevisActionTCP;
|
136 |
import org.openconcerto.erp.core.sales.quote.action.ListeDesElementsDevisAction;
|
137 |
import org.openconcerto.erp.core.sales.quote.action.ListeDesElementsDevisAction;
|
137 |
import org.openconcerto.erp.core.sales.quote.action.NouveauDevisAction;
|
138 |
import org.openconcerto.erp.core.sales.quote.action.NouveauDevisAction;
|
138 |
import org.openconcerto.erp.core.sales.shipment.action.ListeDesBonsDeLivraisonAction;
|
139 |
import org.openconcerto.erp.core.sales.shipment.action.ListeDesBonsDeLivraisonAction;
|
- |
|
140 |
import org.openconcerto.erp.core.sales.shipment.action.ListeDesElementsBLAction;
|
139 |
import org.openconcerto.erp.core.sales.shipment.action.ListeDesReliquatsBonsLivraisonsAction;
|
141 |
import org.openconcerto.erp.core.sales.shipment.action.ListeDesReliquatsBonsLivraisonsAction;
|
140 |
import org.openconcerto.erp.core.sales.shipment.action.NouveauBonLivraisonAction;
|
142 |
import org.openconcerto.erp.core.sales.shipment.action.NouveauBonLivraisonAction;
|
141 |
import org.openconcerto.erp.core.supplychain.credit.action.ListeDesAvoirsFournisseurAction;
|
143 |
import org.openconcerto.erp.core.supplychain.credit.action.ListeDesAvoirsFournisseurAction;
|
142 |
import org.openconcerto.erp.core.supplychain.credit.action.NouvelAvoirFournisseurAction;
|
144 |
import org.openconcerto.erp.core.supplychain.credit.action.NouvelAvoirFournisseurAction;
|
143 |
import org.openconcerto.erp.core.supplychain.order.action.ListeDesCommandesAction;
|
145 |
import org.openconcerto.erp.core.supplychain.order.action.ListeDesCommandesAction;
|
Line 165... |
Line 167... |
165 |
import org.openconcerto.erp.core.supplychain.supplier.action.NouvelHistoriqueListeFournAction;
|
167 |
import org.openconcerto.erp.core.supplychain.supplier.action.NouvelHistoriqueListeFournAction;
|
166 |
import org.openconcerto.erp.modules.ModuleFrame;
|
168 |
import org.openconcerto.erp.modules.ModuleFrame;
|
167 |
import org.openconcerto.erp.preferences.DefaultNXProps;
|
169 |
import org.openconcerto.erp.preferences.DefaultNXProps;
|
168 |
import org.openconcerto.erp.preferences.GestionArticleGlobalPreferencePanel;
|
170 |
import org.openconcerto.erp.preferences.GestionArticleGlobalPreferencePanel;
|
169 |
import org.openconcerto.erp.preferences.GestionClientPreferencePanel;
|
171 |
import org.openconcerto.erp.preferences.GestionClientPreferencePanel;
|
- |
|
172 |
import org.openconcerto.erp.preferences.GestionCommercialeGlobalPreferencePanel;
|
170 |
import org.openconcerto.erp.rights.ComptaUserRight;
|
173 |
import org.openconcerto.erp.rights.ComptaUserRight;
|
171 |
import org.openconcerto.erp.rights.NXRights;
|
174 |
import org.openconcerto.erp.rights.NXRights;
|
172 |
import org.openconcerto.erp.utils.correct.CorrectMouvement;
|
175 |
import org.openconcerto.erp.utils.correct.CorrectMouvement;
|
173 |
import org.openconcerto.sql.model.DBRoot;
|
176 |
import org.openconcerto.sql.model.DBRoot;
|
174 |
import org.openconcerto.sql.model.SQLSelect;
|
177 |
import org.openconcerto.sql.model.SQLSelect;
|
Line 456... |
Line 459... |
456 |
analytic.addItem("accounting.analytical.dpt");
|
459 |
analytic.addItem("accounting.analytical.dpt");
|
457 |
group.add(analytic);
|
460 |
group.add(analytic);
|
458 |
group.addItem("accounting.general.ledger");
|
461 |
group.addItem("accounting.general.ledger");
|
459 |
group.addItem("accounting.entries.ledger");
|
462 |
group.addItem("accounting.entries.ledger");
|
460 |
group.addItem("accounting.entries.list");
|
463 |
group.addItem("accounting.entries.list");
|
- |
|
464 |
if (this.configuration.isExperimental()) {
|
- |
|
465 |
group.addItem("accounting.bank.statement.list");
|
461 |
|
466 |
}
|
462 |
final Group gIO = new Group("menu.accounting.io", LayoutHints.DEFAULT_NOLABEL_SEPARATED_GROUP_HINTS);
|
467 |
final Group gIO = new Group("menu.accounting.io", LayoutHints.DEFAULT_NOLABEL_SEPARATED_GROUP_HINTS);
|
463 |
gIO.addItem("accounting.import");
|
468 |
gIO.addItem("accounting.import");
|
464 |
gIO.addItem("accounting.import.fec");
|
469 |
gIO.addItem("accounting.import.fec");
|
465 |
if (this.configuration.isExperimental()) {
|
470 |
if (this.configuration.isExperimental()) {
|
466 |
gIO.addItem("accounting.import.rimport");
|
471 |
gIO.addItem("accounting.import.rimport");
|
Line 509... |
Line 514... |
509 |
group.add(gCustomer);
|
514 |
group.add(gCustomer);
|
510 |
|
515 |
|
511 |
boolean useListDesVentesAction = bModeVenteComptoir;
|
516 |
boolean useListDesVentesAction = bModeVenteComptoir;
|
512 |
if (useListDesVentesAction) {
|
517 |
if (useListDesVentesAction) {
|
513 |
gCustomer.addItem("sales.list");
|
518 |
gCustomer.addItem("sales.list");
|
- |
|
519 |
if (prefs.getBoolean(GestionCommercialeGlobalPreferencePanel.FACTURE_PREVISIONNELLE, false)) {
|
- |
|
520 |
gCustomer.addItem("customer.invoice.future.list");
|
514 |
|
521 |
}
|
515 |
} else {
|
522 |
} else {
|
516 |
|
523 |
|
517 |
gCustomer.addItem("customer.invoice.list");
|
524 |
gCustomer.addItem("customer.invoice.list");
|
- |
|
525 |
if (prefs.getBoolean(GestionCommercialeGlobalPreferencePanel.FACTURE_PREVISIONNELLE, false)) {
|
- |
|
526 |
gCustomer.addItem("customer.invoice.future.list");
|
- |
|
527 |
}
|
518 |
}
|
528 |
}
|
519 |
|
529 |
|
520 |
gCustomer.addItem("customer.credit.list");
|
530 |
gCustomer.addItem("customer.credit.list");
|
521 |
gCustomer.addItem("sales.quote.element.list");
|
531 |
gCustomer.addItem("sales.quote.element.list");
|
522 |
gCustomer.addItem("customer.invoice.details.list");
|
532 |
gCustomer.addItem("customer.invoice.details.list");
|
- |
|
533 |
gCustomer.addItem("customer.deliver.details.list");
|
523 |
|
534 |
|
524 |
final Group gSupplier = new Group("menu.list.supplier", LayoutHints.DEFAULT_NOLABEL_SEPARATED_GROUP_HINTS);
|
535 |
final Group gSupplier = new Group("menu.list.supplier", LayoutHints.DEFAULT_NOLABEL_SEPARATED_GROUP_HINTS);
|
525 |
gSupplier.addItem("supplier.list");
|
536 |
gSupplier.addItem("supplier.list");
|
526 |
gSupplier.addItem("supplier.contact.list");
|
537 |
gSupplier.addItem("supplier.contact.list");
|
527 |
gSupplier.addItem("supplier.history");
|
538 |
gSupplier.addItem("supplier.history");
|
Line 664... |
Line 675... |
664 |
}
|
675 |
}
|
665 |
|
676 |
|
666 |
boolean useListDesVentesAction = bModeVenteComptoir;
|
677 |
boolean useListDesVentesAction = bModeVenteComptoir;
|
667 |
if (useListDesVentesAction) {
|
678 |
if (useListDesVentesAction) {
|
668 |
mManager.putAction(new ListeDesVentesAction(conf), "sales.list");
|
679 |
mManager.putAction(new ListeDesVentesAction(conf), "sales.list");
|
669 |
|
- |
|
- |
|
680 |
mManager.putAction(new ListeDesFacturesPrevisionnellesOCAction(), "customer.invoice.future.list");
|
670 |
} else {
|
681 |
} else {
|
671 |
|
682 |
|
672 |
mManager.putAction(new ListeSaisieVenteFactureAction(), "customer.invoice.list");
|
683 |
mManager.putAction(new ListeSaisieVenteFactureAction(), "customer.invoice.list");
|
- |
|
684 |
mManager.putAction(new ListeDesFacturesPrevisionnellesOCAction(), "customer.invoice.future.list");
|
673 |
}
|
685 |
}
|
674 |
|
686 |
|
675 |
mManager.putAction(new ListeDesAvoirsClientsAction(conf), "customer.credit.list");
|
687 |
mManager.putAction(new ListeDesAvoirsClientsAction(conf), "customer.credit.list");
|
676 |
mManager.putAction(new ListeDesFactureItemsAction(conf), "customer.invoice.details.list");
|
688 |
mManager.putAction(new ListeDesFactureItemsAction(conf), "customer.invoice.details.list");
|
- |
|
689 |
mManager.putAction(new ListeDesElementsBLAction(conf), "customer.deliver.details.list");
|
677 |
mManager.putAction(new ListeDesElementsDevisAction(conf), "sales.quote.element.list");
|
690 |
mManager.putAction(new ListeDesElementsDevisAction(conf), "sales.quote.element.list");
|
678 |
|
691 |
|
679 |
mManager.putAction(new ListeDesFournisseursAction(), "supplier.list");
|
692 |
mManager.putAction(new ListeDesFournisseursAction(), "supplier.list");
|
680 |
mManager.putAction(new ListeDesContactsFournisseursAction(), "supplier.contact.list");
|
693 |
mManager.putAction(new ListeDesContactsFournisseursAction(), "supplier.contact.list");
|
681 |
mManager.putAction(new NouvelHistoriqueListeFournAction(), "supplier.history");
|
694 |
mManager.putAction(new NouvelHistoriqueListeFournAction(), "supplier.history");
|
Line 719... |
Line 732... |
719 |
mManager.putAction(new NouveauClotureAction(), "accounting.closing");
|
732 |
mManager.putAction(new NouveauClotureAction(), "accounting.closing");
|
720 |
mManager.putAction(new ImportEcritureAction(), "accounting.import");
|
733 |
mManager.putAction(new ImportEcritureAction(), "accounting.import");
|
721 |
mManager.putAction(new ExportRelationExpertAction(), "accounting.export");
|
734 |
mManager.putAction(new ExportRelationExpertAction(), "accounting.export");
|
722 |
mManager.putAction(new ImportEcritureFECAction(), "accounting.import.fec");
|
735 |
mManager.putAction(new ImportEcritureFECAction(), "accounting.import.fec");
|
723 |
mManager.putAction(new ImportEcritureRImportAction(), "accounting.import.rimport");
|
736 |
mManager.putAction(new ImportEcritureRImportAction(), "accounting.import.rimport");
|
- |
|
737 |
if (configuration.isExperimental()) {
|
- |
|
738 |
mManager.putAction(new RelevesBancairesAction(this.configuration.getDirectory()), "accounting.bank.statement.list");
|
- |
|
739 |
}
|
724 |
}
|
740 |
}
|
725 |
|
741 |
|
726 |
public void registerStatsDocumentsActions(final MenuAndActions mManager) {
|
742 |
public void registerStatsDocumentsActions(final MenuAndActions mManager) {
|
727 |
// mManager.putAction("accounting.vat.report", new DeclarationTVAAction());
|
743 |
// mManager.putAction("accounting.vat.report", new DeclarationTVAAction());
|
728 |
mManager.putAction(new EtatChargeAction(), "accounting.costs.report");
|
744 |
mManager.putAction(new EtatChargeAction(), "accounting.costs.report");
|