Merge lp:~numerigraphe/openobject-addons/5.0-unittest into lp:openobject-addons/5.0

[Numérigraphe]

[Numérigraphe (numerigraphe)]

Resubmitting, as requested during the IRC meeting last Friday.

[Christophe Simonis (OpenERP) (kangol)]

This branch will be merged when bug #399817 will be fixed.

[Numérigraphe (numerigraphe)]

> This branch will be merged when bug #399817 will be fixed.
Thanks for your interrest.
In that case you should wait for bug Bug #452854 too - the test case causes the server to fail on init with price_accuracy>3.
Lionel.

[lp:~numerigraphe/openobject-addons/5.0-unittest]

2428. By Numerigraphe - Lionel Sausin <email address hidden> on 2010-03-04

[MERGE] merged updates from v5.0.7

2429. By Numerigraphe - Lionel Sausin <email address hidden> on 2010-03-05

[MERGE] fix tests for purchase, submitted by Don Kirkby

2430. By Numerigraphe - Lionel Sausin <email address hidden> on 2010-03-05

[REF] sale: manually merge changes made to tests from 5.0.7

2431. By Numerigraphe - Lionel Sausin <email address hidden> on 2010-03-12

[MERGE] resolved conflicts

=== modified file 'account/__terp__.py'
--- account/__terp__.py	2010-03-22 05:43:46 +0000
+++ account/__terp__.py	2010-04-07 13:28:34 +0000
@@ -65,7 +65,8 @@
         'project/project_demo.xml',
         'project/analytic_account_demo.xml',
         'demo/account_minimal.xml',
-        'account_unit_test.xml'
+        'test/invoice_basic_test.xml',
+        'test/invoice_bug452854_test.xml',
     ],
     'installable': True,
     'active': False,

=== modified file 'account/demo/account_minimal.xml'
--- account/demo/account_minimal.xml	2010-02-02 07:37:02 +0000
+++ account/demo/account_minimal.xml	2010-04-07 13:28:34 +0000
@@ -41,6 +41,11 @@
             <field name="code">cash</field>
             <field name="close_method">balance</field>
         </record>
+        <record id="account_type_tax" model="account.account.type">
+            <field name="name">Tax</field> 
+            <field name="code">Tax</field>
+            <field name="close_method">unreconciled</field>
+        </record>
 
         <!--
         Chart of Account
@@ -130,6 +135,31 @@
 your own chart of account.
 </field>
         </record>
+        <record id="a_taxes" model="account.account">
+            <field name="name">Taxes</field>
+            <field name="code">x 445000</field>
+            <field name="type">other</field>
+            <field eval="ref('minimal_0')" name="parent_id"/>
+            <field name="user_type" ref="account_type_tax"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="note">
+This chart of account is used for automated testing purpose. It is installed
+only if you selected demo data during your database creation. Modules can
+do black box testing on entries on this chart of account, without modifying
+your own chart of account.
+</field>
+        </record>
+        <!--
+        Tax
+        -->
+        <record model="account.tax" id="t_vat">
+            <field name="name">x VAT</field>
+            <field name="amount" eval="0.196"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="a_taxes"/>
+            <field name="account_collected_id" ref="a_taxes"/>
+            <field name="ref_tax_sign" eval="-1"/>
+        </record>
 
         <!-- Properties -->
         <record forcecreate="True" id="property_account_receivable" model="ir.property">

=== renamed file 'account/account_unit_test.xml' => 'account/test/invoice_basic_test.xml'
--- account/account_unit_test.xml	2009-01-21 12:25:28 +0000
+++ account/test/invoice_basic_test.xml	2010-04-07 13:28:34 +0000
@@ -29,20 +29,20 @@
             <field name="account_id" ref="account.a_sale"/>
         </record>
         
+        <!-- XXX pointless test, it's in the record tag -->
         <assert id="test_invoice_1" model="account.invoice" string="The currency unit of Test invoice 1 is EUR">
             <test expr="currency_id.code">EUR</test>
         </assert>
-        
         <assert id="test_invoice_1" model="account.invoice" severity="error" string="The amount of Test invoice 1 is correct">
             <test expr="sum([l.price_subtotal for l in invoice_line]) == 1850"/>
             <test expr="sum([l.price_subtotal for l in invoice_line]) == amount_untaxed"/>
         </assert>
         
         <workflow action="invoice_open" model="account.invoice" ref="test_invoice_1"/>
