Skip to content

erp5
erp5
Commit c480f5d9 authored by Fabien Morin's avatar Fabien Morin
Browse files
Options

updateCellRange is not needed anymore since the workfow trade_matrix_workflow... 

updateCellRange is not needed anymore since the workfow trade_matrix_workflow has been added to Pay Sheet Line and Pay Sheet Model Line in r27028


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27029 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent b7db361e
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 21 deletions
product/ERP5/tests/testPayroll.py
View file @ c480f5d9
...@@ -433,7 +433,6 @@ class TestPayrollMixin(ERP5ReportTestCase): ...@@ -433,7 +433,6 @@ class TestPayrollMixin(ERP5ReportTestCase):
self.tic() self.tic()
# put values in Model Line cells # put values in Model Line cells
model_line.updateCellRange(base_id='movement')
for slice in slice_list: for slice in slice_list:
for share in share_list: for share in share_list:
cell = model_line.newCell(\ cell = model_line.newCell(\
...@@ -1199,7 +1198,6 @@ class TestPayroll(TestPayrollMixin): ...@@ -1199,7 +1198,6 @@ class TestPayroll(TestPayrollMixin):
line.setResourceValue(self.urssaf) line.setResourceValue(self.urssaf)
line.setVariationCategoryList(['tax_category/employee_share', line.setVariationCategoryList(['tax_category/employee_share',
'tax_category/employer_share']) 'tax_category/employer_share'])
line.updateCellRange(base_id='movement')
cell0 = line.newCell('tax_category/employee_share', cell0 = line.newCell('tax_category/employee_share',
portal_type='Pay Sheet Cell', base_id='movement') portal_type='Pay Sheet Cell', base_id='movement')
cell0.setMappedValuePropertyList(['quantity', 'price']) cell0.setMappedValuePropertyList(['quantity', 'price'])
...@@ -1234,7 +1232,6 @@ class TestPayroll(TestPayrollMixin): ...@@ -1234,7 +1232,6 @@ class TestPayroll(TestPayrollMixin):
# Note that it is required that the editable line contains at least one # Note that it is required that the editable line contains at least one
# cell, to know which tax_category is used (employee share or employer # cell, to know which tax_category is used (employee share or employer
# share). # share).
line.updateCellRange(base_id='movement')
cell = line.newCell('tax_category/employee_share', cell = line.newCell('tax_category/employee_share',
portal_type='Pay Sheet Cell', portal_type='Pay Sheet Cell',
base_id='movement') base_id='movement')
...@@ -1315,7 +1312,6 @@ class TestPayroll(TestPayrollMixin): ...@@ -1315,7 +1312,6 @@ class TestPayroll(TestPayrollMixin):
'base_amount/gross_salary'], 'base_amount/gross_salary'],
float_index=1, float_index=1,
int_index=1) int_index=1)
line1.updateCellRange(base_id='movement')
cell = line1.newCell('tax_category/employee_share', cell = line1.newCell('tax_category/employee_share',
portal_type='Pay Sheet Cell', portal_type='Pay Sheet Cell',
base_id='movement') base_id='movement')
...@@ -1336,7 +1332,6 @@ class TestPayroll(TestPayrollMixin): ...@@ -1336,7 +1332,6 @@ class TestPayroll(TestPayrollMixin):
editable=1, editable=1,
float_index=2, float_index=2,
int_index=2) int_index=2)
line2.updateCellRange(base_id='movement')
cell = line2.newCell('tax_category/employee_share', cell = line2.newCell('tax_category/employee_share',
portal_type='Pay Sheet Cell', portal_type='Pay Sheet Cell',
base_id='movement') base_id='movement')
...@@ -1440,7 +1435,6 @@ class TestPayroll(TestPayrollMixin): ...@@ -1440,7 +1435,6 @@ class TestPayroll(TestPayrollMixin):
resource_value=self.labour, resource_value=self.labour,
variation_category_list=['tax_category/employee_share'], variation_category_list=['tax_category/employee_share'],
base_contribution_list=['base_amount/base_salary', 'base_amount/gross_salary']) base_contribution_list=['base_amount/base_salary', 'base_amount/gross_salary'])
line.updateCellRange(base_id='movement')
cell = line.newCell('tax_category/employee_share', cell = line.newCell('tax_category/employee_share',
portal_type='Pay Sheet Cell', portal_type='Pay Sheet Cell',
base_id='movement') base_id='movement')
...@@ -1470,7 +1464,6 @@ class TestPayroll(TestPayrollMixin): ...@@ -1470,7 +1464,6 @@ class TestPayroll(TestPayrollMixin):
resource_value=self.labour, resource_value=self.labour,
variation_category_list=['tax_category/employee_share'], variation_category_list=['tax_category/employee_share'],
base_contribution_list=['base_amount/base_salary', 'base_amount/gross_salary']) base_contribution_list=['base_amount/base_salary', 'base_amount/gross_salary'])
line.updateCellRange(base_id='movement')
cell = line.newCell('tax_category/employee_share', cell = line.newCell('tax_category/employee_share',
portal_type='Pay Sheet Cell', portal_type='Pay Sheet Cell',
base_id='movement') base_id='movement')
...@@ -1644,7 +1637,6 @@ class TestPayroll(TestPayrollMixin): ...@@ -1644,7 +1637,6 @@ class TestPayroll(TestPayrollMixin):
variation_category_list=['tax_category/employee_share'], variation_category_list=['tax_category/employee_share'],
source_annotation_line_reference='tax1', source_annotation_line_reference='tax1',
base_contribution_list = ['base_amount/deductible_tax',],) base_contribution_list = ['base_amount/deductible_tax',],)
model_line.updateCellRange(base_id='movement')
cell = model_line.newCell('tax_category/employee_share', cell = model_line.newCell('tax_category/employee_share',
portal_type='Pay Sheet Cell', portal_type='Pay Sheet Cell',
base_id='movement') base_id='movement')
...@@ -1717,7 +1709,6 @@ class TestPayroll(TestPayrollMixin): ...@@ -1717,7 +1709,6 @@ class TestPayroll(TestPayrollMixin):
destination_value=employee1, destination_value=employee1,
variation_category_list=('tax_category/employee_share', variation_category_list=('tax_category/employee_share',
'tax_category/employer_share')) 'tax_category/employer_share'))
line.updateCellRange(base_id='movement')
cell_employee = line.newCell('tax_category/employee_share', cell_employee = line.newCell('tax_category/employee_share',
portal_type='Pay Sheet Cell', portal_type='Pay Sheet Cell',
base_id='movement', base_id='movement',
...@@ -1744,7 +1735,6 @@ class TestPayroll(TestPayrollMixin): ...@@ -1744,7 +1735,6 @@ class TestPayroll(TestPayrollMixin):
destination_value=employee2, destination_value=employee2,
variation_category_list=('tax_category/employee_share', variation_category_list=('tax_category/employee_share',
'tax_category/employer_share')) 'tax_category/employer_share'))
line.updateCellRange(base_id='movement')
cell_employee = line.newCell('tax_category/employee_share', cell_employee = line.newCell('tax_category/employee_share',
portal_type='Pay Sheet Cell', portal_type='Pay Sheet Cell',
base_id='movement', base_id='movement',
...@@ -1764,7 +1754,6 @@ class TestPayroll(TestPayrollMixin): ...@@ -1764,7 +1754,6 @@ class TestPayroll(TestPayrollMixin):
source_section_value=other_provider, source_section_value=other_provider,
variation_category_list=('tax_category/employee_share', variation_category_list=('tax_category/employee_share',
'tax_category/employer_share')) 'tax_category/employer_share'))
other_line.updateCellRange(base_id='movement')
cell_employee = other_line.newCell('tax_category/employee_share', cell_employee = other_line.newCell('tax_category/employee_share',
portal_type='Pay Sheet Cell', portal_type='Pay Sheet Cell',
base_id='movement', base_id='movement',
...@@ -1883,7 +1872,6 @@ class TestPayroll(TestPayrollMixin): ...@@ -1883,7 +1872,6 @@ class TestPayroll(TestPayrollMixin):
'tax_category/employer_share', 'tax_category/employer_share',
'salary_range/france/tranche_a', 'salary_range/france/tranche_a',
'salary_range/france/tranche_b')) 'salary_range/france/tranche_b'))
line.updateCellRange(base_id='movement')
cell_employee_a = line.newCell('tax_category/employee_share', cell_employee_a = line.newCell('tax_category/employee_share',
'salary_range/france/tranche_a', 'salary_range/france/tranche_a',
portal_type='Pay Sheet Cell', portal_type='Pay Sheet Cell',
...@@ -1938,7 +1926,6 @@ class TestPayroll(TestPayrollMixin): ...@@ -1938,7 +1926,6 @@ class TestPayroll(TestPayrollMixin):
'tax_category/employer_share', 'tax_category/employer_share',
'salary_range/france/tranche_a', 'salary_range/france/tranche_a',
'salary_range/france/tranche_b')) 'salary_range/france/tranche_b'))
line.updateCellRange(base_id='movement')
cell_employee_a = line.newCell('tax_category/employee_share', cell_employee_a = line.newCell('tax_category/employee_share',
'salary_range/france/tranche_a', 'salary_range/france/tranche_a',
portal_type='Pay Sheet Cell', portal_type='Pay Sheet Cell',
...@@ -2104,7 +2091,6 @@ class TestPayroll(TestPayrollMixin): ...@@ -2104,7 +2091,6 @@ class TestPayroll(TestPayrollMixin):
base_contribution_list=['base_amount/net_salary',], base_contribution_list=['base_amount/net_salary',],
variation_category_list=('tax_category/employee_share', variation_category_list=('tax_category/employee_share',
'tax_category/employer_share')) 'tax_category/employer_share'))
line.updateCellRange(base_id='movement')
cell_employee = line.newCell('tax_category/employee_share', cell_employee = line.newCell('tax_category/employee_share',
portal_type='Pay Sheet Cell', portal_type='Pay Sheet Cell',
base_id='movement', base_id='movement',
...@@ -2118,7 +2104,6 @@ class TestPayroll(TestPayrollMixin): ...@@ -2118,7 +2104,6 @@ class TestPayroll(TestPayrollMixin):
base_contribution_list=['base_amount/net_salary',], base_contribution_list=['base_amount/net_salary',],
variation_category_list=('tax_category/employee_share', variation_category_list=('tax_category/employee_share',
'tax_category/employer_share')) 'tax_category/employer_share'))
line.updateCellRange(base_id='movement')
cell_employee = line.newCell('tax_category/employee_share', cell_employee = line.newCell('tax_category/employee_share',
portal_type='Pay Sheet Cell', portal_type='Pay Sheet Cell',
base_id='movement', base_id='movement',
...@@ -2146,7 +2131,6 @@ class TestPayroll(TestPayrollMixin): ...@@ -2146,7 +2131,6 @@ class TestPayroll(TestPayrollMixin):
base_contribution_list=['base_amount/net_salary',], base_contribution_list=['base_amount/net_salary',],
variation_category_list=('tax_category/employee_share', variation_category_list=('tax_category/employee_share',
'tax_category/employer_share')) 'tax_category/employer_share'))
line.updateCellRange(base_id='movement')
cell_employee = line.newCell('tax_category/employee_share', cell_employee = line.newCell('tax_category/employee_share',
portal_type='Pay Sheet Cell', portal_type='Pay Sheet Cell',
base_id='movement', base_id='movement',
...@@ -2160,7 +2144,6 @@ class TestPayroll(TestPayrollMixin): ...@@ -2160,7 +2144,6 @@ class TestPayroll(TestPayrollMixin):
base_contribution_list=['base_amount/net_salary',], base_contribution_list=['base_amount/net_salary',],
variation_category_list=('tax_category/employee_share', variation_category_list=('tax_category/employee_share',
'tax_category/employer_share')) 'tax_category/employer_share'))
line.updateCellRange(base_id='movement')
cell_employee = line.newCell('tax_category/employee_share', cell_employee = line.newCell('tax_category/employee_share',
portal_type='Pay Sheet Cell', portal_type='Pay Sheet Cell',
base_id='movement', base_id='movement',
...@@ -2371,7 +2354,6 @@ class TestPayroll(TestPayrollMixin): ...@@ -2371,7 +2354,6 @@ class TestPayroll(TestPayrollMixin):
destination_value=employee, destination_value=employee,
variation_category_list=('tax_category/employee_share', variation_category_list=('tax_category/employee_share',
'tax_category/employer_share')) 'tax_category/employer_share'))
line.updateCellRange(base_id='movement')
cell_employee = line.newCell('tax_category/employee_share', cell_employee = line.newCell('tax_category/employee_share',
portal_type='Pay Sheet Cell', portal_type='Pay Sheet Cell',
base_id='movement', base_id='movement',
...@@ -2392,7 +2374,6 @@ class TestPayroll(TestPayrollMixin): ...@@ -2392,7 +2374,6 @@ class TestPayroll(TestPayrollMixin):
destination_value=employee, destination_value=employee,
variation_category_list=('tax_category/employee_share', variation_category_list=('tax_category/employee_share',
'tax_category/employer_share')) 'tax_category/employer_share'))
line.updateCellRange(base_id='movement')
cell_employee = line.newCell('tax_category/employee_share', cell_employee = line.newCell('tax_category/employee_share',
portal_type='Pay Sheet Cell', portal_type='Pay Sheet Cell',
base_id='movement', base_id='movement',
...@@ -2413,7 +2394,6 @@ class TestPayroll(TestPayrollMixin): ...@@ -2413,7 +2394,6 @@ class TestPayroll(TestPayrollMixin):
destination_value=employee, destination_value=employee,
variation_category_list=('tax_category/employee_share', variation_category_list=('tax_category/employee_share',
'tax_category/employer_share')) 'tax_category/employer_share'))
line.updateCellRange(base_id='movement')
cell_employee = line.newCell('tax_category/employee_share', cell_employee = line.newCell('tax_category/employee_share',
portal_type='Pay Sheet Cell', portal_type='Pay Sheet Cell',
base_id='movement', base_id='movement',
...@@ -2436,7 +2416,6 @@ class TestPayroll(TestPayrollMixin): ...@@ -2436,7 +2416,6 @@ class TestPayroll(TestPayrollMixin):
destination_value=employee, destination_value=employee,
variation_category_list=('tax_category/employee_share', variation_category_list=('tax_category/employee_share',
'tax_category/employer_share')) 'tax_category/employer_share'))
line.updateCellRange(base_id='movement')
cell_employee = line.newCell('tax_category/employee_share', cell_employee = line.newCell('tax_category/employee_share',
portal_type='Pay Sheet Cell', portal_type='Pay Sheet Cell',
base_id='movement', base_id='movement',
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7