[Erp5-report] r30018 - in /erp5/trunk/bt5/erp5_trade: CategoryTemplateItem/portal_categorie...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Oct 27 08:25:44 CET 2009
Author: tatuya
Date: Tue Oct 27 08:25:43 2009
New Revision: 30018
URL: http://svn.erp5.org?rev=30018&view=rev
Log:
2009-10-27 tatuya
* Change the usage of
price, quantity and efficiency in Trade Model Line
Added:
erp5/trunk/bt5/erp5_trade/CategoryTemplateItem/portal_categories/rounding_method.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view/my_rounding_method.xml
Modified:
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_price.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view/my_price.xml
erp5/trunk/bt5/erp5_trade/bt/change_log
erp5/trunk/bt5/erp5_trade/bt/revision
erp5/trunk/bt5/erp5_trade/bt/template_base_category_list
Added: erp5/trunk/bt5/erp5_trade/CategoryTemplateItem/portal_categories/rounding_method.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/CategoryTemplateItem/portal_categories/rounding_method.xml?rev=30018&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_trade/CategoryTemplateItem/portal_categories/rounding_method.xml (added)
+++ erp5/trunk/bt5/erp5_trade/CategoryTemplateItem/portal_categories/rounding_method.xml [utf8] Tue Oct 27 08:25:43 2009
@@ -1,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>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox.xml?rev=30018&r1=30017&r2=30018&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox.xml [utf8] Tue Oct 27 08:25:43 2009
@@ -134,15 +134,23 @@
</tuple>
<tuple>
<string>resource_title</string>
- <string>Model</string>
+ <string>Service</string>
+ </tuple>
+ <tuple>
+ <string>base_quantity</string>
+ <string>Base</string>
+ </tuple>
+ <tuple>
+ <string>efficiency</string>
+ <string>Efficiency</string>
</tuple>
<tuple>
<string>quantity</string>
- <string>Base</string>
+ <string>Quantity</string>
</tuple>
<tuple>
<string>price</string>
- <string>Ratio</string>
+ <string>Price</string>
</tuple>
<tuple>
<string>total_price</string>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_price.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_price.xml?rev=30018&r1=30017&r2=30018&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_price.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewAggregatedAmountList/listbox_price.xml [utf8] Tue Oct 27 08:25:43 2009
@@ -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>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view.xml?rev=30018&r1=30017&r2=30018&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view.xml [utf8] Tue Oct 27 08:25:43 2009
@@ -108,6 +108,7 @@
<string>my_price</string>
<string>my_quantity</string>
<string>my_efficiency</string>
+ <string>my_rounding_method</string>
</list>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view/my_price.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view/my_price.xml?rev=30018&r1=30017&r2=30018&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view/my_price.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view/my_price.xml [utf8] Tue Oct 27 08:25:43 2009
@@ -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>
Added: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view/my_rounding_method.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view/my_rounding_method.xml?rev=30018&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view/my_rounding_method.xml (added)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view/my_rounding_method.xml [utf8] Tue Oct 27 08:25:43 2009
@@ -1,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>
Modified: erp5/trunk/bt5/erp5_trade/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/change_log?rev=30018&r1=30017&r2=30018&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/change_log [utf8] Tue Oct 27 08:25:43 2009
@@ -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.
Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=30018&r1=30017&r2=30018&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Tue Oct 27 08:25:43 2009
@@ -1,1 +1,1 @@
-753
+755
Modified: erp5/trunk/bt5/erp5_trade/bt/template_base_category_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/template_base_category_list?rev=30018&r1=30017&r2=30018&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/template_base_category_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/template_base_category_list [utf8] Tue Oct 27 08:25:43 2009
@@ -4,6 +4,7 @@
delivery_mode
discount_type
incoterm
+rounding_method
segmentation
trade_condition_type
trade_date
More information about the Erp5-report
mailing list