[MERGE]: Merge with lp:openobject-addons

[odoo/odoo.git] / addons / stock / stock_view.xml

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 8f18b89..7c0547a 100644 (file)
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -740,7 +740,7 @@
                     <group>
                         <group>
                             <field name="backorder_id" readonly="1"/>
-                            <field name="invoice_state" string="Invoice Control"/>
+                            <field name="invoice_state" string="Invoice Control" groups="account.group_account_invoice"/>
                             <field name="stock_journal_id" widget="selection" groups="account.group_account_user"/>
                         </group>
                         <group>
@@ -818,7 +818,7 @@
 
                                         <group string="Locations" groups="stock.group_locations">
                                             <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
-                                            <field name="location_dest_id" domain="[('usage','=','internal')]"/>
+                                            <field name="location_dest_id" domain="[('usage','=','internal')]" groups="stock.group_locations"/>
                                         </group>
 
                                         <group groups="stock.group_tracking_lot" string="Traceability">
@@ -848,16 +848,20 @@
                             </field>
                         </page>
                         <page string="Additional info">
-                            <group col="4">
-                                <field name="auto_picking"/>
-                                <field name="date_done"/>
-                                <field name="move_type"/>
-                                <field name="type"/>
-                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <group>
+                                <group>
+                                    <field name="move_type"/>
+                                    <field name="type"/>
+                                    <field name="auto_picking"/>
+                                </group>
+                                <group>
+                                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                    <field name="date_done"/>
+                                </group>
                             </group>
                         </page>
                         <page string="Notes">
-                            <field name="note" placeholder="Quality test ok..."/>
+                            <field name="note" placeholder="Add an internal note..."/>
                         </page>
                     </notebook>
                 </sheet>
@@ -1058,8 +1062,8 @@
                     <field name="origin"/>
                     <field name="date"/>
                     <field name="min_date"/>
-                    <field name="invoice_state"/>
-                    <field name="stock_journal_id" widget="selection"/>
+                    <field name="invoice_state" groups="account.group_account_invoice"/>
+                    <field name="stock_journal_id" widget="selection" groups="account.group_account_user"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -1433,7 +1437,7 @@
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         <field name="location_id" groups="stock.group_locations"/>
                         <field name="location_dest_id" groups="stock.group_locations"/>
-                        <field name="partner_id"/>
+                        <field name="partner_id" groups="stock.group_locations"/>
                         <field name="create_date" groups="base.group_no_one" />
                         <field name="date" groups="base.group_no_one" />
                         <field name="date_expected" on_change="onchange_date(date,date_expected)"/>