From 62637ff00f1afea6951e0b6060748236f028fcb7 Mon Sep 17 00:00:00 2001
From: Nicolas Dumazet <nicolas.dumazet@nexedi.com>
Date: Thu, 5 Aug 2010 06:25:57 +0000
Subject: [PATCH] Fix display of price and quantity for Cells listed on
PackingList views
Packing List views are a bit particular because they use getMovementList.
All the listbox lines are movements. Similarly, some lines can bear
variation categories. It means that the "enabled" TALES test:
python: cell.isMovement() and not cell.getVariationCategoryList()
is problematic for this view.
For quantity fields, the Base_viewFieldLibrary.my_view_mode_quantity
fits perfectly our usecase.
For price, we need to get price precision from the cell, so
Base_viewFieldLibrary.my_view_mode_price does not fit. On the other hand,
Base_viewTradeFieldLibrary.my_view_mode_price does include the "enabled" TALES,
which we do not want.
We thus create a new "my_view_mode_movement_listbox_price" field in
Base_viewTradeFieldLibrary for this usage.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@37500 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../erp5_trade/Base_viewTradeFieldLibrary.xml | 1 +
.../my_view_mode_movement_listbox_price.xml | 103 ++++++++++++++++++
.../listbox_price.xml | 2 +-
.../listbox_quantity.xml | 4 +-
.../listbox_price.xml | 2 +-
.../listbox_quantity.xml | 4 +-
.../listbox_quantity.xml | 4 +-
.../listbox_quantity.xml | 4 +-
.../SalePackingList_view/listbox_price.xml | 2 +-
.../SalePackingList_view/listbox_quantity.xml | 4 +-
bt5/erp5_trade/bt/revision | 2 +-
11 files changed, 118 insertions(+), 14 deletions(-)
create mode 100644 bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_movement_listbox_price.xml
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary.xml
index 97d5c1e024..fcbbc5bf6f 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary.xml
@@ -305,6 +305,7 @@
<string>my_view_mode_movement_use</string>
<string>my_view_mode_listbox_resource_relative_url</string>
<string>my_view_mode_listbox_movement_relative_url</string>
+ <string>my_view_mode_movement_listbox_price</string>
</list>
</value>
</item>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_movement_listbox_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_movement_listbox_price.xml
new file mode 100644
index 0000000000..61bc49464a
--- /dev/null
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_movement_listbox_price.xml
@@ -0,0 +1,103 @@
+<?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>my_view_mode_movement_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_view_mode_listbox_price</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewTradeFieldLibrary</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>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/listbox_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/listbox_price.xml
index f1a2fdbedb..8f9df6d11e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/listbox_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/listbox_price.xml
@@ -74,7 +74,7 @@
<dictionary>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_view_mode_listbox_price</string> </value>
+ <value> <string>my_view_mode_movement_listbox_price</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/listbox_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/listbox_quantity.xml
index 0e49184471..33eeeeca51 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/listbox_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalPackingList_view/listbox_quantity.xml
@@ -74,11 +74,11 @@
<dictionary>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_view_mode_listbox_quantity</string> </value>
+ <value> <string>my_view_mode_quantity</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewTradeFieldLibrary</string> </value>
+ <value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/listbox_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/listbox_price.xml
index f1a2fdbedb..8f9df6d11e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/listbox_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/listbox_price.xml
@@ -74,7 +74,7 @@
<dictionary>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_view_mode_listbox_price</string> </value>
+ <value> <string>my_view_mode_movement_listbox_price</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/listbox_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/listbox_quantity.xml
index 0e49184471..33eeeeca51 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/listbox_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingList_view/listbox_quantity.xml
@@ -74,11 +74,11 @@
<dictionary>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_view_mode_listbox_quantity</string> </value>
+ <value> <string>my_view_mode_quantity</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewTradeFieldLibrary</string> </value>
+ <value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedPurchasePackingList_view/listbox_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedPurchasePackingList_view/listbox_quantity.xml
index 0e49184471..33eeeeca51 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedPurchasePackingList_view/listbox_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedPurchasePackingList_view/listbox_quantity.xml
@@ -74,11 +74,11 @@
<dictionary>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_view_mode_listbox_quantity</string> </value>
+ <value> <string>my_view_mode_quantity</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewTradeFieldLibrary</string> </value>
+ <value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingList_view/listbox_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingList_view/listbox_quantity.xml
index 0e49184471..33eeeeca51 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingList_view/listbox_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingList_view/listbox_quantity.xml
@@ -74,11 +74,11 @@
<dictionary>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_view_mode_listbox_quantity</string> </value>
+ <value> <string>my_view_mode_quantity</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewTradeFieldLibrary</string> </value>
+ <value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/listbox_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/listbox_price.xml
index f1a2fdbedb..8f9df6d11e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/listbox_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/listbox_price.xml
@@ -74,7 +74,7 @@
<dictionary>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_view_mode_listbox_price</string> </value>
+ <value> <string>my_view_mode_movement_listbox_price</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/listbox_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/listbox_quantity.xml
index 0e49184471..33eeeeca51 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/listbox_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_view/listbox_quantity.xml
@@ -74,11 +74,11 @@
<dictionary>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_view_mode_listbox_quantity</string> </value>
+ <value> <string>my_view_mode_quantity</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewTradeFieldLibrary</string> </value>
+ <value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index 4832075b37..63e305abad 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-967
\ No newline at end of file
+968
--
2.30.9