[MERGE] Merged with main addons.

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

diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 713dbe1..516af4f 100644 (file)
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -61,8 +61,8 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <field name="standard_price" position="replace" version="7.0">
-                    <label string="Cost Price" for="standard_price" align="1.0"/>
-                    <div>
+                    <label string="Cost Price" for="standard_price" align="1.0" groups="base.group_user"/>
+                    <div groups="base.group_user">
                         <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/>
                         <button name="%(action_view_change_standard_price)d" string="Update"
                             type="action" icon="gtk-execute" attrs="{'invisible':[('cost_method','&lt;&gt;','average')]}"/>
@@ -106,12 +106,12 @@
                     <group string="Stock and Expected Variations">
                         <field name="qty_available"/>
                         <field name="incoming_qty"/>
-                        <label for="virtual_available" />
+                        <label for="virtual_available"/>
                         <div>
-                            <field name="virtual_available" class="oe_inline" />
+                            <field name="virtual_available" class="oe_inline"/>
 
                             <button name="%(action_view_change_product_quantity)d" string="Update" attrs="{'invisible': [('type', '=', 'service')]}"
-                                type="action" icon="gtk-execute" groups="stock.group_stock_manager,stock.group_stock_user" class="oe_inline" />
+                                type="action" icon="gtk-execute" groups="stock.group_stock_manager,stock.group_stock_user" class="oe_inline"/>
                         </div>
                         <field name="outgoing_qty"/>
                     </group>
@@ -175,14 +175,17 @@
                                         <li t-if="record.type.raw_value != 'service'">Stock on hand: <field name="qty_available"/> <field name="uom_id"/></li>
                                         <li t-if="record.type.raw_value != 'service'">Stock available: <field name="virtual_available"/> <field name="uom_id"/></li>
                                         <li>Price: <field name="lst_price"></field></li>
-                                        <li>Cost: <field name="standard_price"></field></li>
+                                        <!-- TODO the 'groups' attribute doesn't work in kanban views -->
+                                        <li groups="base.group_user">Cost: <field name="standard_price"></field></li>
                                     </ul>
-                                    <a name="%(action_receive_move)d" type="action">
-                                        <t t-if="record.reception_count.value">Receptions(<t t-esc="record.reception_count.value"/>)</t>
-                                    </a>
-                                    <a name="%(action_deliver_move)d" type="action">
-                                        <t t-if="record.delivery_count.value">Deliveries(<t t-esc="record.delivery_count.value"/>)</t>
-                                    </a>
+                                    <div groups="base.group_user">
+                                        <a name="%(action_receive_move)d" type="action">
+                                            <t t-if="record.reception_count.value">Receptions(<t t-esc="record.reception_count.value"/>)</t>
+                                        </a>
+                                        <a name="%(action_deliver_move)d" type="action">
+                                            <t t-if="record.delivery_count.value">Deliveries(<t t-esc="record.delivery_count.value"/>)</t>
+                                        </a>
+                                    </div>
                                 </div>
                             </div>
                             <script>