From 1a46f397055d93dff58b998a9d2a5a860370a597 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis.delattre@akretion.com>
Date: Tue, 25 Oct 2016 12:42:05 +0200
Subject: [PATCH] Port mrp_usability and pos_usability to v10

---
 mrp_usability/__manifest__.py | 33 ++++++--------------
 mrp_usability/mrp.py          | 28 ++++-------------
 mrp_usability/mrp_view.xml    | 47 +++++++++++++++++++---------
 pos_usability/__manifest__.py | 29 +++---------------
 pos_usability/pos_view.xml    | 58 +++++++++++++++++++++++++----------
 5 files changed, 95 insertions(+), 100 deletions(-)

diff --git a/mrp_usability/__manifest__.py b/mrp_usability/__manifest__.py
index 7d84fc8..2d42352 100644
--- a/mrp_usability/__manifest__.py
+++ b/mrp_usability/__manifest__.py
@@ -1,24 +1,7 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    MRP Usability module for Odoo
-#    Copyright (C) 2015 Akretion (http://www.akretion.com)
-#    @author Alexis de Lattre <alexis.delattre@akretion.com>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
+# -*- coding: utf-8 -*-
+# © 2015-2016 Akretion (http://www.akretion.com)
+# @author Alexis de Lattre <alexis.delattre@akretion.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 
 {
@@ -35,7 +18,11 @@ Small usability improvements on MRP:
 
 * order by id desc
 
-* show date start and date finished on production order form view
+* show field date_start and date_finished on mrp.production form view
+
+* show more fields on stock move form
+
+* show bom type in tree view + add group by
 
 This module has been written by Alexis de Lattre from Akretion <alexis.delattre@akretion.com>.
     """,
@@ -43,5 +30,5 @@ This module has been written by Alexis de Lattre from Akretion <alexis.delattre@
     'website': 'http://www.akretion.com',
     'depends': ['mrp'],
     'data': ['mrp_view.xml'],
-    'installable': False,
+    'installable': True,
 }
diff --git a/mrp_usability/mrp.py b/mrp_usability/mrp.py
index 1291653..a1d6f89 100644
--- a/mrp_usability/mrp.py
+++ b/mrp_usability/mrp.py
@@ -1,26 +1,10 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    MRP Usability module for Odoo
-#    Copyright (C) 2015 Akretion (http://www.akretion.com)
-#    @author Alexis de Lattre <alexis.delattre@akretion.com>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
+# -*- coding: utf-8 -*-
+# © 2015-2016 Akretion (http://www.akretion.com)
+# @author Alexis de Lattre <alexis.delattre@akretion.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from openerp import models
+
+from odoo import models
 
 
 class MrpProduction(models.Model):
diff --git a/mrp_usability/mrp_view.xml b/mrp_usability/mrp_view.xml
index 083c4e4..1763338 100644
--- a/mrp_usability/mrp_view.xml
+++ b/mrp_usability/mrp_view.xml
@@ -1,30 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-   Copyright (C) 2016 Akretion (http://www.akretion.com/)
-   @author: Alexis de Lattre <alexis.delattre@akretion.com>
-   The licence is in the file __openerp__.py
+  © 2016 Akretion (http://www.akretion.com/)
+  @author: Alexis de Lattre <alexis.delattre@akretion.com>
+  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
 
-<openerp>
-<data>
+<odoo>
+
 
 <record id="mrp_production_form_view" model="ir.ui.view">
     <field name="name">usability.mrp.production.form</field>
     <field name="model">mrp.production</field>
     <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
     <field name="arch" type="xml">
-        <field name="date_start" position="attributes">
-            <attribute name="invisible">0</attribute>
-        </field>
-        <field name="date_finished" position="attributes">
-            <attribute name="invisible">0</attribute>
+        <field name="availability" position="after">
+            <field name="date_start"/>
+            <field name="date_finished"/>
         </field>
     </field>
 </record>
 
-
 <record id="view_move_form" model="ir.ui.view">
-    <field name="name">stock.usability.stock.move.form</field>
+    <field name="name">mrp.usability.stock.move.form</field>
     <field name="model">stock.move</field>
     <field name="inherit_id" ref="stock.view_move_form" />
     <field name="arch" type="xml">
@@ -35,5 +32,27 @@
     </field>
 </record>
 
-</data>
-</openerp>
+<record id="mrp_bom_tree_view" model="ir.ui.view">
+    <field name="name">mrp_usability.bom.tree</field>
+    <field name="model">mrp.bom</field>
+    <field name="inherit_id" ref="mrp.mrp_bom_tree_view"/>
+    <field name="arch" type="xml">
+        <field name="routing_id" position="after">
+            <field name="type"/>
+        </field>
+    </field>
+</record>
+
+<record id="view_mrp_bom_filter" model="ir.ui.view">
+    <field name="name">mrp_usability.bom.search</field>
+    <field name="model">mrp.bom</field>
+    <field name="inherit_id" ref="mrp.view_mrp_bom_filter"/>
+    <field name="arch" type="xml">
+        <group expand="0" position="inside">
+            <filter string="Type" context="{'group_by': 'type'}" name="type_groupby"/>
+        </group>
+    </field>
+</record>
+
+
+</odoo>
diff --git a/pos_usability/__manifest__.py b/pos_usability/__manifest__.py
index 3cfabdc..c49e067 100644
--- a/pos_usability/__manifest__.py
+++ b/pos_usability/__manifest__.py
@@ -1,25 +1,6 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    POS Usability module for Odoo
-#    Copyright (C) 2014-2015 Akretion (http://www.akretion.com)
-#    @author Alexis de Lattre <alexis.delattre@akretion.com>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
+# © 2014-2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
     'name': 'Point of Sale Usability',
@@ -31,9 +12,7 @@
 Point of Sale Usability
 =======================
 
-Small usability enhancements in POS:
-
-* Add a filter *Available in POS* in Product search view
+Minor usability enhancements in POS:
 
 This module has been written by Alexis de Lattre from Akretion <alexis.delattre@akretion.com>.
     """,
@@ -41,5 +20,5 @@ This module has been written by Alexis de Lattre from Akretion <alexis.delattre@
     'website': 'http://www.akretion.com',
     'depends': ['point_of_sale'],
     'data': ['pos_view.xml'],
-    'installable': False,
+    'installable': True,
 }
