[MERGE] from master

[odoo/odoo.git] / addons / point_of_sale / point_of_sale_view.xml

diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index d1edbdf..8e6ea1d 100644 (file)
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -553,7 +553,7 @@
             <field name="model">product.template</field>
             <field name="inherit_id" ref="product.product_template_only_form_view"/>
             <field name="arch" type="xml">
-                <field name="ean13" position="after">
+                <field name="barcode" position="after">
                     <button colspan="2" name="%(action_edit_ean)d" type="action" string="Set a Custom EAN"
                             attrs="{'invisible': [('product_variant_count', '>', 1)]}" class="oe_link oe_edit_only"/>
                 </field>
@@ -564,11 +564,23 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <field name="ean13" position="after">
+                <field name="barcode" position="after">
                     <button colspan="2" name="%(action_edit_ean)d" type="action" string="Set a Custom EAN" class="oe_link oe_edit_only"/>
                 </field>
             </field>
         </record>
+
+        <record id="product_template_tree_view" model="ir.ui.view">
+            <field name="name">product.template.tree.inherit</field>
+            <field name="model">product.template</field>
+            <field name="inherit_id" ref="product.product_template_tree_view"/>
+            <field name="arch" type="xml">
+                <field name="name" position="before">
+                    <field name="sequence" widget="handle" />
+                </field>
+            </field>
+        </record>
+
         <!-- END -->
 
         <menuitem name="Configuration" parent="menu_point_root"
@@ -669,6 +681,7 @@
                             <field name="pricelist_id" groups="product.group_sale_pricelist"/>
                             <field name="journal_id" widget="selection"/>
                             <field name="group_by" groups="account.group_account_user"/>
+                            <field name="barcode_nomenclature_id" />
                             <field name="sequence_id" readonly="1" groups="base.group_no_one"/>
                             <field name="currency_id" invisible="1"/>
                         </group>
@@ -685,50 +698,25 @@
                             <group>
                                 <field name="iface_vkeyboard" />
                                 <field name="iface_invoicing" />
+                                <field name="iface_precompute_cash" />
                             </group>
                             <group>
                                 <field name="iface_fullscreen" />
                                 <field name="iface_big_scrollbars" />
+                                <field name="iface_print_auto" />
+                                <field name="iface_tax_included" />
                             </group>
                         </group>
-                        <group string="Hardware Proxy" >
+                        <group string="Hardware Proxy / PosBox" >
                             <field name="proxy_ip" />
-                            <field name="iface_print_via_proxy" />
-                            <field name="iface_scan_via_proxy" />
+                            <field name="iface_print_via_proxy" string="Receipt Printer"/>
+                            <field name="iface_scan_via_proxy" string="Barcode Scanner"/>
                             <field name="iface_electronic_scale" />
                             <field name="iface_cashdrawer" />
                         </group>
                         <group string="Receipt" >
-                            <field name="receipt_header" placeholder="A custom receipt header message"/>
-                            <field name="receipt_footer" placeholder="A custom receipt header footage"/>
-                        </group>
-                        <group string="Barcode Types" col="1">
-                            <p>
-                                Barcode Patterns allow to match barcodes to actions or to embed information such as price and quantity in the barcode.
-                                Barcode Patterns only work with EAN13 barcodes.
-                            </p>
-                            <p> 
-                                Each type of barcode accepts a list of patterns seprated by commas. A scanned 
-                                barcode will be attributed to a type if it matches one of its patterns. 
-                                The patterns take the form of EAN13 barcodes. Numbers in the pattern must match
-                                the number in the scanned barcode. A 'x' or a '*' in a pattern will match
-                                any one number. If the patterns are shorter than EAN13 barcodes, they are assumed
-                                to be prefixes and match at the beginning. Weight, Price and Discount patterns also
-                                tell how the weight, price or discount is encoded in the barcode. 'N' indicate the
-                                positions where the integer part is en encoded, and 'D' where the decimals are encoded.
-                                If multiple pattern match one barcode, the longest pattern with the less 'x' or '*' is
-                                considered the matching one. If a barcode matches no pattern it will not be found in
-                                the POS.
-                            </p>
-                            <group col="4">
-
-                                <field name="barcode_product" />
-                                <field name="barcode_cashier" />
-                                <field name="barcode_customer" />
-                                <field name="barcode_weight" />
-                                <field name="barcode_discount" />
-                                <field name="barcode_price" />
-                            </group>
+                            <field name="receipt_header" string="Header" placeholder="A custom receipt header message"/>
+                            <field name="receipt_footer" string="Footer" placeholder="A custom receipt header footage"/>
                         </group>
                     </sheet>
 
@@ -1021,7 +1009,9 @@
             </field>
         </record>
 
-
+        <!-- Barcode Nomenclatures -->
+        <menuitem parent="menu_point_config_product" action="barcodes.action_barcode_nomenclature_form" id="menu_pos_barcode_nomenclature_all"
+            sequence="30"/>
     </data>
 </openerp>