[Erp5-report] r20621 - in /erp5/trunk/bt5/erp5_trade: CategoryTemplateItem/portal_categorie...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Apr 17 16:49:41 CEST 2008
Author: jerome
Date: Thu Apr 17 16:49:34 2008
New Revision: 20621
URL: http://svn.erp5.org?rev=20621&view=rev
Log:
* Add new discount system, similar to new tax system:
- Discount are the resource (in discount module)
- Trade Condition contains Discount Model Line
- Delivery contains Discount Line
(also apply some minor fixes to Tax* forms)
Removed:
erp5/trunk/bt5/erp5_trade/CategoryTemplateItem/portal_categories/discount_type.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view/my_discount.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view/my_discount_ratio.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view/my_discount_type.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view/my_immediate_discount.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view/my_int_index.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_viewFieldLibrary/
Removed: erp5/trunk/bt5/erp5_trade/CategoryTemplateItem/portal_categories/discount_type.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/CategoryTemplateItem/portal_categories/discount_type.xml?rev=20620&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_trade/CategoryTemplateItem/portal_categories/discount_type.xml (original)
+++ erp5/trunk/bt5/erp5_trade/CategoryTemplateItem/portal_categories/discount_type.xml (removed)
@@ -1,211 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
- <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>_tree</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>acquisition_append_value</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>acquisition_base_category</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>acquisition_copy_value</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>acquisition_mask_value</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>acquisition_object_id</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>acquisition_portal_type</string> </key>
- <value> <string>python:[]</string> </value>
- </item>
- <item>
- <key> <string>acquisition_sync_value</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>categories</string> </key>
- <value>
- <tuple>
- <string>discount_type</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>category_type</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>criterion_property</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>fallback_base_category</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>discount_type</string> </value>
- </item>
- <item>
- <key> <string>id_generator</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>id_group</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>last_id</string> </key>
- <value> <string>1</string> </value>
- </item>
- <item>
- <key> <string>membership_criterion_base_category</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>membership_criterion_category</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>multimembership_criterion_base_category</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>portal_type</string> </key>
- <value> <string>Base Category</string> </value>
- </item>
- <item>
- <key> <string>read_permission</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>rid</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>short_title</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>sid</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>test_method_id</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Discount Type</string> </value>
- </item>
- <item>
- <key> <string>uid</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>write_permission</string> </key>
- <value>
- <none/>
- </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>
Removed: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view/my_discount.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view/my_discount.xml?rev=20620&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view/my_discount.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view/my_discount.xml (removed)
@@ -1,93 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>delegated_list</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>my_discount</string> </value>
- </item>
- <item>
- <key> <string>message_values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>external_validator_failed</string> </key>
- <value> <string>The input failed the external validator.</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>overrides</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>tales</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string>my_discount</string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string>Discount_viewFieldLibrary</string> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string>Click to edit the target</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Removed: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view/my_discount_ratio.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view/my_discount_ratio.xml?rev=20620&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view/my_discount_ratio.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view/my_discount_ratio.xml (removed)
@@ -1,93 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>delegated_list</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>my_discount_ratio</string> </value>
- </item>
- <item>
- <key> <string>message_values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>external_validator_failed</string> </key>
- <value> <string>The input failed the external validator.</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>overrides</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>tales</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string>my_discount_ratio</string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string>Discount_viewFieldLibrary</string> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string>Click to edit the target</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Removed: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view/my_discount_type.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view/my_discount_type.xml?rev=20620&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view/my_discount_type.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view/my_discount_type.xml (removed)
@@ -1,93 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>delegated_list</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>my_discount_type</string> </value>
- </item>
- <item>
- <key> <string>message_values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>external_validator_failed</string> </key>
- <value> <string>The input failed the external validator.</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>overrides</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>tales</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string>my_discount_type</string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string>Discount_viewFieldLibrary</string> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string>Click to edit the target</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Removed: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view/my_immediate_discount.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view/my_immediate_discount.xml?rev=20620&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view/my_immediate_discount.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view/my_immediate_discount.xml (removed)
@@ -1,93 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>delegated_list</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>my_immediate_discount</string> </value>
- </item>
- <item>
- <key> <string>message_values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>external_validator_failed</string> </key>
- <value> <string>The input failed the external validator.</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>overrides</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>tales</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string>my_immediate_discount</string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string>Discount_viewFieldLibrary</string> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string>Click to edit the target</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Removed: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view/my_int_index.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view/my_int_index.xml?rev=20620&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view/my_int_index.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Discount_view/my_int_index.xml (removed)
@@ -1,93 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>delegated_list</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>my_int_index</string> </value>
- </item>
- <item>
- <key> <string>message_values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>external_validator_failed</string> </key>
- <value> <string>The input failed the external validator.</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>overrides</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>tales</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string>my_int_index</string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string>Discount_viewFieldLibrary</string> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string>Click to edit the target</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
More information about the Erp5-report
mailing list