diff --git a/pos_usability/pos_view.xml b/pos_usability/pos_view.xml
index d5e53c2..cad6a6d 100644
--- a/pos_usability/pos_view.xml
+++ b/pos_usability/pos_view.xml
@@ -1,27 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-    Copyright (C) 2015 Akretion (http://www.akretion.com/)
-    @author Alexis de Lattre <alexis.delattre@akretion.com>
-    The licence is in the file __openerp__.py
+  © 2015-2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
+  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
 
-<openerp>
-<data>
+<odoo>
 
 
-<record id="product_template_search_view" model="ir.ui.view">
-    <field name="name">pos_usability.product.template.search</field>
-    <field name="model">product.template</field>
-    <field name="inherit_id" ref="product.product_template_search_view"/>
-    <field name="arch" type="xml">
-        <filter name="filter_to_sell" position="after">
-            <filter name="available_in_pos" string="Available in the Point of Sale"
-                domain="[('available_in_pos', '=', 1)]"/>
-        </filter>
+<record id="view_pos_config_tree" model="ir.ui.view">
+    <field name="name">usability.pos.config.tree</field>
+    <field name="model">pos.config</field>
+    <field name="inherit_id" ref="point_of_sale.view_pos_config_tree"/>
+    <field name="arch"  type="xml">
+        <field name="name" position="after">
+            <field name="company_id" groups="base.group_multi_company"/>
+        </field>
     </field>
 </record>
 
 
-</data>
-</openerp>
+<record id="view_pos_session_form" model="ir.ui.view">
+    <field name="name">usability.pos.session.form</field>
+    <field name="model">pos.session</field>
+    <field name="inherit_id" ref="point_of_sale.view_pos_session_form"/>
+    <field name="arch"  type="xml">
+        <xpath expr="//field[@name='statement_ids']/tree/field[@name='total_entry_encoding']" position="attributes">
+            <attribute name="sum">Total Transactions</attribute>
+        </xpath>
+        <xpath expr="//field[@name='statement_ids']/tree/field[@name='balance_end_real']" position="attributes">
+            <attribute name="sum">Total Balance Finale</attribute>
+        </xpath>
+    </field>
+</record>
+
+<!-- put option "available in POS" at the top of product form view -->
+<record id="product_template_form_view" model="ir.ui.view">
+    <field name="name">usability.pos.product.template</field>
+    <field name="model">product.template</field>
+    <field name="inherit_id" ref="point_of_sale.product_template_form_view"/>
+    <field name="arch" type="xml">
+        <xpath expr="//group[@name='pos']/field[@name='available_in_pos']" position="replace"/>
+        <xpath expr="//div[@name='options']" position="inside">
+            <div name="available_in_pos">
+                <field name="available_in_pos"/>
+                <label for="available_in_pos"/>
+            </div>
+        </xpath>
+    </field>
+</record>
+
+</odoo>