--- summary 
+++ summary 
@@ -1,15 +1,15 @@
 Test Suite: ERP5
-Revision: 42937
+Revision: 42944
 Result: FAIL
 
 All tests: 4513
-Failures: 33
-Errors: 2812
+Failures: 36
+Errors: 2655
 Skips: 84
 
 
 The following tests have an unknown status:
-extra_sql_connection_string_list='test6a test,test6b test' Products/ERP5Type/tests/runUnitTest.py --verbose '--erp5_sql_connection_string=test6 test' --instance_home=unit_test.6 testBase
+extra_sql_connection_string_list='test5a test,test5b test' Products/ERP5Type/tests/runUnitTest.py --verbose '--erp5_sql_connection_string=test5 test' --instance_home=unit_test.5 testBase
 
 The following tests failed:
 
@@ -32,9 +32,8 @@
   testAccounting_l10n_fr_m9                          (14 errors)
    test_AccountTypeConstaintFixFor4718 (testAccounting_l10n_fr_m9.TestAccounting_l10n_M9)
 
-  testAdvancedInvoicing                              (24 errors)
+  testAdvancedInvoicing                              (23 errors)
    test_01_TwoInvoicesFromTwoPackingList (testAdvancedInvoicing.TestAdvancedSaleInvoice)
-   test_autoplanned (testAdvancedInvoicing.TestWorkflow)
 
   testAmount                                         (1 errors)
    test_01_variationProperty (testAmount.TestAmount)
@@ -54,8 +53,17 @@
    test_isCompleted_OrderedDeliveredInvoiced (testBPMCore.TestBPMisCompletedImplementation), Test isCompleted for ordered, delivered and invoiced sequence
    test_isFrozen_OrderedDeliveredInvoiced (testBPMCore.TestBPMisFrozenImplementation), Test isFrozen for ordered, delivered and invoiced sequence
 
-  testBudget                                         (20 errors)
+  testBudget                                         (10 errors)
    test_all_other_and_strict_consumption (testBudget.TestBudget)
+   test_budget_consumption_report (testBudget.TestBudget)
+   test_consumption_category_budget_variation_not_set (testBudget.TestBudget)
+   test_consumption_category_variation_summary (testBudget.TestBudget)
+   test_consumption_movement_category (testBudget.TestBudget)
+   test_consumption_node_budget_variation_not_set (testBudget.TestBudget)
+   test_none_and_all_others_virtual_nodes_together (testBudget.TestBudget)
+   test_none_virtual_node (testBudget.TestBudget)
+   test_only_none_virtual_node (testBudget.TestBudget)
+   test_simple_consumption (testBudget.TestBudget)
 
   testBug                                            (9 errors)
    test_01_StopDateUpdatedOnClose (testBug.TestBug)
@@ -76,8 +84,8 @@
    test_167_InstanceAndRelatedClassDefinedInSameBT (testBusinessTemplate.TestBusinessTemplate)
    test_16_BusinessTemplateWithAllItems (testBusinessTemplate.TestBusinessTemplate)
 
-  testCMFCategory                                    (45 errors)
-   test_00_HasEverything (testCMFCategory.TestCMFCategory)
+  testCMFCategory                                    (1 failures)
+   test_31_assert_raise_if_base_category_is_missing (testCMFCategory.TestCMFCategory)
 
   testCRM                                            (2 failures, 2 skips)
    test_MailFromOtherEvents (testCRM.TestCRMMailSend)
@@ -115,7 +123,8 @@
   testDivergenceTester                               (5 errors)
    test_01_QuantityDivergenceTester (testDivergenceTester.TestDivergenceTester)
 
-  testDms                                            (1 failures, 4 errors, 2 skips)
+  testDms                                            (1 failures, 5 errors, 2 skips)
+   test_convertToImageOnTraversal (testDms.TestDocument)
    test_DownloadableDocumentSize (testDms.TestDocumentWithSecurity), Check that once the document is converted and cached, its size is
    test_01_LargeOOoDocumentToImageConversion (testDms.TestDocumentPerformance)
    test_base_convertable_behaviour_with_successive_updates (testDms.TestDocument), Check that update content's document (with setData and setFile)
@@ -131,7 +140,7 @@
   testDomainTool                                     (7 errors)
    test_01_SearchPredidateListWithNoTest (testDomainTool.TestDomainTool)
 
-  testDynamicClassGeneration                         (24 errors, 1 skips)
+  testDynamicClassGeneration                         (1 failures, 23 errors, 1 skips)
    testAddAcquiredPropertyToZodbPropertySheet (testDynamicClassGeneration.TestZodbPropertySheet)
    testZodbImportPropertySheet (testDynamicClassGeneration.TestZodbImportFilesystemPropertySheet)
 
@@ -154,8 +163,13 @@
   testERP5Core                                       (1 errors)
    test_getPropertyForUid (testERP5Core.TestERP5Core)
 
-  testERP5Credential                                 (9 errors)
-   test_01_simpleSubsciptionRequest (testERP5Credential.TestERP5Credential)
+  testERP5Credential                                 (6 errors)
+   test_02_acceptSubscriptionRequest (testERP5Credential.TestERP5Credential)
+   test_03_simpleCredentialUpdate (testERP5Credential.TestERP5Credential)
+   test_04_automaticCredentialRequestApproval (testERP5Credential.TestERP5Credential)
+   test_05_automaticCredentialUpdateApproval (testERP5Credential.TestERP5Credential)
+   test_06_checkSecurityQuestionCategoryDefinition (testERP5Credential.TestERP5Credential)
+   test_07_checkSecurityQuestionFreeTextDefinition (testERP5Credential.TestERP5Credential)
 
   testERP5CurrencyExchangeLine                       (9 errors)
    test_CreateCELWithNoBasePrice (testERP5CurrencyExchangeLine.TestCurrencyExchangeLine)
@@ -166,9 +180,6 @@
    test_UseCurrencyExchangeLineForDestination (testERP5CurrencyExchangeLine.TestCurrencyExchangeLine)
    test_UseCurrencyExchangeLineForSource (testERP5CurrencyExchangeLine.TestCurrencyExchangeLine)
    test_ConvertUsingCurrencyExchangeCell (testERP5CurrencyExchangeLine.TestCurrencyExchangeCell)
-
-  testERP5Discussion                                 (2 errors)
-   test_01_createDiscussionThread (testERP5Discussion.TestERP5Discussion), Create a new discussion thread
 
   testERP5DocumentSyncML                             (10 errors)
    test_02_FirstSynchronization (testERP5DocumentSyncML.TestERP5DocumentSyncML)
@@ -262,7 +273,8 @@
   testImmobilisation                                 (22 errors)
    test_01_singlePackingListImmobilisationStateChange (testImmobilisation.TestImmobilisation)
 
-  testIngestion                                      (1 failures, 4 skips)
+  testIngestion                                      (2 failures, 4 skips)
+   test_05_FormatIngestionPresentation (testIngestion.TestIngestion)
    test_14_ContributionToolIndexation (testIngestion.TestIngestion)
 
   testIngestionWithFlare                             (1 failures, 4 skips)
@@ -299,6 +311,18 @@
 
   testLegacyAccounting                               (85 errors)
    test_AccountingPeriodNotStoppedTransactions (Products.ERP5.tests.testAccounting.TestAccountingWithSequences), Accounting Periods refuse to close when some transactions are
