diff --git a/bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/BusinessConfiguration_afterConfiguration.xml b/bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/BusinessConfiguration_afterConfiguration.xml index b89510868e65d37ff2b0dd22af7785ba39c716db..6cc51ff2f4071b1384b23efc41c2ff62156f102f 100644 --- a/bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/BusinessConfiguration_afterConfiguration.xml +++ b/bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/BusinessConfiguration_afterConfiguration.xml @@ -100,8 +100,6 @@ if business_template is not None:\n if obj.getPortalType() in (\'Person\', \n \'Organisation\', \n \'Account\', \n - \'Tax\',\n - \'Discount\', \n \'Service\', \'Product\',\n \'Sale Trade Condition\', \n \'Purchase Trade Condition\',\n @@ -157,8 +155,7 @@ module_business_application_map = {\'base\': (\'currency_module\',\n \'image_module\',\n \'document_ingestion_module\',\n \'web_page_module\',),\n - \'trade\': (\'discount_module\',\n - \'internal_packing_list_module\',\n + \'trade\': (\'internal_packing_list_module\',\n \'inventory_module\',\n \'purchase_order_module\',\n \'purchase_packing_list_module\',\n @@ -166,8 +163,7 @@ module_business_application_map = {\'base\': (\'currency_module\',\n \'returned_sale_packing_list_module\',\n \'sale_order_module\',\n \'sale_packing_list_module\',\n - \'sale_trade_condition_module\',\n - \'tax_module\',),\n + \'sale_trade_condition_module\'),\n \'pdm\': (\'component_module\',\n \'product_module\',\n \'purchase_supply_module\',\n diff --git a/bt5/erp5_configurator_standard/TestTemplateItem/testLiveStandardConfigurationWorkflow.py b/bt5/erp5_configurator_standard/TestTemplateItem/testLiveStandardConfigurationWorkflow.py index 2c3e4ee0d72e533aeb9f74ee7d4f2218da07edb5..00371684a0280e607b13eea6f98d5e5c7f14d164 100644 --- a/bt5/erp5_configurator_standard/TestTemplateItem/testLiveStandardConfigurationWorkflow.py +++ b/bt5/erp5_configurator_standard/TestTemplateItem/testLiveStandardConfigurationWorkflow.py @@ -1253,10 +1253,6 @@ class TestLiveStandardConfiguratorWorkflow(TestLiveConfiguratorWorkflowMixin): self.portal.internal_packing_list_module.getBusinessApplicationTitle()) self.assertEquals('Trade', self.portal.returned_sale_packing_list_module.getBusinessApplicationTitle()) - self.assertEquals('Trade', - self.portal.discount_module.getBusinessApplicationTitle()) - self.assertEquals('Trade', - self.portal.tax_module.getBusinessApplicationTitle()) self.assertEquals(set([self.portal.sale_order_module, self.portal.purchase_order_module, self.portal.sale_trade_condition_module, @@ -1266,8 +1262,6 @@ class TestLiveStandardConfiguratorWorkflow(TestLiveConfiguratorWorkflowMixin): self.portal.internal_packing_list_module, self.portal.returned_sale_packing_list_module, self.portal.inventory_module, - self.portal.discount_module, - self.portal.tax_module, ba.trade]), set(ba.trade.getBusinessApplicationRelatedValueList())) @@ -2659,18 +2653,6 @@ class TestLiveStandardConfiguratorWorkflow(TestLiveConfiguratorWorkflowMixin): self.failUnlessUserCanPassWorkflowTransition( username, 'confirm_action', pl) - def stepViewAccessTaxModule(self, sequence=None, sequence_list=None, **kw): - for username in self.all_username_list: - self.assertUserCanViewDocument(username, self.portal.tax_module) - self.assertUserCanAccessDocument(username, self.portal.tax_module) - self.assertUserCanAddDocument(username, self.portal.tax_module) - - def stepAddTax(self, sequence=None, sequence_list=None, **kw): - tax = self.portal.tax_module.newContent(portal_type='Tax') - for username in self.all_username_list: - self.assertUserCanViewDocument(username, tax) - self.assertUserCanAccessDocument(username, tax) - # }}} # web def stepWebSiteModule(self, sequence=None, sequence_list=None, **kw): @@ -2779,8 +2761,6 @@ class TestLiveStandardConfiguratorWorkflow(TestLiveConfiguratorWorkflowMixin): stepViewAccessAddSalePackingList stepViewAccessPurchaseOrder stepPurchasePackingList - stepViewAccessTaxModule - stepAddTax stepWebSiteModule stepPortalContributionsTool stepConfiguredPropertySheets diff --git a/bt5/erp5_configurator_standard/bt/revision b/bt5/erp5_configurator_standard/bt/revision index 18133faa4c390be86679ce450d86d69567bfcf5c..51f1d23291ee8e7a7a03ec643d5727a7859d7188 100644 --- a/bt5/erp5_configurator_standard/bt/revision +++ b/bt5/erp5_configurator_standard/bt/revision @@ -1 +1 @@ -564 \ No newline at end of file +566 \ No newline at end of file