Revert r34406 commit to fix unit test failures.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@34410 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/Document/BudgetLine.py

@@ -35,7 +35,7 @@ from Products.ERP5.Document.Predicate import Predicate
 from Products.ERP5.Variated import Variated
 
 
-class BudgetLine(XMLMatrix, Predicate, Variated):
+class BudgetLine(Predicate, XMLMatrix, Variated):
     """
     BudgetLine  a line of budget...
     """

product/ERP5/Document/Consumption.py

@@ -35,7 +35,7 @@ from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5Type.XMLMatrix import XMLMatrix
 from Products.ERP5.Variated import Variated
 
-class Consumption(XMLMatrix, XMLObject, Variated):
+class Consumption(XMLObject, XMLMatrix, Variated):
     """
       A matrix which provides default quantities
       for a given quantity

product/ERP5/Document/DeliveryLine.py

@@ -38,7 +38,7 @@ from Products.ERP5.Document.Movement import Movement
 from Products.ERP5.Variated import Variated
 from Products.ERP5.Document.ImmobilisationMovement import ImmobilisationMovement
 
-class DeliveryLine(XMLMatrix, Movement, XMLObject, Variated,
+class DeliveryLine(Movement, XMLObject, XMLMatrix, Variated,
                    ImmobilisationMovement):
     """
       A DeliveryLine object allows to implement lines in

product/ERP5/Document/PaySheetModel.py

@@ -33,7 +33,7 @@ from Products.ERP5.Document.TradeCondition import TradeCondition
 from Products.ERP5Type.XMLMatrix import XMLMatrix
 from Products.ERP5.Document.PaySheetTransaction import PaySheetTransaction
 
-class PaySheetModel(XMLMatrix, TradeCondition):
+class PaySheetModel(TradeCondition, XMLMatrix):
   """A PaySheetModel defines calculation rules for paysheets.
 
     PaySheetModel are used to define calculating rules specific to a

product/ERP5/Document/PortalTest.py

@@ -33,7 +33,7 @@ from Products.ERP5Type.XMLMatrix import XMLMatrix
 
 from Products.ERP5.Document.MappedValue import MappedValue
 
-class PortalTest(XMLMatrix, MappedValue):
+class PortalTest(MappedValue, XMLMatrix):
     """
       Container for test descriptions (funtionnal test scenarii,...).
     """

product/ERP5/Document/Pricing.py

@@ -33,7 +33,7 @@ from Products.ERP5Type.XMLMatrix import XMLMatrix
 
 from Products.ERP5.Document.MappedValue import MappedValue
 
-class Pricing(XMLMatrix, MappedValue):
+class Pricing(MappedValue, XMLMatrix):
     """
       Un element de tarif est un prix pour un ensemble de conditions d'application...
     """

product/ERP5/Document/Project.py

@@ -36,7 +36,7 @@ from Products.ERP5Type.Accessor.Constant import PropertyGetter as ConstantGetter
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5Type.XMLMatrix import XMLMatrix
 
-class Project(XMLMatrix, XMLObject):
+class Project(XMLObject, XMLMatrix):
     """
     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

product/ERP5/Document/SetPricing.py

@@ -33,7 +33,7 @@ from Products.ERP5Type.XMLMatrix import XMLMatrix
 
 from Products.ERP5.Document.MappedValue import MappedValue
 
-class SetPricing(XMLMatrix, MappedValue):
+class SetPricing(MappedValue, XMLMatrix):
     """
       Un element de tarif est un prix pour un ensemble de conditions d'application...
     """

product/ERP5/Document/SupplyLine.py

@@ -35,7 +35,7 @@ from Products.ERP5.Document.Path import Path
 from Products.ERP5Type.Utils import convertToUpperCase
 
 
-class SupplyLine(XMLMatrix, Path):
+class SupplyLine(Path, XMLMatrix):
     """A Supply Line is a path to define price 
     """
 

product/ERP5/Document/TradeModelLine.py

@@ -40,7 +40,7 @@ from Products.ERP5.PropertySheet.TradeModelLine import (TARGET_LEVEL_MOVEMENT,
                                                         TARGET_LEVEL_DELIVERY)
 import zope.interface
 
-class TradeModelLine(XMLMatrix, Predicate, Amount):
+class TradeModelLine(Predicate, XMLMatrix, Amount):
   """Trade Model Line is a way to represent trade transformation for movements"""
   meta_type = 'ERP5 Trade Model Line'
   portal_type = 'Trade Model Line'

product/ERP5/Document/TransformedResource.py

@@ -41,7 +41,7 @@ from Products.ERP5.AggregatedAmountList import AggregatedAmountList
 
 from Products.ERP5.Document.Predicate import Predicate
 
-class TransformedResource(XMLMatrix, Predicate, XMLObject, Amount):
+class TransformedResource(Predicate, XMLObject, XMLMatrix, Amount):
     """
         TransformedResource defines which
         resource is being transformed

product/ERP5/Document/VariatedProperty.py

@@ -33,7 +33,7 @@ from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5Type.XMLMatrix import XMLMatrix
 
-class VariatedProperty(XMLMatrix, XMLObject):
+class VariatedProperty(XMLObject, XMLMatrix):
     """
         VariatedReference defines a reference which
         can take multiples values depending of the variations of a resource