-        
         <assert id="test_invoice_1" model="account.invoice" string="Test invoice 1 is now open">
             <test expr="state">open</test>
         </assert>
+        
         <function model="account.invoice" name="pay_and_reconcile">
 			<!-- ids = -->					<value eval="[ref('test_invoice_1')]"/>
 			<!-- pay_amount = -->			<value eval="1850"/>

=== added file 'account/test/invoice_bug452854_test.xml'
--- account/test/invoice_bug452854_test.xml	1970-01-01 00:00:00 +0000
+++ account/test/invoice_bug452854_test.xml	2010-04-07 13:28:34 +0000
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <!-- 
+            Illustrate one aspect of bug #452854:
+            Cannot validate invoices with foreign currency or price_accuracy=3
+        -->
+        <!-- This file must be loaded  _after_  account_demo.xml ! -->
+        <record id="invoice_bug452854" model="account.invoice">
+            <field name="currency_id" ref="base.EUR" />
+            <field name="company_id" ref="base.main_company" />
+            <field name="address_invoice_id" ref="base.res_partner_address_tang" />
+            <field name="partner_id" ref="base.res_partner_asus" />
+            <field name="journal_id" ref="account.sales_journal" />
+            <field name="state">draft</field>
+            <field name="type">out_invoice</field>
+            <field name="account_id" ref="account.a_recv" />
+            <field name="name">lp:452854</field>
+            <field name="address_contact_id" ref="base.res_partner_address_tang" />
+        </record>
+        <record id="invoice_bug452854_line_1" model="account.invoice.line">
+            <field name="name">Dummy product</field>
+            <field name="invoice_id" ref="invoice_bug452854" />
+            <field name="price_unit" eval="1000.0/3" />
+            <field name="quantity">1</field>
+            <field name="account_id" ref="account.a_sale" />
+            <field eval="[(6,0,[ref('account.t_vat')])]" name="invoice_line_tax_id" />
+        </record>
+        <workflow action="invoice_open" model="account.invoice" ref="invoice_bug452854" />
+        <assert id="invoice_bug452854" model="account.invoice" severity="error" string="Invoice lp:452854 validated correctly">
+            <test expr="state">open</test>
+        </assert>
+    </data>
+</openerp>

=== modified file 'product/product_demo.xml'
--- product/product_demo.xml	2010-03-17 12:04:13 +0000
+++ product/product_demo.xml	2010-04-07 13:28:34 +0000
@@ -54,6 +54,40 @@
             <field name="name">IT components kits</field>
         </record>
         
+        <!--
+    Resource: product.uom.categ
+    -->
+
+        <record id="product_uom_categ_m" model="product.uom.categ">
+            <field name="name">Length</field>
+        </record>
+        
+        <!--
+    Resource: product.uom
+    -->
+        <record id="product_uom_m" model="product.uom">
+            <field name="category_id" ref="product_uom_categ_m"/>
+            <field name="name">m</field>
+            <field name="factor_inv">1</field>
+            <field name="factor">1</field>
+        </record>
+        <record id="product_uom_km" model="product.uom">
+            <field name="category_id" ref="product_uom_categ_m"/>
+            <field name="name">Km</field>
+            <field name="factor_inv">1000</field>
+            <field name="factor">0.001</field>
+        </record>
+        <record id="product_uom_cm" model="product.uom">
+            <field name="category_id" ref="product_uom_categ_m"/>
+            <field name="factor_inv">0.01</field>
+            <field name="factor">100</field>
+            <field name="name">cm</field>
+        </record>
+        
+        <!-- 
+    Resource: product.ul 
+    -->
+        
         <record id="product_ul_box" model="product.ul">
             <field name="name">Box 20x20x40</field>
             <field name="type">box</field>
@@ -351,6 +385,27 @@
             <field name="name">Kit Keyboard + Mouse</field>
             <field name="categ_id" ref="product_category_11"/>
         </record>
