[Erp5-report] r32522 kazuhiko - in /erp5/trunk/products/ERP5: Document/ TargetSolver/
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Feb 15 05:57:34 CET 2010
Author: kazuhiko
Date: Mon Feb 15 05:57:33 2010
New Revision: 32522
URL: http://svn.erp5.org?rev=32522&view=rev
Log:
to support both new and old simulation hierarchy.
Modified:
erp5/trunk/products/ERP5/Document/AppliedRule.py
erp5/trunk/products/ERP5/Document/InvoiceTransactionRule.py
erp5/trunk/products/ERP5/Document/Movement.py
erp5/trunk/products/ERP5/Document/Order.py
erp5/trunk/products/ERP5/Document/OrderLine.py
erp5/trunk/products/ERP5/Document/PaymentRule.py
erp5/trunk/products/ERP5/Document/SimulationMovement.py
erp5/trunk/products/ERP5/TargetSolver/SplitAndDefer.py
erp5/trunk/products/ERP5/TargetSolver/SplitQuantity.py
Modified: erp5/trunk/products/ERP5/Document/AppliedRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/AppliedRule.py?rev=32522&r1=32521&r2=32522&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/AppliedRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/AppliedRule.py [utf8] Mon Feb 15 05:57:33 2010
@@ -209,6 +209,7 @@
.getRootSpecialiseValue(portal_type_list)
if specialise_value is not None:
return specialise_value
+ # 'order' category is deprecated. it is kept for compatibility.
if order is not None:
specialise_value = order.getExplanationValue() \
.getRootSpecialiseValue(portal_type_list)
Modified: erp5/trunk/products/ERP5/Document/InvoiceTransactionRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/InvoiceTransactionRule.py?rev=32522&r1=32521&r2=32522&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/InvoiceTransactionRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/InvoiceTransactionRule.py [utf8] Mon Feb 15 05:57:33 2010
@@ -89,6 +89,7 @@
delivery = simulation_movement.getDeliveryValue()
if delivery is not None:
resource = delivery.getProperty('price_currency', None)
+ # 'order' category is deprecated. it is kept for compatibility.
if (resource is None) and \
(simulation_movement.getParentValue().getParentValue() \
== portal_simulation) :
Modified: erp5/trunk/products/ERP5/Document/Movement.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Movement.py?rev=32522&r1=32521&r2=32522&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Movement.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Movement.py [utf8] Mon Feb 15 05:57:33 2010
@@ -595,6 +595,7 @@
security.declareProtected( Permissions.AccessContentsInformation,
'isSimulated')
def isSimulated(self):
+ # 'order' category is deprecated. it is kept for compatibility.
return (len(self.getDeliveryRelatedValueList()) > 0) or\
(len(self.getOrderRelatedValueList()) > 0)
@@ -605,6 +606,7 @@
"""
Returns the quantity of related order(s)
"""
+ # XXX deprecated
return self.getQuantity()
security.declareProtected( Permissions.AccessContentsInformation,
@@ -629,6 +631,7 @@
"""
Returns the list of start date of related order(s)
"""
+ # XXX deprecated
return [self.getStartDate()]
security.declareProtected( Permissions.AccessContentsInformation,
@@ -653,6 +656,7 @@
"""
Returns the list of stop date of related order(s)
"""
+ # XXX deprecated
return [self.getStopDate()]
security.declareProtected( Permissions.AccessContentsInformation,
@@ -677,6 +681,7 @@
"""
Returns the source of related orders
"""
+ # XXX deprecated
return self.getSourceList()
security.declareProtected( Permissions.AccessContentsInformation,
@@ -701,6 +706,7 @@
"""
Returns the destination of related orders
"""
+ # XXX deprecated
return self.getDestinationList()
security.declareProtected( Permissions.AccessContentsInformation,
@@ -725,6 +731,7 @@
"""
Returns the source_section of related orders
"""
+ # XXX deprecated
return self.getSourceSectionList()
security.declareProtected( Permissions.AccessContentsInformation,
@@ -749,6 +756,7 @@
"""
Returns the destination_section of related orders
"""
+ # XXX deprecated
return self.getDestinationSectionList()
security.declareProtected( Permissions.AccessContentsInformation,
Modified: erp5/trunk/products/ERP5/Document/Order.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Order.py?rev=32522&r1=32521&r2=32522&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Order.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Order.py [utf8] Mon Feb 15 05:57:33 2010
@@ -125,21 +125,28 @@
"""
Warning: does not work if it was not catalogued immediately
"""
+ # 'order' category is deprecated. it is kept for compatibility.
for my_simulation_movement in self.getOrderRelatedValueList(
- portal_type='Simulation Movement'):
+ portal_type='Simulation Movement') or \
+ self.getDeliveryRelatedValueList(
+ portal_type='Simulation Movement'):
# And apply
getattr(my_simulation_movement, method_id)(**kw)
for m in self.contentValues(filter={'portal_type': \
self.getPortalMovementTypeList()}):
# Find related in simulation
for my_simulation_movement in m.getOrderRelatedValueList(
- portal_type='Simulation Movement'):
+ portal_type='Simulation Movement') or \
+ m.getDeliveryRelatedValueList(
+ portal_type='Simulation Movement'):
# And apply
getattr(my_simulation_movement, method_id)(**kw)
for c in m.contentValues(filter={'portal_type':
self.getPortalMovementTypeList()}):
for my_simulation_movement in c.getOrderRelatedValueList(
- portal_type='Simulation Movement'):
+ portal_type='Simulation Movement') or \
+ c.getDeliveryRelatedValueList(
+ portal_type='Simulation Movement'):
# And apply
getattr(my_simulation_movement, method_id)(**kw)
@@ -156,14 +163,21 @@
Returns simulation movements related to a cell or line
of this order
"""
- result = self.getOrderRelatedValueList(portal_type='Simulation Movement')
+ # XXX The name should be getDeliveryRelatedMovementList, but this
+ # method seems to be not used at all.
+ result = self.getOrderRelatedValueList(
+ portal_type='Simulation Movement') or \
+ self.getDeliveryRelatedValueList(portal_type='Simulation Movement')
for m in self.contentValues(filter={'portal_type': \
self.getPortalMovementTypeList()}):
# Find related in simulation
- result += m.getOrderRelatedValueList(portal_type='Simulation Movement')
+ result += m.getOrderRelatedValueList(
+ portal_type='Simulation Movement') or \
+ m.getDeliveryRelatedValueList(portal_type='Simulation Movement')
for c in m.contentValues(filter={'portal_type': 'Delivery Cell'}):
- result += c.getOrderRelatedValueList( \
- portal_type='Simulation Movement')
+ result += c.getOrderRelatedValueList(
+ portal_type='Simulation Movement') or \
+ c.getDeliveryRelatedValueList(portal_type='Simulation Movement')
return result
def manage_beforeDelete(self, item, container):
Modified: erp5/trunk/products/ERP5/Document/OrderLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/OrderLine.py?rev=32522&r1=32521&r2=32522&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/OrderLine.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/OrderLine.py [utf8] Mon Feb 15 05:57:33 2010
@@ -67,14 +67,17 @@
"""
Warning: does not work if it was not catalogued immediately
"""
+ # XXX This method seems to be not used at all.
# Find related in simulation
for my_simulation_movement in self.getOrderRelatedValueList(
- portal_type = 'Simulation Movement'):
+ portal_type = 'Simulation Movement') or \
+ self.getDeliveryRelatedValueList(portal_type = 'Simulation Movement'):
# And apply
getattr(my_simulation_movement, method_id)()
for c in self.contentValues(filter={'portal_type': 'Delivery Cell'}):
for my_simulation_movement in c.getOrderRelatedValueList(
- portal_type = 'Simulation Movement'):
+ portal_type = 'Simulation Movement') or \
+ c.getDeliveryRelatedValueList(portal_type = 'Simulation Movement'):
# And apply
getattr(my_simulation_movement, method_id)()
Modified: erp5/trunk/products/ERP5/Document/PaymentRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/PaymentRule.py?rev=32522&r1=32521&r2=32522&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/PaymentRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/PaymentRule.py [utf8] Mon Feb 15 05:57:33 2010
@@ -65,6 +65,7 @@
if payment_condition_list:
return payment_condition_list
+ # 'order' category is deprecated. it is kept for compatibility.
order_movement = movement.getOrderValue()
if order_movement is not None:
explanation = order_movement.getExplanationValue()
Modified: erp5/trunk/products/ERP5/Document/SimulationMovement.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/SimulationMovement.py?rev=32522&r1=32521&r2=32522&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/SimulationMovement.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/SimulationMovement.py [utf8] Mon Feb 15 05:57:33 2010
@@ -165,6 +165,7 @@
delivery = self.getDeliveryValue()
if delivery is not None:
return delivery.getSimulationState()
+ # 'order' category is deprecated. it is kept for compatibility.
order = self.getOrderValue()
if order is not None:
return order.getSimulationState()
@@ -186,6 +187,7 @@
delivery = self.getDeliveryValue()
if delivery is not None:
return delivery.getTranslatedSimulationStateTitle()
+ # 'order' category is deprecated. it is kept for compatibility.
order = self.getOrderValue()
if order is not None:
return order.getTranslatedSimulationStateTitle()
@@ -331,16 +333,24 @@
security.declareProtected( Permissions.AccessContentsInformation,
'getOrderStartDate')
def getOrderStartDate(self):
+ # 'order' category is deprecated. it is kept for compatibility.
order_value = self.getOrderValue()
if order_value is not None:
return order_value.getStartDate()
+ delivery_value = self.getDeliveryValue()
+ if delivery_value is not None:
+ return delivery_value.getStartDate()
security.declareProtected( Permissions.AccessContentsInformation,
'getOrderStopDate')
def getOrderStopDate(self):
+ # 'order' category is deprecated. it is kept for compatibility.
order_value = self.getOrderValue()
if order_value is not None:
return order_value.getStopDate()
+ delivery_value = self.getDeliveryValue()
+ if delivery_value is not None:
+ return delivery_value.getStopDate()
security.declareProtected( Permissions.AccessContentsInformation,
'getDeliveryStartDateList')
Modified: erp5/trunk/products/ERP5/TargetSolver/SplitAndDefer.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/TargetSolver/SplitAndDefer.py?rev=32522&r1=32521&r2=32522&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/TargetSolver/SplitAndDefer.py [utf8] (original)
+++ erp5/trunk/products/ERP5/TargetSolver/SplitAndDefer.py [utf8] Mon Feb 15 05:57:33 2010
@@ -77,6 +77,7 @@
id=new_id,
quantity=movement_quantity - new_movement_quantity,
activate_kw=self.activate_kw,
+ # 'order' category is deprecated. it is kept for compatibility.
order=simulation_movement.getOrder(),
**self.additional_parameters
)
@@ -110,6 +111,8 @@
efficiency=simulation_movement.getEfficiency(),
start_date=simulation_movement.getStartDate(),
stop_date=simulation_movement.getStopDate(),
+ # 'order' category is deprecated. it is kept for
+ # compatibility.
order=simulation_movement.getOrder(),
resource=simulation_movement.getResource(),
Modified: erp5/trunk/products/ERP5/TargetSolver/SplitQuantity.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/TargetSolver/SplitQuantity.py?rev=32522&r1=32521&r2=32522&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/TargetSolver/SplitQuantity.py [utf8] (original)
+++ erp5/trunk/products/ERP5/TargetSolver/SplitQuantity.py [utf8] Mon Feb 15 05:57:33 2010
@@ -57,6 +57,7 @@
start_date=simulation_movement.getStartDate(),
stop_date=simulation_movement.getStopDate(),
# XXX resource
+ # 'order' category is deprecated. it is kept for compatibility.
order = simulation_movement.getOrder(),
quantity = self.quantity,
source = simulation_movement.getSource(),
More information about the Erp5-report
mailing list