Fix new gross salary calculation on update.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@11509 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_initializePreview.xml

@@ -166,20 +166,18 @@ if selection_params.has_key(\'updated_listbox\'):\n
 \n
 \n
 # Scan the listbox and look for complementary lines to add to the gross salary\n
-new_gross_salary = 0.0\n
+new_gross_salary = r_(context.getGrossSalary())\n
 for line in updated_listbox:\n
   salary_range = line[\'salary_range\']\n
   if salary_range not in [None, \'\'] and salary_range.startswith(\'salary_range/france/fixed/gross\'):\n
     # Get the employee or employer share as part of the multiline gross salary\n
     # The payroll service "setup convention" require that the fixed value should be defined on \'employer_share\'\n
     share_value = line[\'employer_share\']\n
-    if share_value not in [None, \'\']:\n
+    if share_value not in [None, \'\']: \n
       new_gross_salary = r_(new_gross_salary + r_(share_value))\n
 \n
-if new_gross_salary > 0.0:\n
-  # Don\'t forget to add the base salary\n
-  new_gross_salary = r_(new_gross_salary + r_(context.getGrossSalary()))\n
-else:\n
+# Reset new salary if calculation goes bad\n
+if new_gross_salary <= 0.0:\n
   new_gross_salary = None\n
 \n
 \n

bt5/erp5_payroll/bt/change_log

 2006-11-28 Kevin
 * Fix "prevoyance" calculation.
 * Add free text zone (based on description property) to add more detailled info on PaySheets.
+* Fix new gross salary calculation on update.
 
 2006-11-27 Kevin
 * Make "prevoyance" payroll service accountable.

bt5/erp5_payroll/bt/revision

-145
\ No newline at end of file
+147
\ No newline at end of file

bt5/erp5_payroll/bt/version

-0.2.16
\ No newline at end of file
+0.2.17
\ No newline at end of file