--- summary 
+++ summary 
@@ -2,9 +2,9 @@
 Revision: None
 Result: FAIL
 
-All tests: 4536
-Failures: 59
-Errors: 8
+All tests: 4485
+Failures: 18
+Errors: 14
 Skips: 189
 
 
@@ -14,11 +14,6 @@
   testBusinessTemplate                               (2 failures, 2 skips)
    test_BusinessTemplateWithDocumentPropertySheetMigrated (testBusinessTemplate.TestBusinessTemplate), Checks that if Business Template defines Document and PropertySheet
    test_BusinessTemplateWithDocumentTestRemoved (testBusinessTemplate.TestBusinessTemplate), Checks that if Business Template defines Document and Test
-
-  testConversionInSimulation                         (1 failures, 2 errors, 4 skips)
-   test_01_simulation_movement_destination_asset_price (testConversionInSimulation.TestConversionInSimulation)
-   test_01_simulation_movement_source_asset_price (testConversionInSimulation.TestConversionInSimulation)
-   test_01_diverged_purchase_packing_list_source_total_asset_price (testConversionInSimulation.TestConversionInSimulation)
 
   testDms                                            (2 failures, 1 skips)
    test_HTML_to_ODT_conversion_keep_related_image_list (testDms.TestDocument), This test create a Web Page and an Image.
@@ -42,58 +37,8 @@
   testIngestionWithFlare                             (1 failures, 4 skips)
    test_IngestionConfigurationByTypeBasedMethod_usecase6 (testIngestionWithFlare.TestIngestionWithFlare), How to configure meta data discovery so that a Spreadsheet
 
-  testLegacyConversionInSimulation                   (5 failures, 2 errors)
-   test_01_simulation_movement_destination_asset_price (testLegacyConversionInSimulation.TestConversionInSimulation)
-   test_01_simulation_movement_source_asset_price (testLegacyConversionInSimulation.TestConversionInSimulation)
-   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)
-
-  testLegacyDeliveryBuilderToSupportMultipleLines    (4 failures)
-   test_01_IfNested (Products.ERP5.tests.testDeliveryBuilderToSupportMultipleLines.TestNestedLine)
-   test_02_AdoptingPrevision (Products.ERP5.tests.testDeliveryBuilderToSupportMultipleLines.TestNestedLine)
-   test_03_AcceptingDecision (Products.ERP5.tests.testDeliveryBuilderToSupportMultipleLines.TestNestedLine)
-   test_04_MergingMultipleSaleOrders (Products.ERP5.tests.testDeliveryBuilderToSupportMultipleLines.TestNestedLine)
-
   testLegacyProjectAndTask                           (1 failures, 1 skips)
    testProjectMontlyReport (Products.ERP5.tests.testTaskReporting.TestTaskReporting)
-
-  testLegacySimulationAdvancedInvoicing              (20 failures)
-   test_01_TwoInvoicesFromTwoPackingList (Products.ERP5.tests.testAdvancedInvoicing.TestAdvancedSaleInvoice)
-   test_02_InvoiceDeletePackingListLine (Products.ERP5.tests.testAdvancedInvoicing.TestAdvancedSaleInvoice)
-   test_03_InvoiceDecreaseQuantity (Products.ERP5.tests.testAdvancedInvoicing.TestAdvancedSaleInvoice)
-   test_04_InvoiceChangeStartDateFail (Products.ERP5.tests.testAdvancedInvoicing.TestAdvancedSaleInvoice)
-   test_05_AcceptDecisionOnPackingList (Products.ERP5.tests.testAdvancedInvoicing.TestAdvancedSaleInvoice)
-   test_06_AcceptDecisionOnPackingListAndInvoice (Products.ERP5.tests.testAdvancedInvoicing.TestAdvancedSaleInvoice)
-   test_07_SplitAndDeferInvoice (Products.ERP5.tests.testAdvancedInvoicing.TestAdvancedSaleInvoice)
-   test_08_AcceptDecisionOnInvoice (Products.ERP5.tests.testAdvancedInvoicing.TestAdvancedSaleInvoice)
-   test_10_ManuallyAddedMovements (Products.ERP5.tests.testAdvancedInvoicing.TestAdvancedSaleInvoice)
-   test_11_ManuallyAddedMovementsManyTransactions (Products.ERP5.tests.testAdvancedInvoicing.TestAdvancedSaleInvoice)
-   test_12_compareInvoiceAndPackingList (Products.ERP5.tests.testAdvancedInvoicing.TestAdvancedSaleInvoice)
-   test_13_acceptQuantityDivergenceOnInvoiceWithStartedPackingList (Products.ERP5.tests.testAdvancedInvoicing.TestAdvancedSaleInvoice)
-   test_AcceptQuantityDivergenceOnInvoiceWithStoppedPackingList (Products.ERP5.tests.testAdvancedInvoicing.TestAdvancedSaleInvoice), Accept divergence with stopped packing list
-   test_AdoptQuantityDivergenceOnInvoiceLineWithStoppedPackingList (Products.ERP5.tests.testAdvancedInvoicing.TestAdvancedSaleInvoice), Adopt quantity with stopped packing list
-   test_CreatingAccountingTransactionThroughInvoice (Products.ERP5.tests.testAdvancedInvoicing.TestAdvancedSaleInvoice), test creating simple invoice and accounting transaction
-   test_PackingListEditAndInvoiceRule (Products.ERP5.tests.testAdvancedInvoicing.TestAdvancedSaleInvoice)
-   test_AcceptQuantityDivergenceOnInvoiceWithStoppedPackingList (Products.ERP5.tests.testAdvancedInvoicing.TestAdvancedPurchaseInvoice), Accept divergence with stopped packing list
-   test_AdoptQuantityDivergenceOnInvoiceLineWithStoppedPackingList (Products.ERP5.tests.testAdvancedInvoicing.TestAdvancedPurchaseInvoice), Adopt quantity with stopped packing list
-   test_CreatingAccountingTransactionThroughInvoice (Products.ERP5.tests.testAdvancedInvoicing.TestAdvancedPurchaseInvoice), test creating simple invoice and accounting transaction
-   test_PackingListEditAndInvoiceRule (Products.ERP5.tests.testAdvancedInvoicing.TestAdvancedPurchaseInvoice)
-
-  testLegacySimulationItem                           (11 failures)
-   test_01_ItemSimpleTest (Products.ERP5.tests.testItem.TestItem)
-   test_02_ItemWithInvoice (Products.ERP5.tests.testItem.TestItem)
-   test_07_WithPackingListChangePackingListQuantityAndAccept (Products.ERP5.tests.testItem.TestItem)
-   test_08_ChangePackingListDateAndAccept (Products.ERP5.tests.testItem.TestItem)
-   test_09_ChangeOrderDateAndAcceptOnPackingList (Products.ERP5.tests.testItem.TestItem)
-   test_10_ChangeOrderQuantityAndAdoptOnPackingList (Products.ERP5.tests.testItem.TestItem)
-   test_11_ChangeOrderQuantityAndAcceptOnPackingList (Products.ERP5.tests.testItem.TestItem)
-   test_12_CreteSameResourceDifferentItemOrderLines (Products.ERP5.tests.testItem.TestItem)
-   test_13_CreateSameResourceDiffrentItemOrderLinesThenChangeTheOrderLinesDate (Products.ERP5.tests.testItem.TestItem)
-   test_14_ManuallyAddPackingListWithItem (Products.ERP5.tests.testItem.TestItem)
-   test_15_ThreeOrderLines (Products.ERP5.tests.testItem.TestItem)
 
   testLegacyTradeModelLine                           (2 failures)
    test_tradeModelLineWithRounding (Products.ERP5.tests.testTradeModelLine.TestTradeModelLineSale)
