Commit 177ccc84 by Yusei Tahara

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
parent 1b6033b3
......@@ -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...
"""
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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,...).
"""
......
......@@ -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...
"""
......
......@@ -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
......
......@@ -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...
"""
......
......@@ -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
"""
......
......@@ -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'
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment