[Erp5-report] r18401 - in /erp5/trunk/products/ERP5/Document: Order.py PackingList.py

[nobody at svn.erp5.org]

Author: yo
Date: Wed Dec 19 04:27:08 2007
New Revision: 18401

URL: http://svn.erp5.org?rev=18401&view=rev
Log:
Fix the way of passing a rule to Delivery.updateAppliedRule, and correct a warning message.

Modified:
    erp5/trunk/products/ERP5/Document/Order.py
    erp5/trunk/products/ERP5/Document/PackingList.py

Modified: erp5/trunk/products/ERP5/Document/Order.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Order.py?rev=18401&r1=18400&r2=18401&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Order.py (original)
+++ erp5/trunk/products/ERP5/Document/Order.py Wed Dec 19 04:27:08 2007
@@ -35,6 +35,7 @@
 from Products.ERP5.Document.Delivery import Delivery
 
 from zLOG import LOG
+from warnings import warn
 
 class Order(Delivery):
     # CMF Type Definition
@@ -136,13 +137,18 @@
 
     ##########################################################################
     # Applied Rule stuff
-    def updateAppliedRule(self, rule_id="default_order_rule",force=0,**kw):
+    def updateAppliedRule(self, rule_id=None, rule_reference=None, **kw):
+      """XXX FIXME: Kept for compatibility.
+      updateAppliedRule must be called with a rule_reference in a workflow
+      script.
       """
-        XXX FIXME: Kept for compatibility
-        updateAppliedRule must be call with the rule_id in workflow script
-      """
-      LOG('Order.updateAppliedRule ',0,'This method this method should not be used anymore.')
-      Delivery.updateAppliedRule(self, rule_id, force=force,**kw)
+      if rule_id is None and rule_reference is None:
+        warn('Relying on a default order rule is deprecated; ' \
+             'rule_reference must be specified explicitly.',
+             DeprecationWarning)
+        rule_reference = 'default_order_rule'
+      Delivery.updateAppliedRule(self, rule_id=rule_id, 
+                                 rule_reference=rule_reference, **kw)
 
     def expandAppliedRuleRelatedToOrder(self, activate_kw=None,**kw):
       """

Modified: erp5/trunk/products/ERP5/Document/PackingList.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/PackingList.py?rev=18401&r1=18400&r2=18401&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/PackingList.py (original)
+++ erp5/trunk/products/ERP5/Document/PackingList.py Wed Dec 19 04:27:08 2007
@@ -32,6 +32,7 @@
 
 from Products.ERP5.Document.Delivery import Delivery
 from zLOG import LOG
+from warnings import warn
 
 class PackingList(Delivery):
     """
@@ -122,9 +123,15 @@
 
     ##########################################################################
     # Applied Rule stuff
-    def updateAppliedRule(self, rule_id="default_delivery_rule", **kw):
+    def updateAppliedRule(self, rule_id=None, rule_reference=None, **kw):
+      """XXX FIXME: Kept for compatibility.
+      updateAppliedRule must be called with a rule_reference in a workflow
+      script.
       """
-        XXX FIXME: Kept for compatibility
-        updateAppliedRule must be call with the rule_id in workflow script
-      """
-      Delivery.updateAppliedRule(self, rule_id, **kw)
+      if rule_id is None and rule_reference is None:
+        warn('Relying on a default order rule is deprecated; ' \
+             'rule_reference must be specified explicitly.',
+             DeprecationWarning)
+        rule_reference = 'default_delivery_rule'
+      Delivery.updateAppliedRule(self, rule_id=rule_id, 
+                                 rule_reference=rule_reference, **kw)