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

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Mar 28 18:43:01 2008
New Revision: 20201

URL: http://svn.erp5.org?rev=20201&view=rev
Log:
PaySheetTransaction_getYearToDateWorkTimeSalary: if we cannot find a line with reference, try with ID, because this work_time_annotation_line will be created by accessor

Modified:
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateWorkTimeSalary.xml
    erp5/trunk/bt5/erp5_payroll/bt/revision

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateWorkTimeSalary.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateWorkTimeSalary.xml?rev=20201&r1=20200&r2=20201&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateWorkTimeSalary.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateWorkTimeSalary.xml Fri Mar 28 18:43:01 2008
@@ -76,6 +76,7 @@
    \'portal_type\'         : \'Pay Sheet Transaction\',\n
    \'delivery.start_date\' : {\'range\': "minmax", \'query\': (from_date, to_date)},\n
    \'delivery.source_section_uid\' : context.getSourceSectionUid(),\n
+   \'delivery.destination_section_uid\' : context.getDestinationSectionUid(),\n
    \'simulation_state\'    : [\'confirmed\', \'stopped\', \'delivered\'],\n
   }\n
 \n
@@ -85,6 +86,11 @@
 for paysheet in paysheet_list:\n
   annotation_line = paysheet.getAnnotationLineFromReference(\\\n
       reference=\'work_time_annotation_line\')\n
+  if annotation_line is None:\n
+    annotation_line = getattr(paysheet, \'work_time_annotation_line\', None)\n
+  if annotation_line is None:\n
+    raise ValueError, "Paysheet %s has no Annotation Line with reference work_time_annotation_line"\\\n
+                             % paysheet.getRelativeUrl()\n
   nb_heures = annotation_line.getQuantity()\n
   yearly_work_time += nb_heures\n
 \n
@@ -99,6 +105,12 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
             <value>
               <none/>
             </value>
@@ -145,6 +157,9 @@
                             <string>_getiter_</string>
                             <string>paysheet</string>
                             <string>annotation_line</string>
+                            <string>None</string>
+                            <string>getattr</string>
+                            <string>ValueError</string>
                             <string>nb_heures</string>
                             <string>_inplacevar_</string>
                           </tuple>

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=20201&r1=20200&r2=20201&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision Fri Mar 28 18:43:01 2008
@@ -1,1 +1,1 @@
-232
+233