From 2a39a998960125abc38d993f6b22e0298f5b0a83 Mon Sep 17 00:00:00 2001 From: Yoshinori Okuji <yo@nexedi.com> Date: Tue, 3 Feb 2009 09:21:28 +0000 Subject: [PATCH] 2009-02-03 yo * Editable fields must use "cell" instead of "here" in the tales expressions, so they may not use proxy fields created for my_* intact. Due to this error, total_price and total_quantity could be wrongly displayed. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25422 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../listbox_total_price.xml | 31 +++++++++++++++++++ .../listbox_total_quantity.xml | 31 +++++++++++++++++++ bt5/erp5_invoicing/bt/change_log | 3 ++ bt5/erp5_invoicing/bt/revision | 2 +- 4 files changed, 66 insertions(+), 1 deletion(-) diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewFieldLibrary/listbox_total_price.xml b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewFieldLibrary/listbox_total_price.xml index 7ce7bac338..02ea2ca586 100644 --- a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewFieldLibrary/listbox_total_price.xml +++ b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewFieldLibrary/listbox_total_price.xml @@ -13,6 +13,7 @@ <key> <string>delegated_list</string> </key> <value> <list> + <string>default</string> <string>enabled</string> </list> </value> @@ -55,6 +56,16 @@ <key> <string>tales</string> </key> <value> <dictionary> + <item> + <key> <string>default</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>field_id</string> </key> <value> <string></string> </value> @@ -74,6 +85,10 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>enabled</string> </key> <value> <int>1</int> </value> @@ -96,4 +111,20 @@ </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.getTotalPrice(fast=0)</string> </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewFieldLibrary/listbox_total_quantity.xml b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewFieldLibrary/listbox_total_quantity.xml index b4d7922eec..0c83aeca40 100644 --- a/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewFieldLibrary/listbox_total_quantity.xml +++ b/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewFieldLibrary/listbox_total_quantity.xml @@ -13,6 +13,7 @@ <key> <string>delegated_list</string> </key> <value> <list> + <string>default</string> <string>enabled</string> </list> </value> @@ -55,6 +56,16 @@ <key> <string>tales</string> </key> <value> <dictionary> + <item> + <key> <string>default</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>field_id</string> </key> <value> <string></string> </value> @@ -74,6 +85,10 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>enabled</string> </key> <value> <int>1</int> </value> @@ -96,4 +111,20 @@ </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.getTotalQuantity(fast=0)</string> </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_invoicing/bt/change_log b/bt5/erp5_invoicing/bt/change_log index 34bbd34496..7394e9b525 100644 --- a/bt5/erp5_invoicing/bt/change_log +++ b/bt5/erp5_invoicing/bt/change_log @@ -1,3 +1,6 @@ +2009-02-03 yo +* Editable fields must use "cell" instead of "here" in the tales expressions, so they may not use proxy fields created for my_* intact. Due to this error, total_price and total_quantity could be wrongly displayed. + 2009-01-27 yusei * Added invoice_transmission_mode category. diff --git a/bt5/erp5_invoicing/bt/revision b/bt5/erp5_invoicing/bt/revision index 4129657509..fb35181565 100644 --- a/bt5/erp5_invoicing/bt/revision +++ b/bt5/erp5_invoicing/bt/revision @@ -1 +1 @@ -196 \ No newline at end of file +197 \ No newline at end of file -- 2.30.9