+   test_AccountingPeriodOtherSections (Products.ERP5.tests.testAccounting.TestAccountingWithSequences), Accounting Periods does not change other section transactions.
+   test_AccountingPeriodRefusesWrongDateTransactionValidation (Products.ERP5.tests.testAccounting.TestAccountingWithSequences), Accounting Periods prevents transactions from being validated when there
+   test_AccountingTransactionValidationAccounts (Products.ERP5.tests.testAccounting.TestAccountingWithSequences), Transaction validation and accounts
+   test_AccountingTransactionValidationBalanced (Products.ERP5.tests.testAccounting.TestAccountingWithSequences), Transaction validation and balance
+   test_AccountingTransactionValidationCurrency (Products.ERP5.tests.testAccounting.TestAccountingWithSequences), Transaction validation and currency
+   test_AccountingTransactionValidationDate (Products.ERP5.tests.testAccounting.TestAccountingWithSequences), Transaction validation and dates
+   test_AccountingTransactionValidationPayment (Products.ERP5.tests.testAccounting.TestAccountingWithSequences), Transaction validation and payment
+   test_AccountingTransactionValidationRemoveEmptyLines (Products.ERP5.tests.testAccounting.TestAccountingWithSequences), Transaction validation removes empty lines
+   test_AccountingTransactionValidationSection (Products.ERP5.tests.testAccounting.TestAccountingWithSequences), Transaction validation and section
+   test_Acquisition (Products.ERP5.tests.testAccounting.TestAccountingWithSequences), Tests acquisition, categories and portal types are well
+   test_MultiCurrencyInvoice (Products.ERP5.tests.testAccounting.TestAccountingWithSequences), Basic test for multi currency accounting
+   test_createAccountingTransaction (Products.ERP5.tests.testAccounting.TestAccountingWithSequences), Make sure acounting transactions created by createAccountingTransaction
    test_Account_getDestinationSectionItemList (Products.ERP5.tests.testAccounting.TestTransactions)
    test_AccountValidation (Products.ERP5.tests.testAccounting.TestAccounts)
    test_AccountingPeriodWorkflow (Products.ERP5.tests.testAccounting.TestClosingPeriod), Tests that accounting_period_workflow creates a balance transaction.
@@ -310,17 +334,57 @@
    testAccountStatement (Products.ERP5.tests.testAccountingReports.TestAccountingReports)
    testAccountStatementAnalyticsHidden (Products.ERP5.tests.testAccountingReports.TestAccountingReportsWithAnalytic)
 
-  testLegacyAccountingRules                          (28 errors)
-   test_01_HasEverything (Products.ERP5.tests.testAccountingRules.TestSaleAccountingRules), check necessary tools and modules are present.
+  testLegacyAccountingRules                          (24 errors)
+   test_03_invoiceTransactionRule_getMatchingCell (Products.ERP5.tests.testAccountingRules.TestSaleAccountingRules), test predicates for the cells of invoice transaction rule
+   test_04_SimpleInvoice (Products.ERP5.tests.testAccountingRules.TestSaleAccountingRules), Simple Invoice.
+   test_04b_SimpleInvoiceConfirm (Products.ERP5.tests.testAccountingRules.TestSaleAccountingRules), Same test as SimpleInvoice but directly confirm the invoice
+   test_04c_SimpleInvoiceTwoLines (Products.ERP5.tests.testAccountingRules.TestSaleAccountingRules), Simple Invoice, 2 lines.
+   test_04d_SimpleInvoiceTwoCells (Products.ERP5.tests.testAccountingRules.TestSaleAccountingRules), Simple Invoice, 2 cells.
+   test_05a_SimpleInvoiceReExpandAddLine (Products.ERP5.tests.testAccountingRules.TestSaleAccountingRules), Add a new line then updateAppliedRule.
+   test_05b_SimpleInvoiceReExpandEditLine (Products.ERP5.tests.testAccountingRules.TestSaleAccountingRules), Tests that editing a line updates simulation correctly
+   test_05c_SimpleInvoiceReExpandDeleteLine (Products.ERP5.tests.testAccountingRules.TestSaleAccountingRules), Tests that removing a line updates simulation correctly
+   test_05d_SimpleInvoiceReExpandCreateCell (Products.ERP5.tests.testAccountingRules.TestSaleAccountingRules), Tests that replacing a line by cells updates simulation correctly
+   test_05e_SimpleInvoiceExpandManyTimes (Products.ERP5.tests.testAccountingRules.TestSaleAccountingRules), Tests that updating an applied rule many times doesn't break the
+   test_06_MultiLineInvoice (Products.ERP5.tests.testAccountingRules.TestSaleAccountingRules), Multiple lines invoice.
+   test_planning_invoice_creates_simulation (Products.ERP5.tests.testAccountingRules.TestSaleAccountingRules)
+   test_03_invoiceTransactionRule_getMatchingCell (Products.ERP5.tests.testAccountingRules.TestPurchaseAccountingRules), test predicates for the cells of invoice transaction rule
+   test_04_SimpleInvoice (Products.ERP5.tests.testAccountingRules.TestPurchaseAccountingRules), Simple Invoice.
+   test_04b_SimpleInvoiceConfirm (Products.ERP5.tests.testAccountingRules.TestPurchaseAccountingRules), Same test as SimpleInvoice but directly confirm the invoice
+   test_04c_SimpleInvoiceTwoLines (Products.ERP5.tests.testAccountingRules.TestPurchaseAccountingRules), Simple Invoice, 2 lines.
+   test_04d_SimpleInvoiceTwoCells (Products.ERP5.tests.testAccountingRules.TestPurchaseAccountingRules), Simple Invoice, 2 cells.
+   test_05a_SimpleInvoiceReExpandAddLine (Products.ERP5.tests.testAccountingRules.TestPurchaseAccountingRules), Add a new line then updateAppliedRule.
+   test_05b_SimpleInvoiceReExpandEditLine (Products.ERP5.tests.testAccountingRules.TestPurchaseAccountingRules), Tests that editing a line updates simulation correctly
+   test_05c_SimpleInvoiceReExpandDeleteLine (Products.ERP5.tests.testAccountingRules.TestPurchaseAccountingRules), Tests that removing a line updates simulation correctly
+   test_05d_SimpleInvoiceReExpandCreateCell (Products.ERP5.tests.testAccountingRules.TestPurchaseAccountingRules), Tests that replacing a line by cells updates simulation correctly
+   test_05e_SimpleInvoiceExpandManyTimes (Products.ERP5.tests.testAccountingRules.TestPurchaseAccountingRules), Tests that updating an applied rule many times doesn't break the
+   test_06_MultiLineInvoice (Products.ERP5.tests.testAccountingRules.TestPurchaseAccountingRules), Multiple lines invoice.
+   test_planning_invoice_creates_simulation (Products.ERP5.tests.testAccountingRules.TestPurchaseAccountingRules)
 
   testLegacyBPMCore                                  (15 errors)
    testBPMCopyAndPaste (testLegacyBPMCore.TestBPMImplementation)
