[Erp5-report] r20528 - in /erp5/trunk/products/ERP5/Document: DeliveryRule.py InvoiceRule.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Apr 15 16:16:57 CEST 2008
Author: jerome
Date: Tue Apr 15 16:16:56 2008
New Revision: 20528
URL: http://svn.erp5.org?rev=20528&view=rev
Log:
Invoice rule should expand all movements, including tax movements
Modified:
erp5/trunk/products/ERP5/Document/DeliveryRule.py
erp5/trunk/products/ERP5/Document/InvoiceRule.py
Modified: erp5/trunk/products/ERP5/Document/DeliveryRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/DeliveryRule.py?rev=20528&r1=20527&r2=20528&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/DeliveryRule.py (original)
+++ erp5/trunk/products/ERP5/Document/DeliveryRule.py Tue Apr 15 16:16:56 2008
@@ -61,7 +61,7 @@
# Simulation workflow
security.declareProtected(Permissions.ModifyPortalContent, 'expand')
- def expand(self, applied_rule, **kw):
+ def expand(self, applied_rule, delivery_movement_type_list=None, **kw):
"""
Expands the additional Delivery movements to a new simulation tree.
Expand is only allowed to create or modify simulation movements for
@@ -77,8 +77,11 @@
existing_movement_list = []
immutable_movement_list = []
delivery = applied_rule.getDefaultCausalityValue()
+ if delivery_movement_type_list is None:
+ delivery_movement_type_list = self.getPortalDeliveryMovementTypeList()
if delivery is not None:
- delivery_movement_list = delivery.getMovementList()
+ delivery_movement_list = delivery.getMovementList(
+ portal_type=delivery_movement_type_list)
# Check existing movements
for movement in applied_rule.contentValues(portal_type=movement_type):
if movement.getLastExpandSimulationState() in \
@@ -95,7 +98,7 @@
immutable_movement_list.append(movement)
# Create or modify movements
- for deliv_mvt in delivery.getMovementList():
+ for deliv_mvt in delivery_movement_list:
sim_mvt = deliv_mvt.getDeliveryRelatedValue()
if sim_mvt is None:
# create a new deliv_mvt
Modified: erp5/trunk/products/ERP5/Document/InvoiceRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/InvoiceRule.py?rev=20528&r1=20527&r2=20528&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/InvoiceRule.py (original)
+++ erp5/trunk/products/ERP5/Document/InvoiceRule.py Tue Apr 15 16:16:56 2008
@@ -73,11 +73,11 @@
return 0
security.declareProtected(Permissions.ModifyPortalContent, 'expand')
- def expand(self, applied_rule,
- movement_type_method='getPortalInvoiceMovementTypeList', **kw):
+ def expand(self, applied_rule, **kw):
"""
Call expand defined on DeliveryRule.
"""
- DeliveryRule.expand(self, applied_rule,
- movement_type_method=movement_type_method,
- **kw)
+ kw['delivery_movement_type_list'] = \
+ self.getPortalInvoiceMovementTypeList() + \
+ self.getPortalTaxMovementTypeList()
+ DeliveryRule.expand(self, applied_rule, **kw)
More information about the Erp5-report
mailing list