[Erp5-report] r27279 - in /erp5/trunk/products/ERP5: Interface/ interfaces/

[nobody at svn.erp5.org]

Author: jp
Date: Mon Jun  1 11:08:51 2009
New Revision: 27279

URL: http://svn.erp5.org?rev=27279&view=rev
Log:
solved some conflicts manually

Removed:
    erp5/trunk/products/ERP5/Interface/
Modified:
    erp5/trunk/products/ERP5/interfaces/business_process.py
    erp5/trunk/products/ERP5/interfaces/rule.py

Modified: erp5/trunk/products/ERP5/interfaces/business_process.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/interfaces/business_process.py?rev=27279&r1=27278&r2=27279&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/interfaces/business_process.py [utf8] (original)
+++ erp5/trunk/products/ERP5/interfaces/business_process.py [utf8] Mon Jun  1 11:08:51 2009
@@ -85,3 +85,7 @@
     'explanation' is the Order or Item or Document which is the
     cause of a root applied rule in the simulation
     """
+
+  def getTradePhaseList(self):
+    """Returns list of all trade_phase of this Business Process
+    """

Modified: erp5/trunk/products/ERP5/interfaces/rule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/interfaces/rule.py?rev=27279&r1=27278&r2=27279&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/interfaces/rule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/interfaces/rule.py [utf8] Mon Jun  1 11:08:51 2009
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002-2009 Nexedi SA and Contributors. All Rights Reserved.
+# Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
 #                    Jean-Paul Smets-Solanes <jp at nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
@@ -37,12 +37,10 @@
 
     An applied rule is an instanciation of a Rule. The applied rule is
     linked to the Rule through the `specialise` relation.
-    XXX update params
     """
 
   def expand(applied_rule):
     """Expand this applied rule to create new documents inside the
     applied rule.
-    XXX update params
     """