@@ -105,15 +50,23 @@
   testPayroll                                        (1 failures)
    test_sourceSectionIsSetOnMovements (testPayroll.TestPayroll)
 
-  testTradeModelLine                                 (1 failures)
+  testTradeModelLine                                 (1 failures, 6 errors)
+   test_01_OrderWithSimpleTaxedAndDiscountedLines (testTradeModelLine.TestTradeModelLineSale), Full test case with quite simple linear use case
+   test_01a_InvoiceNewTradeConditionOrLineSupport (testTradeModelLine.TestTradeModelLineSale)
+   test_01b_NewSimulation_InvoiceModifyQuantityAndSolveDivergency (testTradeModelLine.TestTradeModelLineSale)
+   test_01c_PackingListSplitBuildInvoiceBuild (testTradeModelLine.TestTradeModelLineSale)
+   test_BuildTradeModelLineAndAccountingFromInvoice (testTradeModelLine.TestTradeModelLineSale)
+   test_BuildTradeModelLineAndAccountingFromOrder (testTradeModelLine.TestTradeModelLineSale)
    test_tradeModelLineWithRounding (testTradeModelLine.TestTradeModelLineSale)
 
-  testTradeModelLinePurchase                         (1 failures)
+  testTradeModelLinePurchase                         (1 failures, 6 errors)
+   test_01_OrderWithSimpleTaxedAndDiscountedLines (testTradeModelLinePurchase.TestTradeModelLinePurchase), Full test case with quite simple linear use case
+   test_01a_InvoiceNewTradeConditionOrLineSupport (testTradeModelLinePurchase.TestTradeModelLinePurchase)
+   test_01b_NewSimulation_InvoiceModifyQuantityAndSolveDivergency (testTradeModelLinePurchase.TestTradeModelLinePurchase)
+   test_01c_PackingListSplitBuildInvoiceBuild (testTradeModelLinePurchase.TestTradeModelLinePurchase)
+   test_BuildTradeModelLineAndAccountingFromInvoice (testTradeModelLinePurchase.TestTradeModelLinePurchase)
+   test_BuildTradeModelLineAndAccountingFromOrder (testTradeModelLinePurchase.TestTradeModelLinePurchase)
    test_tradeModelLineWithRounding (testTradeModelLinePurchase.TestTradeModelLinePurchase)
-
-  testUNGConfigurationWorkflow                       (2 errors)
-   test_ung_workflow_brazil (testUNGConfigurationWorkflow.TestUNGConfiguratorWorkflowBrazilLanguage), Test the ung workflow with brazilian language
-   test_ung_workflow_france (testUNGConfigurationWorkflow.TestUNGConfiguratorWorkflowFranceLanguage), Test the ung workflow with french language
 
   testXHTML                                          (1 failures)
    test_duplicatingSelectionNameInListbox (testXHTML.TestXHTML)