+        <record id="product_product_27" model="product.product">
+            <field name="default_code">UTP5</field>
+            <field name="list_price">3</field>
+            <field name="standard_price">2</field>
+            <field name="uom_id" ref="product_uom_m"/>
+            <field name="uom_po_id" ref="product_uom_km"/>
+            <field name="name">CAT5e Grey UTP cable</field>
+            <field name="categ_id" ref="product_category_accessories"/>
+        </record>
+
+        <!-- sale advance demo.. -->
+		<!-- Demo Data for Product -->
+		<record id="advance_product_0" model="product.product">
+			<field name="name">Advance Product</field>
+			<field name="categ_id" ref="cat1"/>
+			<field name="type">service</field>
+			<field name="list_price">150.0</field>
+			<field name="standard_price">100.0</field>
+			<field name="uom_id" ref="product_uom_unit"/>
+			<field name="uom_po_id" ref="product_uom_unit"/>
+		</record>
         
         <record id="supplierinfo1" model="product.supplierinfo">
             <field name="name" ref="base.res_partner_asus"/>

=== modified file 'sale/__terp__.py'
--- sale/__terp__.py	2010-03-08 17:57:25 +0000
+++ sale/__terp__.py	2010-04-07 13:28:34 +0000
@@ -57,7 +57,13 @@
         'stock_view.xml',
         'process/sale_process.xml',
     ],
-    'demo_xml': ['sale_demo.xml', 'test/sale_test.xml'],
+    'demo_xml': [
+        'sale_demo.xml',
+        'test/sale_test.xml',
+        'test/invoice_packing.xml',
+        'test/bug461801.xml',
+        'test/bug399817.xml',
+    ],
     'installable': True,
     'active': False,
     'certificate': '0058103601429',

=== modified file 'sale/sale_demo.xml'
--- sale/sale_demo.xml	2008-09-18 14:14:19 +0000
+++ sale/sale_demo.xml	2010-04-07 13:28:34 +0000
@@ -198,18 +198,5 @@
         <!-- Run all schedulers -->
         <function model="mrp.procurement" name="run_scheduler"/>
 
-
-        <!-- sale advance demo.. -->
-		<!-- Demo Data for Product -->
-		<record id="advance_product_0" model="product.product">
-			<field name="name">Advance Product</field>
-			<field name="categ_id" ref="product.cat1"/>
-			<field name="type">service</field>
-			<field name="list_price">150.0</field>
-			<field name="standard_price">100.0</field>
-			<field name="uom_id" ref="product.product_uom_unit"/>
-			<field name="uom_po_id" ref="product.product_uom_unit"/>
-		</record>
-
     </data>
 </openerp>

=== added file 'sale/test/bug399817.xml'
--- sale/test/bug399817.xml	1970-01-01 00:00:00 +0000
+++ sale/test/bug399817.xml	2010-04-07 13:28:34 +0000
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- 
+            Illustrate bug #399817
+            SO not marked picked when 2nd delivery canceled
+            
+        -->
+
+        <!-- Resource: sale.order -->
+        <record id="bug399817" model="sale.order">
+            <field name="shop_id" ref="shop" />
+            <field name="name">lp:399817</field>
+            <field name="note">This Order was created to assert that the following bug is fixed:
+                https://bugs.launchpad.net/openobject-addons/+bug/399817
+            </field>
+            <field model="product.pricelist" name="pricelist_id" search="[]" />
+            <field name="user_id" ref="base.user_demo" />
+            <field name="partner_id" ref="base.res_partner_3" />
+            <field name="partner_invoice_id" ref="base.res_partner_address_zen" />
+            <field name="partner_shipping_id" ref="base.res_partner_address_zen" />
+            <field name="partner_order_id" ref="base.res_partner_address_zen" />
+        </record>
+        <record id="bug399817_line1" model="sale.order.line">
+            <field name="order_id" ref="bug399817" />
+            <field name="name">[PC2] Basic+ PC (assembly on order)</field>
+            <field name="product_id" ref="product.product_product_pc2" />
+            <field name="product_uom" ref="product.product_uom_unit" />
+            <field name="product_uom_qty">4</field>
+            <field name="price_unit">750</field>
+            <field name="type">make_to_order</field>
+            <field name="delay">15</field>
+        </record>
+        <workflow action="order_confirm" model="sale.order" ref="bug399817" />
+
+        <!-- copy packing and do the first one -->
+        <!-- this is similar to what the partial packing wizard does (except for quantities) -->
+        <function model="stock.picking" name="copy">
+            <value eval="obj(ref('bug399817')).picking_ids[0].id" model="sale.order" />
+        </function>
+        <function model="stock.picking" name="draft_validate">
+            <value eval="[obj(ref('bug399817')).picking_ids[0].id]" model="sale.order" />
+        </function>
+        <assert id="bug399817" model="sale.order" severity="warning" string="the sale order's first picking is done">
+            <test expr="len(picking_ids) == 2" />
+            <test expr="picking_ids[0].state">done</test>
+        </assert>
+
+        <!-- cancel the second packing -->
+        <function model="stock.picking" name="action_cancel">
+            <value eval="[obj(ref('bug399817')).picking_ids[1].id]" model="sale.order" />
+        </function>
+        <assert id="bug399817" model="sale.order" severity="warn" string="the sale order's second picking is cancelled">
+            <test expr="picking_ids[1].state">cancel</test>
+        </assert>
+        <assert id="bug399817" model="sale.order" severity="error" string="the sale order's is picked">
+            <test expr="shipped == True" /> <!-- at this stage, the order should be marked picked -->
+        </assert>
+    </data>
+</openerp>

