ZODB Components: erp5_trade: Migrate Documents, Interfaces and Mixins from filesystem (MR !1101).

* Remove TaxLine Document which was replaced by Trade Model Line a while ago.
* Keep {Delivery,Inventory,Order}{Cell,Line} on FS for now because of InventoryInteractor.
* About DeliveryRootSimulation Document migration to erp5_trade:
  + AccountingTransactionRootSimulationRule (erp5_accounting) inherited from
    it but as this is probably not actually used/useful, avoid depending on
    erp5_trade or refactoring but just copy/paste.
  + InvoiceRootSimulationRule inherited from it but as it is only used in
    erp5_invoicing (which already depends on erp5_trade) move it there.
    - erp5_configurator_standard_accounting_template: Add depend on erp5_invoicing.
* Move Documents used by several bt5 to erp5_core rather than add depends on erp5_core.
  Once migration of Products to ZODB Components will be finished, there will be moved to
  their appropriate bt5s as it would be complicated to reorganize bt5s too at this point.
  + Inventory: used by erp5_archive and erp5_accounting.
  + Order: used by erp5_project.
  + PackingList: used by erp5_publication.

bt5/erp5_accounting/DocumentTemplateItem/portal_components/document.erp5.AccountingTransactionRootSimulationRule.py

@@ -26,11 +26,11 @@
 ##############################################################################
 
 from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions
-from Products.ERP5.Document.DeliveryRootSimulationRule \
-     import DeliveryRootSimulationRule, DeliveryRuleMovementGenerator
+from Products.ERP5Type import Permissions, PropertySheet
 
