[Erp5-report] r20466 - in /erp5/trunk/bt5/erp5_invoicing: ActionTemplateItem/portal_types/P...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Apr 14 11:04:52 CEST 2008
Author: jerome
Date: Mon Apr 14 11:04:50 2008
New Revision: 20466
URL: http://svn.erp5.org?rev=20466&view=rev
Log:
Add tax system on invoices, and update builder and scripts to generate tax lines from orders.
Added:
erp5/trunk/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_tax.xml
erp5/trunk/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/view_tax.xml
erp5/trunk/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Tax%20Rule/
erp5/trunk/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Tax%20Rule/view.xml
erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_tax_builder.xml
erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_tax_builder.xml
erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_tax_rule/
erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_tax_rule.xml
erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_tax_rule/1.xml
erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_tax_rule/3.xml
erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Tax%20Rule.xml
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTaxRule.xml
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/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectDelivery.xml
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionRule.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
Added: erp5/trunk/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_tax.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Purchase%2520Invoice%2520Transaction/view_tax.xml?rev=20466&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_tax.xml (added)
+++ erp5/trunk/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_tax.xml Mon Apr 14 11:04:50 2008
@@ -1,0 +1,83 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>action</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>category</string> </key>
+ <value> <string>object_view</string> </value>
+ </item>
+ <item>
+ <key> <string>condition</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>icon</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>view_tax</string> </value>
+ </item>
+ <item>
+ <key> <string>permissions</string> </key>
+ <value>
+ <tuple>
+ <string>View</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>priority</string> </key>
+ <value> <float>4.5</float> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Tax</string> </value>
+ </item>
+ <item>
+ <key> <string>visible</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>text</string> </key>
+ <value> <string>string:${object_url}/Delivery_viewTax</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/view_tax.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Sale%2520Invoice%2520Transaction/view_tax.xml?rev=20466&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/view_tax.xml (added)
+++ erp5/trunk/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/view_tax.xml Mon Apr 14 11:04:50 2008
@@ -1,0 +1,83 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>action</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>category</string> </key>
+ <value> <string>object_view</string> </value>
+ </item>
+ <item>
+ <key> <string>condition</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>icon</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>view_tax</string> </value>
+ </item>
+ <item>
+ <key> <string>permissions</string> </key>
+ <value>
+ <tuple>
+ <string>View</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>priority</string> </key>
+ <value> <float>4.5</float> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Tax</string> </value>
+ </item>
+ <item>
+ <key> <string>visible</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>text</string> </key>
+ <value> <string>string:${object_url}/Delivery_viewTax</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Tax%20Rule/view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Tax%2520Rule/view.xml?rev=20466&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Tax%20Rule/view.xml (added)
+++ erp5/trunk/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Tax%20Rule/view.xml Mon Apr 14 11:04:50 2008
@@ -1,0 +1,83 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>action</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>category</string> </key>
+ <value> <string>object_view</string> </value>
+ </item>
+ <item>
+ <key> <string>condition</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>icon</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>view</string> </value>
+ </item>
+ <item>
+ <key> <string>permissions</string> </key>
+ <value>
+ <tuple>
+ <string>View</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>priority</string> </key>
+ <value> <float>1.0</float> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>View</string> </value>
+ </item>
+ <item>
+ <key> <string>visible</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>text</string> </key>
+ <value> <string>string:${object_url}/Rule_view</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_tax_builder.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_tax_builder.xml?rev=20466&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_tax_builder.xml (added)
+++ erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_tax_builder.xml Mon Apr 14 11:04:50 2008
@@ -1,0 +1,220 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_count</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_mt_index</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_tree</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>collect_order</string> </key>
+ <value>
+ <tuple>
+ <string>OrderMovementGroup</string>
+ <string>PathMovementGroup</string>
+ <string>DateMovementGroup</string>
+ <string>ResourceMovementGroup</string>
+ <string>VariantMovementGroup</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>collect_order_list</string> </key>
+ <value>
+ <list>
+ <string>test</string>
+ <string>test2</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>collect_order_list_id</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>comment</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>delivery_after_generation_method_id</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>delivery_after_generation_script_id</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>delivery_cell_collect_order</string> </key>
+ <value>
+ <tuple>
+ <string>VariantMovementGroup</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>delivery_cell_portal_type</string> </key>
+ <value> <string>Invoice Cell</string> </value>
+ </item>
+ <item>
+ <key> <string>delivery_cell_separate_order</string> </key>
+ <value>
+ <tuple>
+ <string>calculateSeparatePrice</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>delivery_collect_order</string> </key>
+ <value>
+ <tuple>
+ <string>CausalityMovementGroup</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>delivery_line_collect_order</string> </key>
+ <value>
+ <tuple>
+ <string>ResourceMovementGroup</string>
+ <string>BaseVariantMovementGroup</string>
+ <string>BaseApplicationMovementGroup</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>delivery_line_portal_type</string> </key>
+ <value> <string>Tax Line</string> </value>
+ </item>
+ <item>
+ <key> <string>delivery_module</string> </key>
+ <value> <string>accounting_module</string> </value>
+ </item>
+ <item>
+ <key> <string>delivery_portal_type</string> </key>
+ <value> <string>Purchase Invoice Transaction</string> </value>
+ </item>
+ <item>
+ <key> <string>delivery_select_method_id</string> </key>
+ <value> <string>InvoiceTransaction_selectDelivery</string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string>Add Tax Lines in Purchase Invoices</string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>purchase_invoice_tax_builder</string> </value>
+ </item>
+ <item>
+ <key> <string>last_id</string> </key>
+ <value> <string>1</string> </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Delivery Builder</string> </value>
+ </item>
+ <item>
+ <key> <string>resource_portal_type</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>simulation_select_method_id</string> </key>
+ <value> <string>Invoice_selectTaxMovementList</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Purchase Invoice Tax Builder</string> </value>
+ </item>
+ <item>
+ <key> <string>uid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.Length</string>
+ <string>Length</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle> <int>0</int> </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.OOBTree</string>
+ <string>OOBTree</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+ <record id="4" aka="AAAAAAAAAAQ=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.OOBTree</string>
+ <string>OOBTree</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_tax_builder.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_tax_builder.xml?rev=20466&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_tax_builder.xml (added)
+++ erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_tax_builder.xml Mon Apr 14 11:04:50 2008
@@ -1,0 +1,220 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_count</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_mt_index</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_tree</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>collect_order</string> </key>
+ <value>
+ <tuple>
+ <string>OrderMovementGroup</string>
+ <string>PathMovementGroup</string>
+ <string>DateMovementGroup</string>
+ <string>ResourceMovementGroup</string>
+ <string>VariantMovementGroup</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>collect_order_list</string> </key>
+ <value>
+ <list>
+ <string>test</string>
+ <string>test2</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>collect_order_list_id</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>comment</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>delivery_after_generation_method_id</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>delivery_after_generation_script_id</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>delivery_cell_collect_order</string> </key>
+ <value>
+ <tuple>
+ <string>VariantMovementGroup</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>delivery_cell_portal_type</string> </key>
+ <value> <string>Invoice Cell</string> </value>
+ </item>
+ <item>
+ <key> <string>delivery_cell_separate_order</string> </key>
+ <value>
+ <tuple>
+ <string>calculateSeparatePrice</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>delivery_collect_order</string> </key>
+ <value>
+ <tuple>
+ <string>CausalityMovementGroup</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>delivery_line_collect_order</string> </key>
+ <value>
+ <tuple>
+ <string>ResourceMovementGroup</string>
+ <string>BaseVariantMovementGroup</string>
+ <string>BaseApplicationMovementGroup</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>delivery_line_portal_type</string> </key>
+ <value> <string>Tax Line</string> </value>
+ </item>
+ <item>
+ <key> <string>delivery_module</string> </key>
+ <value> <string>accounting_module</string> </value>
+ </item>
+ <item>
+ <key> <string>delivery_portal_type</string> </key>
+ <value> <string>Sale Invoice Transaction</string> </value>
+ </item>
+ <item>
+ <key> <string>delivery_select_method_id</string> </key>
+ <value> <string>InvoiceTransaction_selectDelivery</string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string>Add Tax Lines in Sale Invoices</string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>sale_invoice_tax_builder</string> </value>
+ </item>
+ <item>
+ <key> <string>last_id</string> </key>
+ <value> <string>1</string> </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Delivery Builder</string> </value>
+ </item>
+ <item>
+ <key> <string>resource_portal_type</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>simulation_select_method_id</string> </key>
+ <value> <string>Invoice_selectTaxMovementList</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Sale Invoice Tax Builder</string> </value>
+ </item>
+ <item>
+ <key> <string>uid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.Length</string>
+ <string>Length</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle> <int>0</int> </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.OOBTree</string>
+ <string>OOBTree</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+ <record id="4" aka="AAAAAAAAAAQ=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>BTrees.OOBTree</string>
+ <string>OOBTree</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_tax_rule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_tax_rule.xml?rev=20466&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_tax_rule.xml (added)
+++ erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_tax_rule.xml Mon Apr 14 11:04:50 2008
@@ -1,0 +1,135 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="TaxRule" module="Products.ERP5Type.Document.TaxRule"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_Add_portal_content_Permission</string> </key>
+ <value>
+ <tuple>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>_Delete_objects_Permission</string> </key>
+ <value>
+ <tuple>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>_Modify_portal_content_Permission</string> </key>
+ <value>
+ <tuple>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_count</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_folder_handler</string> </key>
+ <value> <string>CMFBTreeFolderHandler</string> </value>
+ </item>
+ <item>
+ <key> <string>_identity_criterion</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_mt_index</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_range_criterion</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_tree</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>default_reference</string> </key>
+ <value> <string>default_tax_rule</string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>default_tax_rule</string> </value>
+ </item>
+ <item>
+ <key> <string>last_id</string> </key>
+ <value> <string>3</string> </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Tax Rule</string> </value>
+ </item>
+ <item>
+ <key> <string>test_method_id</string> </key>
+ <value>
+ <tuple>
+ <string>SimulationMovement_testTaxRule</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>uid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>version</string> </key>
+ <value> <string>1</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="Length" module="BTrees.Length"/>
+ </pickle>
+ <pickle> <int>0</int> </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <global name="OOBTree" module="BTrees._OOBTree"/>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+ <record id="4" aka="AAAAAAAAAAQ=">
+ <pickle>
+ <global name="OOBTree" module="BTrees._OOBTree"/>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_tax_rule/1.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_tax_rule/1.xml?rev=20466&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_tax_rule/1.xml (added)
+++ erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_tax_rule/1.xml Mon Apr 14 11:04:50 2008
@@ -1,0 +1,35 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="QuantityDivergenceTester" module="Products.ERP5Type.Document.QuantityDivergenceTester"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>1</string> </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Quantity Divergence Tester</string> </value>
+ </item>
+ <item>
+ <key> <string>uid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_tax_rule/3.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_tax_rule/3.xml?rev=20466&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_tax_rule/3.xml (added)
+++ erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_tax_rule/3.xml Mon Apr 14 11:04:50 2008
@@ -1,0 +1,56 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="CategoryDivergenceTester" module="Products.ERP5Type.Document.CategoryDivergenceTester"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>3</string> </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Category Divergence Tester</string> </value>
+ </item>
+ <item>
+ <key> <string>solver_script</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>tested_property</string> </key>
+ <value>
+ <tuple>
+ <string>base_application | Base Application</string>
+ <string>resource | Resource</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>uid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
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=20466&r1=20465&r2=20466&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml (original)
+++ erp5/trunk/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml Mon Apr 14 11:04:50 2008
@@ -4,28 +4,36 @@
</portal_type>
<portal_type id="Invoice Transaction Rule">
<item>Category Divergence Tester</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>
<item>Payment Condition</item>
+ <item>Tax Line</item>
<item>Invoice Line</item>
</portal_type>
<portal_type id="Rule Tool">
<item>Invoice Transaction Rule</item>
<item>Invoicing Rule</item>
+ <item>Tax Rule</item>
</portal_type>
<portal_type id="Sale Invoice Transaction">
+ <item>Payment Condition</item>
<item>Discount</item>
- <item>Payment Condition</item>
+ <item>Tax Line</item>
<item>Invoice Line</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>
</allowed_content_type_list>
Added: erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Tax%20Rule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Tax%2520Rule.xml?rev=20466&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Tax%20Rule.xml (added)
+++ erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Tax%20Rule.xml Mon Apr 14 11:04:50 2008
@@ -1,0 +1,176 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_actions</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_aliases</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_property_domain_dict</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>short_title</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>_roles</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>acquire_local_roles</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>allowed_content_types</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>base_category_list</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>content_icon</string> </key>
+ <value> <string>rule_icon.gif</string> </value>
+ </item>
+ <item>
+ <key> <string>content_meta_type</string> </key>
+ <value> <string>ERP5 Tax Rule</string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>factory</string> </key>
+ <value> <string>addTaxRule</string> </value>
+ </item>
+ <item>
+ <key> <string>filter_content_types</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>group_list</string> </key>
+ <value>
+ <tuple>
+ <string>rule</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>hidden_content_type_list</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>Tax Rule</string> </value>
+ </item>
+ <item>
+ <key> <string>init_script</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>permission</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>property_sheet_list</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>domain_name</string> </key>
+ <value> <string>erp5_content</string> </value>
+ </item>
+ <item>
+ <key> <string>property_name</string> </key>
+ <value> <string>short_title</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>domain_name</string> </key>
+ <value> <string>erp5_content</string> </value>
+ </item>
+ <item>
+ <key> <string>property_name</string> </key>
+ <value> <string>title</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
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=20466&r1=20465&r2=20466&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml (original)
+++ erp5/trunk/bt5/erp5_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml Mon Apr 14 11:04:50 2008
@@ -1,11 +1,11 @@
<workflow_chain>
<chain>
<type>Invoice Cell</type>
- <workflow>delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow, edit_workflow</workflow>
+ <workflow>delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow, tax_interaction_workflow, edit_workflow</workflow>
</chain>
<chain>
<type>Invoice Line</type>
- <workflow>delivery_movement_simulation_interaction_workflow, pricing_interaction_workflow, trade_matrix_workflow, delivery_movement_causality_interaction_workflow, edit_workflow</workflow>
+ <workflow>delivery_movement_simulation_interaction_workflow, tax_interaction_workflow, pricing_interaction_workflow, trade_matrix_workflow, delivery_movement_causality_interaction_workflow, edit_workflow</workflow>
</chain>
<chain>
<type>Invoice Transaction Rule</type>
@@ -15,4 +15,8 @@
<type>Invoicing Rule</type>
<workflow>rule_validation_workflow, edit_workflow</workflow>
</chain>
+ <chain>
+ <type>Tax Rule</type>
+ <workflow>edit_workflow, rule_validation_workflow</workflow>
+ </chain>
</workflow_chain>
Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectDelivery.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectDelivery.xml?rev=20466&r1=20465&r2=20466&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectDelivery.xml (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectDelivery.xml Mon Apr 14 11:04:50 2008
@@ -71,23 +71,29 @@
# in which creating new Invoice Transaction Lines.\n
#\n
\n
-LOG = lambda msg: context.log("InvoiceTransaction_selectDelivery", msg)\n
-LOG = lambda msg: "disabled"\n
+deliveries_keys = {}\n
+for movement in movement_list:\n
+ ar = movement.getParentValue()\n
+ line = None\n
\n
-LOG("movements = %s" % movement_list)\n
+ # case of tax movement \n
+ if ar.getSpecialiseValue().getPortalType() == \'Tax Rule\':\n
+ for other_rule in ar.getParentValue().contentValues():\n
+ if other_rule == ar:\n
+ continue\n
+ for sm in other_rule.contentValues():\n
+ line = sm.getDeliveryValue()\n
\n
-deliveries_keys = {}\n
-for movement in movement_list :\n
# in case of invoice rule (ie. starting from Invoice)\n
- line = movement.getParentValue().getParentValue().getOrderValue()\n
+ if line is None:\n
+ line = ar.getParentValue().getOrderValue()\n
\n
- if line is None : \n
- # in case of invoicing rule (ie. starting from Order)\n
+ # in case of invoicing rule (ie. starting from Order)\n
+ if line is None:\n
line = movement.getParentValue().getParentValue().getDeliveryValue()\n
\n
deliveries_keys[line.getExplanationValue()] = 1\n
\n
-LOG("deliveries = %s" % deliveries_keys.keys())\n
return filter(lambda x : x is not None, deliveries_keys.keys())\n
</string> </value>
</item>
@@ -139,13 +145,15 @@
<tuple>
<string>movement_list</string>
<string>kw</string>
- <string>LOG</string>
<string>deliveries_keys</string>
<string>_getiter_</string>
<string>movement</string>
<string>_getattr_</string>
+ <string>ar</string>
+ <string>None</string>
<string>line</string>
- <string>None</string>
+ <string>other_rule</string>
+ <string>sm</string>
<string>_write_</string>
<string>filter</string>
</tuple>
Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionRule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionRule.xml?rev=20466&r1=20465&r2=20466&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionRule.xml (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionRule.xml Mon Apr 14 11:04:50 2008
@@ -76,7 +76,9 @@
return False\n
\n
delivery_movement = movement.getDeliveryValue()\n
-if delivery_movement is not None and delivery_movement.getPortalType() not in movement.getPortalInvoiceMovementTypeList():\n
+if delivery_movement is not None and (\n
+ delivery_movement.getPortalType() not in movement.getPortalInvoiceMovementTypeList()\n
+ and delivery_movement.getPortalType() not in movement.getPortalTaxMovementTypeList()):\n
return False\n
\n
return rule.getMatchingCell(movement) is not None\n
Added: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTaxRule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTaxRule.xml?rev=20466&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTaxRule.xml (added)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTaxRule.xml Mon Apr 14 11:04:50 2008
@@ -1,0 +1,160 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Python_magic</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>movement = context\n
+\n
+parent = movement.getParentValue()\n
+if parent.getPortalType() == \'Applied Rule\':\n
+ parent_rule = parent.getSpecialiseValue()\n
+ if parent_rule.getPortalType() not in [\'Delivery Rule\', \'Order Rule\']:\n
+ return False\n
+\n
+return True\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_filepath</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>rule</string> </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>rule</string>
+<string>context</string>
+ <string>movement</string>
+ <string>_getattr_</string>
+ <string>parent</string>
+ <string>parent_rule</string>
+ <string>False</string>
+ <string>True</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>SimulationMovement_testTaxRule</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/revision?rev=20466&r1=20465&r2=20466&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision Mon Apr 14 11:04:50 2008
@@ -1,1 +1,1 @@
-36
+47
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=20466&r1=20465&r2=20466&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/template_action_path_list (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/template_action_path_list Mon Apr 14 11:04:50 2008
@@ -5,8 +5,11 @@
Invoice Transaction Rule | view
Invoicing Rule | view
Purchase Invoice Transaction | view_invoice
+Purchase Invoice Transaction | view_tax
Sale Invoice Transaction | invoice_item_list
Sale Invoice Transaction | jump_to_related_sale_packing_list
Sale Invoice Transaction | payment_condition
Sale Invoice Transaction | trade_condition_discount
-Sale Invoice Transaction | trade_condition_profile_view
+Sale Invoice Transaction | trade_condition_profile_view
+Sale Invoice Transaction | view_tax
+Tax 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=20466&r1=20465&r2=20466&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/template_path_list (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/template_path_list Mon Apr 14 11:04:50 2008
@@ -1,9 +1,13 @@
portal_deliveries/payment_transaction_builder
portal_deliveries/purchase_invoice_builder
+portal_deliveries/purchase_invoice_tax_builder
portal_deliveries/purchase_invoice_transaction_builder
portal_deliveries/sale_invoice_builder
+portal_deliveries/sale_invoice_tax_builder
portal_deliveries/sale_invoice_transaction_builder
portal_rules/default_invoice_transaction_rule
portal_rules/default_invoice_transaction_rule/**
portal_rules/default_invoicing_rule
-portal_rules/default_invoicing_rule/**
+portal_rules/default_invoicing_rule/**
+portal_rules/default_tax_rule
+portal_rules/default_tax_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=20466&r1=20465&r2=20466&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 Mon Apr 14 11:04:50 2008
@@ -10,8 +10,14 @@
Purchase Invoice Transaction | Discount
Purchase Invoice Transaction | Invoice Line
Purchase Invoice Transaction | Payment Condition
+Purchase Invoice Transaction | Tax Line
Rule Tool | Invoice Transaction Rule
Rule Tool | Invoicing Rule
+Rule Tool | Tax Rule
Sale Invoice Transaction | Discount
Sale Invoice Transaction | Invoice Line
-Sale Invoice Transaction | Payment Condition
+Sale Invoice Transaction | Payment Condition
+Sale Invoice Transaction | Tax Line
+Tax Rule | Category Divergence Tester
+Tax Rule | Property Divergence Tester
+Tax 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=20466&r1=20465&r2=20466&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 Mon Apr 14 11:04:50 2008
@@ -1,4 +1,5 @@
Invoice Cell
Invoice Line
Invoice Transaction Rule
-Invoicing Rule
+Invoicing Rule
+Tax 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=20466&r1=20465&r2=20466&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 Mon Apr 14 11:04:50 2008
@@ -1,13 +1,17 @@
Invoice Cell | delivery_movement_causality_interaction_workflow
Invoice Cell | delivery_movement_simulation_interaction_workflow
Invoice Cell | edit_workflow
+Invoice Cell | tax_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
+Invoicing Rule | rule_validation_workflow
+Tax Rule | edit_workflow
+Tax Rule | rule_validation_workflow
More information about the Erp5-report
mailing list