=== added file 'sale/test/bug461801.xml'
--- sale/test/bug461801.xml	1970-01-01 00:00:00 +0000
+++ sale/test/bug461801.xml	2010-04-07 13:28:34 +0000
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+		<!-- 
+            Illustrate bug #461801
+            Sale order line in state 'done' but order in state 'draft'
+        -->
+
+		<!-- Resource: sale.order -->
+		<record id="bug461801" model="sale.order">
+			<field name="shop_id" ref="shop" />
+			<field name="name">lp:461801</field>
+			<field name="note">This Order was created to assert that the following bug is fixed:
+				https://bugs.launchpad.net/openobject-addons/+bug/461801
+            </field>
+			<field model="product.pricelist" name="pricelist_id" search="[]" />
+			<field name="user_id" ref="base.user_demo" />
+			<field name="partner_id" ref="base.res_partner_3" />
+			<field name="partner_invoice_id" ref="base.res_partner_address_zen" />
+			<field name="partner_shipping_id" ref="base.res_partner_address_zen" />
+			<field name="partner_order_id" ref="base.res_partner_address_zen" />
+		</record>
+		<record id="bug461801_line1" model="sale.order.line">
+			<field name="order_id" ref="bug461801" />
+			<field name="name">[PC2] Basic+ PC (assembly on order)</field>
+			<field name="product_id" ref="product.product_product_pc2" />
+			<field name="product_uom" ref="product.product_uom_unit" />
+			<field name="product_uom_qty">4</field>
+			<field name="price_unit">750</field>
+			<field name="type">make_to_order</field>
+			<field name="delay">15</field>
+		</record>
+		<!-- confirm order -->
+		<workflow action="order_confirm" model="sale.order" ref="bug461801" />
+		<assert id="bug461801" model="sale.order" severity="warning" string="the sale order is confirmed and has a packing">
+			<test expr="picking_ids[0].state">confirmed</test>
+			<test expr="len(picking_ids) == 1" />
+		</assert>
+
+		<!-- cancel packing -->
+		<function model="stock.picking" name="action_cancel">
+			<value eval="[obj(ref('bug461801')).picking_ids[0].id]" model="sale.order" />
+		</function>
+		<assert id="bug461801" model="sale.order" severity="warning" string="the sale order's first picking is cancelled">
+			<test expr="picking_ids[0].state">cancel</test>
+		</assert>
+
+		<!-- cancel the order -->
+		<function model="sale.order" name="action_cancel">
+			<value eval="[ref('bug461801')]" model="sale.order" />
+		</function>
+		<assert id="bug461801" model="sale.order" severity="warning" string="the sale order is cancelled">
+			<test expr="state">cancel</test>
+		</assert>
+
+		<!-- set the order to draft -->
+		<function model="sale.order" name="action_cancel_draft">
+			<value eval="[ref('bug461801')]" model="sale.order" />
+		</function>
+		<assert id="bug461801" model="sale.order" severity="warning" string="the sale order is cancelled">
+			<test expr="state">draft</test>
+		</assert>
+
+		<!-- add a 2nd line -->
+		<record id="bug461801_line2" model="sale.order.line">
+			<field name="order_id" ref="bug461801" />
+			<field name="name">[PC1] Basic PC</field>
+			<field name="product_id" ref="product.product_product_pc1" />
+			<field name="product_uom" ref="product.product_uom_unit" />
+			<field name="product_uom_qty">1</field>
+			<field name="price_unit">450</field>
+			<field name="type">make_to_stock</field>
+			<field name="delay">2</field>
+		</record>
+		<assert id="bug461801_line2" model="sale.order.line" severity="warning" string="the new line in the sale order is draft">
+			<test expr="state">draft</test>
+		</assert>
+
+		<!-- force new computation of totals (change something on the order) -->
+        <record id="bug461801" model="sale.order">
+            <field name="client_order_ref">Test</field>
+        </record>
+		<assert id="bug461801_line2" model="sale.order.line" severity="error" string="the new line in the sale order remains draft when totals are computed">
+			<test expr="state">draft</test>
+		</assert>
+	</data>
+</openerp>