+   test_BuinessPathDynamicCategoryAccessProvider (testLegacyBPMCore.TestBPMImplementation)
+   test_BuinessPathDynamicCategoryAccessProviderBusinessPathPrecedence (testLegacyBPMCore.TestBPMImplementation)
+   test_BuinessPathDynamicCategoryAccessProviderEmptyMovement (testLegacyBPMCore.TestBPMImplementation)
+   test_BusinessPathStandardCategoryAccessProvider (testLegacyBPMCore.TestBPMImplementation)
+   test_BusinessPath_calculateExpectedDate (testLegacyBPMCore.TestBPMImplementation)
+   test_BusinessProcess_getPathValueList (testLegacyBPMCore.TestBPMImplementation)
+   test_BusinessState_getRemainingTradePhaseList (testLegacyBPMCore.TestBPMImplementation)
+   test_EmptyBusinessPathStandardCategoryAccessProvider (testLegacyBPMCore.TestBPMImplementation)
    test_isBuildable_OrderedDeliveredInvoiced (testLegacyBPMCore.TestBPMisBuildableImplementation), Test isBuildable for ordered, delivered and invoiced sequence
+   test_isBuildable_OrderedInvoicedDelivered (testLegacyBPMCore.TestBPMisBuildableImplementation), Test isBuildable for ordered, invoiced and delivered sequence
    test_isCompleted_OrderedDeliveredInvoiced (testLegacyBPMCore.TestBPMisCompletedImplementation), Test isCompleted for ordered, delivered and invoiced sequence
+   test_isCompleted_OrderedInvoicedDelivered (testLegacyBPMCore.TestBPMisCompletedImplementation), Test isCompleted for ordered, invoiced and invoiced sequence
    test_isFrozen_OrderedDeliveredInvoiced (testLegacyBPMCore.TestBPMisFrozenImplementation), Test isFrozen for ordered, delivered and invoiced sequence
+   test_isFrozen_OrderedInvoicedDelivered (testLegacyBPMCore.TestBPMisFrozenImplementation), Test isFrozen for ordered, invoiced and invoiced sequence
 
   testLegacyConversionInSimulation                   (7 errors)
    test_01_delivery_mode_on_sale_packing_list_and_invoice (testLegacyConversionInSimulation.TestConversionInSimulation)
