[MERGE] merge with trunk

[odoo/odoo.git] / addons / sale / sale_view.xml

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 9b879d4..4a12e1d 100644 (file)
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -14,6 +14,7 @@
                 <form string="Sale Shop">
                     <field name="name" select="1"/>
                     <field name="warehouse_id" required="1" select="1" widget="selection"/>
+                    <field name="company_id" widget='selection'/>
                     <separator colspan="4" string="Accounting"/>
                     <field name="payment_default_id"/>
                     <field domain="[('type','=','sale')]" name="pricelist_id" select="1"/>
@@ -97,7 +98,7 @@
            view_mode="form"
            target="new"
            key2="client_action_multi"
-           id="action_view_sale_advance_payment_inv"/> 
+           id="action_view_sale_advance_payment_inv"/>
 
 
         <record id="view_order_form" model="ir.ui.view">
@@ -114,7 +115,7 @@
                         <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="base.group_extended"/>
                         <field name="invoiced"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook colspan="5">
                         <page string="Sale Order">
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" required="1"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_order_id"/>