[MERGE] sale order & stock improvements

bzr revid: fp@tinyerp.com-20120918172145-lr3vtmm06j7virse

diff --cc addons/sale/sale.py
Simple merge

diff --cc addons/sale/sale_view.xml
index 651454e,3733006..5c2320a
--- 1/addons/sale/sale_view.xml
--- 2/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@@ -163,7 -163,7 +163,7 @@@
                              <button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
                              <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object"/>
                              <button name="action_view_invoice" string="View Invoice" type="object" class="oe_highlight"
-                               attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>
 -                              attrs="{'invisible': ['|', '|', '|', ('state', 'not in',('progress','manual')), ('invoiced', '=', True), ('invoice_exists', '=', False), ('order_policy','=','picking')]}"/>
++                              attrs="{'invisible': [('invoice_exists', '=', False)]}"/>
                              <button name="action_view_delivery" string="View Delivery Order" type="object" class="oe_highlight"
                                attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
                              <button name="%(action_view_sale_advance_payment_inv)d" string="Create Invoice"
@@@ -320,6 -320,7 +320,7 @@@
                                  <group>
                                      <field name="invoiced"/>
                                      <field name="shipped"/>
 -                                    <field name="invoice_exists"/>
++                                    <field name="invoice_exists" invisible="1"/>
                                  </group>
                              </group>
                          </page>

diff --cc addons/stock/stock_view.xml
index de4913d,2630f9f..83fed18
--- 1/addons/stock/stock_view.xml
--- 2/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@@ -910,10 -1008,7 +910,10 @@@
                          <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
                      </xpath>
                      <xpath expr="//field[@name='partner_id']" position="replace">
--                        <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Customer"/>
++                        <field name="partner_id" on_change="onchange_partner_in(partner_id)"  string="Customer"/>
 +                    </xpath>
 +                    <xpath expr="//field[@name='move_lines']" position="replace">
 +                        <field name="move_lines" context="{'address_in_id': partner_id, 'picking_type': 'out', 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>
                      </xpath>
                      <xpath expr="/form/sheet" position="after">
                          <div class="oe_chatter">
@@@ -1036,10 -1131,7 +1036,10 @@@
                          <button name="action_process" states="assigned" string="Receive" type="object" class="oe_highlight"/>
                      </xpath>
                      <xpath expr="//field[@name='partner_id']" position="replace">
--                        <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Supplier"/>
++                        <field name="partner_id" on_change="onchange_partner_in(partner_id)"  string="Supplier"/>
 +                    </xpath>
 +                    <xpath expr="//field[@name='move_lines']" position="replace">
 +                        <field name="move_lines" context="{'address_in_id': partner_id, 'picking_type': 'in', 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>
                      </xpath>
                      <xpath expr="/form/sheet" position="after">
                          <div class="oe_chatter">