[Erp5-report] r34406 jerome - /erp5/trunk/products/ERP5/Document/
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Apr 8 18:19:21 CEST 2010
Author: jerome
Date: Thu Apr 8 18:19:19 2010
New Revision: 34406
URL: http://svn.erp5.org?rev=34406&view=rev
Log:
Move XMLMatrix to the first in class hierarchy, so that self._checkConsistency
resolves to XMLMatrix._checkConsistency
Modified:
erp5/trunk/products/ERP5/Document/BudgetLine.py
erp5/trunk/products/ERP5/Document/Consumption.py
erp5/trunk/products/ERP5/Document/DeliveryLine.py
erp5/trunk/products/ERP5/Document/PaySheetModel.py
erp5/trunk/products/ERP5/Document/PortalTest.py
erp5/trunk/products/ERP5/Document/Pricing.py
erp5/trunk/products/ERP5/Document/Project.py
erp5/trunk/products/ERP5/Document/SetPricing.py
erp5/trunk/products/ERP5/Document/SupplyLine.py
erp5/trunk/products/ERP5/Document/TradeModelLine.py
erp5/trunk/products/ERP5/Document/TransformedResource.py
erp5/trunk/products/ERP5/Document/VariatedProperty.py
Modified: erp5/trunk/products/ERP5/Document/BudgetLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BudgetLine.py?rev=34406&r1=34405&r2=34406&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BudgetLine.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BudgetLine.py [utf8] Thu Apr 8 18:19:19 2010
@@ -35,7 +35,7 @@
from Products.ERP5.Variated import Variated
-class BudgetLine(Predicate, XMLMatrix, Variated):
+class BudgetLine(XMLMatrix, Predicate, Variated):
"""
BudgetLine a line of budget...
"""
Modified: erp5/trunk/products/ERP5/Document/Consumption.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Consumption.py?rev=34406&r1=34405&r2=34406&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Consumption.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Consumption.py [utf8] Thu Apr 8 18:19:19 2010
@@ -35,7 +35,7 @@
from Products.ERP5Type.XMLMatrix import XMLMatrix
from Products.ERP5.Variated import Variated
-class Consumption(XMLObject, XMLMatrix, Variated):
+class Consumption(XMLMatrix, XMLObject, Variated):
"""
A matrix which provides default quantities
for a given quantity
Modified: erp5/trunk/products/ERP5/Document/DeliveryLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/DeliveryLine.py?rev=34406&r1=34405&r2=34406&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/DeliveryLine.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/DeliveryLine.py [utf8] Thu Apr 8 18:19:19 2010
@@ -38,7 +38,7 @@
from Products.ERP5.Variated import Variated
from Products.ERP5.Document.ImmobilisationMovement import ImmobilisationMovement
-class DeliveryLine(Movement, XMLObject, XMLMatrix, Variated,
+class DeliveryLine(XMLMatrix, Movement, XMLObject, Variated,
ImmobilisationMovement):
"""
A DeliveryLine object allows to implement lines in
Modified: erp5/trunk/products/ERP5/Document/PaySheetModel.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/PaySheetModel.py?rev=34406&r1=34405&r2=34406&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/PaySheetModel.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/PaySheetModel.py [utf8] Thu Apr 8 18:19:19 2010
@@ -33,7 +33,7 @@
from Products.ERP5Type.XMLMatrix import XMLMatrix
from Products.ERP5.Document.PaySheetTransaction import PaySheetTransaction
-class PaySheetModel(TradeCondition, XMLMatrix):
+class PaySheetModel(XMLMatrix, TradeCondition):
"""A PaySheetModel defines calculation rules for paysheets.
PaySheetModel are used to define calculating rules specific to a
Modified: erp5/trunk/products/ERP5/Document/PortalTest.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/PortalTest.py?rev=34406&r1=34405&r2=34406&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/PortalTest.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/PortalTest.py [utf8] Thu Apr 8 18:19:19 2010
@@ -33,7 +33,7 @@
from Products.ERP5.Document.MappedValue import MappedValue
-class PortalTest(MappedValue, XMLMatrix):
+class PortalTest(XMLMatrix, MappedValue):
"""
Container for test descriptions (funtionnal test scenarii,...).
"""
Modified: erp5/trunk/products/ERP5/Document/Pricing.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Pricing.py?rev=34406&r1=34405&r2=34406&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Pricing.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Pricing.py [utf8] Thu Apr 8 18:19:19 2010
@@ -33,7 +33,7 @@
from Products.ERP5.Document.MappedValue import MappedValue
-class Pricing(MappedValue, XMLMatrix):
+class Pricing(XMLMatrix, MappedValue):
"""
Un element de tarif est un prix pour un ensemble de conditions d'application...
"""
Modified: erp5/trunk/products/ERP5/Document/Project.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Project.py?rev=34406&r1=34405&r2=34406&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Project.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Project.py [utf8] Thu Apr 8 18:19:19 2010
@@ -36,7 +36,7 @@
from Products.ERP5Type.XMLObject import XMLObject
from Products.ERP5Type.XMLMatrix import XMLMatrix
-class Project(XMLObject, XMLMatrix):
+class Project(XMLMatrix, XMLObject):
"""
Project is a class which describes a typical project in consulting firm.
A project has a client, an invoiced client. A project has also a start
Modified: erp5/trunk/products/ERP5/Document/SetPricing.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/SetPricing.py?rev=34406&r1=34405&r2=34406&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/SetPricing.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/SetPricing.py [utf8] Thu Apr 8 18:19:19 2010
@@ -33,7 +33,7 @@
from Products.ERP5.Document.MappedValue import MappedValue
-class SetPricing(MappedValue, XMLMatrix):
+class SetPricing(XMLMatrix, MappedValue):
"""
Un element de tarif est un prix pour un ensemble de conditions d'application...
"""
Modified: erp5/trunk/products/ERP5/Document/SupplyLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/SupplyLine.py?rev=34406&r1=34405&r2=34406&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/SupplyLine.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/SupplyLine.py [utf8] Thu Apr 8 18:19:19 2010
@@ -35,7 +35,7 @@
from Products.ERP5Type.Utils import convertToUpperCase
-class SupplyLine(Path, XMLMatrix):
+class SupplyLine(XMLMatrix, Path):
"""A Supply Line is a path to define price
"""
Modified: erp5/trunk/products/ERP5/Document/TradeModelLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TradeModelLine.py?rev=34406&r1=34405&r2=34406&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TradeModelLine.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/TradeModelLine.py [utf8] Thu Apr 8 18:19:19 2010
@@ -40,7 +40,7 @@
TARGET_LEVEL_DELIVERY)
import zope.interface
-class TradeModelLine(Predicate, XMLMatrix, Amount):
+class TradeModelLine(XMLMatrix, Predicate, Amount):
"""Trade Model Line is a way to represent trade transformation for movements"""
meta_type = 'ERP5 Trade Model Line'
portal_type = 'Trade Model Line'
Modified: erp5/trunk/products/ERP5/Document/TransformedResource.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TransformedResource.py?rev=34406&r1=34405&r2=34406&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TransformedResource.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/TransformedResource.py [utf8] Thu Apr 8 18:19:19 2010
@@ -41,7 +41,7 @@
from Products.ERP5.Document.Predicate import Predicate
-class TransformedResource(Predicate, XMLObject, XMLMatrix, Amount):
+class TransformedResource(XMLMatrix, Predicate, XMLObject, Amount):
"""
TransformedResource defines which
resource is being transformed
Modified: erp5/trunk/products/ERP5/Document/VariatedProperty.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/VariatedProperty.py?rev=34406&r1=34405&r2=34406&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/VariatedProperty.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/VariatedProperty.py [utf8] Thu Apr 8 18:19:19 2010
@@ -33,7 +33,7 @@
from Products.ERP5Type.XMLObject import XMLObject
from Products.ERP5Type.XMLMatrix import XMLMatrix
-class VariatedProperty(XMLObject, XMLMatrix):
+class VariatedProperty(XMLMatrix, XMLObject):
"""
VariatedReference defines a reference which
can take multiples values depending of the variations of a resource
More information about the Erp5-report
mailing list