+   test_01_destination_total_asset_price_on_accounting_lines (testLegacyConversionInSimulation.TestConversionInSimulation)
+   test_01_diverged_purchase_packing_list_source_total_asset_price (testLegacyConversionInSimulation.TestConversionInSimulation)
+   test_01_diverged_sale_packing_list_destination_total_asset_price (testLegacyConversionInSimulation.TestConversionInSimulation)
+   test_01_quantity_unit_on_sale_packing_list (testLegacyConversionInSimulation.TestConversionInSimulation)
+   test_01_simulation_movement_destination_asset_price (testLegacyConversionInSimulation.TestConversionInSimulation)
+   test_01_simulation_movement_source_asset_price (testLegacyConversionInSimulation.TestConversionInSimulation)
 
   testLegacyDeliveryBuilderToSupportMultipleLines    (4 errors)
    test_01_IfNested (Products.ERP5.tests.testDeliveryBuilderToSupportMultipleLines.TestNestedLine)
@@ -328,8 +392,8 @@
   testLegacyDivergenceTester                         (5 errors)
    test_01_QuantityDivergenceTester (Products.ERP5.tests.testDivergenceTester.TestDivergenceTester)
 
-  testLegacyERP5Commerce                             (28 errors)
-   test_01_AddResourceToShoppingCart (Products.ERP5.tests.testERP5Commerce.TestCommerce)
+  testLegacyERP5Commerce                             (1 errors)
+   test_24_getImageDataWithAnonymousUser (Products.ERP5.tests.testERP5Commerce.TestCommerce)
 
   testLegacyICal                                     (3 errors)
    test_01_renderEvent (Products.ERP5.tests.testICal.TestICal)
@@ -342,6 +406,10 @@
 
   testLegacyMRP                                      (5 errors)
    test_TransformationRule_expand (Products.ERP5.tests.testMRP.TestMRPImplementation)
+   test_TransformationRule_expand_concurrent (Products.ERP5.tests.testMRP.TestMRPImplementation)
+   test_TransformationRule_expand_reexpand (Products.ERP5.tests.testMRP.TestMRPImplementation)
+   test_TransformationRule_getHeadProductionPathList (Products.ERP5.tests.testMRP.TestMRPImplementation)
+   test_TransformationSourcingRule_expand (Products.ERP5.tests.testMRP.TestMRPImplementation)
 
   testLegacyOrder                                    (31 errors)
    test_01_OrderLine_getVariationRangeCategoryList (testLegacyOrder.TestOrder)
@@ -364,9 +432,8 @@
   testLegacyReturnedSalePackingList                  (7 errors)
    test_01_ReturnedSalePackingListWithInventory (Products.ERP5.tests.testReturnedSalePackingList.TestReturnedSalePackingList)
 
-  testLegacySimulationAdvancedInvoicing              (24 errors)
+  testLegacySimulationAdvancedInvoicing              (23 errors)
    test_01_TwoInvoicesFromTwoPackingList (Products.ERP5.tests.testAdvancedInvoicing.TestAdvancedSaleInvoice)
-   test_autoplanned (Products.ERP5.tests.testAdvancedInvoicing.TestWorkflow)
 
   testLegacySimulationInventory                      (3 errors)
    test_01_getInventory (Products.ERP5.tests.testInventory.TestInventory)
@@ -380,9 +447,8 @@
   testLegacySimulationInvoice                        (53 errors)
    test_01_SimpleInvoice (testLegacySimulationInvoice.TestSaleInvoice)
 
-  testLegacySimulationItem                           (25 errors)
+  testLegacySimulationItem                           (17 errors)
    test_01_ItemSimpleTest (Products.ERP5.tests.testItem.TestItem)
-   test_Item_getCurrentOwnerTitle (Products.ERP5.tests.testItem.TestItemScripts)
 
   testLegacySimulationOrder                          (33 errors)
    test_01_OrderLine_getVariationRangeCategoryList (Products.ERP5.tests.testOrder.TestOrder)
