diff --git a/bt5/erp5_trade/CategoryTemplateItem/portal_categories/rounding_method.xml b/bt5/erp5_trade/CategoryTemplateItem/portal_categories/rounding_method.xml deleted file mode 100644 index 9a9efc58432545dab241b0d3fa5de85f1fc7f595..0000000000000000000000000000000000000000 --- a/bt5/erp5_trade/CategoryTemplateItem/portal_categories/rounding_method.xml +++ /dev/null @@ -1,77 +0,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>_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 6c27814deed061f35790f182a199c972d0999a87..651ce0680d2bdbeba8e31abfb0ba2e79d58b0949 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,23 +134,15 @@ </tuple> <tuple> <string>resource_title</string> - <string>Service</string> - </tuple> - <tuple> - <string>base_quantity</string> - <string>Base</string> - </tuple> - <tuple> - <string>efficiency</string> - <string>Efficiency</string> + <string>Model</string> </tuple> <tuple> <string>quantity</string> - <string>Quantity</string> + <string>Base</string> </tuple> <tuple> <string>price</string> - <string>Price</string> + <string>Ratio</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 4f2baa7943c709e5c135566ab8feaae1fa3258e9..35e40f8b578e32f2c83c7a12d4b75997fb471b1c 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_money_quantity</string> </value> + <value> <string>my_percent</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 048d575cd8d39e092ee66f768440617f90847f71..df7dd6c9a2851bccbe6d0d00486beb373bbc7dc5 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,7 +108,6 @@ <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 7c895c96811a0a1b76264a091e6b11cab77a0d79..0b326975818636a54a4c15dcf8e95a05a40704e9 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_money_quantity</string> </value> + <value> <string>my_percent</string> </value> </item> <item> <key> <string>form_id</string> </key> @@ -93,7 +93,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Price</string> </value> + <value> <string>Ratio</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 deleted file mode 100644 index 16705b10e9971cf18e5f80b30cc749262ac29bc1..0000000000000000000000000000000000000000 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeModelLine_view/my_rounding_method.xml +++ /dev/null @@ -1,99 +0,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> - <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 5b1880f5ea5d637216adeb471f3562f3d851a742..af629ade818bf8634d19bf89cba707e68ec77b47 100644 --- a/bt5/erp5_trade/bt/change_log +++ b/bt5/erp5_trade/bt/change_log @@ -1,7 +1,3 @@ -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 5d1d1b123b85a650151ddcc8869d7c658cedc0e0..3879e48b523c8ecd6fa81a86ff7d05d485d0516d 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -755 \ No newline at end of file +753 \ 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 dd749d671b9151385517af8547d862a0ef3eeef2..c1ee21d9bc851ae6e47662070b82f47386de7b9a 100644 --- a/bt5/erp5_trade/bt/template_base_category_list +++ b/bt5/erp5_trade/bt/template_base_category_list @@ -4,7 +4,6 @@ base_contribution delivery_mode discount_type incoterm -rounding_method segmentation trade_condition_type trade_date \ No newline at end of file