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

bt5/erp5_core

-../products/ERP5/bootstrap/erp5_core
\ No newline at end of file

bt5/erp5_mysql_innodb_catalog

-../products/ERP5/bootstrap/erp5_mysql_innodb_catalog
\ No newline at end of file

product/ERP5/Document/Resource.py

@@ -681,8 +681,9 @@ class Resource(XMLObject, XMLMatrix, VariatedMixin):
 
       sort_method = kw.pop('sort_method', self._pricingSortMethod)
       # Generate the fake context
-      tmp_context = context.asContext(categories=new_category_list,
-                                      REQUEST=REQUEST, **kw)
+      tmp_context = self.asContext(context=context,
+                                   categories=new_category_list,
+                                   REQUEST=REQUEST, **kw)
       # XXX When called for a generated amount, base_application may point
       #     to nonexistant base_amount (e.g. "produced_quantity" for
       #     transformations), which would make domain tool return nothing.

product/ERP5/tests/testResource.py

@@ -632,7 +632,8 @@ class TestResource(ERP5TypeTestCase):
     # Fill the PDM preferences
     preference = self.portal.portal_preferences.default_site_preference
     preference.setPreferredProductOptionalVariationBaseCategoryList(['industrial_phase'])
-    preference.enable()
+    if preference.getPreferenceState() == 'disabled':
+      preference.enable()
     transaction.commit()
     self.tic()
     # Create another product/supply, in order to be sure that the