=== added file 'sale/test/invoice_packing.xml'
--- sale/test/invoice_packing.xml	1970-01-01 00:00:00 +0000
+++ sale/test/invoice_packing.xml	2010-04-07 13:28:34 +0000
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- 
+            Tests for an order with invoice from the packings
+        -->
+
+        <!-- Resource: sale.order -->
+        <record id="test_order_2" model="sale.order">
+            <field name="name">test_order_2</field>
+            <field name="note">This Sale Order was used to test the following use case during the installation: Order - Picking - Invoice - Payment</field>
+            <field name="shop_id" ref="shop" />
+            <field model="product.pricelist" name="pricelist_id" search="[]" />
+            <field name="user_id" ref="base.user_root" />
+            <field name="partner_id" ref="base.res_partner_agrolait" />
+            <field name="partner_invoice_id" ref="base.res_partner_address_8invoice" /> <!-- you should patch your server to get res_partner_address_8invoice, or revert to res_partner_address_8 -->
+            <field name="partner_shipping_id" ref="base.res_partner_address_8delivery" /> <!-- you should patch your server to get res_partner_address_8delivery, or revert to res_partner_address_8 -->
+            <field name="partner_order_id" ref="base.res_partner_address_8" />
+            <field name="order_policy">picking</field>
+        </record>
+        <!-- Resource: sale.order.line -->
+        <record id="test_order_2_line_1" model="sale.order.line">
+            <field name="order_id" ref="test_order_2" />
+            <field name="name">[PC1] Basic PC</field>
+            <field name="product_id" ref="product.product_product_pc1" />
+            <field name="product_uom" ref="product.product_uom_unit" />
+            <field name="price_unit">450</field>
+            <field name="product_uom_qty">2</field>
+            <field name="product_uos_qty">2</field>
+            <field name="type">make_to_stock</field>
+        </record>
+        <record id="test_order_2_line_3" model="sale.order.line">
+            <field name="order_id" ref="test_order_2" />
+            <field name="name">[RAM512] DDR 512MB PC400</field>
+            <field name="product_id" ref="product.product_product_ram512" />
+            <field name="product_uom" ref="product.product_uom_unit" />
+            <field name="price_unit">90</field>
+            <field name="product_uom_qty">3</field>
+            <field name="product_uos_qty">3</field>
+            <field name="type">make_to_stock</field>
+        </record>
+        <assert id="test_order_2" model="sale.order" severity="error" string="The amount of the sale order is correctly computed">
+            <test expr="amount_untaxed == 450*2 + 90*3" />
+            <test expr="state">draft</test>
+        </assert>
+
+        <workflow action="order_confirm" model="sale.order" ref="test_order_2" />
+        <assert id="test_order_2" model="sale.order" string="the sale order is now in progress">
+            <test expr="state">progress</test>
+        </assert>
+
+        <!-- Treat generated picking -->
+        <assert id="test_order_2" model="sale.order" severity="error" string="the sale order has now a correspending packing">
+            <test expr="len(picking_ids) == 1" />
+            <test expr="picking_ids[0].invoice_state">2binvoiced</test>
+            <test expr="picking_ids[0].address_id == partner_shipping_id" />
+        </assert>
+
+        <!-- Here we need to use the function tag because action_assign is a method of stock_picking and not part of the workflow -->
+        <function model="stock.picking" name="action_assign">
+            <value eval="[obj(ref('test_order_2')).picking_ids[0].id]" model="sale.order" />
+        </function>
+        <assert id="test_order_2" model="sale.order" severity="error" string="the sale order's picking is now assigned">
+            <test expr="picking_ids[0].state">assigned</test>
+        </assert>
+
+        <!-- Do the same as in wizard_partial_picking lines 143-144 -->
+        <function model="stock.picking" name="action_move">
+            <value eval="[obj(ref('test_order_2')).picking_ids[0].id]" model="sale.order" />
+        </function>
+        <workflow action="button_done" model="stock.picking">
+            <value eval="obj(ref('test_order_2')).picking_ids[0].id" model="sale.order" />
+        </workflow>
+        <assert id="test_order_2" model="sale.order" string="the sale order's picking is now done">
+            <test expr="picking_ids[0].state">done</test>
+        </assert>
+
+        <!-- Run all schedulers -->
+        <function model="mrp.procurement" name="run_scheduler" />
+        <assert id="test_order_2" model="sale.order" string="the sale order is now done">
+            <test expr="state">done</test>
+            <test expr="shipped == True" />
+            <test expr="invoiced == False" />
+        </assert>
+
+        <!-- Invoice from the packing -->
+        <function model="stock.picking" name="action_invoice_create">
+            <value eval="[obj(ref('test_order_2')).picking_ids[0].id]" model="sale.order" />
+            <value eval="ref('account.sales_journal')" />
+            <value eval="" />
+            <value eval="'out_invoice'" />
+        </function>
+        <assert id="test_order_2" model="sale.order" severity="error" string="the sale order's picking is invoiced">
+            <test expr="picking_ids[0].invoice_state">invoiced</test>
+            <test expr="len(invoice_ids) == 1" />
+            <test expr="invoice_ids[0].amount_untaxed == amount_untaxed" />
+            <test expr="invoice_ids[0].amount_total == amount_total" />
+            <test expr="invoice_ids[0].reconciled == False" />
+            <test expr="invoice_ids[0].residual == 450*2 + 90*3" />
+            <test expr="invoice_ids[0].state">draft</test>
+            <test expr="invoice_ids[0].address_invoice_id == partner_invoice_id" />
+        </assert>
+
+        <!-- Confirm the invoice -->
+        <workflow action="invoice_open" model="account.invoice">
+            <value eval="obj(ref('test_order_2')).invoice_ids[0].id" model="sale.order" />
+        </workflow>
+        <assert id="test_order_2" model="sale.order" severity="error" string="the sale order's picking is invoiced">
+            <test expr="invoice_ids[0].reconciled == False" />
+            <test expr="invoice_ids[0].residual == amount_total" />
+            <test expr="invoice_ids[0].state">open</test>
+        </assert>
+
+        <!-- Pay the invoice -->
+        <function model="account.invoice" name="pay_and_reconcile">
+            <value eval="[obj(ref('test_order_2')).invoice_ids[0].id]" model="sale.order" />
+            <value eval="obj(ref('test_order_2')).amount_total" model="sale.order" />
+            <value eval="ref('account.cash')" />
+            <value eval="ref('account.period_' + str(int(time.strftime('%m'))))" />
+            <value eval="ref('account.bank_journal')" />
+            <value eval="ref('account.cash')" />
+            <value eval="ref('account.period_' + str(int(time.strftime('%m'))))" />
+            <value eval="ref('account.bank_journal')" />
+        </function>
+        <assert id="test_order_2" model="sale.order" severity="error" string="the sale order's invoice is now paid">
+            <test expr="invoice_ids[0].reconciled == True" />
+            <test expr="invoice_ids[0].residual == 0.0" />
+            <test expr="invoice_ids[0].state">paid</test>
+            <test expr="state">done</test>
+            <test expr="shipped == True" />
+            <test expr="invoiced == True" />
+        </assert>
+    </data>
+</openerp>

