Skip to content

erp5
erp5
Commit 4eb3510f authored by Alexandre Boeglin's avatar Alexandre Boeglin
Browse files
Options

* fix listbox_price proxy field 

* fix Purchase & Sale Packing Lists listboxes, show variation list

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20766 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 66d09dbd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 817 additions and 82 deletions
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view/listbox_price.xml
View file @ 4eb3510f
......@@ -62,7 +62,7 @@
<value>
<dictionary>
<item>
<key> <string>enabled</string> </key>
<key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
......@@ -91,7 +91,7 @@
<value>
<dictionary>
<item>
<key> <string>enabled</string> </key>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
......@@ -102,7 +102,7 @@
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_quantity</string> </value>
<value> <string>my_price</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_price.xml
View file @ 4eb3510f
......@@ -62,7 +62,7 @@
<value>
<dictionary>
<item>
<key> <string>enabled</string> </key>
<key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
......@@ -102,7 +102,7 @@
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_quantity</string> </value>
<value> <string>my_price</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view.xml
View file @ 4eb3510f
......@@ -100,6 +100,8 @@
<string>listbox_quantity_unit</string>
<string>listbox_quantity</string>
<string>listbox_reference</string>
<string>listbox_price</string>
<string>listbox_variation_category_item_list</string>
</list>
</value>
</item>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/listbox_quantity.xml
View file @ 4eb3510f
......@@ -20,7 +20,6 @@
<value>
<list>
<string>enabled</string>
<string>editable</string>
</list>
</value>
</item>
......@@ -82,11 +81,7 @@
<value>
<dictionary>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/listbox_quantity_unit.xml
View file @ 4eb3510f
......@@ -21,7 +21,6 @@
<list>
<string>items</string>
<string>enabled</string>
<string>editable</string>
</list>
</value>
</item>
......@@ -63,14 +62,6 @@
<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> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
......@@ -97,11 +88,7 @@
<value>
<dictionary>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
......@@ -113,7 +100,7 @@
<value> <string>PackingListLine_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>items</string> </key>
<key> <string>items</string> </key>
<value>
<list/>
</value>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/listbox_stop_date.xml
View file @ 4eb3510f
......@@ -18,9 +18,7 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>editable</string>
</list>
<list/>
</value>
</item>
<item>
......@@ -80,10 +78,6 @@
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_stop_date</string> </value>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_viewFieldLibrary/my_purchase_packing_list_lines_listbox.xml
View file @ 4eb3510f
......@@ -79,7 +79,7 @@
<value>
<dictionary>
<item>
<key> <string>editable_columns</string> </key>
<key> <string>editable_columns</string> </key>
<value>
<list>
<tuple>
......@@ -106,17 +106,17 @@
<value> <string>PurchaseOrder_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>portal_types</string> </key>
<key> <string>portal_types</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>report_tree</string> </key>
<key> <string>report_tree</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>selection_name</string> </key>
<key> <string>selection_name</string> </key>
<value> <string>purchase_packing_list_line_selection</string> </value>
</item>
<item>
......@@ -124,7 +124,7 @@
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<key> <string>title</string> </key>
<value> <string>Purchase Packing List Lines</string> </value>
</item>
</dictionary>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_viewFieldLibrary/my_purchase_packing_list_movements_listbox.xml
View file @ 4eb3510f
......@@ -101,6 +101,10 @@
<string>resource_title</string>
<string>Resource</string>
</tuple>
<tuple>
<string>variation_category_item_list</string>
<string>Variation</string>
</tuple>
<tuple>
<string>quantity</string>
<string>Quantity</string>
......@@ -110,11 +114,11 @@
<string>Unit</string>
</tuple>
<tuple>
<string>getPrice</string>
<string>price</string>
<string>Price</string>
</tuple>
<tuple>
<string>getTotalPrice</string>
<string>total_price</string>
<string>Total Price</string>
</tuple>
<tuple>
......@@ -144,6 +148,10 @@
<string>resource_title</string>
<string>Resource</string>
</tuple>
<tuple>
<string>variation_category_item_list</string>
<string>Variation</string>
</tuple>
<tuple>
<string>quantity</string>
<string>Quantity</string>
......@@ -153,11 +161,11 @@
<string>Unit</string>
</tuple>
<tuple>
<string>getPrice</string>
<string>price</string>
<string>Price</string>
</tuple>
<tuple>
<string>getTotalPrice</string>
<string>total_price</string>
<string>Total Price</string>
</tuple>
<tuple>
......@@ -175,6 +183,10 @@
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>variation_category_item_list</string>
<string>Variation</string>
</tuple>
<tuple>
<string>quantity</string>
<string>Quantity</string>
......@@ -183,6 +195,10 @@
<string>quantity_unit</string>
<string>Unit</string>
</tuple>
<tuple>
<string>price</string>
<string>Price</string>
</tuple>
<tuple>
<string>stop_date</string>
<string>Delivery Date</string>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/listbox_price.xml
View file @ 4eb3510f
......@@ -62,7 +62,7 @@
<value>
<dictionary>
<item>
<key> <string>enabled</string> </key>
<key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
......@@ -102,7 +102,7 @@
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_quantity</string> </value>
<value> <string>my_price</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view.xml
View file @ 4eb3510f
......@@ -100,6 +100,8 @@
<string>listbox_reference</string>
<string>listbox_stop_date</string>
<string>listbox_quantity_unit</string>
<string>listbox_price</string>
<string>listbox_variation_category_item_list</string>
</list>
</value>
</item>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/listbox_price.xml 0 → 100644
View file @ 4eb3510f
<?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>_owner</string> </key>
<value>
<none/>
</value>
</item>
<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>
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/listbox_quantity.xml
View file @ 4eb3510f
......@@ -20,7 +20,6 @@
<value>
<list>
<string>enabled</string>
<string>editable</string>
</list>
</value>
</item>
......@@ -82,11 +81,7 @@
<value>
<dictionary>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/listbox_quantity_unit.xml
View file @ 4eb3510f
......@@ -21,7 +21,6 @@
<list>
<string>items</string>
<string>enabled</string>
<string>editable</string>
</list>
</value>
</item>
......@@ -63,14 +62,6 @@
<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> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
......@@ -97,11 +88,7 @@
<value>
<dictionary>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
......@@ -113,7 +100,7 @@
<value> <string>PackingListLine_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>items</string> </key>
<key> <string>items</string> </key>
<value>
<list/>
</value>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/listbox_stop_date.xml
View file @ 4eb3510f
......@@ -18,9 +18,7 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>editable</string>
</list>
<list/>
</value>
</item>
<item>
......@@ -80,10 +78,6 @@
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_stop_date</string> </value>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewFieldLibrary/my_sale_packing_list_lines_listbox.xml
View file @ 4eb3510f
......@@ -79,7 +79,7 @@
<value>
<dictionary>
<item>
<key> <string>editable_columns</string> </key>
<key> <string>editable_columns</string> </key>
<value>
<list>
<tuple>
......@@ -102,17 +102,17 @@
<value> <string>SaleOrder_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>portal_types</string> </key>
<key> <string>portal_types</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>report_tree</string> </key>
<key> <string>report_tree</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>selection_name</string> </key>
<key> <string>selection_name</string> </key>
<value> <string>sale_packing_list_movement_selection</string> </value>
</item>
<item>
......@@ -120,7 +120,7 @@
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<key> <string>title</string> </key>
<value> <string>Sale Packing List Lines</string> </value>
</item>
</dictionary>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_viewFieldLibrary/my_sale_packing_list_movements_listbox.xml
View file @ 4eb3510f
......@@ -101,6 +101,10 @@
<string>resource_title</string>
<string>Resource</string>
</tuple>
<tuple>
<string>variation_category_item_list</string>
<string>Variation</string>
</tuple>
<tuple>
<string>quantity</string>
<string>Quantity</string>
......@@ -110,11 +114,11 @@
<string>Unit</string>
</tuple>
<tuple>
<string>getPrice</string>
<string>price</string>
<string>Price</string>
</tuple>
<tuple>
<string>getTotalPrice</string>
<string>total_price</string>
<string>Total Price</string>
</tuple>
<tuple>
......@@ -144,6 +148,10 @@
<string>resource_title</string>
<string>Resource</string>
</tuple>
<tuple>
<string>variation_category_item_list</string>
<string>Variation</string>
</tuple>
<tuple>
<string>quantity</string>
<string>Quantity</string>
......@@ -153,11 +161,11 @@
<string>Unit</string>
</tuple>
<tuple>
<string>getPrice</string>
<string>price</string>
<string>Price</string>
</tuple>
<tuple>
<string>getTotalPrice</string>
<string>total_price</string>
<string>Total Price</string>
</tuple>
<tuple>
......@@ -175,6 +183,10 @@
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>variation_category_item_list</string>
<string>Variation</string>
</tuple>
<tuple>
<string>quantity</string>
<string>Quantity</string>
......@@ -183,6 +195,10 @@
<string>quantity_unit</string>
<string>Unit</string>
</tuple>
<tuple>
<string>price</string>
<string>Price</string>
</tuple>
<tuple>
<string>stop_date</string>
<string>Delivery Date</string>
......
bt5/erp5_trade/bt/revision
View file @ 4eb3510f
344
\ No newline at end of file
346
\ 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7