Commit 3e41afa7 authored by Fabien Morin's avatar Fabien Morin

fix problems related to category change (tax_category -> contribution_share)

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29074 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 4c87af43
No related merge requests found
...@@ -114,7 +114,7 @@ def getPriceCurrencyId(currency):\n ...@@ -114,7 +114,7 @@ def getPriceCurrencyId(currency):\n
return s\n return s\n
\n \n
salaire_net_imposable = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n salaire_net_imposable = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
base_contribution=\'base_contribution/base_amount/salaire_net_imposable\',\n base_contribution=\'base_contribution/base_amount/payroll/earning/salary/taxable_net_salary\',\n
contribution_share=\'contribution_share/employee\')\n contribution_share=\'contribution_share/employee\')\n
def getTaxableNetPayId(salaire_net_imposable):\n def getTaxableNetPayId(salaire_net_imposable):\n
s = \'\'\n s = \'\'\n
...@@ -123,7 +123,7 @@ def getTaxableNetPayId(salaire_net_imposable):\n ...@@ -123,7 +123,7 @@ def getTaxableNetPayId(salaire_net_imposable):\n
return s\n return s\n
\n \n
total_employee_tax = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n total_employee_tax = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
base_contribution=\'base_contribution/base_amount/total_deductions\',\n base_contribution=\'base_contribution/base_amount/payroll/tax\',\n
contribution_share=\'contribution_share/employee\')\n contribution_share=\'contribution_share/employee\')\n
def getTotalEmployeeTaxId(total_employee_tax):\n def getTotalEmployeeTaxId(total_employee_tax):\n
s = \'\'\n s = \'\'\n
...@@ -133,7 +133,7 @@ def getTotalEmployeeTaxId(total_employee_tax):\n ...@@ -133,7 +133,7 @@ def getTotalEmployeeTaxId(total_employee_tax):\n
return s\n return s\n
\n \n
total_employer_tax = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n total_employer_tax = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
base_contribution=\'base_contribution/base_amount/total_deductions\',\n base_contribution=\'base_contribution/base_amount/payroll/tax\',\n
contribution_share=\'contribution_share/employer\')\n contribution_share=\'contribution_share/employer\')\n
def getTotalEmployerTaxId(total_employer_tax):\n def getTotalEmployerTaxId(total_employer_tax):\n
s = \'\'\n s = \'\'\n
...@@ -176,10 +176,10 @@ def getPaymentConditionText(paysheet):\n ...@@ -176,10 +176,10 @@ def getPaymentConditionText(paysheet):\n
return \'\'\n return \'\'\n
\n \n
gross_salary = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n gross_salary = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
base_contribution=\'base_contribution/base_amount/gross_salary\',\n base_contribution=\'base_contribution/base_amount/payroll/earning/salary/gross_salary\',\n
contribution_share=\'contribution_share/employee\')\n contribution_share=\'contribution_share/employee\')\n
year_to_date_gross_salary = context.PaySheetTransaction_getYearToDateBaseContributionTotalPrice(\\\n year_to_date_gross_salary = context.PaySheetTransaction_getYearToDateBaseContributionTotalPrice(\\\n
paysheet=context, base_contribution_list=\'gross_salary\') + gross_salary\n paysheet=context, base_contribution_list=\'payroll/earning/salary/gross_salary\') + gross_salary\n
\n \n
year_to_date_slice_a = context.PaySheetTransaction_getYearToDateSlice(\'salary_range/france/tranche_a\')\n year_to_date_slice_a = context.PaySheetTransaction_getYearToDateSlice(\'salary_range/france/tranche_a\')\n
\n \n
...@@ -196,13 +196,13 @@ year_to_date_bonus_worked_hour_count = bonus_worked_hour_count + \\\n ...@@ -196,13 +196,13 @@ year_to_date_bonus_worked_hour_count = bonus_worked_hour_count + \\\n
context.PaySheetTransaction_getYearToDateOvertimeHours() or 0\n context.PaySheetTransaction_getYearToDateOvertimeHours() or 0\n
\n \n
year_to_date_bonus_worked_hour_amount = context.PaySheetTransaction_getYearToDateBaseContributionTotalPrice(\\\n year_to_date_bonus_worked_hour_amount = context.PaySheetTransaction_getYearToDateBaseContributionTotalPrice(\\\n
paysheet=context, base_contribution_list=\'overtime\') + \\\n paysheet=context, base_contribution_list=\'payroll/earning/salary/overtime\') + \\\n
context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
base_contribution=\'base_contribution/base_amount/overtime\', \\\n base_contribution=\'base_contribution/base_amount/payroll/earning/salary/overtime\', \\\n
contribution_share=\'contribution_share/employee\') or 0\n contribution_share=\'contribution_share/employee\') or 0\n
\n \n
year_to_date_taxable_net_salary = context.PaySheetTransaction_getYearToDateBaseContributionTotalPrice(\\\n year_to_date_taxable_net_salary = context.PaySheetTransaction_getYearToDateBaseContributionTotalPrice(\\\n
paysheet=context, base_contribution_list=\'salaire_net_imposable\') + salaire_net_imposable\n paysheet=context, base_contribution_list=\'payroll/earning/salary/net_salary\') + salaire_net_imposable\n
\n \n
def unicodeDict(d):\n def unicodeDict(d):\n
for k, v in d.items():\n for k, v in d.items():\n
......
112 113
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment