Commit 9555803a authored by Sebastien Robin's avatar Sebastien Robin

add sub categories in the vault_type category

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@11632 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 930486f0
...@@ -487,6 +487,19 @@ class TestERP5BankingMixin: ...@@ -487,6 +487,19 @@ class TestERP5BankingMixin:
self.paris = self.testsite.newContent(id='paris', portal_type='Category', codification='P1', vault_type='site') self.paris = self.testsite.newContent(id='paris', portal_type='Category', codification='P1', vault_type='site')
self.madrid = self.testsite.newContent(id='madrid', portal_type='Category', codification='S1', vault_type='site') self.madrid = self.testsite.newContent(id='madrid', portal_type='Category', codification='S1', vault_type='site')
self.siege = self.testsite.newContent(id='siege', portal_type='Category', codification='HQ1', vault_type='site') self.siege = self.testsite.newContent(id='siege', portal_type='Category', codification='HQ1', vault_type='site')
self.vault_type_base_category = getattr(self.category_tool, 'vault_type')
site_vault_type = self.vault_type_base_category.newContent(id='site')
surface_vault_type = site_vault_type.newContent('surface')
bi_vault_type = surface_vault_type.newContent('banque_interne')
guichet_bi_vault_type = bi_vault_type.newContent('guichet')
gp_vault_type = surface_vault_type.newContent('gros_paiement')
guichet_gp_vault_type = gp_vault_type.newContent('guichet')
gv_vault_type = surface_vault_type.newContent('gros_versement')
guichet_gv_vault_type = gv_vault_type.newContent('guichet')
op_vault_type = surface_vault_type.newContent('operations_diverses')
guichet_op_vault_type = op_vault_type.newContent('guichet')
caveau_vault_type = site_vault_type.newContent('caveau')
if not no_site: if not no_site:
for c in self.testsite.getCategoryChildValueList(): for c in self.testsite.getCategoryChildValueList():
...@@ -550,7 +563,7 @@ class TestERP5BankingMixin: ...@@ -550,7 +563,7 @@ class TestERP5BankingMixin:
s.newContent(id='%s' %(ss,), portal_type='Category', codification='', vault_type='site/caveau/%s' %(s.getId(),)) s.newContent(id='%s' %(ss,), portal_type='Category', codification='', vault_type='site/caveau/%s' %(s.getId(),))
def openCounterDate(self, date=None, site=None,id='counter_date_1'): def openCounterDate(self, date=None, site=None,id='counter_date_1',open=1):
""" """
open a couter date fort the given date open a couter date fort the given date
by default use the current date by default use the current date
...@@ -566,7 +579,9 @@ class TestERP5BankingMixin: ...@@ -566,7 +579,9 @@ class TestERP5BankingMixin:
site_value = site, site_value = site,
start_date = date) start_date = date)
# open the counter date # open the counter date
counter_date.open() if open:
counter_date.open()
setattr(self,id,counter_date)
def openCounter(self, site=None, id='counter_1'): def openCounter(self, site=None, id='counter_1'):
...@@ -811,13 +826,13 @@ class TestERP5BankingMixin: ...@@ -811,13 +826,13 @@ class TestERP5BankingMixin:
price = movement_line.getResourceValue().getBasePrice()) price = movement_line.getResourceValue().getBasePrice())
def createCashInventory(self, source, destination, currency, line_list=[]): def createCashInventory(self, source, destination, currency, line_list=[],extra_id=''):
""" """
Create a cash inventory group Create a cash inventory group
""" """
# we need to have a unique inventory group id by destination # we need to have a unique inventory group id by destination
inventory_group_id = 'inventory_group_%s_%s' % \ inventory_group_id = 'inventory_group_%s_%s%s' % \
(destination.getParentValue().getUid(),destination.getId()) (destination.getParentValue().getUid(),destination.getId(),extra_id)
if not hasattr(self, inventory_group_id): if not hasattr(self, inventory_group_id):
inventory_group = self.cash_inventory_module.newContent(id=inventory_group_id, inventory_group = self.cash_inventory_module.newContent(id=inventory_group_id,
portal_type='Cash Inventory Group', portal_type='Cash Inventory Group',
......
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