[Erp5-report] r28503 - in /erp5/trunk/bt5/erp5_invoicing: PortalTypeAllowedContentTypeTempl...

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Aug 20 15:04:22 2009
New Revision: 28503

URL: http://svn.erp5.org?rev=28503&view=rev
Log:
2009-08-20 Jérome
* Move out old tax and discount system.

Modified:
    erp5/trunk/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
    erp5/trunk/bt5/erp5_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
    erp5/trunk/bt5/erp5_invoicing/bt/change_log
    erp5/trunk/bt5/erp5_invoicing/bt/revision
    erp5/trunk/bt5/erp5_invoicing/bt/template_action_path_list
    erp5/trunk/bt5/erp5_invoicing/bt/template_path_list
    erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_allowed_content_type_list
    erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_id_list
    erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_workflow_chain_list

Modified: erp5/trunk/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml?rev=28503&r1=28502&r2=28503&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml [utf8] Thu Aug 20 15:04:22 2009
@@ -18,13 +18,7 @@
  <portal_type id="Rule Tool">
   <item>Invoicing Rule</item>
   <item>Trade Model Rule</item>
-  <item>Tax Rule</item>
   <item>Invoice Transaction Rule</item>
- </portal_type>
- <portal_type id="Tax Rule">
-  <item>Property Divergence Tester</item>
-  <item>Category Divergence Tester</item>
-  <item>Quantity Divergence Tester</item>
  </portal_type>
  <portal_type id="Trade Model Rule">
   <item>Category Divergence Tester</item>

Modified: erp5/trunk/bt5/erp5_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml?rev=28503&r1=28502&r2=28503&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml [utf8] Thu Aug 20 15:04:22 2009
@@ -1,11 +1,11 @@
 <workflow_chain>
  <chain>
   <type>Invoice Cell</type>
-  <workflow>pricing_interaction_workflow, delivery_movement_account_interaction_workflow, delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow, tax_interaction_workflow, edit_workflow</workflow>
+  <workflow>pricing_interaction_workflow, delivery_movement_account_interaction_workflow, delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow, edit_workflow</workflow>
  </chain>
  <chain>
   <type>Invoice Line</type>
-  <workflow>delivery_movement_simulation_interaction_workflow, delivery_movement_account_interaction_workflow, pricing_interaction_workflow, tax_interaction_workflow, trade_matrix_workflow, delivery_movement_causality_interaction_workflow, edit_workflow</workflow>
+  <workflow>delivery_movement_simulation_interaction_workflow, delivery_movement_account_interaction_workflow, pricing_interaction_workflow, trade_matrix_workflow, delivery_movement_causality_interaction_workflow, edit_workflow</workflow>
  </chain>
  <chain>
   <type>Invoice Transaction Rule</type>
@@ -16,20 +16,12 @@
   <workflow>edit_workflow, rule_validation_workflow</workflow>
  </chain>
  <chain>
-  <type>Purchase Invoice Transaction</type>
-  <workflow>delivery_tax_interaction_workflow</workflow>
- </chain>
- <chain>
   <type>Purchase Order Cell</type>
   <workflow>delivery_movement_account_interaction_workflow</workflow>
  </chain>
  <chain>
   <type>Purchase Order Line</type>
   <workflow>delivery_movement_account_interaction_workflow</workflow>
- </chain>
- <chain>
-  <type>Sale Invoice Transaction</type>
-  <workflow>delivery_tax_interaction_workflow</workflow>
  </chain>
  <chain>
   <type>Sale Order Cell</type>

Modified: erp5/trunk/bt5/erp5_invoicing/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/change_log?rev=28503&r1=28502&r2=28503&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/change_log [utf8] Thu Aug 20 15:04:22 2009
@@ -1,3 +1,6 @@
+2009-08-20 Jérome
+* Move out old tax and discount system.
+
 2009-07-09 tatuya
 * Append Japanese localized invoice style-sheet  fixing font setting. To avoid hand modification after printing Japanese invoice.
 