-class AccountingTransactionRootSimulationRule(DeliveryRootSimulationRule):
+from Products.ERP5.mixin.rule import RuleMixin
+from Products.ERP5.mixin.movement_collection_updater import MovementCollectionUpdaterMixin
+class AccountingTransactionRootSimulationRule(RuleMixin, MovementCollectionUpdaterMixin):
   """
   Accounting Transaction Root Simulation Rule is a root level rule for
   Accounting Transaction.
@@ -50,7 +50,52 @@ class AccountingTransactionRootSimulationRule(DeliveryRootSimulationRule):
     return AccountingTransactionRuleMovementGenerator(applied_rule=context,
                                                       rule=self)
 
-class AccountingTransactionRuleMovementGenerator(DeliveryRuleMovementGenerator):
+  ## XXX: From here on, copy/paste from DeliveryRootSimulationRule to avoid a
+  ##      dependency on erp5_trade. Is this Rule really actually used/useful?
+  #
+  # Default Properties
+  property_sheets = (
+    PropertySheet.Base,
+    PropertySheet.XMLObject,
+    PropertySheet.CategoryCore,
+    PropertySheet.DublinCore,
+    PropertySheet.Task,
+    PropertySheet.Predicate,
+    PropertySheet.Reference,
+    PropertySheet.Version,
+    PropertySheet.Rule
+    )
+  def _isProfitAndLossMovement(self, movement):
+    # For a kind of trade rule, a profit and loss movement lacks source
+    # or destination.
+    return (movement.getSource() is None or movement.getDestination() is None)
+
+from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
+class AccountingTransactionRuleMovementGenerator(MovementGeneratorMixin):
 
   def _getPortalDeliveryMovementTypeList(self):
     return self._rule.getPortalObject().getPortalAccountingMovementTypeList()
+
+  def _getInputMovementList(self, movement_list=None, rounding=None):
+    """
+    Input movement list comes from delivery
+
+    XXX: Copy/paste from DeliveryRootSimulationRule to avoid a dependency on
+         erp5_trade. Is this Rule really actually used/useful?
+    """
+    delivery = self._applied_rule.getDefaultCausalityValue()
+    if delivery is None:
+      return []
+    else:
+      result = []
+      movement_kw = {}
+      movement_type_list = self._getPortalDeliveryMovementTypeList()
+      if movement_type_list:
+        movement_kw["portal_type"] = movement_type_list
+      for movement in delivery.getMovementList(**movement_kw):
+        simulation_movement_list = movement.getDeliveryRelatedValueList()
+        if not simulation_movement_list or self._applied_rule in (
+            simulation_movement.getParentValue()
+            for simulation_movement in simulation_movement_list):
+          result.append(movement)
+      return result

bt5/erp5_accounting/DocumentTemplateItem/portal_components/document.erp5.BalanceTransaction.py

@@ -30,7 +30,7 @@ from UserDict import UserDict
 
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
-from Products.ERP5.Document.Inventory import Inventory
+from erp5.component.document.Inventory import Inventory
 from erp5.component.document.AccountingTransaction import AccountingTransaction
 from Products.ZSQLCatalog.SQLCatalog import Query
 import types

bt5/erp5_accounting/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml

@@ -30,15 +30,6 @@
  <portal_type id="Internal Invoice Transaction">
   <item>Internal Invoice Transaction Line</item>
  </portal_type>
- <portal_type id="Invoice Root Simulation Rule">
-  <item>Category Membership Divergence Tester</item>
-  <item>DateTime Divergence Tester</item>
-  <item>Float Divergence Tester</item>
-  <item>Net Converted Quantity Divergence Tester</item>
-  <item>Specialise Divergence Tester</item>
-  <item>String Divergence Tester</item>
-  <item>Variation Divergence Tester</item>
- </portal_type>
  <portal_type id="Organisation">
   <item>Accounting Period</item>
   <item>Cash Register</item>
@@ -72,7 +63,6 @@
  </portal_type>
  <portal_type id="Rule Tool">
   <item>Accounting Transaction Root Simulation Rule</item>
-  <item>Invoice Root Simulation Rule</item>
   <item>Payment Simulation Rule</item>
  </portal_type>
  <portal_type id="Sale Invoice Transaction">

bt5/erp5_accounting/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml

@@ -35,10 +35,6 @@
   <type>Internal Invoice Transaction</type>
   <workflow>edit_workflow, internal_invoice_transaction_simulation_workflow</workflow>
  </chain>
- <chain>
-  <type>Invoice Root Simulation Rule</type>
-  <workflow>edit_workflow, rule_validation_workflow</workflow>
- </chain>
  <chain>
   <type>Payment Simulation Rule</type>
   <workflow>edit_workflow, rule_validation_workflow</workflow>

bt5/erp5_accounting/bt/template_action_path_list

@@ -75,7 +75,6 @@ Internal Invoice Transaction | document_list
 Internal Invoice Transaction | jump_related_payment
 Internal Invoice Transaction | source_asset
 Internal Invoice Transaction | view
-Invoice Root Simulation Rule | view
 Organisation | account_statement_export
 Organisation | account_statement_report
 Organisation | general_ledger_export

bt5/erp5_accounting/bt/template_document_id_list

@@ -7,5 +7,4 @@ document.erp5.AccountingTransactionRootSimulationRule
 document.erp5.BalanceTransaction
 document.erp5.BalanceTransactionLine
 document.erp5.Invoice
-document.erp5.InvoiceRootSimulationRule
 document.erp5.PaymentSimulationRule
\ No newline at end of file

bt5/erp5_accounting/bt/template_portal_type_allowed_content_type_list

@@ -15,13 +15,6 @@ Accounting Transaction | Accounting Transaction Line
 Accounting Transaction | Embedded File
 Balance Transaction | Balance Transaction Line
 Internal Invoice Transaction | Internal Invoice Transaction Line
-Invoice Root Simulation Rule | Category Membership Divergence Tester
-Invoice Root Simulation Rule | DateTime Divergence Tester
-Invoice Root Simulation Rule | Float Divergence Tester
-Invoice Root Simulation Rule | Net Converted Quantity Divergence Tester
-Invoice Root Simulation Rule | Specialise Divergence Tester
-Invoice Root Simulation Rule | String Divergence Tester
-Invoice Root Simulation Rule | Variation Divergence Tester
 Organisation | Accounting Period
 Organisation | Cash Register
 Payment Simulation Rule | Category Membership Divergence Tester
@@ -42,7 +35,6 @@ Property Sheet | Accounting Transaction Balance Constraint
 Purchase Invoice Transaction | Embedded File
 Purchase Invoice Transaction | Purchase Invoice Transaction Line
 Rule Tool | Accounting Transaction Root Simulation Rule
-Rule Tool | Invoice Root Simulation Rule
 Rule Tool | Payment Simulation Rule
 Sale Invoice Transaction | Embedded File
 Sale Invoice Transaction | Sale Invoice Transaction Line
\ No newline at end of file

bt5/erp5_accounting/bt/template_portal_type_id_list

@@ -13,7 +13,6 @@ Balance Transaction Line
 Cash Register
 Internal Invoice Transaction
 Internal Invoice Transaction Line
-Invoice Root Simulation Rule
 Payment Simulation Rule
 Payment Transaction
 Purchase Invoice Transaction

bt5/erp5_accounting/bt/template_portal_type_workflow_chain_list

@@ -20,8 +20,6 @@ Cash Register | edit_workflow
 Cash Register | validation_workflow
 Internal Invoice Transaction | edit_workflow
 Internal Invoice Transaction | internal_invoice_transaction_simulation_workflow
-Invoice Root Simulation Rule | edit_workflow
-Invoice Root Simulation Rule | rule_validation_workflow
 Payment Simulation Rule | edit_workflow
 Payment Simulation Rule | rule_validation_workflow
 Payment Transaction | accounting_workflow

bt5/erp5_apparel/TestTemplateItem/portal_components/test.erp5.testProductionPackingListApparel.py

@@ -32,7 +32,7 @@ import unittest
 
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
 from erp5.component.test.testProductionOrderApparel import TestProductionOrderApparelMixin
-from Products.ERP5.tests.testProductionPackingList import TestProductionDelivery
+from erp5.component.test.testProductionPackingList import TestProductionDelivery
 
 class TestProductionDeliveryApparel(TestProductionOrderApparelMixin,
     TestProductionDelivery, ERP5TypeTestCase):

bt5/erp5_banking_core/DocumentTemplateItem/portal_components/document.erp5.CashContainer.py

@@ -28,7 +28,7 @@
 
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
-from Products.ERP5.Document.Container import Container
+from erp5.component.document.Container import Container
 from erp5.component.module.BaobabMixin import BaobabMixin
 
 class CashContainer(BaobabMixin, Container):

bt5/erp5_banking_core/DocumentTemplateItem/portal_components/document.erp5.CashInventory.py

@@ -28,7 +28,7 @@
 
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
-from Products.ERP5.Document.Inventory import Inventory
+from erp5.component.document.Inventory import Inventory
 from erp5.component.document.BankingOperation import BankingOperation
 
 

bt5/erp5_configurator_standard_accounting_template/bt/dependency_list

 erp5_accounting
+erp5_invoicing
\ No newline at end of file

bt5/erp5_accounting/DocumentTemplateItem/portal_components/document.erp5.InvoiceRootSimulationRule.py → bt5/erp5_invoicing/DocumentTemplateItem/portal_components/document.erp5.InvoiceRootSimulationRule.py

@@ -30,7 +30,7 @@
 
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions
-from Products.ERP5.Document.DeliveryRootSimulationRule \
+from erp5.component.document.DeliveryRootSimulationRule \
      import DeliveryRootSimulationRule, DeliveryRuleMovementGenerator
 
 class InvoiceRootSimulationRule(DeliveryRootSimulationRule):

bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml

@@ -3,6 +3,15 @@
   <item>Invoice Cell</item>
   <item>Invoice Line</item>
  </portal_type>
+ <portal_type id="Invoice Root Simulation Rule">
+  <item>Category Membership Divergence Tester</item>
+  <item>DateTime Divergence Tester</item>
+  <item>Float Divergence Tester</item>
+  <item>Net Converted Quantity Divergence Tester</item>
+  <item>Specialise Divergence Tester</item>
+  <item>String Divergence Tester</item>
+  <item>Variation Divergence Tester</item>
+ </portal_type>
  <portal_type id="Invoice Simulation Rule">
   <item>Category Membership Divergence Tester</item>
   <item>DateTime Divergence Tester</item>
@@ -22,6 +31,7 @@
   <item>Variation Divergence Tester</item>
  </portal_type>
  <portal_type id="Rule Tool">
+  <item>Invoice Root Simulation Rule</item>
   <item>Invoice Simulation Rule</item>
   <item>Invoice Transaction Simulation Rule</item>
   <item>Trade Model Simulation Rule</item>

bt5/erp5_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml

@@ -7,6 +7,10 @@
   <type>Invoice Line</type>
   <workflow>delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow, edit_workflow, movement_resource_interaction_workflow, pricing_interaction_workflow, trade_matrix_workflow</workflow>
  </chain>
+ <chain>
+  <type>Invoice Root Simulation Rule</type>
+  <workflow>edit_workflow, rule_validation_workflow</workflow>
+ </chain>
  <chain>
   <type>Invoice Simulation Rule</type>
   <workflow>edit_workflow, rule_validation_workflow</workflow>

bt5/erp5_invoicing/bt/template_action_path_list

@@ -3,6 +3,7 @@ Invoice Line | price
 Invoice Line | quantity
 Invoice Line | view
 Invoice Line | view_trade_model
+Invoice Root Simulation Rule | view
 Invoice Simulation Rule | view
 Invoice Transaction Simulation Rule | view
 Trade Model Simulation Rule | view
\ No newline at end of file

bt5/erp5_invoicing/bt/template_document_id_list

+document.erp5.InvoiceRootSimulationRule
 document.erp5.InvoiceSimulationRule
 document.erp5.InvoiceTransactionSimulationRule
 document.erp5.TradeModelSimulationRule
\ No newline at end of file

bt5/erp5_invoicing/bt/template_portal_type_allowed_content_type_list

 Invoice Line | Invoice Cell
 Invoice Line | Invoice Line
+Invoice Root Simulation Rule | Category Membership Divergence Tester
+Invoice Root Simulation Rule | DateTime Divergence Tester
+Invoice Root Simulation Rule | Float Divergence Tester
+Invoice Root Simulation Rule | Net Converted Quantity Divergence Tester
+Invoice Root Simulation Rule | Specialise Divergence Tester
+Invoice Root Simulation Rule | String Divergence Tester
+Invoice Root Simulation Rule | Variation Divergence Tester
 Invoice Simulation Rule | Category Membership Divergence Tester
 Invoice Simulation Rule | DateTime Divergence Tester
 Invoice Simulation Rule | Float Divergence Tester
@@ -14,6 +21,7 @@ Invoice Transaction Simulation Rule | Net Converted Quantity Divergence Tester
 Invoice Transaction Simulation Rule | Specialise Divergence Tester
 Invoice Transaction Simulation Rule | String Divergence Tester
 Invoice Transaction Simulation Rule | Variation Divergence Tester
+Rule Tool | Invoice Root Simulation Rule
 Rule Tool | Invoice Simulation Rule
 Rule Tool | Invoice Transaction Simulation Rule
 Rule Tool | Trade Model Simulation Rule

bt5/erp5_invoicing/bt/template_portal_type_id_list

 Invoice Cell
 Invoice Line
+Invoice Root Simulation Rule
 Invoice Simulation Rule
 Invoice Transaction Simulation Rule
 Trade Model Simulation Rule
\ No newline at end of file

bt5/erp5_invoicing/bt/template_portal_type_workflow_chain_list

@@ -8,6 +8,8 @@ Invoice Line | edit_workflow
 Invoice Line | movement_resource_interaction_workflow
 Invoice Line | pricing_interaction_workflow
 Invoice Line | trade_matrix_workflow
+Invoice Root Simulation Rule | edit_workflow
+Invoice Root Simulation Rule | rule_validation_workflow
 Invoice Simulation Rule | edit_workflow
 Invoice Simulation Rule | rule_validation_workflow
 Invoice Transaction Simulation Rule | edit_workflow

bt5/erp5_mrp/DocumentTemplateItem/portal_components/document.erp5.ProductionSimulationRule.py

-from Products.ERP5.Document.DeliverySimulationRule import DeliverySimulationRule
+from erp5.component.document.DeliverySimulationRule import DeliverySimulationRule
 from Products.ERP5.mixin.movement_generator import MovementGeneratorMixin
 
 class ProductionSimulationRule(DeliverySimulationRule):

bt5/erp5_payroll/DocumentTemplateItem/portal_components/document.erp5.PaySheetModel.py

@@ -29,7 +29,7 @@
 from AccessControl import ClassSecurityInfo
 
 from Products.ERP5Type import Permissions, PropertySheet
-from Products.ERP5.Document.TradeCondition import TradeCondition
+from erp5.component.document.TradeCondition import TradeCondition
 from Products.ERP5Type.XMLMatrix import XMLMatrix
 
 class PaySheetModel(TradeCondition, XMLMatrix):

bt5/erp5_payroll/DocumentTemplateItem/portal_components/document.erp5.PaySheetModelCell.py

@@ -29,7 +29,7 @@
 
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions
-from Products.ERP5.Document.TradeModelCell import TradeModelCell
+from erp5.component.document.TradeModelCell import TradeModelCell
 from Products.ERP5Type.Core.Predicate import Predicate
 
 class PaySheetModelCell(TradeModelCell):

bt5/erp5_payroll/DocumentTemplateItem/portal_components/document.erp5.PaySheetModelLine.py

@@ -28,7 +28,7 @@
 
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
-from Products.ERP5.Document.TradeModelLine import TradeModelLine
+from erp5.component.document.TradeModelLine import TradeModelLine
 
 class PaySheetModelLine(TradeModelLine):
   """

