diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view.xml index 2fc9fe29714cf47e47d7f8438af8789dbb1057c2..1ccf17f5f3787e6c7cb1697b0966df39f7a91057 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view.xml @@ -42,6 +42,12 @@ <tuple/> </value> </item> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> <item> <key> <string>action</string> </key> <value> <string>Base_edit</string> </value> @@ -125,6 +131,7 @@ <string>my_incoterm</string> <string>my_delivery_mode</string> <string>my_specialise_title</string> + <string>listbox_price</string> </list> </value> </item> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox.xml index 43a444b55c5bcc874bb30a262d280daf09893e75..64f19c8e3609ee4b651d571ed09c77631fbaa7f3 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox.xml @@ -12,9 +12,7 @@ <item> <key> <string>delegated_list</string> </key> <value> - <list> - <string>list_method</string> - </list> + <list/> </value> </item> <item> @@ -82,12 +80,6 @@ <key> <string>form_id</string> </key> <value> <string>PurchaseOrder_viewFieldLibrary</string> </value> </item> - <item> - <key> <string>list_method</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> <item> <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> @@ -98,20 +90,4 @@ </dictionary> </pickle> </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <global name="Method" module="Products.Formulator.MethodField"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>method_name</string> </key> - <value> <string>searchFolder</string> </value> - </item> - </dictionary> - </pickle> - </record> </ZopeData> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_price.xml new file mode 100644 index 0000000000000000000000000000000000000000..2c9c575182cf99b668dbdfeaac8bfae275be2681 --- /dev/null +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_price.xml @@ -0,0 +1,133 @@ +<?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>extra_context</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> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>enabled</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>extra_context</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>extra_context</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>field_id</string> </key> + <value> <string>my_quantity</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>OrderLine_viewFieldLibrary</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.isMovement() and not cell.getVariationCategoryList()</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_quantity.xml index 63544417fdb321ceaf95f839dac2f831cb309ce2..7ede9b90d1c920bbf3f59171041c7d7f3bbba40f 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_quantity.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_quantity.xml @@ -20,7 +20,6 @@ <value> <list> <string>enabled</string> - <string>editable</string> </list> </value> </item> @@ -63,15 +62,11 @@ <value> <dictionary> <item> - <key> <string>editable</string> </key> + <key> <string>enabled</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> - <item> - <key> <string>enabled</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>extra_context</string> </key> <value> <string></string> </value> @@ -96,11 +91,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> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_quantity_unit.xml index 87efa1abd0d08d834a317b764c323b5f500c8e24..a8839d1dd1f4fd66a78f354f2bff2e81b8a38c94 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_quantity_unit.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_quantity_unit.xml @@ -21,7 +21,6 @@ <list> <string>items</string> <string>enabled</string> - <string>editable</string> </list> </value> </item> @@ -64,15 +63,11 @@ <value> <dictionary> <item> - <key> <string>editable</string> </key> + <key> <string>enabled</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> - <item> - <key> <string>enabled</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>extra_context</string> </key> <value> <string></string> </value> @@ -103,11 +98,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> @@ -125,7 +116,7 @@ <value> <string>OrderLine_viewFieldLibrary</string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <list/> </value> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_viewFieldLibrary/my_purchase_order_lines_listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_viewFieldLibrary/my_purchase_order_lines_listbox.xml index 3a5d40dd7d65293c21afac05eda935a5909b9a18..184b63bca78338fa81a07334df5b81c525f27bcc 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_viewFieldLibrary/my_purchase_order_lines_listbox.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_viewFieldLibrary/my_purchase_order_lines_listbox.xml @@ -83,7 +83,7 @@ <value> <dictionary> <item> - <key> <string>all_columns</string> </key> + <key> <string>all_columns</string> </key> <value> <list> <tuple> @@ -107,7 +107,7 @@ <string>Quantity</string> </tuple> <tuple> - <string>getTotalQuantity</string> + <string>total_quantity</string> <string>Total Quantity</string> </tuple> <tuple> @@ -115,11 +115,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> @@ -130,7 +130,7 @@ </value> </item> <item> - <key> <string>columns</string> </key> + <key> <string>columns</string> </key> <value> <list> <tuple> @@ -154,7 +154,7 @@ <string>Quantity</string> </tuple> <tuple> - <string>getTotalQuantity</string> + <string>total_quantity</string> <string>Total Quantity</string> </tuple> <tuple> @@ -162,11 +162,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> @@ -177,7 +177,7 @@ </value> </item> <item> - <key> <string>editable_columns</string> </key> + <key> <string>editable_columns</string> </key> <value> <list> <tuple> @@ -196,6 +196,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> @@ -212,7 +216,7 @@ <value> <string>Base_viewFieldLibrary</string> </value> </item> <item> - <key> <string>portal_types</string> </key> + <key> <string>portal_types</string> </key> <value> <list> <tuple> @@ -223,7 +227,7 @@ </value> </item> <item> - <key> <string>report_root_list</string> </key> + <key> <string>report_root_list</string> </key> <value> <list> <tuple> @@ -238,15 +242,15 @@ </value> </item> <item> - <key> <string>report_tree</string> </key> + <key> <string>report_tree</string> </key> <value> <int>1</int> </value> </item> <item> - <key> <string>selection_name</string> </key> + <key> <string>selection_name</string> </key> <value> <string>purchase_order_line_selection</string> </value> </item> <item> - <key> <string>sort</string> </key> + <key> <string>sort</string> </key> <value> <list> <tuple> @@ -261,7 +265,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 Order Lines</string> </value> </item> </dictionary> diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index 4b74f2216dbbf61c34b833c71a1bf5ce78c85b6a..91a3d4243df1581626c3a06d2332405e0241720b 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -338 \ No newline at end of file +340 \ No newline at end of file