diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index e2526b4350f..9dffcf12fdc 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -30,15 +30,14 @@
                 <form string='Invoice Line'>
                     <notebook>
                         <page string='Line'>
-                            <field name='name' select='1' colspan='4'/>
-                            <field name='account_id' domain='[(&apos;company_id&apos;, &apos;=&apos;, parent.company_id), (&apos;journal_id&apos;, &apos;=&apos;, parent.journal_id), (&apos;type&apos;, &apos;&lt;&gt;&apos;, &apos;view&apos;)]' on_change='onchange_account_id(parent.partner_id,account_id)'/>
-                            <field name='account_analytic_id' domain='[(&apos;type&apos;,&apos;&lt;&gt;&apos;,&apos;view&apos;), (&apos;company_id&apos;, &apos;=&apos;, parent.company_id)]'/>
-                            <newline/>
                             <field name='product_id' on_change='product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id)' select='1'/>
                             <field name='uos_id'/>
                             <field name='quantity' select='1'/>
                             <field name='price_unit' select='1'/>
                             <field name='discount'/>
+                            <field name='name' select='1' colspan='4'/>
+                            <field name='account_id' domain='[(&apos;company_id&apos;, &apos;=&apos;, parent.company_id), (&apos;journal_id&apos;, &apos;=&apos;, parent.journal_id), (&apos;type&apos;, &apos;&lt;&gt;&apos;, &apos;view&apos;)]' on_change='onchange_account_id(parent.partner_id,account_id)'/>
+                            <field name='account_analytic_id' domain='[(&apos;type&apos;,&apos;&lt;&gt;&apos;,&apos;view&apos;), (&apos;company_id&apos;, &apos;=&apos;, parent.company_id)]'/>
                             <newline/>
                             <field name='price_subtotal'/>
                             <field name='invoice_line_tax_id' colspan='4'/>