bt5/erp5_real_time_inventory_accounting/DocumentTemplateItem/portal_components/document.erp5.InventoryAssetPriceAccountingSimulationRule.py

@@ -26,7 +26,7 @@
 #
 ##############################################################################
 
-from Products.ERP5.Document.InvoiceTransactionSimulationRule import (InvoiceTransactionSimulationRule,
+from erp5.component.document.InvoiceTransactionSimulationRule import (InvoiceTransactionSimulationRule,
                                                                      InvoiceTransactionRuleMovementGenerator)
 
 class InventoryAssetPriceAccountingRuleMovementGenerator(InvoiceTransactionRuleMovementGenerator):

bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.BusinessLink.py

@@ -35,6 +35,7 @@ from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5.Document.Path import Path
 from Products.ERP5Type.Core.Predicate import Predicate
 from Products.ERP5.ExplanationCache import _getExplanationCache
+from erp5.component.interface.IBusinessLink import IBusinessLink
 
 import zope.interface
 
@@ -93,7 +94,7 @@ class BusinessLink(Path, Predicate):
                     )
 
   # Declarative interfaces
-  zope.interface.implements(interfaces.IBusinessLink,
+  zope.interface.implements(IBusinessLink,
                             interfaces.IPredicate,
                             )
 

bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.BusinessProcess.py

@@ -36,6 +36,7 @@ from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5.Document.Path import Path
 from Products.ERP5.ExplanationCache import _getExplanationCache, _getBusinessLinkClosure
 from Products.ERP5.MovementCollectionDiff import _getPropertyAndCategoryList
+from erp5.component.interface.IBusinessProcess import IBusinessProcess
 
 import zope.interface
 
@@ -116,7 +117,7 @@ class BusinessProcess(Path, XMLObject):
                     )
 
   # Declarative interfaces
