From 7d45a19b167e2833f1a2971c37b345bbcc5aaac7 Mon Sep 17 00:00:00 2001
From: Mame Coumba Sall <mame@nexedi.com>
Date: Thu, 16 Apr 2009 18:09:47 +0000
Subject: [PATCH] 2009-04-16 mame * modify display of variation category in
Stock tabs for Orders( it was displaying relative_urls instead of titles of
variation categories) *remove TALES expression for quantity_unit in
OrderLine_view(it was not enabled when there was variation defined for the
resource) *remove TALES expression for quantity_unit in Order_view(it was not
enabled when there was variation defined for the resource) *add new column to
define quantity_unit defined in order(because quanty_unit defined in order
can be different from quantity_unit used in stock)
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26464 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../erp5_trade/Delivery_viewInventory.xml | 5 +-
.../Delivery_viewInventory/listbox.xml | 18 +-
.../listbox_order_quantity_unit.xml | 132 ++++++++
.../listbox_variation_category_item_list.xml | 319 ++++++++++++++++++
.../OrderLine_view/listbox_quantity_unit.xml | 2 +-
.../OrderLine_view/my_quantity_unit.xml | 12 +-
.../SaleOrder_view/listbox_quantity_unit.xml | 22 +-
.../SaleOrder_view/listbox_total_price.xml | 24 +-
bt5/erp5_trade/bt/revision | 2 +-
9 files changed, 492 insertions(+), 44 deletions(-)
create mode 100644 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox_order_quantity_unit.xml
create mode 100644 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox_variation_category_item_list.xml
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory.xml
index 9b31860816..562b2166dc 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory.xml
@@ -83,7 +83,10 @@
<item>
<key> <string>hidden</string> </key>
<value>
- <list/>
+ <list>
+ <string>listbox_variation_category_item_list</string>
+ <string>listbox_order_quantity_unit</string>
+ </list>
</value>
</item>
<item>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox.xml
index e787be778a..58ad08e036 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox.xml
@@ -18,6 +18,7 @@
<string>list_method</string>
<string>selection_name</string>
<string>default_params</string>
+ <string>editable_columns</string>
<string>domain_tree</string>
<string>domain_root_list</string>
<string>list_action</string>
@@ -100,13 +101,17 @@
<string>Resource</string>
</tuple>
<tuple>
- <string>variation_text</string>
+ <string>variation_category_item_list</string>
<string>Variation</string>
</tuple>
<tuple>
<string>getQuantity</string>
<string>Quantity</string>
</tuple>
+ <tuple>
+ <string>order_quantity_unit</string>
+ <string>Order Quantity Unit</string>
+ </tuple>
<tuple>
<string>getCurrentInventory</string>
<string>Current</string>
@@ -160,6 +165,17 @@
<key> <string>domain_tree</string> </key>
<value> <int>1</int> </value>
</item>
+ <item>
+ <key> <string>editable_columns</string> </key>
+ <value>
+ <list>
+ <tuple>
+ <string>order_quantity_unit</string>
+ <string>Order Quantity Unit</string>
+ </tuple>
+ </list>
+ </value>
+ </item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_view_mode_listbox</string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox_order_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox_order_quantity_unit.xml
new file mode 100644
index 0000000000..aa15afe49b
--- /dev/null
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox_order_quantity_unit.xml
@@ -0,0 +1,132 @@
+<?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>items</string>
+ <string>enabled</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>listbox_order_quantity_unit</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>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <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>items</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </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>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_quantity_unit</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>OrderLine_viewFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: cell.getQuantityUnitList()</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox_variation_category_item_list.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox_variation_category_item_list.xml
new file mode 100644
index 0000000000..3bc300c8db
--- /dev/null
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox_variation_category_item_list.xml
@@ -0,0 +1,319 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="LinesField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>listbox_variation_category_item_list</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>
+ <item>
+ <key> <string>line_too_long</string> </key>
+ <value> <string>A line was too long.</string> </value>
+ </item>
+ <item>
+ <key> <string>required_not_found</string> </key>
+ <value> <string>Input is required but no input given.</string> </value>
+ </item>
+ <item>
+ <key> <string>too_long</string> </key>
+ <value> <string>You entered too many characters.</string> </value>
+ </item>
+ <item>
+ <key> <string>too_many_lines</string> </key>
+ <value> <string>You entered too many lines.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>height</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>max_length</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>max_linelength</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>max_lines</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>unicode</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>view_separator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>whitespace_preserve</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>width</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>height</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>max_length</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>max_linelength</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>max_lines</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>unicode</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>view_separator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>whitespace_preserve</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>width</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>height</string> </key>
+ <value> <int>5</int> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>max_length</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>max_linelength</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>max_lines</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>listbox_variation_category_item_list</string> </value>
+ </item>
+ <item>
+ <key> <string>unicode</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>view_separator</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<br />
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>whitespace_preserve</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>width</string> </key>
+ <value> <int>40</int> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: [x[0] for x in cell.getVariationCategoryItemList()]</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view/listbox_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view/listbox_quantity_unit.xml
index b4615d0f45..398d0307bd 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view/listbox_quantity_unit.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view/listbox_quantity_unit.xml
@@ -132,7 +132,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: cell.isMovement() and not cell.getVariationCategoryList()</string> </value>
+ <value> <string>python: cell.isMovement()</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view/my_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view/my_quantity_unit.xml
index 89ba93f1cb..7af173a0c1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view/my_quantity_unit.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view/my_quantity_unit.xml
@@ -12,7 +12,9 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list/>
+ <list>
+ <string>enabled</string>
+ </list>
</value>
</item>
<item>
@@ -53,6 +55,10 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>extra_context</string> </key>
<value> <string></string> </value>
@@ -76,6 +82,10 @@
<key> <string>values</string> </key>
<value>
<dictionary>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
<item>
<key> <string>extra_context</string> </key>
<value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/listbox_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/listbox_quantity_unit.xml
index 243abc4604..c2ecd2963d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/listbox_quantity_unit.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/listbox_quantity_unit.xml
@@ -58,9 +58,7 @@
<dictionary>
<item>
<key> <string>enabled</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
@@ -73,7 +71,7 @@
<item>
<key> <string>items</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
@@ -116,22 +114,6 @@
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python: cell.isMovement() and not cell.getVariationCategoryList()</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/listbox_total_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/listbox_total_price.xml
index 45b98732cd..38b07b5729 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/listbox_total_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/listbox_total_price.xml
@@ -56,11 +56,13 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>enabled</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>extra_context</string> </key>
@@ -113,20 +115,4 @@
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python: cell.isMovement() and not cell.getVariationCategoryList()</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index 24c5507b23..dc9e6b20e2 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-633
\ No newline at end of file
+634
\ No newline at end of file
--
2.30.9