From 0d85b9e0561911179b789d3d6591e60417e1697c Mon Sep 17 00:00:00 2001 From: Alexandre Boeglin <alex@nexedi.com> Date: Mon, 14 Apr 2008 13:47:58 +0000 Subject: [PATCH] fix tales expression of enabled/editable properties when a line contains a variated resource but no cell has been created yet. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20487 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_trade/OrderLine_viewFieldLibrary/my_price.xml | 6 +++--- .../erp5_trade/OrderLine_viewFieldLibrary/my_quantity.xml | 4 ++-- .../OrderLine_viewFieldLibrary/my_quantity_unit.xml | 8 ++++---- .../erp5_trade/PurchaseOrder_view/listbox_quantity.xml | 6 +++--- .../PurchaseOrder_view/listbox_quantity_unit.xml | 8 ++++---- .../erp5_trade/SaleOrder_view/listbox_quantity.xml | 6 +++--- .../erp5_trade/SaleOrder_view/listbox_quantity_unit.xml | 8 ++++---- bt5/erp5_trade/bt/revision | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_price.xml index 58690e0849..4234a0d58c 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_price.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_price.xml @@ -57,7 +57,7 @@ <value> <dictionary> <item> - <key> <string>enabled</string> </key> + <key> <string>enabled</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> @@ -75,7 +75,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -122,7 +122,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>here/isMovement</string> </value> + <value> <string>python: here.isMovement() and not here.getVariationCategoryList()</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_quantity.xml index 73d4d8a219..60878ee9ab 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_quantity.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_quantity.xml @@ -56,7 +56,7 @@ <value> <dictionary> <item> - <key> <string>enabled</string> </key> + <key> <string>enabled</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> @@ -113,7 +113,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>here/isMovement</string> </value> + <value> <string>python: here.isMovement() and not here.getVariationCategoryList()</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_quantity_unit.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_quantity_unit.xml index f8f7135ef2..6da860b185 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_quantity_unit.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_quantity_unit.xml @@ -58,7 +58,7 @@ <value> <dictionary> <item> - <key> <string>enabled</string> </key> + <key> <string>enabled</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> @@ -72,7 +72,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> @@ -82,7 +82,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -135,7 +135,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>here/isMovement</string> </value> + <value> <string>python: here.isMovement() and not here.getVariationCategoryList()</string> </value> </item> </dictionary> </pickle> 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 07c15ffb29..63544417fd 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 @@ -63,13 +63,13 @@ <value> <dictionary> <item> - <key> <string>editable</string> </key> + <key> <string>editable</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> - <key> <string>enabled</string> </key> + <key> <string>enabled</string> </key> <value> <string></string> </value> </item> <item> @@ -134,7 +134,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>cell/isMovement</string> </value> + <value> <string>python: cell.isMovement() and not cell.getVariationCategoryList()</string> </value> </item> </dictionary> </pickle> 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 44dafd8742..87efa1abd0 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 @@ -64,13 +64,13 @@ <value> <dictionary> <item> - <key> <string>editable</string> </key> + <key> <string>editable</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> - <key> <string>enabled</string> </key> + <key> <string>enabled</string> </key> <value> <string></string> </value> </item> <item> @@ -86,7 +86,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> @@ -147,7 +147,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>cell/isMovement</string> </value> + <value> <string>python: cell.isMovement() and not cell.getVariationCategoryList()</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/listbox_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/listbox_quantity.xml index 501901292a..4838be796b 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/listbox_quantity.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/listbox_quantity.xml @@ -57,13 +57,13 @@ <value> <dictionary> <item> - <key> <string>editable</string> </key> + <key> <string>editable</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> - <key> <string>enabled</string> </key> + <key> <string>enabled</string> </key> <value> <string></string> </value> </item> <item> @@ -122,7 +122,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>cell/isMovement</string> </value> + <value> <string>python: cell.isMovement() and not cell.getVariationCategoryList()</string> </value> </item> </dictionary> </pickle> 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 376b8bd9ba..790f5e0dc5 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,13 +58,13 @@ <value> <dictionary> <item> - <key> <string>editable</string> </key> + <key> <string>editable</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> - <key> <string>enabled</string> </key> + <key> <string>enabled</string> </key> <value> <string></string> </value> </item> <item> @@ -76,7 +76,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>items</string> </key> + <key> <string>items</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> @@ -135,7 +135,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>cell/isMovement</string> </value> + <value> <string>python: cell.isMovement() and not cell.getVariationCategoryList()</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index ce83bd94b3..ddc17b20b7 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -258 \ No newline at end of file +260 \ No newline at end of file -- 2.30.9