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

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Jun 17 10:11:53 2008
New Revision: 21630

URL: http://svn.erp5.org?rev=21630&view=rev
Log:
prevent "bad operand type for unary -" TypeErrors when total_price is None

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

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getPaySheetLineReportSectionLineList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getPaySheetLineReportSectionLineList.xml?rev=21630&r1=21629&r2=21630&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getPaySheetLineReportSectionLineList.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getPaySheetLineReportSectionLineList.xml Tue Jun 17 10:11:53 2008
@@ -129,7 +129,7 @@
 \n
 i = 0\n
 for inventory in employee_inventory_list:\n
-  price = - inventory.total_price or 0\n
+  price = - (inventory.total_price or 0)\n
   movement = inventory.getObject()\n
   employee = movement.getDestinationValue()\n
   salary_range = movement.getSalaryRange()\n
@@ -149,7 +149,7 @@
   base_total += inventory.quantity\n
 \n
 for inventory in employer_inventory_list:\n
-  price = - inventory.total_price or 0\n
+  price = - (inventory.total_price or 0)\n
   movement = inventory.getObject()\n
   employee = movement.getDestinationValue()\n
   salary_range = movement.getSalaryRange()\n

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=21630&r1=21629&r2=21630&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision Tue Jun 17 10:11:53 2008
@@ -1,1 +1,1 @@
-288
+291