diff --git a/product/ERP5/Document/SimulationMovement.py b/product/ERP5/Document/SimulationMovement.py index 9e5929ac6178fe62a533d6335ef7b5660f0d7f2d..ab2c6c2446f07c0ce5fcae6e3f2aa3c3a060a446 100644 --- a/product/ERP5/Document/SimulationMovement.py +++ b/product/ERP5/Document/SimulationMovement.py @@ -593,7 +593,7 @@ class SimulationMovement(PropertyRecordableMixin, Movement, ExplainableMixin): 'isBuildable') def isBuildable(self): """Simulation Movement buildable logic""" - if self.getDeliveryValue() is not None: + if self.getDelivery(): # already delivered return False @@ -815,8 +815,7 @@ class SimulationMovement(PropertyRecordableMixin, Movement, ExplainableMixin): else: return quantity - profit_quantity + delivery_error return mapping.getMappedProperty(self, property) - else: - return self.getProperty(property) + return self.getProperty(property) security.declareProtected(Permissions.ModifyPortalContent, 'setMappedProperty') @@ -824,5 +823,4 @@ class SimulationMovement(PropertyRecordableMixin, Movement, ExplainableMixin): mapping = self.getPropertyMappingValue() if mapping is not None: return mapping.setMappedProperty(self, property, value) - else: - return self.setProperty(property, value) + return self.setProperty(property, value) diff --git a/product/ERP5/Document/SubscriptionItem.py b/product/ERP5/Document/SubscriptionItem.py index 132169eaeb93e7837dcefa9bfc2e1729f96707fd..ec1913c489760ef72c2be33ce10641181d02f2f6 100644 --- a/product/ERP5/Document/SubscriptionItem.py +++ b/product/ERP5/Document/SubscriptionItem.py @@ -206,4 +206,4 @@ class SubscriptionItem(Item, MovementGeneratorMixin, PeriodicityMixin): id_index += 1 # And now return result - return result \ No newline at end of file + return result