Commit bfb56eb7 authored by Yusuke Muraoka's avatar Yusuke Muraoka

some suffixes are overkilled

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28713 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent c4f3d683
...@@ -2569,22 +2569,22 @@ class TestPayroll(TestPayrollMixin): ...@@ -2569,22 +2569,22 @@ class TestPayroll(TestPayrollMixin):
employee_career_reference='E1', employee_career_reference='E1',
employee_title='Employee One', employee_title='Employee One',
base=2000, base=2000,
employee=2000 * .50, employee_share=2000 * .50,
employer=2000 * .40, employer_share=2000 * .40,
total=(2000 * .50 + 2000 * .40)) total=(2000 * .50 + 2000 * .40))
self.checkLineProperties(data_line_list[1], self.checkLineProperties(data_line_list[1],
id=2, id=2,
employee_career_reference='E2', employee_career_reference='E2',
employee_title='Employee Two', employee_title='Employee Two',
base=3000, base=3000,
employee=3000 * .50, employee_share=3000 * .50,
employer=3000 * .40, employer_share=3000 * .40,
total=(3000 * .50 + 3000 * .40)) total=(3000 * .50 + 3000 * .40))
# stat line # stat line
self.checkLineProperties(line_list[-1], self.checkLineProperties(line_list[-1],
base=3000 + 2000, base=3000 + 2000,
employee=(3000 + 2000) * .50, employee_share=(3000 + 2000) * .50,
employer=(3000 + 2000) * .40, employer_share=(3000 + 2000) * .40,
total=((3000 + 2000) * .50 + (3000 + 2000) * .40)) total=((3000 + 2000) * .50 + (3000 + 2000) * .40))
def test_PayrollTaxesReportDifferentSalaryRange(self): def test_PayrollTaxesReportDifferentSalaryRange(self):
...@@ -2754,22 +2754,22 @@ class TestPayroll(TestPayrollMixin): ...@@ -2754,22 +2754,22 @@ class TestPayroll(TestPayrollMixin):
employee_career_reference='E1', employee_career_reference='E1',
employee_title='Employee One', employee_title='Employee One',
base=1000, base=1000,
employee=1000 * .50, employee_share=1000 * .50,
employer=1000 * .40, employer_share=1000 * .40,
total=(1000 * .50 + 1000 * .40)) total=(1000 * .50 + 1000 * .40))
self.checkLineProperties(data_line_list[1], self.checkLineProperties(data_line_list[1],
id=2, id=2,
employee_career_reference='E2', employee_career_reference='E2',
employee_title='Employee Two', employee_title='Employee Two',
base=1000, base=1000,
employee=1000 * .50, employee_share=1000 * .50,
employer=1000 * .40, employer_share=1000 * .40,
total=(1000 * .50 + 1000 * .40)) total=(1000 * .50 + 1000 * .40))
self.checkLineProperties(data_line_list[2], self.checkLineProperties(data_line_list[2],
employee_title='Total Slice A', employee_title='Total Slice A',
base=2000, base=2000,
employee=2000 * .50, employee_share=2000 * .50,
employer=2000 * .40, employer_share=2000 * .40,
#total=(2000 * .50 + 2000 * .40) #total=(2000 * .50 + 2000 * .40)
) )
...@@ -2778,30 +2778,30 @@ class TestPayroll(TestPayrollMixin): ...@@ -2778,30 +2778,30 @@ class TestPayroll(TestPayrollMixin):
employee_career_reference='E1', employee_career_reference='E1',
employee_title='Employee One', employee_title='Employee One',
base=500, base=500,
employee=500 * .20, employee_share=500 * .20,
employer=500 * .32, employer_share=500 * .32,
total=(500 * .20 + 500 * .32)) total=(500 * .20 + 500 * .32))
self.checkLineProperties(data_line_list[4], self.checkLineProperties(data_line_list[4],
id=4, id=4,
employee_career_reference='E2', employee_career_reference='E2',
employee_title='Employee Two', employee_title='Employee Two',
base=3000, base=3000,
employee=3000 * .20, employee_share=3000 * .20,
employer=3000 * .32, employer_share=3000 * .32,
total=(3000 * .20 + 3000 * .32)) total=(3000 * .20 + 3000 * .32))
self.checkLineProperties(data_line_list[5], self.checkLineProperties(data_line_list[5],
employee_title='Total Slice B', employee_title='Total Slice B',
base=3500, base=3500,
employee=3500 * .20, employee_share=3500 * .20,
employer=3500 * .32, employer_share=3500 * .32,
#total=(3500 * .20 + 3500 * .32), #total=(3500 * .20 + 3500 * .32),
) )
# stat line # stat line
self.checkLineProperties(line_list[-1], self.checkLineProperties(line_list[-1],
base=2000 + 3500, base=2000 + 3500,
employee=(2000 * .50 + 3500 * .20), employee_share=(2000 * .50 + 3500 * .20),
employer=(2000 * .40 + 3500 * .32), employer_share=(2000 * .40 + 3500 * .32),
total=((2000 * .50 + 3500 * .20) + total=((2000 * .50 + 3500 * .20) +
(2000 * .40 + 3500 * .32))) (2000 * .40 + 3500 * .32)))
......
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