Commit 747dd81c authored by Fabien Morin's avatar Fabien Morin

- remove "_ng" temporary suffix

- add start_date and stop_date to the pay_sheet


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17996 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 5bcd6188
...@@ -44,6 +44,7 @@ TODO: ...@@ -44,6 +44,7 @@ TODO:
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from AccessControl.SecurityManagement import newSecurityManager from AccessControl.SecurityManagement import newSecurityManager
from Testing import ZopeTestCase from Testing import ZopeTestCase
from DateTime import DateTime
from Acquisition import aq_parent from Acquisition import aq_parent
class TestPayrollMixin(ERP5TypeTestCase): class TestPayrollMixin(ERP5TypeTestCase):
...@@ -246,13 +247,12 @@ class TestPayrollMixin(ERP5TypeTestCase): ...@@ -246,13 +247,12 @@ class TestPayrollMixin(ERP5TypeTestCase):
def getBusinessTemplateList(self): def getBusinessTemplateList(self):
""" """ """ """
return ('erp5_base', 'erp5_pdm', 'erp5_trade', 'erp5_accounting', return ('erp5_base', 'erp5_pdm', 'erp5_trade', 'erp5_accounting',
'erp5_payroll_ng',) 'erp5_payroll',)
def createPerson(self, id='one', title='One', def createPerson(self, id='one', title='One',
career_subordination_value=None, career_grade=None, **kw): career_subordination_value=None, career_grade=None, **kw):
""" """
Create some Pesons so that we have something to feed. Create some Pesons so that we have something to feed.
(we create only one because we'd have sorting problems)
""" """
person_module = self.portal.getDefaultModule(portal_type=\ person_module = self.portal.getDefaultModule(portal_type=\
self.person_portal_type) self.person_portal_type)
...@@ -455,7 +455,9 @@ class TestPayrollMixin(ERP5TypeTestCase): ...@@ -455,7 +455,9 @@ class TestPayrollMixin(ERP5TypeTestCase):
title = id, title = id,
specialise_value = model, specialise_value = model,
source_section_value = model.getSourceSectionValue(), source_section_value = model.getSourceSectionValue(),
destination_section_value = model.getDestinationSectionValue(),) destination_section_value = model.getDestinationSectionValue(),
start_date = DateTime(2008, 1, 1),
stop_date = DateTime(2008, 1, 31),)
paysheet.setPriceCurrency('currency_module/EUR') paysheet.setPriceCurrency('currency_module/EUR')
get_transaction().commit() get_transaction().commit()
paysheet.reindexObject() paysheet.reindexObject()
...@@ -796,7 +798,6 @@ class TestPayroll(TestPayrollMixin): ...@@ -796,7 +798,6 @@ class TestPayroll(TestPayrollMixin):
else: else:
self.fail("Unknown service for line %s" % pay_sheet_line) self.fail("Unknown service for line %s" % pay_sheet_line)
import unittest import unittest
def test_suite(): def test_suite():
suite = unittest.TestSuite() suite = unittest.TestSuite()
......
...@@ -60,7 +60,7 @@ class TestPayroll_l10n_fr(ERP5TypeTestCase): ...@@ -60,7 +60,7 @@ class TestPayroll_l10n_fr(ERP5TypeTestCase):
def getBusinessTemplateList(self): def getBusinessTemplateList(self):
""" """ """ """
return ('erp5_base', 'erp5_pdm', 'erp5_trade', 'erp5_accounting', return ('erp5_base', 'erp5_pdm', 'erp5_trade', 'erp5_accounting',
'erp5_payroll_ng', 'erp5_payroll_l10n_fr') 'erp5_payroll', 'erp5_payroll_l10n_fr')
def test_01_btInstallation(self, quiet=0, run=run_all_test): def test_01_btInstallation(self, quiet=0, run=run_all_test):
......
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