Modified: erp5/trunk/bt5/erp5_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/revision?rev=28503&r1=28502&r2=28503&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] Thu Aug 20 15:04:22 2009
@@ -1,1 +1,1 @@
-281
+283

Modified: erp5/trunk/bt5/erp5_invoicing/bt/template_action_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/template_action_path_list?rev=28503&r1=28502&r2=28503&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/template_action_path_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/template_action_path_list [utf8] Thu Aug 20 15:04:22 2009
@@ -5,5 +5,4 @@
 Invoice Transaction Rule | divergence
 Invoice Transaction Rule | view
 Invoicing Rule | view
-Tax Rule | view
 Trade Model Rule | view

Modified: erp5/trunk/bt5/erp5_invoicing/bt/template_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/template_path_list?rev=28503&r1=28502&r2=28503&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/template_path_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/template_path_list [utf8] Thu Aug 20 15:04:22 2009
@@ -4,7 +4,5 @@
 portal_rules/default_invoice_transaction_rule/**
 portal_rules/default_invoicing_rule
 portal_rules/default_invoicing_rule/**
-portal_rules/default_tax_rule
-portal_rules/default_tax_rule/**
 portal_rules/default_trade_model_rule
 portal_rules/default_trade_model_rule/**

Modified: erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_allowed_content_type_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_allowed_content_type_list?rev=28503&r1=28502&r2=28503&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_allowed_content_type_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_allowed_content_type_list [utf8] Thu Aug 20 15:04:22 2009
@@ -10,11 +10,7 @@
 Invoicing Rule | Quantity Divergence Tester
 Rule Tool | Invoice Transaction Rule
 Rule Tool | Invoicing Rule
-Rule Tool | Tax Rule
 Rule Tool | Trade Model Rule
-Tax Rule | Category Divergence Tester
-Tax Rule | Property Divergence Tester
-Tax Rule | Quantity Divergence Tester
 Trade Model Rule | Category Divergence Tester
 Trade Model Rule | Property Divergence Tester
 Trade Model Rule | Quantity Divergence Tester

Modified: erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_id_list?rev=28503&r1=28502&r2=28503&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_id_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_id_list [utf8] Thu Aug 20 15:04:22 2009
@@ -2,5 +2,4 @@
 Invoice Line
 Invoice Transaction Rule
 Invoicing Rule
-Tax Rule
 Trade Model Rule

Modified: erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_workflow_chain_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_workflow_chain_list?rev=28503&r1=28502&r2=28503&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_workflow_chain_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_workflow_chain_list [utf8] Thu Aug 20 15:04:22 2009
@@ -3,23 +3,19 @@
 Invoice Cell | delivery_movement_simulation_interaction_workflow
 Invoice Cell | edit_workflow
 Invoice Cell | pricing_interaction_workflow
-Invoice Cell | tax_interaction_workflow
 Invoice Line | delivery_movement_account_interaction_workflow
 Invoice Line | delivery_movement_causality_interaction_workflow
 Invoice Line | delivery_movement_simulation_interaction_workflow
 Invoice Line | edit_workflow
 Invoice Line | pricing_interaction_workflow
-Invoice Line | tax_interaction_workflow
 Invoice Line | trade_matrix_workflow
 Invoice Transaction Rule | edit_workflow
 Invoice Transaction Rule | rule_interaction_workflow
 Invoice Transaction Rule | rule_validation_workflow
 Invoicing Rule | edit_workflow
 Invoicing Rule | rule_validation_workflow
-Purchase Invoice Transaction | delivery_tax_interaction_workflow
 Purchase Order Cell | delivery_movement_account_interaction_workflow
 Purchase Order Line | delivery_movement_account_interaction_workflow
-Sale Invoice Transaction | delivery_tax_interaction_workflow
 Sale Order Cell | delivery_movement_account_interaction_workflow
 Sale Order Line | delivery_movement_account_interaction_workflow
 Tax Rule | edit_workflow