[MERGE] resolved conflicts

bzr revid: ls@numerigraphe.fr-20100312152116-64pmk9cs01bd8kha

diff --cc addons/sale/test/sale_test.xml
index 99c4c19,1643e84..6371dce
--- 1/addons/sale/test/sale_test.xml
--- 2/addons/sale/test/sale_test.xml
+++ b/addons/sale/test/sale_test.xml
@@@ -1,10 -1,10 +1,10 @@@
  <?xml version="1.0" encoding="utf-8"?>
  <openerp>
      <data>
--    
-       <!-- ================================================================  
-                         Smoke test for sale.order process.
-                         
++ 
+       <!-- ===========================================================================================  
+                         Smoke test 1 for sale.order process - Output location NOT chained to Customers locations. 
 -                        
++                
                           0. Verify that the virtual stock level for the products is sufficient. 
                           1. creates a simple sale order with 2 lines, 
                             in manual invoice mode
@@@ -16,7 -16,7 +16,8 @@@
                           7. deliver the products
                           8. verify that everything is done: sale.order, invoice, picking. 
                           
-            ================================================================
++
+            ===========================================================================================
        -->
        
        <!-- ==== 0. CHECK VIRTUAL STOCK LEVEL ==== -->
@@@ -83,9 -80,15 +84,12 @@@
          <!-- ==== 3. CREATE DRAFT INVOICE ==== --> 
          <workflow action="manual_invoice" model="sale.order" ref="smoke_test_sale_order" uid="base.user_root"/>
          
 -        <assert id="smoke_test_sale_order" model="sale.order" string="the sale order is now in progress">
 +        <assert id="smoke_test_sale_order" model="sale.order" string="the sale order is now in progress and has an invoice">
              <test expr="state">progress</test>
 -        </assert>
 -        
 -        <assert id="smoke_test_sale_order" model="sale.order" severity="fatal" string="the sale order has now a corresponding invoice">
              <test expr="len(invoice_ids) == 1"/>
+         </assert>
+         
 -        <assert id="smoke_test_sale_order" model="sale.order" severity="fatal" string="the sale order's has the same amount and is currently draft">
++        <assert id="smoke_test_sale_order" model="sale.order" severity="error" string="the sale order's invoice has the same amount and is a draft">
              <test expr="invoice_ids[0].amount_untaxed == amount_untaxed"/>
              <test expr="invoice_ids[0].amount_total == amount_total"/>
              <test expr="invoice_ids[0].state">draft</test>
@@@ -158,12 -160,8 +166,10 @@@
          <!-- ==== 8. VERIFY THAT EVERYTHING IS DONE ==== -->
          <assert id="smoke_test_sale_order" model="sale.order" string="the sale order's picking is now done">
              <test expr="picking_ids[0].state">done</test>
 +            <test expr="shipped == True"/>
 +            <test expr="invoiced == True"/>
          </assert>
 -        
 +
-         <!-- Run all schedulers -->
-         <function model="mrp.procurement" name="run_scheduler"/>
          <assert id="smoke_test_sale_order" model="sale.order" string="the sale order is now done">
              <test expr="state">done</test>
          </assert>