[Erp5-report] r28466 - in /erp5/trunk: bt5/erp5_bpm/PropertySheetTemplateItem/ products/ERP...

[nobody at svn.erp5.org]

Author: luke
Date: Wed Aug 19 17:06:45 2009
New Revision: 28466

URL: http://svn.erp5.org?rev=28466&view=rev
Log:
 - move matching_property from BPMRule to Rule property sheet
 - use rule property sheet in BPMRule instead of applied rule
 - remove not needed inheritance simulation for property_sheets property

Removed:
    erp5/trunk/bt5/erp5_bpm/PropertySheetTemplateItem/
Modified:
    erp5/trunk/products/ERP5/Document/BPMDeliveryRule.py
    erp5/trunk/products/ERP5/Document/BPMInvoiceTransactionRule.py
    erp5/trunk/products/ERP5/Document/BPMInvoicingRule.py
    erp5/trunk/products/ERP5/Document/BPMOrderRule.py
    erp5/trunk/products/ERP5/Document/BPMRule.py
    erp5/trunk/products/ERP5/PropertySheet/Rule.py

Modified: erp5/trunk/products/ERP5/Document/BPMDeliveryRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BPMDeliveryRule.py?rev=28466&r1=28465&r2=28466&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BPMDeliveryRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BPMDeliveryRule.py [utf8] Wed Aug 19 17:06:45 2009
@@ -44,8 +44,6 @@
   meta_type = 'ERP5 BPM Delivery Rule'
   portal_type = 'BPM Delivery Rule'
 
-  property_sheets = BPMRule.property_sheets
-
   # Declarative security
   security = ClassSecurityInfo()
   security.declareObjectProtected(Permissions.AccessContentsInformation)

Modified: erp5/trunk/products/ERP5/Document/BPMInvoiceTransactionRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BPMInvoiceTransactionRule.py?rev=28466&r1=28465&r2=28466&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BPMInvoiceTransactionRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BPMInvoiceTransactionRule.py [utf8] Wed Aug 19 17:06:45 2009
@@ -43,8 +43,6 @@
   # CMF Type Definition
   meta_type = 'ERP5 BPM Invoice Transaction Rule'
   portal_type = 'BPM Invoice Transaction Rule'
-
-  property_sheets = BPMRule.property_sheets
 
   # Declarative security
   security = ClassSecurityInfo()

Modified: erp5/trunk/products/ERP5/Document/BPMInvoicingRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BPMInvoicingRule.py?rev=28466&r1=28465&r2=28466&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BPMInvoicingRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BPMInvoicingRule.py [utf8] Wed Aug 19 17:06:45 2009
@@ -45,8 +45,6 @@
   meta_type = 'ERP5 BPM Invoicing Rule'
   portal_type = 'BPM Invoicing Rule'
 
-  property_sheets = BPMRule.property_sheets
-
   # Declarative security
   security = ClassSecurityInfo()
   security.declareObjectProtected(Permissions.AccessContentsInformation)

Modified: erp5/trunk/products/ERP5/Document/BPMOrderRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BPMOrderRule.py?rev=28466&r1=28465&r2=28466&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BPMOrderRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BPMOrderRule.py [utf8] Wed Aug 19 17:06:45 2009
@@ -43,8 +43,6 @@
   meta_type = 'ERP5 BPM Order Rule'
   portal_type = 'BPM Order Rule'
 
-  property_sheets = BPMDeliveryRule.property_sheets
-
   # Declarative security
   security = ClassSecurityInfo()
   security.declareObjectProtected(Permissions.AccessContentsInformation)

Modified: erp5/trunk/products/ERP5/Document/BPMRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BPMRule.py?rev=28466&r1=28465&r2=28466&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BPMRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BPMRule.py [utf8] Wed Aug 19 17:06:45 2009
@@ -72,7 +72,7 @@
                     , PropertySheet.Predicate
                     , PropertySheet.Reference
                     , PropertySheet.Version
-                    , PropertySheet.AppliedRule
+                    , PropertySheet.Rule
                     )
 
   movement_type = 'Simulation Movement'

Modified: erp5/trunk/products/ERP5/PropertySheet/Rule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/PropertySheet/Rule.py?rev=28466&r1=28465&r2=28466&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/PropertySheet/Rule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/PropertySheet/Rule.py [utf8] Wed Aug 19 17:06:45 2009
@@ -29,8 +29,14 @@
   """
   Property sheet for Rule class and subclass instances
   """
-
   _properties = (
+        {  'id'          : 'matching_property',
+           'description' : 'List of properties used in to compare previsions '
+                           'with Simulation Movements',
+           'type'        : 'lines',
+           'default'     : [],
+           'multivalued' : 1,
+           'mode'        : 'w' },
         {  'id'          : 'expandable_property',
            'description' : 'List of properties used in expand',
            'type'        : 'lines',
@@ -38,3 +44,5 @@
            'multivalued' : 1,
            'mode'        : 'w' },
   )
+
+