-  zope.interface.implements(interfaces.IBusinessProcess,
+  zope.interface.implements(IBusinessProcess,
                             interfaces.IArrowBase)
 
   # ITradeModelPathProcess implementation

bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.Container.py

+##############################################################################
+#
+# Copyright (c) 2002, 2005 Nexedi SARL and Contributors. All Rights Reserved.
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
+#                    Romain Courteaud <romain@nexedi.com>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+from AccessControl import ClassSecurityInfo
+from AccessControl.PermissionRole import PermissionRole
+
+from Products.ERP5Type import Permissions, PropertySheet
+from Products.ERP5Type.XMLObject import XMLObject
+
+from Products.ERP5.Document.Movement import Movement
+
+class Container(Movement, XMLObject):
+  """
+      Container is equivalent to a movement with qty 1.0 and resource =
+      to the kind of packaging Container may point to item (ex.
+      Container serial No or Parcel Serial No if tracing required)
+      Container may eventually usa optional property sheet to store
+      parcel No information (we use Item property sheet for that). Some
+      acquisition may be required...
+
+      A Container which does not point to an Item can act itself as an Item
+      for traceability.
+
+      Container Line / Container Cell is used to store quantities (never
+      accounted)
+      Container Line / Countainer Cell may point to Item
+  """
+  meta_type = 'ERP5 Container'
+  portal_type = 'Container'
+
+  # Declarative security
+  security = ClassSecurityInfo()
+  security.declareObjectProtected(Permissions.AccessContentsInformation)
+
+  # Declarative properties
+  property_sheets = ( PropertySheet.Base
+                    , PropertySheet.XMLObject
+                    , PropertySheet.CategoryCore
+                    , PropertySheet.Amount
+                    , PropertySheet.Task
+                    , PropertySheet.Arrow
+                    , PropertySheet.Movement
+                    , PropertySheet.Price
+                    , PropertySheet.VariationRange
+                    , PropertySheet.ItemAggregation
+                    , PropertySheet.Item
+                    , PropertySheet.Container
+                    , PropertySheet.SortIndex
+                    )
+
+  security.declareProtected(Permissions.AccessContentsInformation,
+                            'getQuantity')
+  def getQuantity(self, default=1.0):
+    """
+    Returns 1 because only one container is shipped
+    """
+    return 1.0
+
+  security.declareProtected(Permissions.AccessContentsInformation,
+                            'isAccountable')
+  def isAccountable(self):
+    """
+        Returns 1 if this needs to be accounted
+        Only account movements which are not associated to a delivery
+        Whenever delivery is there, delivery has priority
+    """
+    # Always accountable - to account the containers which we use
+    return 1
+
+  security.declareProtected( Permissions.ModifyPortalContent,
+                            'hasCellContent' )
+  def hasCellContent(self, base_id='movement'):
+    """
+    This method can be overriden
+    """
+    return 0
+
+  security.declareProtected(Permissions.AccessContentsInformation, 'isDivergent')
+  def isDivergent(self):
+    """Return True if this movement diverges from the its simulation.
+    Containers are never divergent.
+    """
+    return False
+
+  security.declareProtected(Permissions.AccessContentsInformation,
+                            'getContainerText')
+  def getContainerText(self):
+    """
+    Creates a unique string which allows to compare/hash two containers
+    """
+    result = ""
+    container_line_list = list(self.objectValues())
+    container_line_list.sort(key=lambda x: x.getResource())
+    for container_line in container_line_list:
+      if container_line.hasCellContent():
+        container_cell_list = list(container_line.objectValues())
+        container_cell_list.sort(key=lambda x: x.getVariationText())
+        for container_cell in container_cell_list:
+          result += "%s %s %s\n" % (container_cell.getResource(),
+                                    container_cell.getQuantity(),
+                                    '|'.join(container_cell.getVariationText().split('\n')))
+      else:
+        result += "%s %s\n" % (container_line.getResource(), container_line.getQuantity())
+    container_list = list(self.objectValues(spec = self.meta_type))
+    container_list.sort(key=lambda x: x.getContainerText())
+    more_result = ""
+    for container in container_list:
+      more_result += container.getContainerText()
+    result = result + '\n'.join([" %s" % x for x in more_result.split('\n')])
+    return result
+
+  # Used for optimization - requires reindexing using container_uid
+  security.declareProtected(Permissions.AccessContentsInformation,
+                            'getContainerUid')
+  def getContainerUid(self):
+    return self.getUid()
+
+  security.declareProtected(Permissions.AccessContentsInformation,
+                            'getContainerValue')
+  def getContainerValue(self):
+    return self
+
+  security.declareProtected(Permissions.AccessContentsInformation,
+                            'getContainer')
+  def getContainer(self):
+    return self.getRelativeUrl()
+
+  # Quantity methods
+  security.declareProtected(Permissions.AccessContentsInformation,
+                            'getContainedTotalQuantity')
+  def getContainedTotalQuantity(self, recursive = 0):
+    """
+    The sum of quantities of contained lines
+    """
+    result = 0.0
+    for o in self.contentValues(filter =
+                  {'portal_type': self.getPortalContainerLineTypeList()}):
+      result += o.getTotalQuantity()
+    if recursive:
+      for o in self.contentValues(filter =
+                  {'portal_type': self.getPortalContainerTypeList()}):
+        result += o.getContainedTotalQuantity()
+    return result
+
+  security.declareProtected(Permissions.AccessContentsInformation,
+                            'getContainedTotalPrice')
+  def getContainedTotalPrice(self, recursive = 0):
+    """
+    The sum of price of contained lines
+    """
+    result = 0.0
+    for o in self.contentValues(filter =
+                  {'portal_type': self.getPortalContainerLineTypeList()}):
+      result += o.getTotalPrice()
+    if recursive:
+      for o in self.contentValues(filter =
+                  {'portal_type': self.getPortalContainerTypeList()}):
+        result += o.getContainedTotalPrice()
+    return result
+
+  # Item Access
+  security.declareProtected(Permissions.AccessContentsInformation,
+                            'getTrackedItemUidList')
+  def getTrackedItemUidList(self):
+    """
+    Return a list of uid for related items.
+    If this container is related to no item, it is treated as an Item
+    """
+    ### XXX We should filter by portal type here
+    item_uid_list = self.getAggregateUidList()
+    if len(item_uid_list): return item_uid_list
+    return (self.getUid(),)
+
+  # XXX: Dirty but required for erp5_banking_core
+  getBaobabSourceUid = lambda x: x.getSourceUid()
+  getBaobabSourceUid__roles__ = PermissionRole(Permissions.View)
+
+  getBaobabDestinationUid = lambda x: x.getDestinationUid()
+  getBaobabDestinationUid__roles__ = PermissionRole(Permissions.View)
+
+  getBaobabSourceSectionUid = lambda x: x.getSourceSectionUid()
+  getBaobabSourceSectionUid__roles__ = PermissionRole(Permissions.View)
+
+  getBaobabDestinationSectionUid = lambda x: x.getDestinationSectionUid()
+  getBaobabDestinationSectionUid__roles__ = PermissionRole(Permissions.View)
+
+  getBaobabSourcePaymentUid = lambda x: x.getSourcePaymentUid()
+  getBaobabSourcePaymentUid__roles__ = PermissionRole(Permissions.View)
+
+  getBaobabDestinationPaymentUid = lambda x: x.getDestinationPaymentUid()
+  getBaobabDestinationPaymentUid__roles__ = PermissionRole(Permissions.View)
+
+  getBaobabSourceFunctionUid = lambda x: x.getSourceFunctionUid()
+  getBaobabSourceFunctionUid__roles__ = PermissionRole(Permissions.View)
+
+  getBaobabDestinationFunctionUid = lambda x: x.getDestinationFunctionUid()
+  getBaobabDestinationFunctionUid__roles__ = PermissionRole(Permissions.View)
+
+  getBaobabSourceProjectUid = lambda x: x.getSourceProjectUid()
+  getBaobabSourceProjectUid__roles__ = PermissionRole(Permissions.View)
+
+  getBaobabDestinationProjectUid = lambda x: x.getDestinationProjectUid()
+  getBaobabDestinationProjectUid__roles__ = PermissionRole(Permissions.View)
\ No newline at end of file

bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.Container.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>Container</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.Document.Container</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.Container</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.ContainerCell.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ContainerCell</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.Document.ContainerCell</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.ContainerCell</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/Document/ContainerLine.py → bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.ContainerLine.py

@@ -41,7 +41,6 @@ class ContainerLine(DeliveryLine):
   It may include a price (for insurance, for customs, for invoices,
   for orders)
   """
-
   meta_type = 'ERP5 Container Line'
   portal_type = 'Container Line'
 
@@ -64,7 +63,7 @@ class ContainerLine(DeliveryLine):
 
   # Cell Related
   security.declareProtected( Permissions.ModifyPortalContent, 'newCellContent' )
-    def newCellContent(self, id, portal_type='Container Cell', **kw):
+  def newCellContent(self, id, portal_type='Container Cell', **kw): # pylint: disable=redefined-builtin
     """Overriden to specify default portal type
     """
     return self.newContent(id=id, portal_type=portal_type, **kw)
@@ -87,7 +86,7 @@ class ContainerLine(DeliveryLine):
     return False
 
   security.declareProtected(Permissions.AccessContentsInformation, 'getTotalQuantity')
-    def getTotalQuantity(self):
+  def getTotalQuantity(self, *args, **kw):
     """
     Returns the quantity if no cell or the total quantity if cells
     """

bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.ContainerLine.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ContainerLine</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.Document.ContainerLine</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.ContainerLine</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.DeliveryRootSimulationRule.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>DeliveryRootSimulationRule</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.Document.DeliveryRootSimulationRule</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.DeliveryRootSimulationRule</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.DeliverySimulationRule.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>DeliverySimulationRule</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.Document.DeliverySimulationRule</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.DeliverySimulationRule</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.OrderRootSimulationRule.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>OrderRootSimulationRule</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.Document.OrderRootSimulationRule</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.OrderRootSimulationRule</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/Document/PaymentCondition.py → bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.PaymentCondition.py

@@ -29,7 +29,7 @@
 from AccessControl import ClassSecurityInfo
 
 from Products.ERP5Type import Permissions, PropertySheet
-from Products.ERP5.Document.TradeModelLine import TradeModelLine
+from erp5.component.document.TradeModelLine import TradeModelLine
 
 class PaymentCondition(TradeModelLine):
   """

bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.PaymentCondition.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>PaymentCondition</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.Document.PaymentCondition</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.PaymentCondition</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/Document/TradeCondition.py → bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.TradeCondition.py

@@ -36,10 +36,7 @@ import zope.interface
 from AccessControl import ClassSecurityInfo
 
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
-from Products.ERP5Type.Utils import deprecated
 from Products.ERP5.mixin.composition import _getEffectiveModel
-from Products.ERP5.Document.Transformation import Transformation
-from Products.ERP5.GeneratedAmountList import GeneratedAmountList
 from Products.ERP5.Document.MappedValue import MappedValue
 from Products.ERP5.mixin.amount_generator import AmountGeneratorMixin
 from Products.ERP5.mixin.variated import VariatedMixin
@@ -85,7 +82,7 @@ class TradeCondition(MappedValue, AmountGeneratorMixin, VariatedMixin):
   def getMappedValuePropertyList(self):
     return ()
 
-    def getMappedValueBaseCategoryList(self):
+  def getMappedValueBaseCategoryList(self): # pylint: disable=arguments-differ
     return ()
 
   security.declareProtected(Permissions.AccessContentsInformation,
@@ -132,4 +129,3 @@ class TradeCondition(MappedValue, AmountGeneratorMixin, VariatedMixin):
       'getEffectiveModel')
   def getEffectiveModel(self, start_date=None, stop_date=None):
     return _getEffectiveModel(self, start_date, stop_date)
\ No newline at end of file
-

bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.TradeCondition.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>TradeCondition</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.Document.TradeCondition</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.TradeCondition</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/Document/TradeModelCell.py → bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.TradeModelCell.py

@@ -29,7 +29,7 @@
 
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
-from Products.ERP5.Document.TradeModelLine import TradeModelLine
+from erp5.component.document.TradeModelLine import TradeModelLine
 import zope.interface
 
 class TradeModelCell(TradeModelLine):

bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.TradeModelCell.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>TradeModelCell</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.Document.TradeModelCell</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.TradeModelCell</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/Document/TradeModelLine.py → bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.TradeModelLine.py

@@ -65,5 +65,5 @@ class TradeModelLine(AmountGeneratorLine):
     # Else tax provides only a ratio on amount
     return ('price',)
 
-  def getMappedValueBaseCategoryList(self):
+  def getMappedValueBaseCategoryList(self): # pylint: disable=arguments-differ
     return self._baseGetMappedValueBaseCategoryList() or ('trade_phase', 'use',)

bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.TradeModelLine.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>TradeModelLine</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.Document.TradeModelLine</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.TradeModelLine</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/Document/TradeModelLineCellConsistencyConstraint.py → bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.TradeModelLineCellConsistencyConstraint.py

@@ -61,7 +61,7 @@ class TradeModelLineCellConsistencyConstraint(ConstraintMixin):
   _message_id_tuple = ('message_cell_inexistance',)
 
   @staticmethod
-  def _convertFromFilesystemDefinition(base_id):
+  def _convertFromFilesystemDefinition(base_id, *args, **kw):
     """
     @see ERP5Type.mixin.constraint.ConstraintMixin._convertFromFilesystemDefinition
     """

bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.TradeModelLineCellConsistencyConstraint.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>TradeModelLineCellConsistencyConstraint</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.Document.TradeModelLineCellConsistencyConstraint</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.TradeModelLineCellConsistencyConstraint</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.TradeModelPath.py

@@ -34,6 +34,7 @@ from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5.Document.Path import Path
 from Products.ERP5.ExplanationCache import _getExplanationCache
+from erp5.component.interface.ITradeModelPath import ITradeModelPath
 
 import zope.interface
 
@@ -94,7 +95,7 @@ class TradeModelPath(Path):
   # Declarative interfaces
   zope.interface.implements(interfaces.ICategoryAccessProvider,
                             interfaces.IArrowBase,
-                            interfaces.ITradeModelPath,
+                            ITradeModelPath,
                             interfaces.IPredicate,
                             )
 

product/ERP5/interfaces/business_link.py → bt5/erp5_trade/InterfaceTemplateItem/portal_components/interface.erp5.IBusinessLink.py

@@ -27,7 +27,7 @@
 #
 ##############################################################################
 """
-Products.ERP5.interfaces.business_link
+erp5.component.interface.IBusinessLink
 """
 
 from zope.interface import Interface

bt5/erp5_trade/InterfaceTemplateItem/portal_components/interface.erp5.IBusinessLink.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Interface Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>IBusinessLink</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.interfaces.business_link</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>interface.erp5.IBusinessLink</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Interface Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_trade/InterfaceTemplateItem/portal_components/interface.erp5.IBusinessProcess.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Interface Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>IBusinessProcess</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.interfaces.business_process</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>interface.erp5.IBusinessProcess</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Interface Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/interfaces/trade_model_path.py → bt5/erp5_trade/InterfaceTemplateItem/portal_components/interface.erp5.ITradeModelPath.py

@@ -27,7 +27,7 @@
 #
 ##############################################################################
 """
-Products.ERP5.interfaces.trade_model_path
+erp5.component.interface.ITradeModelPath
 """
 
 from zope.interface import Interface

bt5/erp5_trade/InterfaceTemplateItem/portal_components/interface.erp5.ITradeModelPath.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Interface Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ITradeModelPath</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.interfaces.trade_model_path</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>interface.erp5.ITradeModelPath</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Interface Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_trade/bt/template_document_id_list

 document.erp5.BusinessLink
 document.erp5.BusinessProcess
+document.erp5.Container
+document.erp5.ContainerCell
+document.erp5.ContainerLine
+document.erp5.DeliveryRootSimulationRule
+document.erp5.DeliverySimulationRule
 document.erp5.DuplicateInventoryConstraint
+document.erp5.OrderRootSimulationRule
+document.erp5.PaymentCondition
+document.erp5.TradeCondition
+document.erp5.TradeModelCell
+document.erp5.TradeModelLine
+document.erp5.TradeModelLineCellConsistencyConstraint
 document.erp5.TradeModelPath
\ No newline at end of file

bt5/erp5_trade/bt/template_interface_id_list

+interface.erp5.IBusinessLink
+interface.erp5.IBusinessProcess
+interface.erp5.ITradeModelPath
\ No newline at end of file

product/ERP5/Document/Container.py

-##############################################################################
-#
-# Copyright (c) 2002, 2005 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
-#                    Romain Courteaud <romain@nexedi.com>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-from AccessControl import ClassSecurityInfo
-from AccessControl.PermissionRole import PermissionRole
-
-from Products.ERP5Type import Permissions, PropertySheet
-from Products.ERP5Type.XMLObject import XMLObject
-
-from Products.ERP5.Document.Movement import Movement
-
-class Container(Movement, XMLObject):
-    """
-      Container is equivalent to a movement with qty 1.0 and resource =
-      to the kind of packaging Container may point to item (ex.
-      Container serial No or Parcel Serial No if tracing required)
-      Container may eventually usa optional property sheet to store
-      parcel No information (we use Item property sheet for that). Some
-      acquisition may be required...
-
-      A Container which does not point to an Item can act itself as an Item
-      for traceability.
-
-      Container Line / Container Cell is used to store quantities (never
-      accounted)
-      Container Line / Countainer Cell may point to Item
-    """
-
-    meta_type = 'ERP5 Container'
-    portal_type = 'Container'
-
-    # Declarative security
-    security = ClassSecurityInfo()
-    security.declareObjectProtected(Permissions.AccessContentsInformation)
-
-    # Declarative properties
-    property_sheets = ( PropertySheet.Base
-                      , PropertySheet.XMLObject
-                      , PropertySheet.CategoryCore
-                      , PropertySheet.Amount
-                      , PropertySheet.Task
-                      , PropertySheet.Arrow
-                      , PropertySheet.Movement
-                      , PropertySheet.Price
-                      , PropertySheet.VariationRange
-                      , PropertySheet.ItemAggregation
-                      , PropertySheet.Item
-                      , PropertySheet.Container
-                      , PropertySheet.SortIndex
-                      )
-
-    security.declareProtected(Permissions.AccessContentsInformation,
-                              'getQuantity')
-    def getQuantity(self, default=1.0):
-      """
-        Returns 1 because only one container is shipped
-      """
-      return 1.0
-
-    security.declareProtected(Permissions.AccessContentsInformation,
-                              'isAccountable')
-    def isAccountable(self):
-      """
-        Returns 1 if this needs to be accounted
-        Only account movements which are not associated to a delivery
-        Whenever delivery is there, delivery has priority
-      """
-      # Always accountable - to account the containers which we use
-      return 1
-
-    security.declareProtected( Permissions.ModifyPortalContent,
-                              'hasCellContent' )
-    def hasCellContent(self, base_id='movement'):
-      """
-          This method can be overriden
-      """
-      return 0
-
-    security.declareProtected(Permissions.AccessContentsInformation, 'isDivergent')
-    def isDivergent(self):
-      """Return True if this movement diverges from the its simulation.
-      Containers are never divergent.
-      """
-      return False
-
-    security.declareProtected(Permissions.AccessContentsInformation,
-                              'getContainerText')
-    def getContainerText(self):
-      """
-        Creates a unique string which allows to compare/hash two containers
-      """
-      result = ""
-      container_line_list = list(self.objectValues())
-      container_line_list.sort(key=lambda x: x.getResource())
-      for container_line in container_line_list:
-        if container_line.hasCellContent():
-          container_cell_list = list(container_line.objectValues())
-          container_cell_list.sort(key=lambda x: x.getVariationText())
-          for container_cell in container_cell_list:
-            result += "%s %s %s\n" % (container_cell.getResource(),
-                                      container_cell.getQuantity(),
-                                      '|'.join(container_cell.getVariationText().split('\n')))
-        else:
-          result += "%s %s\n" % (container_line.getResource(), container_line.getQuantity())
-      container_list = list(self.objectValues(spec = self.meta_type))
-      container_list.sort(key=lambda x: x.getContainerText())
-      more_result = ""
-      for container in container_list:
-        more_result += container.getContainerText()
-      result = result + '\n'.join(map(lambda x: " %s" % x, more_result.split('\n')))
-      return result
-
-    # Used for optimization - requires reindexing using container_uid
-    security.declareProtected(Permissions.AccessContentsInformation,
-                              'getContainerUid')
-    def getContainerUid(self):
-      return self.getUid()
-
-    security.declareProtected(Permissions.AccessContentsInformation,
-                              'getContainerValue')
-    def getContainerValue(self):
-      return self
-
-    security.declareProtected(Permissions.AccessContentsInformation,
-                              'getContainer')
-    def getContainer(self):
-      return self.getRelativeUrl()
-
-    # Quantity methods
-    security.declareProtected(Permissions.AccessContentsInformation,
-                              'getContainedTotalQuantity')
-    def getContainedTotalQuantity(self, recursive = 0):
-      """
-        The sum of quantities of contained lines
-      """
-      result = 0.0
-      for o in self.contentValues(filter =
-                    {'portal_type': self.getPortalContainerLineTypeList()}):
-        result += o.getTotalQuantity()
-      if recursive:
-        for o in self.contentValues(filter =
-                    {'portal_type': self.getPortalContainerTypeList()}):
-          result += o.getContainedTotalQuantity()
-      return result
-
-    security.declareProtected(Permissions.AccessContentsInformation,
-                              'getContainedTotalPrice')
-    def getContainedTotalPrice(self, recursive = 0):
-      """
-        The sum of price of contained lines
-      """
-      result = 0.0
-      for o in self.contentValues(filter =
-                    {'portal_type': self.getPortalContainerLineTypeList()}):
-        result += o.getTotalPrice()
-      if recursive:
-        for o in self.contentValues(filter =
-                    {'portal_type': self.getPortalContainerTypeList()}):
-          result += o.getContainedTotalPrice()
-      return result
-
-    # Item Access
-    security.declareProtected(Permissions.AccessContentsInformation,
-                              'getTrackedItemUidList')
-    def getTrackedItemUidList(self):
-      """
-        Return a list of uid for related items.
-        If this container is related to no item, it is treated as an Item
-      """
-      ### XXX We should filter by portal type here
-      item_uid_list = self.getAggregateUidList()
-      if len(item_uid_list): return item_uid_list
-      return (self.getUid(),)
-
-    # XXX: Dirty but required for erp5_banking_core
-    getBaobabSourceUid = lambda x: x.getSourceUid()
-    getBaobabSourceUid__roles__ = PermissionRole(Permissions.View)
-
-    getBaobabDestinationUid = lambda x: x.getDestinationUid()
-    getBaobabDestinationUid__roles__ = PermissionRole(Permissions.View)
-
-    getBaobabSourceSectionUid = lambda x: x.getSourceSectionUid()
-    getBaobabSourceSectionUid__roles__ = PermissionRole(Permissions.View)
-
-    getBaobabDestinationSectionUid = lambda x: x.getDestinationSectionUid()
-    getBaobabDestinationSectionUid__roles__ = PermissionRole(Permissions.View)
-
-    getBaobabSourcePaymentUid = lambda x: x.getSourcePaymentUid()
-    getBaobabSourcePaymentUid__roles__ = PermissionRole(Permissions.View)
-
-    getBaobabDestinationPaymentUid = lambda x: x.getDestinationPaymentUid()
-    getBaobabDestinationPaymentUid__roles__ = PermissionRole(Permissions.View)
-
-    getBaobabSourceFunctionUid = lambda x: x.getSourceFunctionUid()
-    getBaobabSourceFunctionUid__roles__ = PermissionRole(Permissions.View)
-
-    getBaobabDestinationFunctionUid = lambda x: x.getDestinationFunctionUid()
-    getBaobabDestinationFunctionUid__roles__ = PermissionRole(Permissions.View)
-
-    getBaobabSourceProjectUid = lambda x: x.getSourceProjectUid()
-    getBaobabSourceProjectUid__roles__ = PermissionRole(Permissions.View)
-
-    getBaobabDestinationProjectUid = lambda x: x.getDestinationProjectUid()
-    getBaobabDestinationProjectUid__roles__ = PermissionRole(Permissions.View)

product/ERP5/Document/Order.py

-##############################################################################
-#
-# Copyright (c) 2002, 2005 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
-#                    Romain Courteaud <romain@nexedi.com>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-from AccessControl import ClassSecurityInfo
-from Products.ERP5Type import Permissions, PropertySheet
-from Products.ERP5Type.Utils import deprecated
-from Products.ERP5.Document.Delivery import Delivery
-
-from warnings import warn
-
-class Order(Delivery):
-    # CMF Type Definition
-    meta_type = 'ERP5 Order'
-    portal_type = 'Order'
-
-    # Declarative security
-    security = ClassSecurityInfo()
-    security.declareObjectProtected(Permissions.AccessContentsInformation)
-
-    # Default Properties
-    property_sheets = ( PropertySheet.Base
-                      , PropertySheet.XMLObject
-                      , PropertySheet.CategoryCore
-                      , PropertySheet.DublinCore
-                      , PropertySheet.Task
-                      , PropertySheet.Arrow
-                      , PropertySheet.Reference
-                      , PropertySheet.TradeCondition
-                      , PropertySheet.Comment
-                      , PropertySheet.Order
-                      )
-
-    security.declareProtected(Permissions.AccessContentsInformation, \
-                                                   'isAccountable')
-    def isAccountable(self):
-      """
-        Returns 1 if this needs to be accounted
-        Only account movements which are not associated to a delivery
-        Whenever delivery is there, delivery has priority
-      """
-      return 0
-
-    def getTotalPrice(self, **kw) :
-      """Returns the total price for this Order.
-
-      If base_contribution is passed, the trade model lines will be used to
-      include movements that will be generated.
-      """
-      if kw.get('fast'):
-        kw['only_accountable'] = False
-      rounding = kw.get('rounding')
-      if kw.get('base_contribution') is None:
-        kw.setdefault('portal_type', self.getPortalOrderMovementTypeList())
-        return Delivery.getTotalPrice(self, **kw)
-      else:
-        # Find amounts from the result of getAggregatedAmountList.
-        # Call getAggregatedAmountList and sum all the amounts which
-        # base_contribution category is matched with.
-        from Products.ERP5.PropertySheet.TradeModelLine import TARGET_LEVEL_MOVEMENT
-        trade_condition = self.getSpecialiseValue()
-        if trade_condition is None:
-          # We cannot find any amount so that the result is 0.
-          return 0
-        base_contribution = kw.get('base_contribution')
-        if isinstance(base_contribution, (tuple, list)):
-          base_contribution_list = base_contribution
-        else:
-          base_contribution_list = (base_contribution,)
-        base_contribution_value_list = []
-        portal_categories = self.portal_categories
-        for relative_url in base_contribution_list:
-          base_contribution_value = portal_categories.getCategoryValue(relative_url)
-          if base_contribution_value is not None:
-            base_contribution_value_list.append(base_contribution_value)
-        if not base_contribution_value_list:
-          # We cannot find any amount so that the result is 0.
-          return 0
-        current_aggregated_amount_list = trade_condition.getAggregatedAmountList(self, rounding=rounding, force_create_line=True)
-        trade_model_line = self.newContent(temp_object=True,
-            portal_type='Trade Model Line',
-            id='_temp_' + self.getId(), notify_workflow=False)
-        # prevent invoking interaction workflows.
-        trade_model_line.portal_type = ''
-        trade_model_line.edit(target_level=TARGET_LEVEL_MOVEMENT, price=1,
-                              efficiency=1, quantity=None,
-                              base_application_value_list=base_contribution_value_list)
-        aggregated_amount_list = trade_model_line._getAggregatedAmountList(
-            self,
-            movement_list=self.getMovementList(),
-            current_aggregated_amount_list=current_aggregated_amount_list,
-            rounding=rounding)
-        return aggregated_amount_list.getTotalPrice()
-
-    def getTotalQuantity(self, **kw) :
-      """Returns the total quantity for this Order. """
-      if 'portal_type' not in kw:
-        kw['portal_type'] = self.getPortalObject() \
-          .getPortalOrderMovementTypeList()
-      if kw.get('fast'):
-        kw['only_accountable'] = False
-      return Delivery.getTotalQuantity(self, **kw)
-
-    @deprecated
-    def applyToOrderRelatedMovement(self, method_id='expand', **kw):
-      # WARNING: does not work if it was not catalogued immediately
-      # 'order' category is deprecated. it is kept for compatibility.
-      for m in self.getMovementList():
-        for my_simulation_movement in m.getDeliveryRelatedValueList(
-            portal_type='Simulation Movement') or \
-            m.getOrderRelatedValueList(
-            portal_type='Simulation Movement'):
-          getattr(my_simulation_movement, method_id)(**kw)

product/ERP5/Document/TaxLine.py

-##############################################################################
-#
-# Copyright (c) 2008 Nexedi SA and Contributors. All Rights Reserved.
-#                    Jerome Perrin <jerome@nexedi.com>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-from AccessControl import ClassSecurityInfo
-
-from Products.ERP5Type import Permissions, PropertySheet
-
-from Products.ERP5.Document.DeliveryLine import DeliveryLine
-
-
-class TaxLine(DeliveryLine):
-    """ Tax Line
-    """
-    meta_type = 'ERP5 Tax Line'
-    portal_type = 'Tax Line'
-
-    # Declarative security
-    security = ClassSecurityInfo()
-    security.declareObjectProtected(Permissions.AccessContentsInformation)
-
-    # Declarative properties
-    property_sheets = ( PropertySheet.Base
-                      , PropertySheet.XMLObject
-                      , PropertySheet.CategoryCore
-                      , PropertySheet.Amount
-                      , PropertySheet.Task
-                      , PropertySheet.Arrow
-                      , PropertySheet.Movement
-                      , PropertySheet.Price
-                      , PropertySheet.VariationRange
-                      , PropertySheet.ItemAggregation
-                      , PropertySheet.Reference
-                      , PropertySheet.SortIndex
-                      )
-
-    security.declareProtected(Permissions.AccessContentsInformation,
-                              'isAccountable')
-    def isAccountable(self):
-      """Return true if the parent is accountable and
-      not an accounting transaction.
-
-      NOTE: this is because, if the parent is an accounting transaction,
-      the accounting is done with another accounting transaction line,
-      so making tax lines accountable would duplicate the accounting.
-      """
-      delivery = self.getParentValue()
-      if delivery.isAccountable():
-        portal = delivery.getPortalObject()
-        type_list = portal.getPortalAccountingTransactionTypeList()
-        return delivery.getPortalType() not in type_list
-      return 0
-
-    security.declareProtected(Permissions.AccessContentsInformation,
-                              'hasCellContent')
-    def hasCellContent(self, base_id='movement'):
-      """Tax line does not contain cell
-      """
-      return 0
-
-    security.declareProtected(Permissions.AccessContentsInformation,
-                              'isMovement' )
-    def isMovement(self):
-      """Tax lines are movements
-      """
-      return 1
-

product/ERP5/ERP5Defaults.py

@@ -99,8 +99,7 @@ portal_invoice_movement_type_list = (
                       'Pay Sheet Cell',
                       )
 
-portal_tax_movement_type_list = ( 'Tax Line', 'Discount Line',
-                                  'Pay Sheet Line', )
+portal_tax_movement_type_list = ( 'Pay Sheet Line', )
 
 portal_order_movement_type_list = (
                       'Purchase Order Line',

product/ERP5/Document/Inventory.py → product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.Inventory.py

@@ -144,8 +144,8 @@ class Inventory(Delivery):
 
 
     if temp_constructor is None:
-      def temp_constructor(self, id, *args, **kw):
-        return self.newContent(temp_object=True, portal_type='Movement',
+      temp_constructor = lambda self, id, *args, **kw: self.newContent(
+        temp_object=True, portal_type='Movement',
         id=id, *args, **kw)
     stop_date = self.getStopDate()
 
@@ -199,8 +199,8 @@ class Inventory(Delivery):
 
       __order_id_counter_list = [0]
       def getOrderIdCounter():
-        value = __order_id_counter_list[0]
-        __order_id_counter_list[0] = value + 1
+        value = __order_id_counter_list[0] # pylint: disable=cell-var-from-loop
+        __order_id_counter_list[0] = value + 1 # pylint: disable=cell-var-from-loop
         return value
 
       for movement in method():

product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.Inventory.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>Inventory</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.Document.Inventory</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.Inventory</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.Order.py

+##############################################################################
+#
+# Copyright (c) 2002, 2005 Nexedi SARL and Contributors. All Rights Reserved.
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
+#                    Romain Courteaud <romain@nexedi.com>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+from AccessControl import ClassSecurityInfo
+from Products.ERP5Type import Permissions, PropertySheet
+from Products.ERP5Type.Utils import deprecated
+from Products.ERP5.Document.Delivery import Delivery
+
+class Order(Delivery):
+  # CMF Type Definition
+  meta_type = 'ERP5 Order'
+  portal_type = 'Order'
+
+  # Declarative security
+  security = ClassSecurityInfo()
+  security.declareObjectProtected(Permissions.AccessContentsInformation)
+
+  # Default Properties
+  property_sheets = ( PropertySheet.Base
+                    , PropertySheet.XMLObject
+                    , PropertySheet.CategoryCore
+                    , PropertySheet.DublinCore
+                    , PropertySheet.Task
+                    , PropertySheet.Arrow
+                    , PropertySheet.Reference
+                    , PropertySheet.TradeCondition
+                    , PropertySheet.Comment
+                    , PropertySheet.Order
+                    )
+
+  security.declareProtected(Permissions.AccessContentsInformation, \
+                                                 'isAccountable')
+  def isAccountable(self):
+    """
+    Returns 1 if this needs to be accounted
+    Only account movements which are not associated to a delivery
+    Whenever delivery is there, delivery has priority
+    """
+    return 0
+
+  def getTotalPrice(self, **kw) :
+    """Returns the total price for this Order.
+
+    If base_contribution is passed, the trade model lines will be used to
+    include movements that will be generated.
+    """
+    if kw.get('fast'):
+      kw['only_accountable'] = False
+    if kw.get('base_contribution') is None:
+      kw.setdefault('portal_type', self.getPortalOrderMovementTypeList())
+      return Delivery.getTotalPrice(self, **kw)
+    else:
+      # Find amounts from the result of getAggregatedAmountList.
+      # Call getAggregatedAmountList and sum all the amounts which
+      # base_contribution category is matched with.
+      raise NotImplementedError
+      """
+      rounding = kw.get('rounding')
+      from Products.ERP5.PropertySheet.TradeModelLine import TARGET_LEVEL_MOVEMENT
+      trade_condition = self.getSpecialiseValue()
+      if trade_condition is None:
+        # We cannot find any amount so that the result is 0.
+        return 0
+      base_contribution = kw.get('base_contribution')
+      if isinstance(base_contribution, (tuple, list)):
+        base_contribution_list = base_contribution
+      else:
+        base_contribution_list = (base_contribution,)
+      base_contribution_value_list = []
+      portal_categories = self.portal_categories
+      for relative_url in base_contribution_list:
+        base_contribution_value = portal_categories.getCategoryValue(relative_url)
+        if base_contribution_value is not None:
+          base_contribution_value_list.append(base_contribution_value)
+      if not base_contribution_value_list:
+        # We cannot find any amount so that the result is 0.
+        return 0
+      current_aggregated_amount_list = trade_condition.getAggregatedAmountList(self, rounding=rounding, force_create_line=True)
+      trade_model_line = self.newContent(temp_object=True,
+          portal_type='Trade Model Line',
+          id='_temp_' + self.getId(), notify_workflow=False)
+      # prevent invoking interaction workflows.
+      trade_model_line.portal_type = ''
+      trade_model_line.edit(target_level=TARGET_LEVEL_MOVEMENT, price=1,
+                            efficiency=1, quantity=None,
+                            base_application_value_list=base_contribution_value_list)
+      aggregated_amount_list = trade_model_line._getAggregatedAmountList(
+          self,
+          movement_list=self.getMovementList(),
+          current_aggregated_amount_list=current_aggregated_amount_list,
+          rounding=rounding)
+      return aggregated_amount_list.getTotalPrice()
+      """
+
+  def getTotalQuantity(self, **kw) :
+    """Returns the total quantity for this Order. """
+    if 'portal_type' not in kw:
+      kw['portal_type'] = self.getPortalObject() \
+        .getPortalOrderMovementTypeList()
+    if kw.get('fast'):
+      kw['only_accountable'] = False
+    return Delivery.getTotalQuantity(self, **kw)
+
+  @deprecated
+  def applyToOrderRelatedMovement(self, method_id='expand', **kw):
+    # WARNING: does not work if it was not catalogued immediately
+    # 'order' category is deprecated. it is kept for compatibility.
+    for m in self.getMovementList():
+      for my_simulation_movement in m.getDeliveryRelatedValueList(
+          portal_type='Simulation Movement') or \
+          m.getOrderRelatedValueList(
+          portal_type='Simulation Movement'):
+        getattr(my_simulation_movement, method_id)(**kw)
\ No newline at end of file

product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.Order.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>Order</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.Document.Order</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.Order</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/Document/PackingList.py → product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.PackingList.py

@@ -32,7 +32,6 @@ from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
 
 from Products.ERP5.Document.Delivery import Delivery
-from warnings import warn
 
 class PackingList(Delivery):
   """
@@ -121,4 +120,3 @@ class PackingList(Delivery):
       if container_dict.get(key) != movement.getQuantity():
         return False
     return True
\ No newline at end of file
-

product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.PackingList.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>PackingList</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.Document.PackingList</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.PackingList</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/bootstrap/erp5_core/bt/template_document_id_list

+document.erp5.Inventory
 document.erp5.InvoiceCell
 document.erp5.InvoiceLine
 document.erp5.Item
+document.erp5.Order
+document.erp5.PackingList
 document.erp5.ScriptConstraint
\ No newline at end of file

product/ERP5/interfaces/business_process_union_provider.py

@@ -27,7 +27,7 @@
 #
 ##############################################################################
 """
-Products.ERP5.interfaces.business_process
+erp5.component.interface.IBusinessProcess
 """
 
 from zope.interface import Interface

product/ERP5/tests/testAccounting.py

@@ -235,8 +235,9 @@ class AccountingTestCase(ERP5TypeTestCase):
             'erp5_accounting', 'erp5_project',
             'erp5_ods_style',
             'erp5_configurator_standard_trade_template',
+            'erp5_invoicing',
             'erp5_configurator_standard_accounting_template',
-            'erp5_invoicing', 'erp5_configurator_standard_invoicing_template',
+            'erp5_configurator_standard_invoicing_template',
             'erp5_simulation_test', 'erp5_accounting_ui_test')
 
   @UnrestrictedMethod

product/ERP5/tests/testERP5Interfaces.py

@@ -37,11 +37,11 @@ implements_tuple_list = [
   (('erp5.component.document.RoleDefinition', 'RoleDefinition'), 'ILocalRoleGenerator'),
   (('erp5.component.document.BusinessLink','BusinessLink'), 'IBusinessLink'),
   (('erp5.component.document.BusinessLink','BusinessLink'), 'ICategoryAccessProvider'),
-  (('Products.ERP5.Document.TradeCondition','TradeCondition'), 'IAmountGenerator'),
-  (('Products.ERP5.Document.TradeModelCell','TradeModelCell'), 'IAmountGenerator'),
-  (('Products.ERP5.Document.TradeModelCell','TradeModelCell'), 'IVariated'),
-  (('Products.ERP5.Document.TradeModelLine','TradeModelLine'), 'IAmountGenerator'),
-  (('Products.ERP5.Document.TradeModelLine','TradeModelLine'), 'IVariated'),
+  (('erp5.component.document.TradeCondition','TradeCondition'), 'IAmountGenerator'),
+  (('erp5.component.document.TradeModelCell','TradeModelCell'), 'IAmountGenerator'),
+  (('erp5.component.document.TradeModelCell','TradeModelCell'), 'IVariated'),
+  (('erp5.component.document.TradeModelLine','TradeModelLine'), 'IAmountGenerator'),
+  (('erp5.component.document.TradeModelLine','TradeModelLine'), 'IVariated'),
   (('erp5.component.document.TradeModelPath','TradeModelPath'), 'IArrowBase'),
   (('Products.ERP5.Document.Transformation','Transformation'), 'IAmountGenerator'),
   (('Products.ERP5.Document.Transformation','Transformation'), 'IVariated'),
@@ -84,8 +84,8 @@ for failing_method in [
     'test_Products.ERP5.GeneratedAmountList_GeneratedAmountList_implements_IAmountList',
     'test_erp5.component.document.BusinessLink_BusinessLink_implements_IBusinessLink',
     'test_erp5.component.document.BusinessLink_BusinessLink_implements_ICategoryAccessProvider',
-    'test_Products.ERP5.Document.TradeModelCell_TradeModelCell_implements_IVariated',
-    'test_Products.ERP5.Document.TradeModelLine_TradeModelLine_implements_IVariated',
+    'test_erp5.component.document.TradeModelCell_TradeModelCell_implements_IVariated',
+    'test_erp5.component.document.TradeModelLine_TradeModelLine_implements_IVariated',
     'test_Products.ERP5.Document.Transformation_Transformation_implements_IVariated',
     'test_Products.ERP5.Document.TransformedResource_TransformedResource_implements_IVariated',
   ]:

product/ERP5/tests/testInventory.py

@@ -105,7 +105,7 @@ class TestInventory(TestOrderMixin, ERP5TypeTestCase):
     # to manage containers here, this not the job of this test
     def isPacked(self):
       return 1
-    from Products.ERP5Type.Document.PackingList import PackingList
+    from erp5.component.document.PackingList import PackingList
     PackingList.isPacked = isPacked
     self.createCurrency()
     self.setUpPreferences()

product/ERP5/tests/testOrder.py

@@ -2903,13 +2903,6 @@ class TestOrder(TestOrderMixin, ERP5TypeTestCase):
                             resource_value=resource,
                             quantity=10,
                             price=3)
-
-    # see TODO above
-    #tax_line = order.newContent(portal_type='Tax Line',
-    #                            resource_value=tax,
-    #                            quantity=30,
-    #                            price=.26)
-
     order.confirm()
     self.tic()