=== modified file 'sale/test/sale_test.xml'
--- sale/test/sale_test.xml	2010-03-08 19:09:29 +0000
+++ sale/test/sale_test.xml	2010-04-07 13:28:34 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
+ 
     	<!-- ===========================================================================================  
 			  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,6 +16,7 @@
 			   7. deliver the products
 			   8. verify that everything is done: sale.order, invoice, picking. 
 			   
+
     	     ===========================================================================================
     	-->
     	
@@ -33,13 +34,13 @@
             <field name="shop_id" ref="shop"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
             <field name="user_id" ref="base.user_root"/>
-            <field model="res.partner" name="partner_id" search="[]"/>
             <field name="order_policy">manual</field> <!-- force manual invoicing -->
             <field name="picking_policy">one</field> <!-- full delivery only -->
             <field name="invoice_quantity">order</field> <!-- invoice based on ordered quantities -->
-            <field model="res.partner.address" name="partner_invoice_id" search="[]"/>
-            <field model="res.partner.address" name="partner_shipping_id" search="[]"/>
-            <field model="res.partner.address" name="partner_order_id" search="[]"/>
+            <field name="partner_id" ref="base.res_partner_agrolait"/>
+            <field name="partner_invoice_id" ref="base.res_partner_address_8invoice"/>
+            <field name="partner_shipping_id" ref="base.res_partner_address_8delivery"/>
+            <field name="partner_order_id" ref="base.res_partner_address_8"/>
             <field name="name">SO-SMOKE-TEST</field>
         </record>
         <!-- Resource: sale.order.line -->
