From b1d7d2b60b19a8ff78916a400d20daf7fc8e10c8 Mon Sep 17 00:00:00 2001 From: Yoshinori Okuji <yo@nexedi.com> Date: Wed, 8 Sep 2004 13:10:01 +0000 Subject: [PATCH] Renamed from calculPaySheetTransaction.py to PaySheetTransaction_calculate.py. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@1592 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...Transaction.py => PaySheetTransaction_calculate.py} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename product/ERP5/skins/erp5_accounting/{calculPaySheetTransaction.py => PaySheetTransaction_calculate.py} (98%) diff --git a/product/ERP5/skins/erp5_accounting/calculPaySheetTransaction.py b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_calculate.py similarity index 98% rename from product/ERP5/skins/erp5_accounting/calculPaySheetTransaction.py rename to product/ERP5/skins/erp5_accounting/PaySheetTransaction_calculate.py index 761a903a51..89a6c6c579 100755 --- a/product/ERP5/skins/erp5_accounting/calculPaySheetTransaction.py +++ b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_calculate.py @@ -1,4 +1,4 @@ -## Script (Python) "calculPaySheetTransaction" +## Script (Python) "PaySheetTransaction_calculate" ##bind container=container ##bind context=context ##bind namespace= @@ -222,9 +222,9 @@ addPaySheetItem(title = 'Assurance maladie', # this contribution is special because salary and employer shares are calculated from 2 base # salary_share_value = (6.55 / 100) * ceiling_salary # salary_share_total += float(salary_share_value) -# ps_description = "= 6.55% * " + str(ceiling_salary) + " (=salaire plafonné)" +# ps_description = "= 6.55% * " + str(ceiling_salary) + " (=salaire plafonné)" # employer_share_value = gross_salary * (1.60 / 100) + ceiling_salary * (8.20 / 100) -# pp_description = "= 1.60% * " + str(gross_salary) + " + 8.20% * " + str(ceiling_salary) + " = 1.60% * salaire brut + 8.20% * salaire plafonné" +# pp_description = "= 1.60% * " + str(gross_salary) + " + 8.20% * " + str(ceiling_salary) + " = 1.60% * salaire brut + 8.20% * salaire plafonné" # createPaySheetLine( new_title = 'Assurance vieillesse', # share = 'cs', # src_deb = float(employer_share_value) + float(salary_share_value), @@ -246,7 +246,7 @@ addPaySheetItem(title = 'Assurance vieillesse 1', oldage_insurance2 = { 'salary_share_rate' : 6.55 , 'employer_share_rate' : 8.20 , 'base_value' : ceiling_salary - , 'base_description' : "salaire plafonné" + , 'base_description' : "salaire plafonné" } addPaySheetItem(title = 'Assurance vieillesse 2', values = oldage_insurance2, @@ -290,7 +290,7 @@ if company_size > 9: lodging_helps['base_value'] = gross_salary else: lodging_helps['employer_share_rate'] = 0.10 - lodging_helps['base_description'] = "salaire plafonné" + lodging_helps['base_description'] = "salaire plafonné" lodging_helps['base_value'] = ceiling_salary addPaySheetItem(title = 'Aide au logement', values = lodging_helps, -- 2.30.9