From b1fa10a893239395bbd285d4ed88edd8389a75c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com> Date: Fri, 25 Nov 2011 15:24:44 +0100 Subject: [PATCH] fix display of quantity of pay sheet model cells --- .../matrixbox_quantity.xml | 40 ++++++++++++++----- bt5/erp5_payroll/bt/revision | 2 +- 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox_quantity.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox_quantity.xml index bfed061775..7d05d37b61 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox_quantity.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox_quantity.xml @@ -10,6 +10,7 @@ <key> <string>delegated_list</string> </key> <value> <list> + <string>default</string> <string>description</string> <string>display_width</string> <string>precision</string> @@ -55,6 +56,12 @@ <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>description</string> </key> <value> <string></string> </value> @@ -62,7 +69,7 @@ <item> <key> <string>display_width</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> </item> <item> @@ -76,7 +83,7 @@ <item> <key> <string>precision</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> </value> </item> <item> @@ -94,6 +101,10 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>description</string> </key> <value> <string>The Base used to calculate the tax.</string> </value> @@ -130,26 +141,33 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <global name="TALESMethod" module="Products.Formulator.TALESField"/> - <tuple/> - </tuple> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> </pickle> <pickle> <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: preferences.getPreference(\'preferred_money_quantity_field_width\', 10)</string> </value> + <value> <string>python: cell.getQuantity()</string> </value> </item> </dictionary> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <global name="TALESMethod" module="Products.Formulator.TALESField"/> - <tuple/> - </tuple> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: preferences.getPreference(\'preferred_money_quantity_field_width\', 10)</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> </pickle> <pickle> <dictionary> diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision index b66073e9e4..6a3a7891aa 100644 --- a/bt5/erp5_payroll/bt/revision +++ b/bt5/erp5_payroll/bt/revision @@ -1 +1 @@ -586 \ No newline at end of file +587 \ No newline at end of file -- 2.30.9