[Erp5-report] r28723 - /erp5/trunk/products/ERP5/Document/
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Sep 1 15:14:16 CEST 2009
Author: luke
Date: Tue Sep 1 15:14:14 2009
New Revision: 28723
URL: http://svn.erp5.org?rev=28723&view=rev
Log:
- use movement_type from Rule class wherever possible
- remove duplicated variables with same functionality
Modified:
erp5/trunk/products/ERP5/Document/AmortisationRule.py
erp5/trunk/products/ERP5/Document/DeliveryRule.py
erp5/trunk/products/ERP5/Document/OpenOrderRule.py
erp5/trunk/products/ERP5/Document/OrderRule.py
erp5/trunk/products/ERP5/Document/PaymentRule.py
erp5/trunk/products/ERP5/Document/TaxRule.py
erp5/trunk/products/ERP5/Document/TransformationModelRule.py
erp5/trunk/products/ERP5/Document/TransformationRule.py
erp5/trunk/products/ERP5/Document/TransformationSourcingRule.py
Modified: erp5/trunk/products/ERP5/Document/AmortisationRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/AmortisationRule.py?rev=28723&r1=28722&r2=28723&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/AmortisationRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/AmortisationRule.py [utf8] Tue Sep 1 15:14:14 2009
@@ -135,7 +135,7 @@
"""
def createMovement(property_dict, correction_number):
new_id = '%s_%i_%i' % (self.movement_name_dict['correction'], aggregated_period_number, correction_number)
- simulation_movement = applied_rule.newContent(portal_type=delivery_line_type, id=new_id)
+ simulation_movement = applied_rule.newContent(portal_type=self.movement_type, id=new_id)
updateSimulationMovementProperties(simulation_movement = simulation_movement,
calculated_movement = property_dict)
if aggregated_movement['status'] not in invalid_state_list:
@@ -267,7 +267,6 @@
### Start of expand() ###
- delivery_line_type = 'Simulation Movement'
to_notify_delivery_list = []
# Get the item we come from
my_item = applied_rule.getCausalityValue()
@@ -376,7 +375,7 @@
movement = movement_list[movement_number]
if movement['quantity'] != 0:
new_id = '%s_%i_%i' % (mov_type, new_period, movement_number)
- simulation_movement = applied_rule.newContent(portal_type=delivery_line_type, id=new_id)
+ simulation_movement = applied_rule.newContent(portal_type=self.movement_type, id=new_id)
# Set the properties
updateSimulationMovementProperties(simulation_movement = simulation_movement,
calculated_movement = movement)
@@ -418,7 +417,7 @@
else:
# No matching found. We simply create the annuity
new_id = '%s_%i_%i' % (mov_type, aggregated_period_number, new_aggregated_number)
- simulation_movement = applied_rule.newContent(portal_type=delivery_line_type, id=new_id)
+ simulation_movement = applied_rule.newContent(portal_type=self.movement_type, id=new_id)
updateSimulationMovementProperties(simulation_movement = simulation_movement,
calculated_movement = calculated_movement)
new_aggregated_number += 1
@@ -462,7 +461,7 @@
else:
# There is no aggregated movement left. We simply create the remaining calculated movements
new_id = '%s_%i_%i' % (mov_type, aggregated_period_number, new_aggregated_number)
- simulation_movement = applied_rule.newContent(portal_type=delivery_line_type, id=new_id)
+ simulation_movement = applied_rule.newContent(portal_type=self.movement_type, id=new_id)
updateSimulationMovementProperties(simulation_movement = simulation_movement,
calculated_movement = calculated_movement)
new_aggregated_number += 1
Modified: erp5/trunk/products/ERP5/Document/DeliveryRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/DeliveryRule.py?rev=28723&r1=28722&r2=28723&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/DeliveryRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/DeliveryRule.py [utf8] Tue Sep 1 15:14:14 2009
@@ -66,7 +66,6 @@
Rule.expand(self, applied_rule,
delivery_movement_type_list=delivery_movement_type_list, **kw)
return
- movement_type = 'Simulation Movement'
existing_movement_list = []
immutable_movement_list = []
delivery = applied_rule.getDefaultCausalityValue()
@@ -76,7 +75,7 @@
delivery_movement_list = delivery.getMovementList(
portal_type=delivery_movement_type_list)
# Check existing movements
- for movement in applied_rule.contentValues(portal_type=movement_type):
+ for movement in applied_rule.contentValues(portal_type=self.movement_type):
if movement.getLastExpandSimulationState() not in \
self.getPortalCurrentInventoryStateList():
# XXX: This condition is quick and dirty hack - knowing if Simulation
@@ -106,7 +105,7 @@
# Generate the simulation deliv_mvt
# XXX Hardcoded value
new_sim_mvt = applied_rule.newContent(
- portal_type=movement_type,
+ portal_type=self.movement_type,
id=new_id,
order_value=deliv_mvt,
order_ratio=1,
Modified: erp5/trunk/products/ERP5/Document/OpenOrderRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/OpenOrderRule.py?rev=28723&r1=28722&r2=28723&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/OpenOrderRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/OpenOrderRule.py [utf8] Tue Sep 1 15:14:14 2009
@@ -66,7 +66,6 @@
# Delegate implementation of expand to the SubscriptionItem or
# to the OpenOrder instance
return order.expandOpenOrderRule(applied_rule, force=force, **kw)
- movement_type = 'Simulation Movement'
if order is not None:
order_movement_list = order.getMovementList(
portal_type=order.getPortalOrderMovementTypeList())
@@ -89,7 +88,7 @@
property_dict = self._getExpandablePropertyDict(order_movement,
property_dict)
simulation_movement = applied_rule.newContent(
- portal_type=movement_type,
+ portal_type=self.movement_type,
order_value=order_movement,
order_ratio=1,
delivery_ratio=1,
Modified: erp5/trunk/products/ERP5/Document/OrderRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/OrderRule.py?rev=28723&r1=28722&r2=28723&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/OrderRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/OrderRule.py [utf8] Tue Sep 1 15:14:14 2009
@@ -66,7 +66,6 @@
DeliveryRule.expand(self, applied_rule, force=force, **kw)
return
- movement_type = 'Simulation Movement'
existing_movement_list = []
immutable_movement_list = []
order = applied_rule.getDefaultCausalityValue()
@@ -74,7 +73,7 @@
order_movement_list = order.getMovementList(
portal_type=order.getPortalOrderMovementTypeList())
# check existing movements
- for movement in applied_rule.contentValues(portal_type=movement_type):
+ for movement in applied_rule.contentValues(portal_type=self.movement_type):
if (not movement.getLastExpandSimulationState() in
order.getPortalReservedInventoryStateList() and
not movement.getLastExpandSimulationState() in
@@ -109,7 +108,7 @@
# Do not try to create meaningfull IDs, as order movement can be
# hierarchicals
applied_rule.newContent(
- portal_type=movement_type,
+ portal_type=self.movement_type,
order_value=movement,
order_ratio=1,
delivery_ratio=1,
Modified: erp5/trunk/products/ERP5/Document/PaymentRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/PaymentRule.py?rev=28723&r1=28722&r2=28723&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/PaymentRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/PaymentRule.py [utf8] Tue Sep 1 15:14:14 2009
@@ -76,7 +76,7 @@
return payment_condition_list
movement = movement.getParentValue().getParentValue()
- if movement.getPortalType() != 'Simulation Movement':
+ if movement.getPortalType() != self.movement_type:
LOG('ERP5', INFO, "PaymentRule couldn't find payment condition")
return []
@@ -121,8 +121,6 @@
def expand(self, applied_rule, **kw):
"""Expands the current movement downward.
"""
- payment_line_type = 'Simulation Movement'
-
my_parent_movement = applied_rule.getParentValue()
# generate for source
bank_account = self.getDestinationPaymentValue(
Modified: erp5/trunk/products/ERP5/Document/TaxRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TaxRule.py?rev=28723&r1=28722&r2=28723&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TaxRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/TaxRule.py [utf8] Tue Sep 1 15:14:14 2009
@@ -46,7 +46,6 @@
security.declareProtected(Permissions.ModifyPortalContent, 'expand')
def expand(self, applied_rule, force=0, **kw):
""" """
- movement_type = 'Simulation Movement'
immutable_movement_list = []
parent_simulation_movement = applied_rule.getParentValue()
@@ -81,7 +80,7 @@
if not existing_simulation_movement_list:
applied_rule.newContent(
- portal_type=movement_type,
+ portal_type=self.movement_type,
order_value=tax_movement,
order_ratio=1,
delivery_ratio=1,
Modified: erp5/trunk/products/ERP5/Document/TransformationModelRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TransformationModelRule.py?rev=28723&r1=28722&r2=28723&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TransformationModelRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/TransformationModelRule.py [utf8] Tue Sep 1 15:14:14 2009
@@ -40,6 +40,7 @@
from Products.ERP5Type.Errors import TransformationRuleError
class MovementFactory:
+ movement_type = 'Simulation Movement'
def getRequestList(self):
"""
return the list of a request which to be used to apply movements
@@ -65,7 +66,7 @@
"""
movement_dict = {}
for movement in applied_rule.objectValues(
- portal_type="Simulation Movement"):
+ portal_type=self.movement_type):
key = tuple(sorted(movement.getCausalityList()))
movement_dict[key] = movement
@@ -75,7 +76,7 @@
movement = movement_dict.get(key, None)
# when no exist
if movement is None:
- movement = applied_rule.newContent(portal_type="Simulation Movement")
+ movement = applied_rule.newContent(portal_type=self.movement_type)
# update
if movement.isFrozen():
self.makeDifferentMovement(movement, **request)
@@ -98,7 +99,7 @@
request['quantity'] = self._requestNetQuantity(request)\
- movement.getNetQuantity()
if request['quantity'] != 0:
- diff_movement = applied_rule.newContent(portal_type="Simulation Movement")
+ diff_movement = applied_rule.newContent(portal_type=self.movement_type)
diff_movement.edit(**request)
Modified: erp5/trunk/products/ERP5/Document/TransformationRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TransformationRule.py?rev=28723&r1=28722&r2=28723&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TransformationRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/TransformationRule.py [utf8] Tue Sep 1 15:14:14 2009
@@ -53,9 +53,6 @@
security.declareObjectProtected(Permissions.AccessContentsInformation)
zope.interface.implements(interfaces.IPredicate,
interfaces.IRule )
-
- # Class variable
- simulation_movement_portal_type = "Simulation Movement"
# Simulation workflow
security.declareProtected(Permissions.ModifyPortalContent, 'expand')
Modified: erp5/trunk/products/ERP5/Document/TransformationSourcingRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TransformationSourcingRule.py?rev=28723&r1=28722&r2=28723&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TransformationSourcingRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/TransformationSourcingRule.py [utf8] Tue Sep 1 15:14:14 2009
@@ -90,7 +90,7 @@
# Create the movement if it does not exist
if movement is None:
movement = applied_rule.newContent(
- portal_type=self.simulation_movement_portal_type,
+ portal_type=self.movement_type,
id=movement_id,
activate_kw=activate_kw
)
@@ -142,9 +142,6 @@
security.declareObjectProtected(Permissions.AccessContentsInformation)
zope.interface.implements(interfaces.IPredicate,
interfaces.IRule )
-
- # Class variable
- simulation_movement_portal_type = "Simulation Movement"
security.declareProtected(Permissions.ModifyPortalContent, 'expand')
def expand(self, applied_rule, activate_kw=None,**kw):
More information about the Erp5-report
mailing list