Commit 1fc09c7e authored by Sebastien Robin's avatar Sebastien Robin

make sure there is a resource on lines

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@13925 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent db7a14f6
...@@ -72,6 +72,7 @@ class TestImmobilisationMixin(TestOrderMixin, ERP5TypeTestCase): ...@@ -72,6 +72,7 @@ class TestImmobilisationMixin(TestOrderMixin, ERP5TypeTestCase):
organisation_portal_type = 'Organisation' organisation_portal_type = 'Organisation'
account_portal_type = 'Account' account_portal_type = 'Account'
currency_portal_type = 'Currency' currency_portal_type = 'Currency'
resource_portal_type = 'Product'
linear_method = 'eu/linear' linear_method = 'eu/linear'
degressive_method = 'fr/degressive' degressive_method = 'fr/degressive'
uncontinuous_degressive_method = 'fr/uncontinuous_degressive' uncontinuous_degressive_method = 'fr/uncontinuous_degressive'
...@@ -437,7 +438,7 @@ class TestImmobilisationMixin(TestOrderMixin, ERP5TypeTestCase): ...@@ -437,7 +438,7 @@ class TestImmobilisationMixin(TestOrderMixin, ERP5TypeTestCase):
if len(item_module.contentValues()) == 0: if len(item_module.contentValues()) == 0:
for i in range(30): for i in range(30):
item_id = 'item%i' % i item_id = 'item%i' % i
item_module.newContent(id=item_id, reference=item_id) item_module.newContent(id=item_id, reference='%i' % i)
def stepPdb(self, sequence=None, sequence_list=None, **kw): def stepPdb(self, sequence=None, sequence_list=None, **kw):
import pdb;pdb.set_trace() import pdb;pdb.set_trace()
...@@ -493,12 +494,17 @@ class TestImmobilisationMixin(TestOrderMixin, ERP5TypeTestCase): ...@@ -493,12 +494,17 @@ class TestImmobilisationMixin(TestOrderMixin, ERP5TypeTestCase):
def stepAggregateItems(self, sequence=None, sequence_list=None, **kw): def stepAggregateItems(self, sequence=None, sequence_list=None, **kw):
pl = sequence.get('packing_list_list', [])[-1] pl = sequence.get('packing_list_list', [])[-1]
parameter_dict = sequence.get('parameter_dict', {}) parameter_dict = sequence.get('parameter_dict', {})
resource_value = sequence.get('product',None)
if resource_value is None:
resource_value = self.getPortal().product_module.newContent()
sequence.edit(product=resource_value)
if parameter_dict is None: parameter_dict = {} if parameter_dict is None: parameter_dict = {}
item_list_list = sequence.get('item_list_list') # This is a list of list in item_list_list = sequence.get('item_list_list') # This is a list of list in
# order to make multiple lines # order to make multiple lines
for item_list in item_list_list: for item_list in item_list_list:
pl_line = pl.newContent(portal_type = self.packing_list_line_portal_type) pl_line = pl.newContent(portal_type = self.packing_list_line_portal_type)
pl_line.edit(aggregate_value_list = item_list, **parameter_dict) pl_line.edit(aggregate_value_list = item_list,
resource_value=resource_value, **parameter_dict)
get_transaction().commit() get_transaction().commit()
self.tic() self.tic()
pl.edit() pl.edit()
......
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