@@ -393,8 +459,16 @@
   testLegacySimulationPackingList                    (65 errors)
    test_01_PackingListDecreaseQuantity (testLegacySimulationPackingList.TestPackingList)
 
-  testLegacySimulationProduction                     (12 errors)
+  testLegacySimulationProduction                     (10 errors)
    test_01_testProductionSimulationExpand (Products.ERP5.tests.testProductionOrder.TestProductionOrder)
+   test_02_testSourcingSimulationExpand (Products.ERP5.tests.testProductionOrder.TestProductionOrder)
+   test_03_testIndustrialPhase (Products.ERP5.tests.testProductionOrder.TestProductionOrder)
+   test_04_testProductionSimulationBuild (Products.ERP5.tests.testProductionOrder.TestProductionOrder)
+   test_05_testSourcingSimulationBuild (Products.ERP5.tests.testProductionOrder.TestProductionOrder)
+   test_06_testIndustrialPhase (Products.ERP5.tests.testProductionOrder.TestProductionOrder)
+   test_07_testTransformationInteractionProductionOrderLine (Products.ERP5.tests.testProductionOrder.TestProductionOrder)
+   test_08_testTransformationWithEfficiency (Products.ERP5.tests.testProductionOrder.TestProductionOrder)
+   test_09_testTransformationWithVariation (Products.ERP5.tests.testProductionOrder.TestProductionOrder)
    test_01_sourcingDelivery (Products.ERP5.tests.testProductionPackingList.TestProductionDelivery)
 
   testLegacySimulationProductionApparel              (10 errors)
@@ -404,8 +478,20 @@
   testLegacySimulationRule                           (11 errors)
    test_01_ValidatedRuleWithNoScript (Products.ERP5.tests.testRule.TestRule)
 
-  testLegacyTaxLineTradeCondition                    (70 errors)
+  testLegacyTaxLineTradeCondition                    (69 errors)
    test_apply_trade_condition_after_line_creation (testLegacyTaxLineTradeCondition.TestTaxLineCalculationSaleOrder)
+   test_apply_trade_condition_twice_and_tax_lines (testLegacyTaxLineTradeCondition.TestTaxLineCalculationSaleOrder)
+   test_clone_order_line_quantity_update_tax_line (testLegacyTaxLineTradeCondition.TestTaxLineCalculationSaleOrder)
+   test_delete_order_line_quantity_update_tax_line (testLegacyTaxLineTradeCondition.TestTaxLineCalculationSaleOrder)
+   test_hierarchical_order_line_and_tax_line (testLegacyTaxLineTradeCondition.TestTaxLineCalculationSaleOrder)
+   test_multiple_order_line_multiple_tax_line (testLegacyTaxLineTradeCondition.TestTaxLineCalculationSaleOrder)
+   test_order_cell_and_tax_line (testLegacyTaxLineTradeCondition.TestTaxLineCalculationSaleOrder)
+   test_simple_tax_model_line_calculation (testLegacyTaxLineTradeCondition.TestTaxLineCalculationSaleOrder)
+   test_tax_model_line_calculation_with_two_lines (testLegacyTaxLineTradeCondition.TestTaxLineCalculationSaleOrder)
+   test_tax_on_tax (testLegacyTaxLineTradeCondition.TestTaxLineCalculationSaleOrder)
+   test_temp_order (testLegacyTaxLineTradeCondition.TestTaxLineCalculationSaleOrder)
+   test_temp_order_hierarchical (testLegacyTaxLineTradeCondition.TestTaxLineCalculationSaleOrder)
+   test_update_order_line_quantity_update_tax_line (testLegacyTaxLineTradeCondition.TestTaxLineCalculationSaleOrder)
    test_apply_trade_condition_after_line_creation (testLegacyTaxLineTradeCondition.TestTaxLineCalculationPurchaseOrder)
    test_apply_trade_condition_after_line_creation (testLegacyTaxLineTradeCondition.TestTaxLineCalculationSaleInvoice)
    test_apply_trade_condition_after_line_creation (testLegacyTaxLineTradeCondition.TestTaxLineCalculationPurchaseInvoice)
