Commit cde6ccca authored by Mame Coumba Sall's avatar Mame Coumba Sall

2009-05-19 mame

*define new listbox for inventory to show variation on resource and item
*add new column for item in PurchasePackingList_view and SalePackingList_view
*quantity is non-editable if item is defined on Delivery Line

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27062 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 03ab6d61
...@@ -13,12 +13,13 @@ ...@@ -13,12 +13,13 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>description</string>
<string>title</string> <string>title</string>
<string>css_class</string> <string>description</string>
<string>input_style</string>
<string>default</string> <string>default</string>
<string>css_class</string>
<string>display_width</string> <string>display_width</string>
<string>input_style</string>
<string>editable</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -60,18 +61,32 @@ ...@@ -60,18 +61,32 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>display_width</string> </key> <key> <string>display_width</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
<item>
<key> <string>editable</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -80,10 +95,18 @@ ...@@ -80,10 +95,18 @@
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>input_style</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -95,10 +118,22 @@ ...@@ -95,10 +118,22 @@
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string>figure</string> </value> <value> <string>figure</string> </value>
</item> </item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>Default Quantity of a resource in ERP5. It can be a product or it can be time quantity like hours or minutes for example. Quantity can be found in almost every business field of ERP5 and will always have this meaning, unless the term is different or precise, such as Priced Quantity for example.</string> </value> <value> <string>Default Quantity of a resource in ERP5. It can be a product or it can be time quantity like hours or minutes for example. Quantity can be found in almost every business field of ERP5 and will always have this meaning, unless the term is different or precise, such as Priced Quantity for example.</string> </value>
</item> </item>
<item>
<key> <string>display_width</string> </key>
<value> <int>20</int> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_float_field</string> </value> <value> <string>my_float_field</string> </value>
...@@ -157,4 +192,20 @@ ...@@ -157,4 +192,20 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: here.testItemDefinedOnResource()</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -88,6 +88,12 @@ ...@@ -88,6 +88,12 @@
<string>listbox_quantity</string> <string>listbox_quantity</string>
<string>listbox_quantity_unit</string> <string>listbox_quantity_unit</string>
<string>listbox_reference</string> <string>listbox_reference</string>
<string>test_listbox</string>
<string>listbox_total_price</string>
<string>listbox_stop_date</string>
<string>listbox_aggregate_title_list</string>
<string>listbox_variation_category_item_list</string>
<string>listbox_price</string>
</list> </list>
</value> </value>
</item> </item>
......
<?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>enabled</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_price</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>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_price</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>PackingListLine_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>
<?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>listbox_stop_date</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_stop_date</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>PackingListLine_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>
<?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>enabled</string>
<string>editable</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_total_price</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>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<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>field_id</string> </key>
<value> <string>my_price</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>PackingListLine_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>
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<value> <value>
<list> <list>
<string>enabled</string> <string>enabled</string>
<string>editable</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -56,11 +57,17 @@ ...@@ -56,11 +57,17 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>editable</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
<item>
<key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -80,6 +87,14 @@ ...@@ -80,6 +87,14 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_quantity</string> </value> <value> <string>my_quantity</string> </value>
...@@ -109,7 +124,23 @@ ...@@ -109,7 +124,23 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.isMovement() and not here.getVariationCategoryList()</string> </value> <value> <string>python: here.testItemDefinedOnResource()</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: here.isMovement()</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -91,6 +91,7 @@ ...@@ -91,6 +91,7 @@
<string>listbox_price</string> <string>listbox_price</string>
<string>listbox_variation_category_item_list</string> <string>listbox_variation_category_item_list</string>
<string>listbox_total_price</string> <string>listbox_total_price</string>
<string>listbox_aggregate_title_list</string>
</list> </list>
</value> </value>
</item> </item>
......
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>all_columns</string>
<string>editable_columns</string>
<string>title</string> <string>title</string>
<string>report_root_list</string>
<string>selection_name</string>
<string>columns</string> <string>columns</string>
<string>all_columns</string>
<string>sort</string> <string>sort</string>
<string>list_method</string> <string>list_method</string>
<string>selection_name</string>
<string>editable_columns</string>
<string>report_root_list</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -121,6 +121,10 @@ ...@@ -121,6 +121,10 @@
<string>total_price</string> <string>total_price</string>
<string>Total Price</string> <string>Total Price</string>
</tuple> </tuple>
<tuple>
<string>aggregate_title_list</string>
<string>Items</string>
</tuple>
<tuple> <tuple>
<string>stop_date</string> <string>stop_date</string>
<string>Delivery Date</string> <string>Delivery Date</string>
...@@ -168,6 +172,10 @@ ...@@ -168,6 +172,10 @@
<string>total_price</string> <string>total_price</string>
<string>Total Price</string> <string>Total Price</string>
</tuple> </tuple>
<tuple>
<string>aggregate_title_list</string>
<string>Items</string>
</tuple>
<tuple> <tuple>
<string>stop_date</string> <string>stop_date</string>
<string>Delivery Date</string> <string>Delivery Date</string>
...@@ -203,6 +211,10 @@ ...@@ -203,6 +211,10 @@
<string>total_price</string> <string>total_price</string>
<string>Total Price</string> <string>Total Price</string>
</tuple> </tuple>
<tuple>
<string>aggregate_title_list</string>
<string>Items</string>
</tuple>
<tuple> <tuple>
<string>stop_date</string> <string>stop_date</string>
<string>Delivery Date</string> <string>Delivery Date</string>
......
...@@ -12,7 +12,9 @@ ...@@ -12,7 +12,9 @@
<item> <item>
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list/> <list>
<string>editable</string>
</list>
</value> </value>
</item> </item>
<item> <item>
...@@ -53,6 +55,12 @@ ...@@ -53,6 +55,12 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>editable</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -72,6 +80,10 @@ ...@@ -72,6 +80,10 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_quantity</string> </value> <value> <string>my_quantity</string> </value>
...@@ -90,4 +102,20 @@ ...@@ -90,4 +102,20 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </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.testItemDefinedOnResource()</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -90,6 +90,7 @@ ...@@ -90,6 +90,7 @@
<string>listbox_quantity_unit</string> <string>listbox_quantity_unit</string>
<string>listbox_price</string> <string>listbox_price</string>
<string>listbox_variation_category_item_list</string> <string>listbox_variation_category_item_list</string>
<string>listbox_aggregate_title_list</string>
</list> </list>
</value> </value>
</item> </item>
......
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>all_columns</string>
<string>editable_columns</string>
<string>title</string> <string>title</string>
<string>report_root_list</string>
<string>selection_name</string>
<string>columns</string> <string>columns</string>
<string>all_columns</string>
<string>sort</string> <string>sort</string>
<string>list_method</string> <string>list_method</string>
<string>selection_name</string>
<string>editable_columns</string>
<string>report_root_list</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -121,6 +121,10 @@ ...@@ -121,6 +121,10 @@
<string>total_price</string> <string>total_price</string>
<string>Total Price</string> <string>Total Price</string>
</tuple> </tuple>
<tuple>
<string>aggregate_title_list</string>
<string>Items</string>
</tuple>
<tuple> <tuple>
<string>stop_date</string> <string>stop_date</string>
<string>Delivery Date</string> <string>Delivery Date</string>
...@@ -168,6 +172,10 @@ ...@@ -168,6 +172,10 @@
<string>total_price</string> <string>total_price</string>
<string>Total Price</string> <string>Total Price</string>
</tuple> </tuple>
<tuple>
<string>aggregate_title_list</string>
<string>Items</string>
</tuple>
<tuple> <tuple>
<string>stop_date</string> <string>stop_date</string>
<string>Delivery Date</string> <string>Delivery Date</string>
...@@ -199,6 +207,10 @@ ...@@ -199,6 +207,10 @@
<string>price</string> <string>price</string>
<string>Price</string> <string>Price</string>
</tuple> </tuple>
<tuple>
<string>aggregate_title_list</string>
<string>Items</string>
</tuple>
<tuple> <tuple>
<string>stop_date</string> <string>stop_date</string>
<string>Delivery Date</string> <string>Delivery Date</string>
......
644 647
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment