[Erp5-report] r27880 - in /erp5/trunk/bt5/erp5_simplified_invoicing: ActionTemplateItem/por...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Jul 2 18:04:53 CEST 2009
Author: luke
Date: Thu Jul 2 18:04:53 2009
New Revision: 27880
URL: http://svn.erp5.org?rev=27880&view=rev
Log:
- move invoice related parts from erp5_bpm
Added:
erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_trade_model.xml
erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_trade_model_line_list.xml
erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/view_trade_model.xml
erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/view_trade_model_line_list.xml
Modified:
erp5/trunk/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_builder/category_movement_group_on_line.xml
erp5/trunk/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/causality_movement_group_on_delivery.xml
erp5/trunk/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_line.xml
erp5/trunk/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/causality_movement_group_on_delivery.xml
erp5/trunk/bt5/erp5_simplified_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
erp5/trunk/bt5/erp5_simplified_invoicing/bt/revision
erp5/trunk/bt5/erp5_simplified_invoicing/bt/template_action_path_list
erp5/trunk/bt5/erp5_simplified_invoicing/bt/template_portal_type_allowed_content_type_list
Added: erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_trade_model.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%2520Invoice%2520Transaction/view_trade_model.xml?rev=27880&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_trade_model.xml (added)
+++ erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_trade_model.xml [utf8] Thu Jul 2 18:04:53 2009
@@ -1,0 +1,77 @@
+<?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>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_trade_model</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>3.4</float> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Trade Model</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_viewAggregatedAmountList</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_trade_model_line_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%2520Invoice%2520Transaction/view_trade_model_line_list.xml?rev=27880&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_trade_model_line_list.xml (added)
+++ erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_trade_model_line_list.xml [utf8] Thu Jul 2 18:04:53 2009
@@ -1,0 +1,77 @@
+<?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>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_trade_model_line_list</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>3.3</float> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Trade Model Lines</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_viewTradeModelLineList</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/view_trade_model.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%2520Invoice%2520Transaction/view_trade_model.xml?rev=27880&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/view_trade_model.xml (added)
+++ erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/view_trade_model.xml [utf8] Thu Jul 2 18:04:53 2009
@@ -1,0 +1,77 @@
+<?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>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_trade_model</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>3.4</float> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Trade Model</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_viewAggregatedAmountList</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/view_trade_model_line_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%2520Invoice%2520Transaction/view_trade_model_line_list.xml?rev=27880&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/view_trade_model_line_list.xml (added)
+++ erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/view_trade_model_line_list.xml [utf8] Thu Jul 2 18:04:53 2009
@@ -1,0 +1,77 @@
+<?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>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_trade_model_line_list</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>3.3</float> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Trade Model Lines</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_viewTradeModelLineList</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_builder/category_movement_group_on_line.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_builder/category_movement_group_on_line.xml?rev=27880&r1=27879&r2=27880&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_builder/category_movement_group_on_line.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_builder/category_movement_group_on_line.xml [utf8] Thu Jul 2 18:04:53 2009
@@ -44,6 +44,7 @@
<string>aggregate</string>
<string>quantity_unit</string>
<string>base_contribution</string>
+ <string>base_application</string>
<string>source_function</string>
<string>destination_function</string>
<string>source_account</string>
Modified: erp5/trunk/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/causality_movement_group_on_delivery.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/causality_movement_group_on_delivery.xml?rev=27880&r1=27879&r2=27880&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/causality_movement_group_on_delivery.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/purchase_invoice_transaction_builder/causality_movement_group_on_delivery.xml [utf8] Thu Jul 2 18:04:53 2009
@@ -3,7 +3,7 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="CausalityMovementGroup" module="Products.ERP5Type.Document.CausalityMovementGroup"/>
+ <global name="FirstCausalityMovementGroup" module="Products.ERP5Type.Document.FirstCausalityMovementGroup"/>
<tuple/>
</tuple>
</pickle>
@@ -19,9 +19,7 @@
</item>
<item>
<key> <string>description</string> </key>
- <value>
- <none/>
- </value>
+ <value> <string>BPM modification - used instead of Causality Movement Group to group orphaned parent movements coming from invoice</string> </value>
</item>
<item>
<key> <string>id</string> </key>
@@ -33,11 +31,11 @@
</item>
<item>
<key> <string>portal_type</string> </key>
- <value> <string>Causality Movement Group</string> </value>
+ <value> <string>First Causality Movement Group</string> </value>
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>causality_movement_group_on_delivery</string> </value>
+ <value> <string>First Causality Movement Group</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_line.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_line.xml?rev=27880&r1=27879&r2=27880&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_line.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_builder/category_movement_group_on_line.xml [utf8] Thu Jul 2 18:04:53 2009
@@ -44,6 +44,7 @@
<string>aggregate</string>
<string>quantity_unit</string>
<string>base_contribution</string>
+ <string>base_application</string>
<string>source_function</string>
<string>destination_function</string>
<string>source_account</string>
Modified: erp5/trunk/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/causality_movement_group_on_delivery.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/causality_movement_group_on_delivery.xml?rev=27880&r1=27879&r2=27880&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/causality_movement_group_on_delivery.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_simplified_invoicing/PathTemplateItem/portal_deliveries/sale_invoice_transaction_builder/causality_movement_group_on_delivery.xml [utf8] Thu Jul 2 18:04:53 2009
@@ -3,7 +3,7 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="CausalityMovementGroup" module="Products.ERP5Type.Document.CausalityMovementGroup"/>
+ <global name="FirstCausalityMovementGroup" module="Products.ERP5Type.Document.FirstCausalityMovementGroup"/>
<tuple/>
</tuple>
</pickle>
@@ -19,9 +19,7 @@
</item>
<item>
<key> <string>description</string> </key>
- <value>
- <none/>
- </value>
+ <value> <string>BPM modification - used instead of Causality Movement Group to group orphaned parent movements coming from invoice</string> </value>
</item>
<item>
<key> <string>id</string> </key>
@@ -33,11 +31,11 @@
</item>
<item>
<key> <string>portal_type</string> </key>
- <value> <string>Causality Movement Group</string> </value>
+ <value> <string>First Causality Movement Group</string> </value>
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>causality_movement_group_on_delivery</string> </value>
+ <value> <string>First Causality Movement Group</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_simplified_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simplified_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml?rev=27880&r1=27879&r2=27880&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simplified_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_simplified_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml [utf8] Thu Jul 2 18:04:53 2009
@@ -1,11 +1,13 @@
<allowed_content_type_list>
<portal_type id="Purchase Invoice Transaction">
+ <item>Trade Model Line</item>
<item>Payment Condition</item>
<item>Tax Line</item>
<item>Discount Line</item>
<item>Invoice Line</item>
</portal_type>
<portal_type id="Sale Invoice Transaction">
+ <item>Trade Model Line</item>
<item>Discount Line</item>
<item>Tax Line</item>
<item>Invoice Line</item>
Modified: erp5/trunk/bt5/erp5_simplified_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simplified_invoicing/bt/revision?rev=27880&r1=27879&r2=27880&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simplified_invoicing/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_simplified_invoicing/bt/revision [utf8] Thu Jul 2 18:04:53 2009
@@ -1,1 +1,1 @@
-31
+32
Modified: erp5/trunk/bt5/erp5_simplified_invoicing/bt/template_action_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simplified_invoicing/bt/template_action_path_list?rev=27880&r1=27879&r2=27880&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simplified_invoicing/bt/template_action_path_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_simplified_invoicing/bt/template_action_path_list [utf8] Thu Jul 2 18:04:53 2009
@@ -9,6 +9,8 @@
Purchase Invoice Transaction | view_discount
Purchase Invoice Transaction | view_invoice
Purchase Invoice Transaction | view_tax
+Purchase Invoice Transaction | view_trade_model
+Purchase Invoice Transaction | view_trade_model_line_list
Purchase Order | jump_related_invoice
Sale Invoice Transaction | apply_trade_condition
Sale Invoice Transaction | invoice_item_list
@@ -19,4 +21,6 @@
Sale Invoice Transaction | view_confirmed_invoice
Sale Invoice Transaction | view_discount
Sale Invoice Transaction | view_tax
+Sale Invoice Transaction | view_trade_model
+Sale Invoice Transaction | view_trade_model_line_list
Sale Order | jump_related_invoice
Modified: erp5/trunk/bt5/erp5_simplified_invoicing/bt/template_portal_type_allowed_content_type_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simplified_invoicing/bt/template_portal_type_allowed_content_type_list?rev=27880&r1=27879&r2=27880&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simplified_invoicing/bt/template_portal_type_allowed_content_type_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_simplified_invoicing/bt/template_portal_type_allowed_content_type_list [utf8] Thu Jul 2 18:04:53 2009
@@ -2,7 +2,9 @@
Purchase Invoice Transaction | Invoice Line
Purchase Invoice Transaction | Payment Condition
Purchase Invoice Transaction | Tax Line
+Purchase Invoice Transaction | Trade Model Line
Sale Invoice Transaction | Discount Line
Sale Invoice Transaction | Invoice Line
Sale Invoice Transaction | Payment Condition
-Sale Invoice Transaction | Tax Line
+Sale Invoice Transaction | Tax Line
+Sale Invoice Transaction | Trade Model Line
More information about the Erp5-report
mailing list