@@ -63,59 +64,64 @@
             <field name="product_uos_qty">3</field>
             <field name="type">make_to_stock</field>
         </record>
-        
         <assert id="smoke_test_sale_order" model="sale.order" severity="error" string="The amount of the sale order is correctly computed">
-            <test expr="sum([l.price_subtotal for l in order_line]) == amount_untaxed"/>
+            <test expr="amount_untaxed == 450*2 + 90*3"/>
+            <test expr="state">draft</test>
         </assert>
         
         
         <!-- ==== 2. CONFIRM SALE ORDER ==== --> 
         <workflow action="order_confirm" model="sale.order" ref="smoke_test_sale_order"/>
-
         <assert id="smoke_test_sale_order" model="sale.order" string="the sale order is now in 'Manual in progress' state">
             <test expr="state">manual</test>
+            <test expr="len(picking_ids) == 1"/>
+            <test expr="picking_ids[0].address_id == partner_shipping_id"/>
+            <test expr="picking_ids[0].invoice_state">none</test>
+            <test expr="picking_ids[0].state">confirmed</test> <!-- Used to be desactivated because of MRP_JIT  -->
         </assert>
         
         
         <!-- ==== 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>
+            <test expr="invoice_ids[0].address_invoice_id == partner_invoice_id"/>
         </assert>
 
         <!-- ==== 4. CONFIRM INVOICE ==== -->         
         <workflow action="invoice_open" model="account.invoice">
             <value eval="obj(ref('smoke_test_sale_order')).invoice_ids[0].id" model="sale.order"/>
         </workflow>
-        
-        
+        <assert id="smoke_test_sale_order" model="sale.order" severity="error" string="the sale order's picking is invoiced">
+            <test expr="invoice_ids[0].reconciled == False"/>
+            <test expr="invoice_ids[0].residual == amount_total"/>
+            <test expr="invoice_ids[0].state">open</test>
+        </assert>
+
         <!-- ==== 5. PAY THE INVOICE AND RECONCILE ==== -->
         <function model="account.invoice" name="pay_and_reconcile">
             <value eval="[obj(ref('smoke_test_sale_order')).invoice_ids[0].id]" model="sale.order"/>
             <value eval="obj(ref('smoke_test_sale_order')).amount_total" model="sale.order"/>
-            <value model="account.account" search="[('user_type.name', '=', 'Cash')]"/>
+            <value eval="ref('account.cash')"/>
             <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
             <value eval="ref('account.bank_journal')"/>
-            <value model="account.account" search="[('user_type.name', '=', 'Cash')]"/>
+            <value eval="ref('account.cash')"/>
             <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
             <value eval="ref('account.bank_journal')"/>
         </function>
-        
-        <assert id="smoke_test_sale_order" model="sale.order" severity="fatal" string="the sale order's invoice is now paid">
+        <assert id="smoke_test_sale_order" model="sale.order" severity="error" string="the sale order's invoice is now paid">
+            <test expr="invoice_ids[0].reconciled == True"/>
+            <test expr="invoice_ids[0].residual == 0.0"/>
             <test expr="invoice_ids[0].state">paid</test>
         </assert>
-        
 
 		<!-- ==== VERIFY THE PICKING AND MOVES ARE CONFIRMED ==== -->
 		<!-- Check the state of the picking and moves -->
@@ -140,7 +146,7 @@
         <function model="stock.picking" name="action_assign">
             <value eval="[obj(ref('smoke_test_sale_order')).picking_ids[0].id]" model="sale.order"/>
         </function>
-        <assert id="smoke_test_sale_order" model="sale.order" severity="fatal" string="the sale order's picking is now assigned">
+        <assert id="smoke_test_sale_order" model="sale.order" severity="error" string="the sale order's picking is now assigned">
             <test expr="picking_ids[0].state">assigned</test>
         </assert>
         
@@ -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>
-        
+
         <assert id="smoke_test_sale_order" model="sale.order" string="the sale order is now done">
             <test expr="state">done</test>
         </assert>