[MERGE] from master

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

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 5863200..7072a26 100644 (file)
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -40,8 +40,8 @@
             parent="menu_product_in_config_stock" sequence="5" groups="product.group_uom"/>
         <menuitem
             action="product.product_uom_form_action" id="menu_stock_uom_form_action"
-            parent="menu_product_in_config_stock" sequence="4" groups="product.group_uom"/>
-
+            parent="menu_stock_configuration" sequence="35" groups="product.group_uom"/>
+        
         <record id="stock_inventory_line_tree" model="ir.ui.view">
             <field name="name">stock.inventory.line.tree</field>
             <field name="model">stock.inventory.line</field>
@@ -338,29 +338,23 @@
                     <h2><field name="location_id"/></h2>
 
                     <group>
-                        <div>
-                            <group string="Additional Information">
-                                <field name="usage"/>
-                                <field name="partner_id"/>
-                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                <field name="scrap_location"/>
-                                <field name="active"/>
-                            </group>
-                        </div>
-                        <div>
-                            <group string="Localization" name="localization">
-                                <field name="posx"/>
-                                <field name="posy"/>
-                                <field name="posz"/>
-                                <field name="loc_barcode"/>
-                            </group>
-                        </div>
-                        <div>
-                            <group string="Logistics" groups="stock.group_adv_location">
-                                <field name="removal_strategy_id" options="{'no_create': True}"/>
-                                <field name="putaway_strategy_id"/>
-                            </group>
-                        </div>
+                        <group string="Additional Information">
+                            <field name="usage"/>
+                            <field name="partner_id"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <field name="scrap_location"/>
+                            <field name="active"/>
+                        </group>
+                        <group string="Localization" name="localization">
+                            <field name="posx"/>
+                            <field name="posy"/>
+                            <field name="posz"/>
+                            <field name="barcode"/>
+                        </group>
+                        <group string="Logistics" groups="stock.group_adv_location">
+                            <field name="removal_strategy_id" options="{'no_create': True}"/>
+                            <field name="putaway_strategy_id"/>
+                        </group>
                     </group>
                     <field name="comment" placeholder="External note..."/>
                 </form>
@@ -390,6 +384,7 @@
                 <tree string="Stock Location" colors="blue:usage=='view';darkred:usage=='internal'">
                     <field name="complete_name"/>
                     <field name="usage"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
@@ -1360,9 +1355,9 @@
                         <t t-name="kanban-box">
                             <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_stock_picking_type">
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="stock.group_stock_manager">
-                                    <span class="oe_e">í</span>
+                                    <span class="oe_e">i</span>
                                     <ul class="oe_dropdown_menu">
-                                        <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                        <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit Warehouse</a></li></t>
                                         <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                         <t t-if="widget.view.is_action_enabled('edit')"><li><ul class="oe_kanban_colorpicker" data-field="color"/></li></t>
                                     </ul>
@@ -1938,6 +1933,10 @@
                 </xpath>
             </field>
         </record>
-        
+
+        <!-- Barcode Nomenclatures -->
+        <menuitem parent="menu_stock_configuration" action="barcodes.action_barcode_nomenclature_form" id="menu_wms_barcode_nomenclature_all"
+            sequence="50"/>
+       
     </data>
 </openerp>