diff --git a/addons/account/wizard/wizard_automatic_reconcile.py b/addons/account/wizard/wizard_automatic_reconcile.py
index 3503b78ec49..8b3c1d7080a 100644
--- a/addons/account/wizard/wizard_automatic_reconcile.py
+++ b/addons/account/wizard/wizard_automatic_reconcile.py
@@ -55,7 +55,8 @@ import time
 _reconcile_form = '''<?xml version="1.0"?>
 <form string="Reconciliation">
 	<separator string="Options" colspan="4"/>
-	<field name="account_ids" colspan="4" domain="[('reconcile','=',1)]"/>
+	<field name="account_ids" colspan="4" domain="[('reconcile','=',1)]" views="account.view_account_list">
+	</field>
 	<field name="date1"/>
 	<field name="date2"/>
 	<field name="power"/>
diff --git a/addons/l10n_fr/fr_wizard.xml b/addons/l10n_fr/fr_wizard.xml
index d7a07ae18e2..5206ed4899c 100755
--- a/addons/l10n_fr/fr_wizard.xml
+++ b/addons/l10n_fr/fr_wizard.xml
@@ -1,11 +1,15 @@
 <?xml version='1.0'?>
 <terp>
     <data>
-        
+
         <wizard name='account.chart.report' id='wizard_chart_report' model='account.account' menu='False' string='Account Report'/>
-        
-        <menuitem name='Financial Management/Reporting/Balance Sheet  &amp; Profit and Loss' action='wizard_chart_report' type='wizard' id='menu_fr_chart_report'/>
-        
-        
+
+        <menuitem
+            name='Financial Management/Reporting/CERFA Declaration' 
+            action='wizard_chart_report' 
+            type='wizard' 
+            id='menu_fr_chart_report'/>
+
+
     </data>
 </terp>
diff --git a/addons/l10n_fr/wizard/fpdftemp.fdf b/addons/l10n_fr/wizard/fpdftemp.fdf
index 7ef4dd90a72..140a9e5f69c 100755
Binary files a/addons/l10n_fr/wizard/fpdftemp.fdf and b/addons/l10n_fr/wizard/fpdftemp.fdf differ
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 0a6b113e07c..73239bd5cd8 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -680,7 +680,7 @@ class mrp_procurement(osv.osv):
 		'property_ids': fields.many2many('mrp.property', 'mrp_procurement_property_rel', 'procurement_id','property_id', 'Properties'),
 
 		'message': fields.char('Latest error', size=64),
-		'state': fields.selection([('draft','Draft'),('confirmed','Confirmed'),('exception','Exception'),('running','Running'),('cancel','Cancel'),('done','Done')], 'State')
+		'state': fields.selection([('draft','Draft'),('confirmed','Confirmed'),('exception','Exception'),('running','Running'),('cancel','Cancel'),('done','Done'),('waiting','Waiting')], 'State')
 	}
 	_defaults = {
 		'state': lambda *a: 'draft',
@@ -1065,8 +1065,8 @@ class StockMove(osv.osv):
 						'move_dest_id': move.id,
 						'state': state,
 						'location_dest_id': dest,
-						'move_history_ids2': [(6,0,[move.id])],
-						'move_history_ids': [],
+						'move_history_ids': [(6,0,[move.id])],
+						'move_history_ids2': [(6,0,[])],
 						'procurements': []
 					}
 					mid = self.pool.get('stock.move').copy(cr, uid, move.id, default=valdef)
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 75b14ddee57..ea986fb0b8f 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -422,7 +422,7 @@
                             <field name='date_start' select='2'/>
                             <field name='date_finnished'/>
                             <field name='picking_id'/>
-                            <field name='origin'/>
+                            <field name='origin' select="1"/>
                             <field name='move_prod_id'/>
                             <newline/>
                             <field name='move_created_ids' nolabel='1' colspan='4'/>
@@ -614,7 +614,7 @@
                         <field name='state' readonly='1' select='2'/>
                         <button name='button_confirm' states='draft' string='Confirm'/>
                         <button name='button_restart' states='exception' string='Retry'/>
-                        <button name='button_cancel' states='exception' string='Cancel'/>
+                        <button name='button_cancel' states='exception,waiting' string='Cancel'/>
                         <button name='button_check' states='confirmed' string='Run procurement'/>
                         <button name='button_cancel' states='draft,running' string='Cancel'/>
                     </group>
@@ -730,12 +730,12 @@
         </record>
         <menuitem name='Reordering Policy' sequence='4' id='menu_mrp_reordering' parent='stock.menu_stock_root'/>
         <menuitem action='action_orderpoint_form' id='menu_action_orderpoint_form' parent='menu_mrp_reordering'/>
-        
+
         <act_window name='Minimum Stock Rules' domain='[(&apos;warehouse_id&apos;, &apos;=&apos;, active_id)]' id='act_stock_warehouse_2_stock_warehouse_orderpoint' src_model='stock.warehouse' res_model='stock.warehouse.orderpoint'/>
-        
+
         <!-- add product_uom to context to be the default value when adding new orderpoints -->
         <act_window name='Minimum Stock Rules' domain='[(&apos;product_id&apos;, &apos;=&apos;, active_id)]' id='act_product_product_2_stock_warehouse_orderpoint' src_model='product.product' context='{&apos;product_uom&apos;: locals().has_key(&apos;uom_id&apos;) and uom_id}' res_model='stock.warehouse.orderpoint'/>
-        
-        <act_window name='Bill of Material' domain='[(&apos;product_id&apos;, &apos;=&apos;, active_id)]' id='act_product_product_2_mrp_bom' src_model='product.product' res_model='mrp.bom'/>
+
+        <act_window name='Bill of Material' domain='[(&apos;product_id&apos;, &apos;=&apos;, active_id),(&apos;bom_id&apos;,&apos;=&apos;,False)]' id='act_product_product_2_mrp_bom' src_model='product.product' res_model='mrp.bom'/>
     </data>
 </terp>
diff --git a/addons/mrp/mrp_workflow.xml b/addons/mrp/mrp_workflow.xml
index 419142139a6..89a881b5040 100644
--- a/addons/mrp/mrp_workflow.xml
+++ b/addons/mrp/mrp_workflow.xml
@@ -192,12 +192,11 @@
         </record>
         <record model="workflow.activity" id="act_wait_done">
             <field name="wkf_id" ref="wkf"/>
-            <field name="flow_stop">True</field>
             <field name="name">wait_done</field>
             <field name="kind">function</field>
-            <field name="action">write({'state':'done'})</field>
+            <field name="action">write({'state':'waiting'})</field>
         </record>
-        
+
         <record model="workflow.activity" id="act_done">
             <field name="wkf_id" ref="wkf"/>
             <field name="flow_stop">True</field>
@@ -217,6 +216,14 @@
             <field name="signal">button_wait_done</field>
             <field name="condition">True</field>
         </record>
+        <record model="workflow.transition" id="trans_confirm_wait_done">
+            <field name="act_from" ref="act_wait_done"/>
+            <field name="act_to" ref="act_done"/>
+            <field name="condition">check_move_done()</field>
+            <field name="trigger_model">stock.move</field>
+            <field name="trigger_expr_id">[move_id.id]</field>
+        </record>
+
         <record model="workflow.transition" id="trans_confirm_cancel">
             <field name="act_from" ref="act_confirm"/>
             <field name="act_to" ref="act_cancel"/>
@@ -244,6 +251,11 @@
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">button_cancel</field>
         </record>
+        <record model="workflow.transition" id="trans_confirm_waiting_cancel">
+            <field name="act_from" ref="act_wait_done"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">button_cancel</field>
+        </record>
         <record model="workflow.transition" id="trans_confirm_mts_confirm">
             <field name="act_from" ref="act_confirm_mts"/>
             <field name="act_to" ref="act_confirm"/>
diff --git a/addons/sale/report/order.rml b/addons/sale/report/order.rml
index ff9f08e5b78..0fcf2ab837f 100644
--- a/addons/sale/report/order.rml
+++ b/addons/sale/report/order.rml
@@ -1,3 +1,268 @@
 <?xml version="1.0"?>
-<document filename="test.pdf"><template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20"><pageTemplate id="first"><frame id="first" x1="34.0" y1="42.0" width="527" height="758"/></pageTemplate></template><stylesheet><blockTableStyle id="Standard_Outline"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau1"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau2"><blockAlignment value="LEFT"/><blockValign value="TOP"/><lineStyle kind="GRID" colorName="black"/><blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/><blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/><blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/><blockBackground colorName="#e6e6e6" start="3,0" stop="3,0"/><blockBackground colorName="#e6e6e6" start="4,0" stop="4,0"/><blockBackground colorName="#e6e6e6" start="5,0" stop="5,0"/></blockTableStyle><blockTableStyle id="Tableau3"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau5"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau6"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau4"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><initialize><paraStyle name="all" alignment="justify"/></initialize><paraStyle name="P1" fontName="Times-Roman" fontSize="9.0" leading="11"/><paraStyle name="P2" fontName="Times-Roman"/><paraStyle name="P3" fontName="Times-Roman" alignment="LEFT"/><paraStyle name="P4" fontName="Times-Roman" alignment="LEFT"/><paraStyle name="P5" fontName="Times-Bold" fontSize="9.0" leading="11"/><paraStyle name="P6" fontName="Times-Bold" fontSize="9.0" leading="11"/><paraStyle name="P7" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT"/><paraStyle name="P8" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="CENTER"/><paraStyle name="P9" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT"/><paraStyle name="P10" fontName="Times-BoldItalic" fontSize="9.0" leading="11" alignment="LEFT"/><paraStyle name="P11" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="LEFT"/><paraStyle name="P12" fontName="Times-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/><paraStyle name="P13" fontName="Times-Bold" fontSize="9.0" leading="11"/><paraStyle name="P14" fontName="Times-Roman" fontSize="10.0" leading="13"/><paraStyle name="P15" fontName="Times-Roman" fontSize="10.0" leading="13"/><paraStyle name="P16" fontName="Times-Roman" fontSize="4.0" leading="5"/><paraStyle name="P17" fontName="Times-Roman" fontSize="4.0" leading="5"/><paraStyle name="P18" fontName="Times-Roman" fontSize="11.0" leading="14"/><paraStyle name="P19" fontName="Times-Roman" fontSize="11.0" leading="14"/><paraStyle name="P20" fontName="Times-Roman" fontSize="16.0" leading="20"/><paraStyle name="P21" fontName="Times-BoldItalic" fontSize="6.0" leading="8" alignment="LEFT"/><paraStyle name="P22" fontName="Times-Roman" fontSize="7.0" leading="9"/><paraStyle name="P23" fontName="Times-Roman" fontSize="11.0" leading="14"/><paraStyle name="P24" fontName="Times-Roman" fontSize="7.0" leading="9"/><paraStyle name="P25" fontName="Times-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/><paraStyle name="P26" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT"/><paraStyle name="P27" fontName="Times-BoldItalic" fontSize="11.0" leading="14"/><paraStyle name="P28" fontName="Times-BoldItalic" fontSize="11.0" leading="14" alignment="CENTER"/><paraStyle name="Standard" fontName="Times-Roman"/><paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/><paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Table Contents" fontName="Times-Roman"/><paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/><paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/><paraStyle name="Index" fontName="Times-Roman"/></stylesheet><images/><story><para style="P1">[[ repeatIn(objects,'o') ]] <font face="Times-Roman">[[ setLang(o.partner_id.lang) ]]</font></para><blockTable colWidths="257.0,50.0,220.0" style="Tableau1"><tr><td><para style="P5">Shipping address :</para><para style="P14">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para><para style="P14">[[ o.partner_shipping_id.title or '' ]] [[ o.partner_shipping_id.name ]]</para><para style="P14">[[ o.partner_shipping_id.street ]]</para><para style="P14">[[ o.partner_shipping_id.street2 or '' ]]</para><para style="P15"><font face="Times-Roman">[[ o.partner_shipping_id.zip or '' ]]</font> [[ o.partner_shipping_id.city or '' ]]</para><para style="P15">[[ o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name or '' ]]</para><para style="P15">[[ o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name or '' ]]</para><para style="P16"><font color="white"> </font></para><para style="P6">Invoice address :</para><para style="P15">[[ o.partner_invoice_id.street ]][[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]]</para><para style="P15">[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]] [[ o.partner_invoice_id.country_id and (', %s' % (o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '')) ]]</para></td><td><para style="P18"><font color="white"> </font></para></td><td><para style="P19">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para><para style="P19">[[ o.partner_order_id.title or '' ]] [[ o.partner_order_id.name ]]</para><para style="P19">[[ o.partner_order_id.street ]]</para><para style="P19">[[ o.partner_order_id.street2 or '' ]]</para><para style="P19">[[ o.partner_order_id.zip or '' ]] [[ o.partner_order_id.city or '' ]]</para><para style="P19">[[ o.partner_order_id.state_id and o.partner_order_id.state_id.name or '' ]]</para><para style="P19">[[ o.partner_order_id.country_id and o.partner_order_id.country_id.name or '' ]]</para><para style="P17"><font color="white"> </font></para><para style="P14">Tel.&#xA0;: [[ o.partner_order_id.phone or removeParentNode('para') ]]</para><para style="P14">Fax&#xA0;: [[ o.partner_order_id.fax or removeParentNode('para') ]]</para><para style="P14">VAT&#xA0;: [[ o.partner_id.vat or removeParentNode('para') ]]</para></td></tr></blockTable><para style="P2"><font color="white"> </font></para><para style="P20">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]] Quotation N&#xB0; : [[ o.name ]]</para><para style="P20">[[ o.state=='draft' and removeParentNode('para') ]] Order N&#xB0; : [[ o.name ]]</para><para style="P20"><font color="white"> </font></para><para style="P23">Your order reference : [[ o.client_order_ref or '' ]]</para><para style="P23">Date ordered : [[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]]</para><para style="P23">Our salesman : [[ o.user_id.name ]]</para><para style="P2"><font color="white"> </font></para><blockTable colWidths="256.0,46.0,56.0,59.0,56.0,54.0" repeatRows="1" style="Tableau2"><tr><td><para style="P27">Description</para></td><td><para style="P28">Taxes</para></td><td><para style="P28">Quantity</para></td><td><para style="P28">Unit Price</para></td><td><para style="P28"><font face="Times-Roman">Disc. (%)</font></para></td><td><para style="P28">Price</para></td></tr></blockTable><section><para style="P21">[[ repeatIn(o.order_line,'line') ]]</para><blockTable colWidths="256.0,46.0,56.0,59.0,56.0,54.0" style="Tableau3"><tr><td><para style="P7">[[ line.name ]]</para></td><td><para style="P8">[[ ', '.join(map(lambda x: x.name, line.tax_id))]]</para></td><td><para style="P9">[[ line.product_uos and '%.2f' % line.product_uos_qty or '%.2f' % line.product_uom_qty ]] [[ line.product_uos and line.product_uos.name or line.product_uom.name ]]</para></td><td><para style="P9">[[ '%.2f' % line.price_unit ]]</para></td><td><para style="P9">[[ (line.discount and str(line.discount)+'%')or '' ]]</para></td><td><para style="P9">[[ '%.2f' % line.price_subtotal ]]</para></td></tr></blockTable><blockTable colWidths="52.0,366.0,110.0" style="Tableau5"><tr><td><para style="P10">[[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]]</para></td><td><para style="P11">[[ l or removeParentNode('table') ]]</para></td><td><para style="P10"><font color="white"> </font></para></td></tr></blockTable></section><blockTable colWidths="348.0,69.0,110.0" style="Tableau6"><tr><td><para style="P24"><font color="white"> </font></para></td><td><para style="P25">Net Total&#xA0;:</para></td><td><para style="P25">[[ '%.2f' % o.amount_untaxed ]] [[ o.pricelist_id.currency_id.name ]]</para></td></tr><tr><td><para style="P24"><font color="white"> </font></para></td><td><para style="P25">Taxes&#xA0;:</para></td><td><para style="P25">[[ '%.2f' % o.amount_tax ]] [[ o.pricelist_id.currency_id.name ]]</para></td></tr><tr><td><para style="P22"><font color="white"> </font></para></td><td><para style="P12">TOTAL&#xA0;:</para></td><td><para style="P12">[[ '%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]</para></td></tr></blockTable><para style="P13"><font color="white"> </font></para><blockTable colWidths="527.0" style="Tableau4"><tr><td><para style="P3">[[ format(o.note or '') ]]</para></td></tr><tr><td><para style="P3">[[ format((o.partner_id.property_payment_term and o.partner_id.property_payment_term.note) or '') ]]</para></td></tr></blockTable><para style="P4"><font color="white"> </font></para></story></document>
+<document filename="test.pdf">
+<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+<pageTemplate id="first">
+<frame id="first" x1="34.0" y1="42.0" width="527" height="758"/>
+</pageTemplate>
+</template>
+<stylesheet>
+<blockTableStyle id="Standard_Outline">
+<blockAlignment value="LEFT"/>
+<blockValign value="TOP"/>
+</blockTableStyle>
+<blockTableStyle id="Tableau1">
+<blockAlignment value="LEFT"/>
+<blockValign value="TOP"/>
+</blockTableStyle>
+<blockTableStyle id="Tableau2">
+<blockAlignment value="LEFT"/>
+<blockValign value="TOP"/>
+<lineStyle kind="GRID" colorName="black"/>
+<blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
+<blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
+<blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
+<blockBackground colorName="#e6e6e6" start="3,0" stop="3,0"/>
+<blockBackground colorName="#e6e6e6" start="4,0" stop="4,0"/>
+<blockBackground colorName="#e6e6e6" start="5,0" stop="5,0"/>
+</blockTableStyle>
+<blockTableStyle id="Tableau3">
+<blockAlignment value="LEFT"/>
+<blockValign value="TOP"/>
+</blockTableStyle>
+<blockTableStyle id="Tableau5">
+<blockAlignment value="LEFT"/>
+<blockValign value="TOP"/>
+</blockTableStyle>
+<blockTableStyle id="Tableau6">
+<blockAlignment value="LEFT"/>
+<blockValign value="TOP"/>
+</blockTableStyle>
+<blockTableStyle id="Tableau4">
+<blockAlignment value="LEFT"/>
+<blockValign value="TOP"/>
+</blockTableStyle>
+<initialize>
+<paraStyle name="all" alignment="justify"/>
+</initialize>
+<paraStyle name="P1" fontName="Times-Roman" fontSize="9.0" leading="11"/>
+<paraStyle name="P2" fontName="Times-Roman"/>
+<paraStyle name="P3" fontName="Times-Roman" alignment="LEFT"/>
+<paraStyle name="P4" fontName="Times-Roman" alignment="LEFT"/>
+<paraStyle name="P5" fontName="Times-Bold" fontSize="9.0" leading="11"/>
+<paraStyle name="P6" fontName="Times-Bold" fontSize="9.0" leading="11"/>
+<paraStyle name="P7" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT"/>
+<paraStyle name="P8" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="CENTER"/>
+<paraStyle name="P9" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT"/>
+<paraStyle name="P10" fontName="Times-BoldItalic" fontSize="9.0" leading="11" alignment="LEFT"/>
+<paraStyle name="P11" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="LEFT"/>
+<paraStyle name="P12" fontName="Times-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
+<paraStyle name="P13" fontName="Times-Bold" fontSize="9.0" leading="11"/>
+<paraStyle name="P14" fontName="Times-Roman" fontSize="10.0" leading="13"/>
+<paraStyle name="P15" fontName="Times-Roman" fontSize="10.0" leading="13"/>
+<paraStyle name="P16" fontName="Times-Roman" fontSize="4.0" leading="5"/>
+<paraStyle name="P17" fontName="Times-Roman" fontSize="4.0" leading="5"/>
+<paraStyle name="P18" fontName="Times-Roman" fontSize="11.0" leading="14"/>
+<paraStyle name="P19" fontName="Times-Roman" fontSize="11.0" leading="14"/>
+<paraStyle name="P20" fontName="Times-Roman" fontSize="16.0" leading="20"/>
+<paraStyle name="P21" fontName="Times-BoldItalic" fontSize="6.0" leading="8" alignment="LEFT"/>
+<paraStyle name="P22" fontName="Times-Roman" fontSize="7.0" leading="9"/>
+<paraStyle name="P23" fontName="Times-Roman" fontSize="11.0" leading="14"/>
+<paraStyle name="P24" fontName="Times-Roman" fontSize="7.0" leading="9"/>
+<paraStyle name="P25" fontName="Times-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
+<paraStyle name="P26" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT"/>
+<paraStyle name="P27" fontName="Times-BoldItalic" fontSize="11.0" leading="14"/>
+<paraStyle name="P28" fontName="Times-BoldItalic" fontSize="11.0" leading="14" alignment="CENTER"/>
+<paraStyle name="Standard" fontName="Times-Roman"/>
+<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+<paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+<paraStyle name="Table Contents" fontName="Times-Roman"/>
+<paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+<paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+<paraStyle name="Index" fontName="Times-Roman"/>
+</stylesheet>
+<images/>
+<story>
+<para style="P1">[[ repeatIn(objects,'o') ]] <font face="Times-Roman">[[ setLang(o.partner_id.lang) ]]</font>
+</para>
+<blockTable colWidths="257.0,50.0,220.0" style="Tableau1">
+<tr>
+<td>
+<para style="P5">Shipping address :</para>
+<para style="P14">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+<para style="P14">[[ o.partner_shipping_id.title or '' ]] [[ o.partner_shipping_id.name ]]</para>
+<para style="P14">[[ o.partner_shipping_id.street ]]</para>
+<para style="P14">[[ o.partner_shipping_id.street2 or '' ]]</para>
+<para style="P15">
+<font face="Times-Roman">[[ o.partner_shipping_id.zip or '' ]]</font> [[ o.partner_shipping_id.city or '' ]]</para>
+<para style="P15">[[ o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name or '' ]]</para>
+<para style="P15">[[ o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name or '' ]]</para>
+<para style="P16">
+<font color="white"> </font>
+</para>
+<para style="P6">Invoice address :</para>
+<para style="P15">[[ o.partner_invoice_id.street ]][[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]]</para>
+<para style="P15">[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]] [[ o.partner_invoice_id.country_id and (', %s' % (o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '')) ]]</para>
+</td>
+<td>
+<para style="P18">
+<font color="white"> </font>
+</para>
+</td>
+<td>
+<para style="P19">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+<para style="P19">[[ o.partner_order_id.title or '' ]] [[ o.partner_order_id.name ]]</para>
+<para style="P19">[[ o.partner_order_id.street ]]</para>
+<para style="P19">[[ o.partner_order_id.street2 or '' ]]</para>
+<para style="P19">[[ o.partner_order_id.zip or '' ]] [[ o.partner_order_id.city or '' ]]</para>
+<para style="P19">[[ o.partner_order_id.state_id and o.partner_order_id.state_id.name or '' ]]</para>
+<para style="P19">[[ o.partner_order_id.country_id and o.partner_order_id.country_id.name or '' ]]</para>
+<para style="P17">
+<font color="white"> </font>
+</para>
+<para style="P14">Tel.&#xA0;: [[ o.partner_order_id.phone or removeParentNode('para') ]]</para>
+<para style="P14">Fax&#xA0;: [[ o.partner_order_id.fax or removeParentNode('para') ]]</para>
+<para style="P14">VAT&#xA0;: [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+</td>
+</tr>
+</blockTable>
+<para style="P2">
+<font color="white"> </font>
+</para>
+<para style="P20">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]] Quotation N&#xB0; : [[ o.name ]]</para>
+<para style="P20">[[ o.state=='draft' and removeParentNode('para') ]] Order N&#xB0; : [[ o.name ]]</para>
+<para style="P20">
+<font color="white"> </font>
+</para>
+<para style="P23">Your Order Reference : [[ o.client_order_ref or '' ]]</para>
+<para style="P23">Date Ordered : [[ o.date_order ]]</para>
+<para style="P23">Our salesman : [[ o.user_id.name ]]</para>
+<para style="P2">
+<font color="white"> </font>
+</para>
+<blockTable colWidths="256.0,46.0,56.0,59.0,56.0,54.0" repeatRows="1" style="Tableau2">
+<tr>
+<td>
+<para style="P27">Description</para>
+</td>
+<td>
+<para style="P28">Taxes</para>
+</td>
+<td>
+<para style="P28">Quantity</para>
+</td>
+<td>
+<para style="P28">Unit Price</para>
+</td>
+<td>
+<para style="P28">
+<font face="Times-Roman">Disc. (%)</font>
+</para>
+</td>
+<td>
+<para style="P28">Price</para>
+</td>
+</tr>
+</blockTable>
+<section>
+<para style="P21">[[ repeatIn(o.order_line,'line') ]]</para>
+<blockTable colWidths="256.0,46.0,56.0,59.0,56.0,54.0" style="Tableau3">
+<tr>
+<td>
+<para style="P7">[[ line.name ]]</para>
+</td>
+<td>
+<para style="P8">[[ ', '.join(map(lambda x: x.name, line.tax_id))]]</para>
+</td>
+<td>
+<para style="P9">[[ line.product_uos and line.product_uos_qty or line.product_uom_qty ]] [[ line.product_uos and line.product_uos.name or line.product_uom.name ]]</para>
+</td>
+<td>
+<para style="P9">[[ line.price_unit ]]</para>
+</td>
+<td>
+<para style="P9">[[ (line.discount and str(line.discount)+'%')or '' ]]</para>
+</td>
+<td>
+<para style="P9">[[ line.price_subtotal ]]</para>
+</td>
+</tr>
+</blockTable>
+<blockTable colWidths="52.0,366.0,110.0" style="Tableau5">
+<tr>
+<td>
+<para style="P10">[[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]]</para>
+</td>
+<td>
+<para style="P11">[[ l or removeParentNode('table') ]]</para>
+</td>
+<td>
+<para style="P10">
+<font color="white"> </font>
+</para>
+</td>
+</tr>
+</blockTable>
+</section>
+<blockTable colWidths="348.0,69.0,110.0" style="Tableau6">
+<tr>
+<td>
+<para style="P24">
+<font color="white"> </font>
+</para>
+</td>
+<td>
+<para style="P25">Net Total&#xA0;:</para>
+</td>
+<td>
+<para style="P25">[[ o.amount_untaxed ]] [[ o.pricelist_id.currency_id.name ]]</para>
+</td>
+</tr>
+<tr>
+<td>
+<para style="P24">
+<font color="white"> </font>
+</para>
+</td>
+<td>
+<para style="P25">Taxes&#xA0;:</para>
+</td>
+<td>
+<para style="P25">[[ o.amount_tax ]] [[ o.pricelist_id.currency_id.name ]]</para>
+</td>
+</tr>
+<tr>
+<td>
+<para style="P22">
+<font color="white"> </font>
+</para>
+</td>
+<td>
+<para style="P12">TOTAL&#xA0;:</para>
+</td>
+<td>
+<para style="P12">[[ o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]</para>
+</td>
+</tr>
+</blockTable>
+<para style="P13">
+<font color="white"> </font>
+</para>
+<blockTable colWidths="527.0" style="Tableau4">
+<tr>
+<td>
+<para style="P3">[[ format(o.note or '') ]]</para>
+</td>
+</tr>
+<tr>
+<td>
+<para style="P3">[[ format((o.partner_id.property_payment_term and o.partner_id.property_payment_term.note) or '') ]]</para>
+</td>
+</tr>
+</blockTable>
+<para style="P4">
+<font color="white"> </font>
+</para>
+</story>
+</document>
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index b74d9ef343c..c16224c04c1 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -90,9 +90,9 @@
                                     <notebook>
                                         <page string='Order Line'>
                                             <separator string='Automatic Declaration' colspan='4'/>
+                                            <field name='product_id' on_change='product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, &apos;lang&apos; in context and context[&apos;lang&apos;], True, parent.date_order)' context='partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom' colspan='4' select='1'/>
                                             <field name='product_uom_qty' on_change='product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, &apos;lang&apos; in context and context[&apos;lang&apos;], False, parent.date_order)' context='partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom' select='1'/>
                                             <field name='product_uom' on_change='product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, &apos;lang&apos; in context and context[&apos;lang&apos;], False, parent.date_order)'/>
-                                            <field name='product_id' on_change='product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, &apos;lang&apos; in context and context[&apos;lang&apos;], True, parent.date_order)' context='partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom' colspan='4' select='1'/>
                                             <separator string='Manual Description' colspan='4'/>
                                             <field name='name' colspan='4' select='2'/>
                                             <field name='price_unit' select='2'/>
@@ -129,7 +129,6 @@
                                 </form>
                                 <tree string='Sales order lines'>
                                     <field name='name' colspan='4'/>
-                                    <field name='product_id'/>
                                     <field name='product_uom_qty' string='Qty'/>
                                     <field name='product_uom' string='UoM'/>
                                     <field name='discount'/>