@@ -414,8 +500,14 @@
    test_tax_line_simulation (testLegacyTaxLineTradeCondition.TestTaxLineInvoiceSimulationPurchaseInvoice)
    test_tax_line_simulation (testLegacyTaxLineTradeCondition.TestTaxLineInvoiceSimulationSaleInvoice)
 
-  testLegacyTradeCondition                           (54 errors)
+  testLegacyTradeCondition                           (46 errors)
    test_apply_trade_condition_copy_subobjects (testLegacyTradeCondition.TestApplyTradeConditionSaleOrder)
+   test_apply_trade_condition_copy_subobjects_with_hierarchy (testLegacyTradeCondition.TestApplyTradeConditionSaleOrder)
+   test_apply_trade_condition_keep_categories (testLegacyTradeCondition.TestApplyTradeConditionSaleOrder)
+   test_apply_trade_condition_set_categories (testLegacyTradeCondition.TestApplyTradeConditionSaleOrder)
+   test_apply_trade_condition_set_categories_with_hierarchy (testLegacyTradeCondition.TestApplyTradeConditionSaleOrder)
+   test_apply_trade_condition_twice_update_order (testLegacyTradeCondition.TestApplyTradeConditionSaleOrder)
+   test_apply_twice_trade_condition_copy_subobjects (testLegacyTradeCondition.TestApplyTradeConditionSaleOrder)
    test_apply_trade_condition_copy_subobjects (testLegacyTradeCondition.TestApplyTradeConditionPurchaseOrder)
    test_category_acquisition (testLegacyTradeCondition.TestTradeConditionSupplyLineSaleOrder)
    test_category_acquisition (testLegacyTradeCondition.TestTradeConditionSupplyLinePurchaseOrder)
@@ -426,6 +518,15 @@
 
   testLegacyTradeModelLine                           (32 errors)
    test_01_OrderWithSimpleTaxedAndDiscountedLines (Products.ERP5.tests.testTradeModelLine.TestTradeModelLineSale), Full test case with quite simple linear use case
+   test_01a_InvoiceNewTradeConditionOrLineSupport (Products.ERP5.tests.testTradeModelLine.TestTradeModelLineSale)
+   test_01c_PackingListSplitBuildInvoiceBuild (Products.ERP5.tests.testTradeModelLine.TestTradeModelLineSale)
+   test_02_OrderWithComplexTaxedAndDiscountedLines (Products.ERP5.tests.testTradeModelLine.TestTradeModelLineSale)
+   test_BuildTradeModelLineAndAccountingFromInvoice (Products.ERP5.tests.testTradeModelLine.TestTradeModelLineSale)
+   test_BuildTradeModelLineAndAccountingFromOrder (Products.ERP5.tests.testTradeModelLine.TestTradeModelLineSale)
+   test_tradeModelLineWithEmptyBaseContributionMovement (Products.ERP5.tests.testTradeModelLine.TestTradeModelLineSale)
+   test_tradeModelLineWithFixedPrice (Products.ERP5.tests.testTradeModelLine.TestTradeModelLineSale)
+   test_tradeModelLineWithRounding (Products.ERP5.tests.testTradeModelLine.TestTradeModelLineSale)
+   test_tradeModelLineWithTargetLevelSetting (Products.ERP5.tests.testTradeModelLine.TestTradeModelLineSale)
    test_01_OrderWithSimpleTaxedAndDiscountedLines (Products.ERP5.tests.testTradeModelLinePurchase.TestTradeModelLinePurchase), Full test case with quite simple linear use case
    test_usecase1 (Products.ERP5.tests.testComplexTradeModelLineUseCase.TestComplexTradeModelLineUseCaseSale)
    test_usecase1 (Products.ERP5.tests.testComplexTradeModelLineUseCase.TestComplexTradeModelLineUseCasePurchase)
@@ -439,9 +540,6 @@
   testMilestoneReporting                             (2 errors)
    testMilestoneReport (testMilestoneReporting.TestMilestoneReporting)
    testMilestoneReport (testMilestoneReporting.TestOptimisedMilestoneReporting)
-
-  testMovementGroup                                  (18 errors)
-   test_property_movement_group_and_separating (testMovementGroup.TestPropertyMovementGroup)
 
   testOOoImport                                      (1 failures, 6 errors)
    test_06_AuthorImportFile (testOOoImport.TestOOoImport)
