[Erp5-report] r42154 rafael - in /erp5/trunk/bt5/erp5_configurator_standard: SkinTemplateIt...

nobody at svn.erp5.org nobody at svn.erp5.org
Sun Jan 9 01:30:29 CET 2011


Author: rafael
Date: Sun Jan  9 01:30:29 2011
New Revision: 42154

URL: http://svn.erp5.org?rev=42154&view=rev
Log:
Drop support to old discount and Tax legacy.

Modified:
    erp5/trunk/bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/BusinessConfiguration_afterConfiguration.xml
    erp5/trunk/bt5/erp5_configurator_standard/TestTemplateItem/testLiveStandardConfigurationWorkflow.py
    erp5/trunk/bt5/erp5_configurator_standard/bt/revision

Modified: erp5/trunk/bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/BusinessConfiguration_afterConfiguration.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/BusinessConfiguration_afterConfiguration.xml?rev=42154&r1=42153&r2=42154&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/BusinessConfiguration_afterConfiguration.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/BusinessConfiguration_afterConfiguration.xml [utf8] Sun Jan  9 01:30:29 2011
@@ -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 = {\'bas
                                            \'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 = {\'bas
                                              \'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

Modified: erp5/trunk/bt5/erp5_configurator_standard/TestTemplateItem/testLiveStandardConfigurationWorkflow.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_configurator_standard/TestTemplateItem/testLiveStandardConfigurationWorkflow.py?rev=42154&r1=42153&r2=42154&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_configurator_standard/TestTemplateItem/testLiveStandardConfigurationWorkflow.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_configurator_standard/TestTemplateItem/testLiveStandardConfigurationWorkflow.py [utf8] Sun Jan  9 01:30:29 2011
@@ -1253,10 +1253,6 @@ class TestLiveStandardConfiguratorWorkfl
         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 TestLiveStandardConfiguratorWorkfl
                        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 TestLiveStandardConfiguratorWorkfl
       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 TestLiveStandardConfiguratorWorkfl
       stepViewAccessAddSalePackingList
       stepViewAccessPurchaseOrder
       stepPurchasePackingList
-      stepViewAccessTaxModule
-      stepAddTax
       stepWebSiteModule
       stepPortalContributionsTool
       stepConfiguredPropertySheets

Modified: erp5/trunk/bt5/erp5_configurator_standard/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_configurator_standard/bt/revision?rev=42154&r1=42153&r2=42154&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_configurator_standard/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_configurator_standard/bt/revision [utf8] Sun Jan  9 01:30:29 2011
@@ -1 +1 @@
-564
\ No newline at end of file
+566
\ No newline at end of file



More information about the Erp5-report mailing list