From ef6cd932d2e0026eccfe0dc45b3c77293b9c52dd Mon Sep 17 00:00:00 2001 From: Kevin Deldycke <kevin@nexedi.com> Date: Fri, 14 Apr 2006 22:16:47 +0000 Subject: [PATCH] Minor changes git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6751 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...AccountingModule_buildAllPaySheetAccountingLine.xml | 2 +- .../AccountingModule_checkPaySheetConsistency.xml | 2 +- ...gModule_validateAllConfirmedPaySheetTransaction.xml | 2 +- .../PaySheetTransaction_buildAccountingLine.xml | 2 +- .../erp5_payroll/PaySheetTransaction_view/listbox.xml | 4 ++++ .../PaySheetTransaction_view/my_gross_salary.xml | 10 +--------- 6 files changed, 9 insertions(+), 13 deletions(-) diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingModule_buildAllPaySheetAccountingLine.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingModule_buildAllPaySheetAccountingLine.xml index ce148d326e..4866a12c16 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingModule_buildAllPaySheetAccountingLine.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingModule_buildAllPaySheetAccountingLine.xml @@ -146,7 +146,7 @@ return printed\n <string>_print</string> <string>_getiter_</string> <string>_getattr_</string> -<string>context</string> + <string>context</string> <string>pay_sheet</string> <string>_getitem_</string> <string>str</string> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingModule_checkPaySheetConsistency.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingModule_checkPaySheetConsistency.xml index 408e13cbd3..3e1556c83d 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingModule_checkPaySheetConsistency.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingModule_checkPaySheetConsistency.xml @@ -75,7 +75,7 @@ STATE_LIST = [ \'confirmed\'\n , \'planned\'\n , \'stopped\'\n #, \'draft\'\n - ]\n +]\n AUTO_UPDATE = False\n \n \n diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingModule_validateAllConfirmedPaySheetTransaction.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingModule_validateAllConfirmedPaySheetTransaction.xml index 1b9c06cfaa..49dde94f03 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingModule_validateAllConfirmedPaySheetTransaction.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingModule_validateAllConfirmedPaySheetTransaction.xml @@ -75,7 +75,7 @@ STATE_LIST = [ \'confirmed\'\n #, \'planned\'\n , \'stopped\'\n #, \'draft\'\n - ]\n +]\n AUTO = False\n \n print """<html>\n diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_buildAccountingLine.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_buildAccountingLine.xml index 4f3368d39f..f9aa8c17db 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_buildAccountingLine.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_buildAccountingLine.xml @@ -160,7 +160,7 @@ return None\n <value> <tuple> <string>PRIORITY</string> -<string>context</string> + <string>context</string> <string>pay_sheet</string> <string>_getiter_</string> <string>_getattr_</string> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox.xml index 9da70f0fdd..427fbdf127 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox.xml @@ -356,6 +356,10 @@ </list> </value> </item> + <item> + <key> <string>count_method</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>css_class</string> </key> <value> <string></string> </value> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_gross_salary.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_gross_salary.xml index 1396194bbc..b63c8d4b3a 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_gross_salary.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_gross_salary.xml @@ -225,18 +225,10 @@ <key> <string>hidden</string> </key> <value> <int>0</int> </value> </item> - <item> - <key> <string>input_style</string> </key> - <value> <string>-1234.5</string> </value> - </item> <item> <key> <string>not_viewable</string> </key> <value> <int>0</int> </value> </item> - <item> - <key> <string>precision</string> </key> - <value> <string></string> </value> - </item> <item> <key> <string>read_only</string> </key> <value> <int>0</int> </value> @@ -247,7 +239,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Gross Salary</string> </value> + <value> <string>Gross Salary (Euros)</string> </value> </item> <item> <key> <string>viewable_expression</string> </key> -- 2.30.9