Commit 13decd0b authored by Julien Muchembled's avatar Julien Muchembled

Remove 2 symlinks added by mistake and revert wrong simplification done in r39505

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@39556 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 63bd553d
../products/ERP5/bootstrap/erp5_core
\ No newline at end of file
../products/ERP5/bootstrap/erp5_mysql_innodb_catalog
\ No newline at end of file
...@@ -681,7 +681,8 @@ class Resource(XMLObject, XMLMatrix, VariatedMixin): ...@@ -681,7 +681,8 @@ class Resource(XMLObject, XMLMatrix, VariatedMixin):
sort_method = kw.pop('sort_method', self._pricingSortMethod) sort_method = kw.pop('sort_method', self._pricingSortMethod)
# Generate the fake context # Generate the fake context
tmp_context = context.asContext(categories=new_category_list, tmp_context = self.asContext(context=context,
categories=new_category_list,
REQUEST=REQUEST, **kw) REQUEST=REQUEST, **kw)
# XXX When called for a generated amount, base_application may point # XXX When called for a generated amount, base_application may point
# to nonexistant base_amount (e.g. "produced_quantity" for # to nonexistant base_amount (e.g. "produced_quantity" for
......
...@@ -632,6 +632,7 @@ class TestResource(ERP5TypeTestCase): ...@@ -632,6 +632,7 @@ class TestResource(ERP5TypeTestCase):
# Fill the PDM preferences # Fill the PDM preferences
preference = self.portal.portal_preferences.default_site_preference preference = self.portal.portal_preferences.default_site_preference
preference.setPreferredProductOptionalVariationBaseCategoryList(['industrial_phase']) preference.setPreferredProductOptionalVariationBaseCategoryList(['industrial_phase'])
if preference.getPreferenceState() == 'disabled':
preference.enable() preference.enable()
transaction.commit() transaction.commit()
self.tic() self.tic()
......
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