@@ -526,7 +624,7 @@
   testReturnedSalePackingList                        (7 errors)
    test_01_ReturnedSalePackingListWithInventory (testReturnedSalePackingList.TestReturnedSalePackingList)
 
-  testRoundingTool                                   (2 errors)
+  testRoundingTool                                   (1 errors)
    testBasicRounding (testRoundingTool.TestRoundingTool)
 
   testRule                                           (11 errors)
@@ -538,8 +636,9 @@
   testSpellChecking                                  (3 errors)
    test_business_template_list_with_workflow_template_item (testSpellChecking.TestSpellChecking)
 
-  testSupply                                         (21 errors)
-   testSupplyCellPropertyAndAccessor (testSupply.TestSaleSupply)
+  testSupply                                         (16 errors)
+   test_01_MovementAndSupplyModification (testSupply.TestSaleSupply)
+   test_03_SupplyLineApplied (testSupply.TestSaleSupply)
    testSupplyCellPropertyAndAccessor (testSupply.TestPurchaseSupply)
    testSupplyCellPropertyAndAccessor (testSupply.TestInternalSupply)
 
@@ -552,8 +651,14 @@
   testTaskReporting                                  (1 errors)
    testProjectMontlyReport (testTaskReporting.TestTaskReporting)
 
-  testTradeCondition                                 (62 errors)
+  testTradeCondition                                 (53 errors)
    test_apply_trade_condition_copy_subobjects (testTradeCondition.TestApplyTradeConditionSaleOrder)
+   test_apply_trade_condition_copy_subobjects_with_hierarchy (testTradeCondition.TestApplyTradeConditionSaleOrder)
+   test_apply_trade_condition_keep_categories (testTradeCondition.TestApplyTradeConditionSaleOrder)
+   test_apply_trade_condition_set_categories (testTradeCondition.TestApplyTradeConditionSaleOrder)
+   test_apply_trade_condition_set_categories_with_hierarchy (testTradeCondition.TestApplyTradeConditionSaleOrder)
+   test_apply_trade_condition_twice_update_order (testTradeCondition.TestApplyTradeConditionSaleOrder)
+   test_apply_twice_trade_condition_copy_subobjects (testTradeCondition.TestApplyTradeConditionSaleOrder)
    test_apply_trade_condition_copy_subobjects (testTradeCondition.TestApplyTradeConditionPurchaseOrder)
    test_category_acquisition (testTradeCondition.TestTradeConditionSupplyLineSaleOrder)
    test_category_acquisition (testTradeCondition.TestTradeConditionSupplyLinePurchaseOrder)
@@ -568,9 +673,6 @@
   testTradeModelLinePurchase                         (11 errors)
    test_01_OrderWithSimpleTaxedAndDiscountedLines (testTradeModelLinePurchase.TestTradeModelLinePurchase), Full test case with quite simple linear use case
 
-  testTradeReports                                   (4 errors)
-   testSaleOrderReport (testTradeReports.TestTradeReports)
-
   testTransformation                                 (6 errors)
    test_01_getAggregatedAmountListSimple (testTransformation.TestTransformation)
 
@@ -583,13 +685,10 @@
   testXHTML                                          (539 errors)
    test_PythonScriptSyntax (testXHTML.TestXHTML)
 
-  testXMLMatrix                                      (8 errors)
-   test_01_RenameCellRange (testXMLMatrix.TestXMLMatrix)
-
 The following tests were at least partly skipped:
 
   testBPMEvaluation                                  (40 skips)
-   done (7.358s)test_confirming (testBPMEvaluation.TestOrderDefaultProcess) ... skipped 'broken since r39918'
+   done (8.486s)test_confirming (testBPMEvaluation.TestOrderDefaultProcess) ... skipped 'broken since r39918'
    test_transition (testBPMEvaluation.TestOrderDefaultProcess) ... skipped 'broken since r39918'
    test_transition_line_edit (testBPMEvaluation.TestOrderDefaultProcess) ... skipped 'broken since r39918'
    test_transition_line_edit_add (testBPMEvaluation.TestOrderDefaultProcess) ... skipped 'broken since r39918'
