[Erp5-report] r27772 - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins/erp5_...

[nobody at svn.erp5.org]

Author: fabien
Date: Tue Jun 23 11:44:00 2009
New Revision: 27772

URL: http://svn.erp5.org?rev=27772&view=rev
Log:
- remove some unused variable
- if slices are used, display the slice title in the printed payslip

Modified:
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.xml
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODT.xml
    erp5/trunk/bt5/erp5_payroll/bt/revision

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml?rev=27772&r1=27771&r2=27772&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml [utf8] Tue Jun 23 11:44:00 2009
@@ -57,9 +57,6 @@
   this script get all paysheet lines in the int_index order with all the amounts\n
   displayed in the lisbox\n
 \'\'\'\n
-import pprint\n
-precision = context.getPriceCurrencyValue().getQuantityPrecision()\n
-\n
 line_list = context.PaySheetTransaction_getMovementList(sort_on=[(\'int_index\',\n
                                                                   \'ascending\')])\n
 def addProperties(line, line_dict, property_list):\n
@@ -132,10 +129,8 @@
                         <key> <string>co_varnames</string> </key>
                         <value>
                           <tuple>
-                            <string>pprint</string>
                             <string>_getattr_</string>
                             <string>context</string>
-                            <string>precision</string>
                             <string>line_list</string>
                             <string>addProperties</string>
                             <string>line_dict_list</string>

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.xml?rev=27772&r1=27771&r2=27772&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.xml [utf8] Tue Jun 23 11:44:00 2009
@@ -54,11 +54,6 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>translateString = context.Base_translateString\n
-request = context.REQUEST\n
-\n
-# display only title line instead of description\n
-use_line_title =  request.get(\'use_line_title\', 0)\n
-\n
 model = context.getSpecialiseValue().getEffectiveModel(\\\n
    start_date=context.getStartDate(), stop_date=context.getStopDate())\n
 \n
@@ -415,8 +410,6 @@
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>translateString</string>
-                            <string>request</string>
-                            <string>use_line_title</string>
                             <string>model</string>
                             <string>getFieldAsLineList</string>
                             <string>getFieldAsString</string>

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODT.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODT.xml?rev=27772&r1=27771&r2=27772&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODT.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODT.xml [utf8] Tue Jun 23 11:44:00 2009
@@ -477,9 +477,8 @@
                  right_style_name python:\'Table_20_Contents_20_Right\'">\n
 \n
               <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
-                <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:line_dict["title"]\' tal:attributes=\'text:style-name left_style_name\'>1</text:p>\n
-              </table:table-cell>\n
-              \n
+                <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:line_dict["slice"] is not None and "%s (%s)" %(line_dict["title"], line_dict["slice"]) or line_dict["title"]\' tal:attributes=\'text:style-name left_style_name\'>1</text:p>\n
+              </table:table-cell>\n
               <table:table-cell table:style-name=\'Tableau1.A3\'\n
                                 office:value-type=\'float\'\n
                                 tal:condition="python: line_dict[\'base\'] != None"\n

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=27772&r1=27771&r2=27772&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] Tue Jun 23 11:44:00 2009
@@ -1,1 +1,1 @@
-479
+480