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

nobody at svn.erp5.org nobody at svn.erp5.org
Fri Dec 7 18:35:50 CET 2007 

Author: jerome
Date: Fri Dec  7 18:35:50 2007
New Revision: 18141

URL: http://svn.erp5.org?rev=18141&view=rev
Log:
invoice_rule is needed in standalone accounting, move it back from erp5_invoicing to erp5_accounting

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/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=18141&r1=18140&r2=18141&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml (original)
+++ erp5/trunk/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml Fri Dec  7 18:35:50 2007
@@ -1,24 +1,19 @@
 <allowed_content_type_list>
  <portal_type id="Invoice Line">
+  <item>Invoice Cell</item>
   <item>Discount</item>
-  <item>Invoice Cell</item>
- </portal_type>
- <portal_type id="Invoice Rule">
-  <item>Category Divergence Tester</item>
-  <item>Quantity Divergence Tester</item>
-  <item>Property Divergence Tester</item>
  </portal_type>
  <portal_type id="Invoice Transaction Rule">
   <item>Category Divergence Tester</item>
+  <item>Accounting Rule Cell</item>
+  <item>Property Divergence Tester</item>
   <item>Quantity Divergence Tester</item>
   <item>Predicate</item>
-  <item>Accounting Rule Cell</item>
-  <item>Property Divergence Tester</item>
  </portal_type>
  <portal_type id="Invoicing Rule">
+  <item>Property Divergence Tester</item>
   <item>Category Divergence Tester</item>
   <item>Quantity Divergence Tester</item>
-  <item>Property Divergence Tester</item>
  </portal_type>
  <portal_type id="Purchase Invoice Transaction">
   <item>Discount</item>
@@ -26,13 +21,12 @@
   <item>Invoice Line</item>
  </portal_type>
  <portal_type id="Rule Tool">
-  <item>Invoice Rule</item>
   <item>Invoice Transaction Rule</item>
   <item>Invoicing Rule</item>
  </portal_type>
  <portal_type id="Sale Invoice Transaction">
+  <item>Discount</item>
   <item>Payment Condition</item>
-  <item>Discount</item>
   <item>Invoice Line</item>
  </portal_type>
 </allowed_content_type_list>

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=18141&r1=18140&r2=18141&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml (original)
+++ erp5/trunk/bt5/erp5_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml Fri Dec  7 18:35:50 2007
@@ -8,10 +8,6 @@
   <workflow>delivery_movement_simulation_interaction_workflow, pricing_interaction_workflow, trade_matrix_workflow, delivery_movement_causality_interaction_workflow, edit_workflow</workflow>
  </chain>
  <chain>
-  <type>Invoice Rule</type>
-  <workflow>edit_workflow, rule_validation_workflow</workflow>
- </chain>
- <chain>
   <type>Invoice Transaction Rule</type>
   <workflow>rule_interaction_workflow, rule_validation_workflow, edit_workflow</workflow>
  </chain>

Modified: erp5/trunk/bt5/erp5_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/revision?rev=18141&r1=18140&r2=18141&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision Fri Dec  7 18:35:50 2007
@@ -1,1 +1,1 @@
-6
+9

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=18141&r1=18140&r2=18141&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/template_action_path_list (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/template_action_path_list Fri Dec  7 18:35:50 2007
@@ -4,7 +4,6 @@
 Invoice Line | price
 Invoice Line | quantity
 Invoice Line | view
-Invoice Rule | view
 Invoice Transaction Rule | divergence
 Invoice Transaction Rule | view
 Invoicing 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=18141&r1=18140&r2=18141&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/template_path_list (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/template_path_list Fri Dec  7 18:35:50 2007
@@ -1,7 +1,5 @@
 portal_deliveries/sale_invoice_builder
 portal_deliveries/sale_invoice_transaction_builder
-portal_rules/default_invoice_rule
-portal_rules/default_invoice_rule/**
 portal_rules/default_invoice_transaction_rule
 portal_rules/default_invoice_transaction_rule/**
 portal_rules/default_invoicing_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=18141&r1=18140&r2=18141&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_allowed_content_type_list (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_allowed_content_type_list Fri Dec  7 18:35:50 2007
@@ -1,9 +1,6 @@
 Invoice Line | Discount
 Invoice Line | Invoice Cell
 Invoice Line | Invoice Cell
-Invoice Rule | Category Divergence Tester
-Invoice Rule | Property Divergence Tester
-Invoice Rule | Quantity Divergence Tester
 Invoice Transaction Rule | Accounting Rule Cell
 Invoice Transaction Rule | Category Divergence Tester
 Invoice Transaction Rule | Predicate
@@ -15,7 +12,6 @@
 Purchase Invoice Transaction | Discount
 Purchase Invoice Transaction | Invoice Line
 Purchase Invoice Transaction | Payment Condition
-Rule Tool | Invoice Rule
 Rule Tool | Invoice Transaction Rule
 Rule Tool | Invoicing Rule
 Sale Invoice Transaction | Discount

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=18141&r1=18140&r2=18141&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_id_list (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_id_list Fri Dec  7 18:35:50 2007
@@ -1,5 +1,4 @@
 Invoice Cell
 Invoice Line
-Invoice Rule
 Invoice Transaction Rule
 Invoicing 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=18141&r1=18140&r2=18141&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_workflow_chain_list (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_workflow_chain_list Fri Dec  7 18:35:50 2007
@@ -6,8 +6,6 @@
 Invoice Line | edit_workflow
 Invoice Line | pricing_interaction_workflow
 Invoice Line | trade_matrix_workflow
-Invoice Rule | edit_workflow
-Invoice Rule | rule_validation_workflow
 Invoice Transaction Rule | edit_workflow
 Invoice Transaction Rule | rule_interaction_workflow
 Invoice Transaction Rule | rule_validation_workflow

More information about the Erp5-report mailing list