Commit bf22132d authored by Yusuke Muraoka's avatar Yusuke Muraoka

2009-09-01 yusuke

* tax_category category is renamed to contribution_share category

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28711 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent cecead52
...@@ -115,7 +115,7 @@ def getPriceCurrencyId(currency):\n ...@@ -115,7 +115,7 @@ def getPriceCurrencyId(currency):\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/salaire_net_imposable\',\n
tax_category=\'tax_category/employee_share\')\n contribution_share=\'contribution_share/employee\')\n
def getTaxableNetPayId(salaire_net_imposable):\n def getTaxableNetPayId(salaire_net_imposable):\n
s = \'\'\n s = \'\'\n
if salaire_net_imposable:\n if salaire_net_imposable:\n
...@@ -124,7 +124,7 @@ def getTaxableNetPayId(salaire_net_imposable):\n ...@@ -124,7 +124,7 @@ def getTaxableNetPayId(salaire_net_imposable):\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/total_deductions\',\n
tax_category=\'tax_category/employee_share\')\n contribution_share=\'contribution_share/employee\')\n
def getTotalEmployeeTaxId(total_employee_tax):\n def getTotalEmployeeTaxId(total_employee_tax):\n
s = \'\'\n s = \'\'\n
if total_employee_tax:\n if total_employee_tax:\n
...@@ -134,7 +134,7 @@ def getTotalEmployeeTaxId(total_employee_tax):\n ...@@ -134,7 +134,7 @@ def getTotalEmployeeTaxId(total_employee_tax):\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/total_deductions\',\n
tax_category=\'tax_category/employer_share\')\n contribution_share=\'contribution_share/employer\')\n
def getTotalEmployerTaxId(total_employer_tax):\n def getTotalEmployerTaxId(total_employer_tax):\n
s = \'\'\n s = \'\'\n
if total_employer_tax:\n if total_employer_tax:\n
...@@ -177,7 +177,7 @@ def getPaymentConditionText(paysheet):\n ...@@ -177,7 +177,7 @@ def getPaymentConditionText(paysheet):\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/gross_salary\',\n
tax_category=\'tax_category/employee_share\')\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=\'gross_salary\') + gross_salary\n
\n \n
...@@ -199,7 +199,7 @@ year_to_date_bonus_worked_hour_amount = context.PaySheetTransaction_getYearToDat ...@@ -199,7 +199,7 @@ year_to_date_bonus_worked_hour_amount = context.PaySheetTransaction_getYearToDat
paysheet=context, base_contribution_list=\'overtime\') + \\\n paysheet=context, base_contribution_list=\'overtime\') + \\\n
context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
base_contribution=\'base_contribution/base_amount/overtime\', \\\n base_contribution=\'base_contribution/base_amount/overtime\', \\\n
tax_category=\'tax_category/employee_share\') 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=\'salaire_net_imposable\') + salaire_net_imposable\n
......
...@@ -89,7 +89,7 @@ plafond_min = slice.getQuantityRangeMin()\n ...@@ -89,7 +89,7 @@ plafond_min = slice.getQuantityRangeMin()\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/gross_salary\',\n
tax_category=\'tax_category/employee_share\')\n contribution_share=\'contribution_share/employee\')\n
\n \n
if gross_salary < plafond_max:\n if gross_salary < plafond_max:\n
slice_amount = gross_salary - plafond_min\n slice_amount = gross_salary - plafond_min\n
...@@ -107,7 +107,7 @@ for paysheet in paysheet_list :\n ...@@ -107,7 +107,7 @@ for paysheet in paysheet_list :\n
plafond_min = slice.getQuantityRangeMin()\n plafond_min = slice.getQuantityRangeMin()\n
gross_salary=paysheet.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n gross_salary=paysheet.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
base_contribution=\'base_contribution/base_amount/gross_salary\',\n base_contribution=\'base_contribution/base_amount/gross_salary\',\n
tax_category=\'tax_category/employee_share\')\n contribution_share=\'contribution_share/employee\')\n
slice_amount = 0\n slice_amount = 0\n
if gross_salary < plafond_max:\n if gross_salary < plafond_max:\n
slice_amount = gross_salary - plafond_min\n slice_amount = gross_salary - plafond_min\n
......
2009-09-01 yusuke
* tax_category category is renamed to contribution_share category
2009-03-10 fabien 2009-03-10 fabien
* add a macro used to display localised information in a part of the payslip * add a macro used to display localised information in a part of the payslip
* increment version number because of the new style of the payslip * increment version number because of the new style of the payslip
......
106 112
\ 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