Commit 650074e0 authored by Romain Courteaud's avatar Romain Courteaud

Only modify the line length.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@3417 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 41955219
...@@ -114,20 +114,16 @@ class DeliveryBuilder(XMLObject, Amount, Predicate): ...@@ -114,20 +114,16 @@ class DeliveryBuilder(XMLObject, Amount, Predicate):
in movement_relative_url_list] in movement_relative_url_list]
# Collect # Collect
root_group = self.collectMovement(movement_list) root_group = self.collectMovement(movement_list)
# Build # Build
delivery_list = self.buildDeliveryList( delivery_list = self.buildDeliveryList(
root_group, root_group,
delivery_relative_url_list=delivery_relative_url_list) delivery_relative_url_list=delivery_relative_url_list)
# Call script on each delivery built
delivery_after_generation_script_id =\ delivery_after_generation_script_id =\
self.getDeliveryAfterGenerationScriptId() self.getDeliveryAfterGenerationScriptId()
# Call script on each delivery built
if delivery_after_generation_script_id not in ["", None]: if delivery_after_generation_script_id not in ["", None]:
for delivery in delivery_list: for delivery in delivery_list:
getattr(delivery, delivery_after_generation_script_id)() getattr(delivery, delivery_after_generation_script_id)()
return delivery_list return delivery_list
def searchMovementList(self, applied_rule_uid=None): def searchMovementList(self, applied_rule_uid=None):
...@@ -231,8 +227,8 @@ class DeliveryBuilder(XMLObject, Amount, Predicate): ...@@ -231,8 +227,8 @@ class DeliveryBuilder(XMLObject, Amount, Predicate):
# Deliveries we are trying to update # Deliveries we are trying to update
delivery_select_method_id = self.getDeliverySelectMethodId() delivery_select_method_id = self.getDeliverySelectMethodId()
if delivery_select_method_id not in ["", None]: if delivery_select_method_id not in ["", None]:
to_update_delivery_sql_list = getattr(self, to_update_delivery_sql_list = getattr(self, delivery_select_method_id)\
delivery_select_method_id)(movement_group=movement_group) (movement_group=movement_group)
delivery_to_update_list.extend([x.getObject() for x\ delivery_to_update_list.extend([x.getObject() for x\
in to_update_delivery_sql_list]) in to_update_delivery_sql_list])
......
...@@ -381,7 +381,8 @@ class Movement(XMLObject, Amount): ...@@ -381,7 +381,8 @@ class Movement(XMLObject, Amount):
# Simulation # Simulation
security.declareProtected(Permissions.View, 'isSimulated') security.declareProtected(Permissions.View, 'isSimulated')
def isSimulated(self): def isSimulated(self):
return len(self.getDeliveryRelatedValueList()) > 0 or len(self.getOrderRelatedValueList()) > 0 return (len(self.getDeliveryRelatedValueList()) > 0) or\
(len(self.getOrderRelatedValueList()) > 0)
# New Causality API # New Causality API
security.declareProtected(Permissions.AccessContentsInformation, 'getOrderQuantity') security.declareProtected(Permissions.AccessContentsInformation, 'getOrderQuantity')
......
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