Bug fix: do not expand Simulation when getVariationCategoryList on a OrderLine

is not empty, and no cell is created.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@2902 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/Document/OrderRule.py

@@ -144,17 +144,21 @@ class OrderRule(Rule):
                 if order_line_object.getUid() not in existing_uid_list:
                   new_id = order_line_object.getId()
                   LOG('Line', 0, str(new_id))
+                  if order_line_object.getVariationCategoryList() == []:
                     new_line = applied_rule.newContent(
                         type_name=delivery_line_type,
                         container=applied_rule,
                         id=new_id,
                         order_value = order_line_object,
                         quantity = order_line_object.getQuantity(),
-#                       source = order_line_object.getSource(),
-#                       destination = order_line_object.getDestination(),
-#                       source_section = order_line_object.getSourceSection(),
-#                       destination_section = \
-#                           order_line_object.getDestinationSection(),
+                        # No acquisition on variation_category_list in this case,
+                        # to prevent user failure
+                        variation_category_list = [],
+  #                       source = order_line_object.getSource(),
+  #                       destination = order_line_object.getDestination(),
+  #                       source_section = order_line_object.getSourceSection(),
+  #                       destination_section = \
+  #                           order_line_object.getDestinationSection(),
                         deliverable = 1
                     )
                     LOG('OrderRule.expand, object created:',0, \
@@ -163,6 +167,10 @@ class OrderRule(Rule):
                     LOG('After Create Cell', 0, str(new_id))
                     # Source, Destination, Quantity, Date, etc. are
                     # acquired from the order and need not to be copied.
+                  else:
+                    raise 'Error', 'VariationCategoryList is defined on\
+                          OrderLine %s and no cell exists.' %\
+                          order_line_object.getRelativeUrl()
             except AttributeError:
               LOG('ERP5: WARNING', 0, \
                   'AttributeError during expand on order line %s' \