From 8cd1d2eecadad3f20fd8a099444daf2fc6863425 Mon Sep 17 00:00:00 2001
From: Tatuya Kamada <tatuya@nexedi.com>
Date: Tue, 27 Oct 2009 07:25:43 +0000
Subject: [PATCH] 2009-10-27 tatuya * Change the usage of price, quantity and
efficiency in Trade Model Line
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@30018 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../portal_categories/rounding_method.xml | 77 +++++++++++++++
.../listbox.xml | 14 ++-
.../listbox_price.xml | 2 +-
.../erp5_trade/TradeModelLine_view.xml | 1 +
.../TradeModelLine_view/my_price.xml | 4 +-
.../my_rounding_method.xml | 99 +++++++++++++++++++
bt5/erp5_trade/bt/change_log | 4 +
bt5/erp5_trade/bt/revision | 2 +-
bt5/erp5_trade/bt/template_base_category_list | 1 +
9 files changed, 197 insertions(+), 7 deletions(-)
create mode 100644 bt5/erp5_trade/CategoryTemplateItem/portal_categories/rounding_method.xml
create mode 100644 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view/my_rounding_method.xml
diff --git a/bt5/erp5_trade/CategoryTemplateItem/portal_categories/rounding_method.xml b/bt5/erp5_trade/CategoryTemplateItem/portal_categories/rounding_method.xml
new file mode 100644
index 0000000000..9a9efc5843
--- /dev/null
+++ b/bt5/erp5_trade/CategoryTemplateItem/portal_categories/rounding_method.xml
@@ -0,0 +1,77 @@
+<?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>_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>description</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>rounding_method</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>Base Category</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>rounding_method</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>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox.xml
index 651ce0680d..6c27814dee 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox.xml
@@ -134,15 +134,23 @@
</tuple>
<tuple>
<string>resource_title</string>
- <string>Model</string>
+ <string>Service</string>
</tuple>
<tuple>
- <string>quantity</string>
+ <string>base_quantity</string>
<string>Base</string>
</tuple>
+ <tuple>
+ <string>efficiency</string>
+ <string>Efficiency</string>
+ </tuple>
+ <tuple>
+ <string>quantity</string>
+ <string>Quantity</string>
+ </tuple>
<tuple>
<string>price</string>
- <string>Ratio</string>
+ <string>Price</string>
</tuple>
<tuple>
<string>total_price</string>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_price.xml
index 35e40f8b57..4f2baa7943 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_price.xml
@@ -80,7 +80,7 @@
</item>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_percent</string> </value>
+ <value> <string>my_money_quantity</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view.xml
index df7dd6c9a2..048d575cd8 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view.xml
@@ -108,6 +108,7 @@
<string>my_price</string>
<string>my_quantity</string>
<string>my_efficiency</string>
+ <string>my_rounding_method</string>
</list>
</value>
</item>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view/my_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view/my_price.xml
index 0b32697581..7c895c9681 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view/my_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view/my_price.xml
@@ -81,7 +81,7 @@
</item>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_percent</string> </value>
+ <value> <string>my_money_quantity</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
@@ -93,7 +93,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Ratio</string> </value>
+ <value> <string>Price</string> </value>
</item>
</dictionary>
</value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view/my_rounding_method.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view/my_rounding_method.xml
new file mode 100644
index 0000000000..16705b10e9
--- /dev/null
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view/my_rounding_method.xml
@@ -0,0 +1,99 @@
+<?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>
+ <string>title</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>my_rounding_method</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_category</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Rounding Method</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_trade/bt/change_log b/bt5/erp5_trade/bt/change_log
index af629ade81..5b1880f5ea 100644
--- a/bt5/erp5_trade/bt/change_log
+++ b/bt5/erp5_trade/bt/change_log
@@ -1,3 +1,7 @@
+2009-10-27 tatuya
+* Change the usage of
+price, quantity and efficiency in Trade Model Line
+
2009-10-23 tatuya
* Clean-up returned sale packing list forms, workflows according to sale/purchase packing list.
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index 3879e48b52..5d1d1b123b 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-753
\ No newline at end of file
+755
\ No newline at end of file
diff --git a/bt5/erp5_trade/bt/template_base_category_list b/bt5/erp5_trade/bt/template_base_category_list
index c1ee21d9bc..dd749d671b 100644
--- a/bt5/erp5_trade/bt/template_base_category_list
+++ b/bt5/erp5_trade/bt/template_base_category_list
@@ -4,6 +4,7 @@ base_contribution
delivery_mode
discount_type
incoterm
+rounding_method
segmentation
trade_condition_type
trade_date
\ No newline at end of file
--
2.30.9