[MERGE]:merged from trunk

bzr revid: apa@tinyerp.com-20120629124211-sx17fxv6xdgedd13

diff --cc addons/account/account_invoice_view.xml
index 267eb02,e5a6ed1..dc69b21
--- 1/addons/account/account_invoice_view.xml
--- 2/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@@ -145,12 -145,11 +145,11 @@@
              <field name="type">form</field>
              <field name="priority">2</field>
              <field name="arch" type="xml">
 -                <form version="7.0">
 +               <form string="Draft Invoice" version="7.0">
                  <header>
                      <span groups="base.group_user">
-                         <button name="invoice_open" states="draft" string="Validate" class="oe_highlight"/>
-                         <button name="invoice_open" states="proforma2" string="Validate"/>
-                         <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid'/>
+                         <button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_highlight"/>
+                         <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid' />
                          <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
                          <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                          <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>

diff --cc addons/purchase/purchase_view.xml
index 6e90fa4,61c8684..197f225
--- 1/addons/purchase/purchase_view.xml
--- 2/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@@ -411,43 -406,42 +411,42 @@@
              <field name="priority" eval="20"/>
              <field name="arch" type="xml">
                  <form string="Purchase Order Line" version="7.0">
 -                      <sheet>
 -                          <label for="order_id" class="oe_edit_only"/>
 -                          <h1>
 -                              <field name="order_id" class="oe_inline"/>
 -                              <field name="date_order" class="oe_inline"/>
 -                          </h1>
 -                          <label for="partner_id" class="oe_edit_only"/>
 -                          <h2><field name="partner_id"/></h2>
 -      
 -                          <group>
 -                              <group>
 -                                  <field name="name"/>
 -                                  <field name="product_id" readonly="1"/>
 -                                  <label for="product_qty"/>
 -                                  <div>
 -                                      <field name="product_qty" readonly="1" class="oe_inline"/>
 -                                      <field name="product_uom" readonly="1" groups="product.group_uom" class="oe_inline"/>
 -                                  </div>
 -                                  <field name="price_unit"/>
 -                              </group>
 -                              <group>
 -                                  <field name="date_planned" widget="date"  readonly="1"/>
 -                                  <field name="company_id" groups="base.group_multi_company" widget="selection"/>
 -                                  <field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
 -                                  <field name="taxes_id" widget="many2many_tags"
 -                                      domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
 -                                  <field name="invoiced"/>
 -                              </group>
 -                          </group>
 -                          <separator string="Manual Invoices"/>
 -                          <field name="invoice_lines"/>
 -                          <separator string="Notes"/>
 -                          <field name="notes"/>
 -                          <separator string="Stock Moves"/>
 -                          <field name="move_ids"/>
 -                      </sheet>
 +                    <sheet>
 +                        <label for="order_id" class="oe_edit_only"/>
 +                        <h1>
 +                            <field name="order_id" class="oe_inline"/>
 +                            <label string="," attrs="{'invisible':[('date_order','=',False)]}"/> 
 +                            <field name="date_order" class="oe_inline"/>
 +                        </h1>
 +                        <label for="partner_id" class="oe_edit_only"/>
 +                        <h2><field name="partner_id"/></h2>
-     
 +                        <group>
 +                            <group>
 +                                <field name="name"/>
 +                                <field name="product_id" readonly="1"/>
 +                                <label for="product_qty"/>
 +                                <div>
 +                                    <field name="product_qty" readonly="1" class="oe_inline"/>
 +                                    <field name="product_uom" readonly="1" groups="product.group_uom" class="oe_inline"/>
 +                                </div>
 +                                <field name="price_unit"/>
 +                            </group>
 +                            <group>
 +                                <field name="date_planned" widget="date"  readonly="1"/>
 +                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
 +                                <field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
 +                                <field name="taxes_id" widget="many2many_tags"
 +                                    domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
 +                                <field name="invoiced"/>
 +                            </group>
 +                        </group>
 +                        <separator string="Manual Invoices"/>
 +                        <field name="invoice_lines"/>
 +                        <separator string="Notes"/>
 +                        <field name="notes"/>
 +                        <separator string="Stock Moves"/>
 +                        <field name="move_ids"/>
 +                    </sheet>
                  </form>
              </field>
          </record>

diff --cc addons/purchase_requisition/purchase_requisition_view.xml
Simple merge

diff --cc addons/stock/stock_view.xml
Simple merge