From e869ed9d3c17234d0e2a9161f95bfd6c8388960f Mon Sep 17 00:00:00 2001
From: "robin.keunen" <robin@keunen.net>
Date: Tue, 19 Feb 2019 11:52:58 +0100
Subject: [PATCH 01/47] [ADD] pos_container: init module

---
 pos_container/__init__.py                  |  2 +
 pos_container/__manifest__.py              | 29 +++++++++++
 pos_container/demo/demo.xml                | 30 +++++++++++
 pos_container/models/__init__.py           |  3 ++
 pos_container/models/models.py             | 17 ++++++
 pos_container/security/ir.model.access.csv |  2 +
 pos_container/views/templates.xml          | 22 ++++++++
 pos_container/views/views.xml              | 60 ++++++++++++++++++++++
 8 files changed, 165 insertions(+)
 create mode 100644 pos_container/__init__.py
 create mode 100644 pos_container/__manifest__.py
 create mode 100644 pos_container/demo/demo.xml
 create mode 100644 pos_container/models/__init__.py
 create mode 100644 pos_container/models/models.py
 create mode 100644 pos_container/security/ir.model.access.csv
 create mode 100644 pos_container/views/templates.xml
 create mode 100644 pos_container/views/views.xml

diff --git a/pos_container/__init__.py b/pos_container/__init__.py
new file mode 100644
index 0000000000..a3326d8405
--- /dev/null
+++ b/pos_container/__init__.py
@@ -0,0 +1,2 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from . import models
\ No newline at end of file
diff --git a/pos_container/__manifest__.py b/pos_container/__manifest__.py
new file mode 100644
index 0000000000..97ed19fd38
--- /dev/null
+++ b/pos_container/__manifest__.py
@@ -0,0 +1,29 @@
+# Copyright 2019 Coop IT Easy SCRLfs
+# 	    Robin Keunen <robin@coopiteasy.be>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).{
+{
+    'name': "POS Container",
+    'version': '12.0.1.0.0',
+
+    'summary': """
+        Allows managing pre-weighted containers for bulk shop""",
+
+    "author": "Coop IT Easy SCRLfs, "
+              "Odoo Community Association (OCA)",
+    'website': "https://odoo-community.org/",
+
+    'category': 'Point of Sale',
+
+    'depends': ['point_of_sale'],
+
+    'data': [
+        # 'security/ir.model.access.csv',
+        # 'views/views.xml',
+        # 'views/templates.xml',
+    ],
+    # only loaded in demonstration mode
+    'demo': [
+        # 'demo/demo.xml',
+    ],
+    'installable': True,
+}
diff --git a/pos_container/demo/demo.xml b/pos_container/demo/demo.xml
new file mode 100644
index 0000000000..aec42696c5
--- /dev/null
+++ b/pos_container/demo/demo.xml
@@ -0,0 +1,30 @@
+<odoo>
+    <data>
+        <!--  -->
+        <!--   <record id="object0" model="pos_container.pos_container"> -->
+        <!--     <field name="name">Object 0</field> -->
+        <!--     <field name="value">0</field> -->
+        <!--   </record> -->
+        <!--  -->
+        <!--   <record id="object1" model="pos_container.pos_container"> -->
+        <!--     <field name="name">Object 1</field> -->
+        <!--     <field name="value">10</field> -->
+        <!--   </record> -->
+        <!--  -->
+        <!--   <record id="object2" model="pos_container.pos_container"> -->
+        <!--     <field name="name">Object 2</field> -->
+        <!--     <field name="value">20</field> -->
+        <!--   </record> -->
+        <!--  -->
+        <!--   <record id="object3" model="pos_container.pos_container"> -->
+        <!--     <field name="name">Object 3</field> -->
+        <!--     <field name="value">30</field> -->
+        <!--   </record> -->
+        <!--  -->
+        <!--   <record id="object4" model="pos_container.pos_container"> -->
+        <!--     <field name="name">Object 4</field> -->
+        <!--     <field name="value">40</field> -->
+        <!--   </record> -->
+        <!--  -->
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/pos_container/models/__init__.py b/pos_container/models/__init__.py
new file mode 100644
index 0000000000..e2ee4b899d
--- /dev/null
+++ b/pos_container/models/__init__.py
@@ -0,0 +1,3 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
\ No newline at end of file
diff --git a/pos_container/models/models.py b/pos_container/models/models.py
new file mode 100644
index 0000000000..359167779f
--- /dev/null
+++ b/pos_container/models/models.py
@@ -0,0 +1,17 @@
+# Copyright 2019 Coop IT Easy SCRLfs
+# 	    Robin Keunen <robin@coopiteasy.be>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import models, fields, api
+
+# class pos_container(models.Model):
+#     _name = 'pos_container.pos_container'
+
+#     name = fields.Char()
+#     value = fields.Integer()
+#     value2 = fields.Float(compute="_value_pc", store=True)
+#     description = fields.Text()
+#
+#     @api.depends('value')
+#     def _value_pc(self):
+#         self.value2 = float(self.value) / 100
\ No newline at end of file
diff --git a/pos_container/security/ir.model.access.csv b/pos_container/security/ir.model.access.csv
new file mode 100644
index 0000000000..ba69636bc1
--- /dev/null
+++ b/pos_container/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_pos_container_pos_container,pos_container.pos_container,model_pos_container_pos_container,,1,0,0,0
\ No newline at end of file
diff --git a/pos_container/views/templates.xml b/pos_container/views/templates.xml
new file mode 100644
index 0000000000..ba61acd8c9
--- /dev/null
+++ b/pos_container/views/templates.xml
@@ -0,0 +1,22 @@
+<odoo>
+    <data>
+        <!-- <template id="listing"> -->
+        <!--   <ul> -->
+        <!--     <li t-foreach="objects" t-as="object"> -->
+        <!--       <a t-attf-href="#{ root }/objects/#{ object.id }"> -->
+        <!--         <t t-esc="object.display_name"/> -->
+        <!--       </a> -->
+        <!--     </li> -->
+        <!--   </ul> -->
+        <!-- </template> -->
+        <!-- <template id="object"> -->
+        <!--   <h1><t t-esc="object.display_name"/></h1> -->
+        <!--   <dl> -->
+        <!--     <t t-foreach="object._fields" t-as="field"> -->
+        <!--       <dt><t t-esc="field"/></dt> -->
+        <!--       <dd><t t-esc="object[field]"/></dd> -->
+        <!--     </t> -->
+        <!--   </dl> -->
+        <!-- </template> -->
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/pos_container/views/views.xml b/pos_container/views/views.xml
new file mode 100644
index 0000000000..cd873a0644
--- /dev/null
+++ b/pos_container/views/views.xml
@@ -0,0 +1,60 @@
+<odoo>
+  <data>
+    <!-- explicit list view definition -->
+    <!--
+    <record model="ir.ui.view" id="pos_container.list">
+      <field name="name">pos_container list</field>
+      <field name="model">pos_container.pos_container</field>
+      <field name="arch" type="xml">
+        <tree>
+          <field name="name"/>
+          <field name="value"/>
+          <field name="value2"/>
+        </tree>
+      </field>
+    </record>
+    -->
+
+    <!-- actions opening views on models -->
+    <!--
+    <record model="ir.actions.act_window" id="pos_container.action_window">
+      <field name="name">pos_container window</field>
+      <field name="res_model">pos_container.pos_container</field>
+      <field name="view_mode">tree,form</field>
+    </record>
+    -->
+
+    <!-- server action to the one above -->
+    <!--
+    <record model="ir.actions.server" id="pos_container.action_server">
+      <field name="name">pos_container server</field>
+      <field name="model_id" ref="model_pos_container_pos_container"/>
+      <field name="state">code</field>
+      <field name="code">
+        action = {
+          "type": "ir.actions.act_window",
+          "view_mode": "tree,form",
+          "res_model": self._name,
+        }
+      </field>
+    </record>
+    -->
+
+    <!-- Top menu item -->
+    <!--
+    <menuitem name="pos_container" id="pos_container.menu_root"/>
+    -->
+    <!-- menu categories -->
+    <!--
+    <menuitem name="Menu 1" id="pos_container.menu_1" parent="pos_container.menu_root"/>
+    <menuitem name="Menu 2" id="pos_container.menu_2" parent="pos_container.menu_root"/>
+    -->
+    <!-- actions -->
+    <!--
+    <menuitem name="List" id="pos_container.menu_1_list" parent="pos_container.menu_1"
+              action="pos_container.action_window"/>
+    <menuitem name="Server to list" id="pos_container" parent="pos_container.menu_2"
+              action="pos_container.action_server"/>
+    -->
+  </data>
+</odoo>
\ No newline at end of file

From 8fca805fdbb97d4620cbc57c3392d9f60a1d1f86 Mon Sep 17 00:00:00 2001
From: "robin.keunen" <robin@keunen.net>
Date: Tue, 19 Feb 2019 15:09:30 +0100
Subject: [PATCH 02/47] [ADD] pos_container: container model, view and menu

---
 pos_container/__manifest__.py              |  8 ++-
 pos_container/demo/demo.xml                | 47 ++++++++---------
 pos_container/models/__init__.py           |  2 +-
 pos_container/models/container.py          | 35 +++++++++++++
 pos_container/models/models.py             | 17 ------
 pos_container/security/ir.model.access.csv |  3 +-
 pos_container/views/container.xml          | 45 ++++++++++++++++
 pos_container/views/templates.xml          | 22 --------
 pos_container/views/views.xml              | 60 ----------------------
 9 files changed, 106 insertions(+), 133 deletions(-)
 create mode 100644 pos_container/models/container.py
 delete mode 100644 pos_container/models/models.py
 create mode 100644 pos_container/views/container.xml
 delete mode 100644 pos_container/views/templates.xml
 delete mode 100644 pos_container/views/views.xml

diff --git a/pos_container/__manifest__.py b/pos_container/__manifest__.py
index 97ed19fd38..3b4aa1e378 100644
--- a/pos_container/__manifest__.py
+++ b/pos_container/__manifest__.py
@@ -17,13 +17,11 @@
     'depends': ['point_of_sale'],
 
     'data': [
-        # 'security/ir.model.access.csv',
-        # 'views/views.xml',
-        # 'views/templates.xml',
+        'views/container.xml',
+        'security/ir.model.access.csv',
     ],
-    # only loaded in demonstration mode
     'demo': [
-        # 'demo/demo.xml',
+        'demo/demo.xml',
     ],
     'installable': True,
 }
diff --git a/pos_container/demo/demo.xml b/pos_container/demo/demo.xml
index aec42696c5..489f162514 100644
--- a/pos_container/demo/demo.xml
+++ b/pos_container/demo/demo.xml
@@ -1,30 +1,23 @@
 <odoo>
     <data>
-        <!--  -->
-        <!--   <record id="object0" model="pos_container.pos_container"> -->
-        <!--     <field name="name">Object 0</field> -->
-        <!--     <field name="value">0</field> -->
-        <!--   </record> -->
-        <!--  -->
-        <!--   <record id="object1" model="pos_container.pos_container"> -->
-        <!--     <field name="name">Object 1</field> -->
-        <!--     <field name="value">10</field> -->
-        <!--   </record> -->
-        <!--  -->
-        <!--   <record id="object2" model="pos_container.pos_container"> -->
-        <!--     <field name="name">Object 2</field> -->
-        <!--     <field name="value">20</field> -->
-        <!--   </record> -->
-        <!--  -->
-        <!--   <record id="object3" model="pos_container.pos_container"> -->
-        <!--     <field name="name">Object 3</field> -->
-        <!--     <field name="value">30</field> -->
-        <!--   </record> -->
-        <!--  -->
-        <!--   <record id="object4" model="pos_container.pos_container"> -->
-        <!--     <field name="name">Object 4</field> -->
-        <!--     <field name="value">40</field> -->
-        <!--   </record> -->
-        <!--  -->
+
+           <record id="container_1" model="pos.container">
+             <field name="name">Container 1</field>
+             <field name="ean13">4987654567897</field>
+             <field name="weight">123</field>
+           </record>
+
+           <record id="container_2" model="pos.container">
+             <field name="name">Container 2</field>
+             <field name="ean13">4909876543567</field>
+             <field name="weight">234</field>
+           </record>
+
+           <record id="container_3" model="pos.container">
+             <field name="name">Container 3</field>
+             <field name="ean13">4909876543987</field>
+             <field name="weight">23.4</field>
+           </record>
+
     </data>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/pos_container/models/__init__.py b/pos_container/models/__init__.py
index e2ee4b899d..14f8196051 100644
--- a/pos_container/models/__init__.py
+++ b/pos_container/models/__init__.py
@@ -1,3 +1,3 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from . import models
\ No newline at end of file
+from . import container
diff --git a/pos_container/models/container.py b/pos_container/models/container.py
new file mode 100644
index 0000000000..36abbd218a
--- /dev/null
+++ b/pos_container/models/container.py
@@ -0,0 +1,35 @@
+# Copyright 2019 Coop IT Easy SCRLfs
+# 	    Robin Keunen <robin@coopiteasy.be>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import models, fields, api
+from odoo.exceptions import ValidationError
+
+
+class Container(models.Model):
+    _name = 'pos.container'
+    _description = 'Container for bulk items'
+
+    name = fields.Char(
+        string='Name',
+    )
+    ean13 = fields.Char(
+        'EAN13 Barcode',
+        size=13,
+    )
+    weight = fields.Float(
+        string='Weight (g)',
+    )
+
+    @api.multi
+    @api.constrains('ean13')
+    def _check_ean13(self):
+        for container in self:
+            if not container.ean13.startswith('49'):
+                raise ValidationError(
+                    'Container barcode must start with 49 prefix.'
+                )
+            if len(container.ean13) != 13:
+                raise ValidationError(
+                    'Container barcode must be 13 digit long.'
+                )
diff --git a/pos_container/models/models.py b/pos_container/models/models.py
deleted file mode 100644
index 359167779f..0000000000
--- a/pos_container/models/models.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2019 Coop IT Easy SCRLfs
-# 	    Robin Keunen <robin@coopiteasy.be>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-
-from odoo import models, fields, api
-
-# class pos_container(models.Model):
-#     _name = 'pos_container.pos_container'
-
-#     name = fields.Char()
-#     value = fields.Integer()
-#     value2 = fields.Float(compute="_value_pc", store=True)
-#     description = fields.Text()
-#
-#     @api.depends('value')
-#     def _value_pc(self):
-#         self.value2 = float(self.value) / 100
\ No newline at end of file
diff --git a/pos_container/security/ir.model.access.csv b/pos_container/security/ir.model.access.csv
index ba69636bc1..9bac7aa8f9 100644
--- a/pos_container/security/ir.model.access.csv
+++ b/pos_container/security/ir.model.access.csv
@@ -1,2 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_pos_container_pos_container,pos_container.pos_container,model_pos_container_pos_container,,1,0,0,0
\ No newline at end of file
+access_pos_container_pos_user,access_pos_container_pos_user,model_pos_container,point_of_sale.group_pos_user,1,1,1,1
+access_pos_container_pos_manager,access_pos_container_pos_manager,model_pos_container,point_of_sale.group_pos_manager,1,1,1,1
diff --git a/pos_container/views/container.xml b/pos_container/views/container.xml
new file mode 100644
index 0000000000..95301eeee5
--- /dev/null
+++ b/pos_container/views/container.xml
@@ -0,0 +1,45 @@
+<odoo>
+  <data>
+    <record id="pos_container_tree_view" model="ir.ui.view">
+      <field name="name">pos.container.tree</field>
+      <field name="model">pos.container</field>
+      <field name="arch" type="xml">
+        <tree>
+          <field name="name"/>
+          <field name="ean13"/>
+          <field name="weight"/>
+        </tree>
+      </field>
+    </record>
+    
+    <record id="pos_container_form_view" model="ir.ui.view">
+      <field name="name">pos.container.form</field>
+      <field name="model">pos.container</field>
+      <field name="arch" type="xml">
+        <form>
+          <sheet>
+            <group>
+              <field name="name"/>
+              <field name="ean13"/>
+              <field name="weight"/>
+            </group>
+          </sheet>
+        </form>
+      </field>
+    </record>
+
+    <record id="pos_container_action_window" model="ir.actions.act_window" >
+      <field name="name">Containers</field>
+      <field name="res_model">pos.container</field>
+      <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem id="pos_container_menu"
+              name="Containers"
+              parent="point_of_sale.pos_config_menu_catalog"
+              sequence="13"
+              action="pos_container_action_window"
+              groups="point_of_sale.group_pos_manager,point_of_sale.group_pos_user"
+              />
+  </data>
+</odoo>
diff --git a/pos_container/views/templates.xml b/pos_container/views/templates.xml
deleted file mode 100644
index ba61acd8c9..0000000000
--- a/pos_container/views/templates.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<odoo>
-    <data>
-        <!-- <template id="listing"> -->
-        <!--   <ul> -->
-        <!--     <li t-foreach="objects" t-as="object"> -->
-        <!--       <a t-attf-href="#{ root }/objects/#{ object.id }"> -->
-        <!--         <t t-esc="object.display_name"/> -->
-        <!--       </a> -->
-        <!--     </li> -->
-        <!--   </ul> -->
-        <!-- </template> -->
-        <!-- <template id="object"> -->
-        <!--   <h1><t t-esc="object.display_name"/></h1> -->
-        <!--   <dl> -->
-        <!--     <t t-foreach="object._fields" t-as="field"> -->
-        <!--       <dt><t t-esc="field"/></dt> -->
-        <!--       <dd><t t-esc="object[field]"/></dd> -->
-        <!--     </t> -->
-        <!--   </dl> -->
-        <!-- </template> -->
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/pos_container/views/views.xml b/pos_container/views/views.xml
deleted file mode 100644
index cd873a0644..0000000000
--- a/pos_container/views/views.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<odoo>
-  <data>
-    <!-- explicit list view definition -->
-    <!--
-    <record model="ir.ui.view" id="pos_container.list">
-      <field name="name">pos_container list</field>
-      <field name="model">pos_container.pos_container</field>
-      <field name="arch" type="xml">
-        <tree>
-          <field name="name"/>
-          <field name="value"/>
-          <field name="value2"/>
-        </tree>
-      </field>
-    </record>
-    -->
-
-    <!-- actions opening views on models -->
-    <!--
-    <record model="ir.actions.act_window" id="pos_container.action_window">
-      <field name="name">pos_container window</field>
-      <field name="res_model">pos_container.pos_container</field>
-      <field name="view_mode">tree,form</field>
-    </record>
-    -->
-
-    <!-- server action to the one above -->
-    <!--
-    <record model="ir.actions.server" id="pos_container.action_server">
-      <field name="name">pos_container server</field>
-      <field name="model_id" ref="model_pos_container_pos_container"/>
-      <field name="state">code</field>
-      <field name="code">
-        action = {
-          "type": "ir.actions.act_window",
-          "view_mode": "tree,form",
-          "res_model": self._name,
-        }
-      </field>
-    </record>
-    -->
-
-    <!-- Top menu item -->
-    <!--
-    <menuitem name="pos_container" id="pos_container.menu_root"/>
-    -->
-    <!-- menu categories -->
-    <!--
-    <menuitem name="Menu 1" id="pos_container.menu_1" parent="pos_container.menu_root"/>
-    <menuitem name="Menu 2" id="pos_container.menu_2" parent="pos_container.menu_root"/>
-    -->
-    <!-- actions -->
-    <!--
-    <menuitem name="List" id="pos_container.menu_1_list" parent="pos_container.menu_1"
-              action="pos_container.action_window"/>
-    <menuitem name="Server to list" id="pos_container" parent="pos_container.menu_2"
-              action="pos_container.action_server"/>
-    -->
-  </data>
-</odoo>
\ No newline at end of file

From 0f1a3d12e1547b86773389d8863f960ece6406fc Mon Sep 17 00:00:00 2001
From: "robin.keunen" <robin@keunen.net>
Date: Wed, 20 Feb 2019 17:03:21 +0100
Subject: [PATCH 03/47] [ADD] pos_container: add container list - broken

---
 pos_container/__manifest__.py         |  6 ++++++
 pos_container/static/src/js/models.js | 25 +++++++++++++++++++++++++
 pos_container/static/src/xml/pos.xml  | 14 ++++++++++++++
 pos_container/templates/templates.xml | 14 ++++++++++++++
 4 files changed, 59 insertions(+)
 create mode 100644 pos_container/static/src/js/models.js
 create mode 100644 pos_container/static/src/xml/pos.xml
 create mode 100644 pos_container/templates/templates.xml

diff --git a/pos_container/__manifest__.py b/pos_container/__manifest__.py
index 3b4aa1e378..541a4b4ca2 100644
--- a/pos_container/__manifest__.py
+++ b/pos_container/__manifest__.py
@@ -18,10 +18,16 @@
 
     'data': [
         'views/container.xml',
+        # 'templates/templates.xml',
         'security/ir.model.access.csv',
     ],
     'demo': [
         'demo/demo.xml',
     ],
+
+    'qweb': [
+        'static/src/xml/pos.xml',
+    ],
+
     'installable': True,
 }
diff --git a/pos_container/static/src/js/models.js b/pos_container/static/src/js/models.js
new file mode 100644
index 0000000000..42500f035a
--- /dev/null
+++ b/pos_container/static/src/js/models.js
@@ -0,0 +1,25 @@
+/*
+    Copyright 2019 Coop IT Easy SCRLfs
+    	    Robin Keunen <robin@coopiteasy.be>
+    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+*/
+
+
+odoo.define('pos_container.pos_container', function (require) {
+    "use strict";
+
+
+    var models = require('point_of_sale.models');
+    var core = require('web.core');
+
+    // example: add field from defined model
+    // models.load_fields('res.partner','loyalty_points');
+
+    models.load_models([
+        {
+            model: 'pos.container',
+            fields: ['name','ean13', 'weight'],
+            // domain: function(self){ return [['id','=',self.config.loyalty_id[0]]]; },
+        }]
+    )
+});
diff --git a/pos_container/static/src/xml/pos.xml b/pos_container/static/src/xml/pos.xml
new file mode 100644
index 0000000000..33efbac830
--- /dev/null
+++ b/pos_container/static/src/xml/pos.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+
+    <t t-extend='ActionpadWidget'>
+        <t t-jquery='.set-customer' t-operation='prepend'>
+            <t t-log="extend actionpadwidget"/>
+            <button class='button set-container'>
+                <i class='fa fa-glass-whiskey' role="img" aria-label="Container" title="Container"/>
+                <span>Container</span>
+            </button>
+        </t>
+    </t>
+
+</templates>
diff --git a/pos_container/templates/templates.xml b/pos_container/templates/templates.xml
new file mode 100644
index 0000000000..8f1cb7c02a
--- /dev/null
+++ b/pos_container/templates/templates.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2019 Coop IT Easy SCRLfs
+    	    Robin Keunen <robin@coopiteasy.be>
+    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+-->
+
+<odoo>
+    <template id="assets_frontend" inherit_id="point_of_sale.assets">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/pos_container/static/src/js/models.js"/>
+        </xpath>
+    </template>
+</odoo>

From 43c6e1e9e49c06273c1163464147f0a49abc2bc0 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Thu, 21 Feb 2019 13:17:15 +0100
Subject: [PATCH 04/47] FIX display container button

---
 pos_container/static/src/xml/pos.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pos_container/static/src/xml/pos.xml b/pos_container/static/src/xml/pos.xml
index 33efbac830..0d74dbffc6 100644
--- a/pos_container/static/src/xml/pos.xml
+++ b/pos_container/static/src/xml/pos.xml
@@ -2,11 +2,10 @@
 <templates id="template" xml:space="preserve">
 
     <t t-extend='ActionpadWidget'>
-        <t t-jquery='.set-customer' t-operation='prepend'>
-            <t t-log="extend actionpadwidget"/>
-            <button class='button set-container'>
-                <i class='fa fa-glass-whiskey' role="img" aria-label="Container" title="Container"/>
-                <span>Container</span>
+        <t t-jquery='.actionpad' t-operation='prepend'>
+            <button class='button set-customer'>
+                <i class='fa fa-icon-glass' role="img" aria-label="Container" title="Container"/>
+                Container
             </button>
         </t>
     </t>

From 81fb626b79ff75ffae0e769bf4737da0ce132622 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Thu, 21 Feb 2019 15:49:07 +0100
Subject: [PATCH 05/47] ADD new barcode rule type

---
 pos_container/models/__init__.py |  1 +
 pos_container/models/barcode.py  | 14 ++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 pos_container/models/barcode.py

diff --git a/pos_container/models/__init__.py b/pos_container/models/__init__.py
index 14f8196051..1f047343e2 100644
--- a/pos_container/models/__init__.py
+++ b/pos_container/models/__init__.py
@@ -1,3 +1,4 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import container
+from . import barcode
diff --git a/pos_container/models/barcode.py b/pos_container/models/barcode.py
new file mode 100644
index 0000000000..64f4ab119d
--- /dev/null
+++ b/pos_container/models/barcode.py
@@ -0,0 +1,14 @@
+# Copyright 2019 Coop IT Easy SCRLfs
+# 	    Pierrick Brun <pierrick.brun@akretion.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import models, fields, api
+from odoo.exceptions import ValidationError
+
+
+class BarcodeRule(models.Model):
+    _inherit = 'barcode.rule'
+
+    type = fields.Selection(
+        selection_add = [('container', 'Container unit')],
+    )

From 8264f2beb0483dbdb98e1805b30fef670c91ce75 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Thu, 21 Feb 2019 17:31:15 +0100
Subject: [PATCH 06/47] ADD dummy container list view

---
 pos_container/__manifest__.py         |  2 +-
 pos_container/static/src/js/models.js |  7 --
 pos_container/static/src/js/pos.js    | 57 +++++++++++++++
 pos_container/static/src/xml/pos.xml  | 99 +++++++++++++++++++++++++--
 pos_container/templates/templates.xml |  2 +-
 5 files changed, 151 insertions(+), 16 deletions(-)
 create mode 100644 pos_container/static/src/js/pos.js

diff --git a/pos_container/__manifest__.py b/pos_container/__manifest__.py
index 541a4b4ca2..ae61ddca74 100644
--- a/pos_container/__manifest__.py
+++ b/pos_container/__manifest__.py
@@ -18,7 +18,7 @@
 
     'data': [
         'views/container.xml',
-        # 'templates/templates.xml',
+        'templates/templates.xml',
         'security/ir.model.access.csv',
     ],
     'demo': [
diff --git a/pos_container/static/src/js/models.js b/pos_container/static/src/js/models.js
index 42500f035a..88ec3531e3 100644
--- a/pos_container/static/src/js/models.js
+++ b/pos_container/static/src/js/models.js
@@ -15,11 +15,4 @@ odoo.define('pos_container.pos_container', function (require) {
     // example: add field from defined model
     // models.load_fields('res.partner','loyalty_points');
 
-    models.load_models([
-        {
-            model: 'pos.container',
-            fields: ['name','ean13', 'weight'],
-            // domain: function(self){ return [['id','=',self.config.loyalty_id[0]]]; },
-        }]
-    )
 });
diff --git a/pos_container/static/src/js/pos.js b/pos_container/static/src/js/pos.js
new file mode 100644
index 0000000000..50325774e0
--- /dev/null
+++ b/pos_container/static/src/js/pos.js
@@ -0,0 +1,57 @@
+/*
+    Copyright 2019 Coop IT Easy SCRLfs
+    	    Robin Keunen <robin@coopiteasy.be>
+    	    Pierrick Brun <pierrick.brun@akretion.com>
+    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+*/
+
+
+odoo.define('pos_container.pos_container', function (require) {
+    "use strict";
+
+    var screens = require('point_of_sale.screens');
+    var gui = require('point_of_sale.gui');
+    var models = require('point_of_sale.models');
+    var core = require('web.core');
+
+
+    // models.load_models([
+    //     {
+    //         model: 'pos.container',
+    //         fields: ['name','barcode', 'weight'],
+    //         // domain: function(self){ return [['id','=',self.config.loyalty_id[0]]]; },
+    //     }]
+    // )
+
+    var ContainerButton = screens.ActionButtonWidget.extend({
+        template: 'ContainerButton',
+        button_click: function(){
+            this.gui.show_screen('containerlist');
+        }
+    });
+
+    screens.define_action_button({
+        'name': 'container',
+        'widget': ContainerButton,
+    });
+
+    var ContainerListScreenWidget = screens.ScreenWidget.extend({
+        template: 'ContainerListScreenWidget',
+
+        init: function(parent, options){
+            this._super(parent, options);
+        },
+
+        auto_back: true,
+
+        show: function(){
+            this._super();
+        }
+    });
+
+    gui.define_screen({
+        name:'containerlist',
+        widget: ContainerListScreenWidget
+    });
+
+});
diff --git a/pos_container/static/src/xml/pos.xml b/pos_container/static/src/xml/pos.xml
index 0d74dbffc6..0697159c74 100644
--- a/pos_container/static/src/xml/pos.xml
+++ b/pos_container/static/src/xml/pos.xml
@@ -1,13 +1,98 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates id="template" xml:space="preserve">
 
-    <t t-extend='ActionpadWidget'>
-        <t t-jquery='.actionpad' t-operation='prepend'>
-            <button class='button set-customer'>
-                <i class='fa fa-icon-glass' role="img" aria-label="Container" title="Container"/>
-                Container
-            </button>
-        </t>
+    <t t-name="ContainerButton">
+        <button class="control-button">
+            <i class="fa fa-beer" role="img" aria-label="Container" title="Container"/>
+            Container
+        </button>
     </t>
 
+    <t t-name="ContainerDetails">
+         <section class="container-details">
+             <div class="container-details-box clearfix">
+                 <div class="container-details-left">
+                     <div class="container-detail">
+                         <span class="label">Nom</span>
+                         <span class="detail container-name">
+                             <t t-esc="container.display_name"/>
+                         </span>
+                     </div>
+                     <div class="container-detail">
+                         <span class="label">Code-barre</span>
+                         <span class="detail container-barcode">
+                             <t t-esc="container.barcode"/>
+                         </span>
+                     </div>
+                 </div>
+                 <div class="container-details-right">
+                     <div class="container-detail">
+                         <span class="label">Poids</span>
+                         <span class="detail container-weight">
+                             <t t-esc="container.weight"/>
+                         </span>
+                     </div>
+                 </div>
+                 <div class="edit-buttons">
+                     <div class="button edit">
+                         <i class="fa fa-pencil-square"/>
+                     </div>
+                 </div>
+             </div>
+         </section>
+     </t>
+
+    <t t-name="ContainerListScreenWidget">
+         <div class="containerlist-screen screen">
+             <div class="screen-content">
+                 <section class="top-content">
+                     <span class="button back">
+                         <i class="fa fa-angle-double-left"/>
+                         Annuler
+                     </span>
+                     <span class="searchbox">
+                         <input placeholder="Search Containers"/>
+                         <span class="search-clear"/>
+                     </span>
+                     <span class="searchbox"/>
+                     <span class="button new-container">
+                         <i class="fa fa-beer"/>
+                         <i class="fa fa-plus"/>
+                     </span>
+                     <span class="button next oe_hidden highlight">
+                         S&#xE9;lectionne un contenant
+                         <i class="fa fa-angle-double-right"/>
+                     </span>
+                 </section>
+                 <section class="full-content">
+                     <div class="window">
+                         <section class="subwindow collapsed">
+                             <div class="subwindow-container collapsed">
+                                 <div class="subwindow-container-fix container-details-contents">
+                                 </div>
+                             </div>
+                         </section>
+                         <section class="subwindow">
+                             <div class="subwindow-container">
+                                 <div class="subwindow-container-fix touch-scrollable scrollable-y">
+                                     <table class="container-list">
+                                         <thead>
+                                             <tr>
+                                                 <th>Nom</th>
+                                                 <th>Code-barre</th>
+                                                 <th>Poids</th>
+                                             </tr>
+                                         </thead>
+                                         <tbody class="container-list-contents">
+                                         </tbody>
+                                     </table>
+                                 </div>
+                             </div>
+                         </section>
+                     </div>
+                 </section>
+             </div>
+         </div>
+     </t>
+
 </templates>
diff --git a/pos_container/templates/templates.xml b/pos_container/templates/templates.xml
index 8f1cb7c02a..9ae5a74801 100644
--- a/pos_container/templates/templates.xml
+++ b/pos_container/templates/templates.xml
@@ -8,7 +8,7 @@
 <odoo>
     <template id="assets_frontend" inherit_id="point_of_sale.assets">
         <xpath expr="." position="inside">
-            <script type="text/javascript" src="/pos_container/static/src/js/models.js"/>
+            <script type="text/javascript" src="/pos_container/static/src/js/pos.js"/>
         </xpath>
     </template>
 </odoo>

From cbf3cf610b97d0c62ce98cef9010faf8f1bdf33b Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Thu, 21 Feb 2019 17:33:13 +0100
Subject: [PATCH 07/47] use barcode instead of ean13

---
 pos_container/models/container.py | 27 +++++++++++++--------------
 pos_container/views/container.xml |  6 ++----
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/pos_container/models/container.py b/pos_container/models/container.py
index 36abbd218a..effaed9c54 100644
--- a/pos_container/models/container.py
+++ b/pos_container/models/container.py
@@ -13,23 +13,22 @@ class Container(models.Model):
     name = fields.Char(
         string='Name',
     )
-    ean13 = fields.Char(
-        'EAN13 Barcode',
+    barcode = fields.Char(
+        'Barcode',
         size=13,
     )
     weight = fields.Float(
         string='Weight (g)',
     )
+    owner_id = fields.Many2one(
+        comodel_name='res.partner',
+        inverse_name='container_ids',
+        string='Owner',
+    )
+
+    _sql_constraints = [
+        ('barcode_uniq',
+            'unique(barcode)',
+            "A barcode can only be assigned to one container !"),
+    ]
 
-    @api.multi
-    @api.constrains('ean13')
-    def _check_ean13(self):
-        for container in self:
-            if not container.ean13.startswith('49'):
-                raise ValidationError(
-                    'Container barcode must start with 49 prefix.'
-                )
-            if len(container.ean13) != 13:
-                raise ValidationError(
-                    'Container barcode must be 13 digit long.'
-                )
diff --git a/pos_container/views/container.xml b/pos_container/views/container.xml
index 95301eeee5..b8d5fcbc2c 100644
--- a/pos_container/views/container.xml
+++ b/pos_container/views/container.xml
@@ -1,12 +1,11 @@
 <odoo>
-  <data>
     <record id="pos_container_tree_view" model="ir.ui.view">
       <field name="name">pos.container.tree</field>
       <field name="model">pos.container</field>
       <field name="arch" type="xml">
         <tree>
           <field name="name"/>
-          <field name="ean13"/>
+          <field name="barcode"/>
           <field name="weight"/>
         </tree>
       </field>
@@ -20,7 +19,7 @@
           <sheet>
             <group>
               <field name="name"/>
-              <field name="ean13"/>
+              <field name="barcode"/>
               <field name="weight"/>
             </group>
           </sheet>
@@ -41,5 +40,4 @@
               action="pos_container_action_window"
               groups="point_of_sale.group_pos_manager,point_of_sale.group_pos_user"
               />
-  </data>
 </odoo>

From 0ffac9e4209b76d9882c748aec7400de05021a35 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Fri, 22 Feb 2019 12:31:58 +0100
Subject: [PATCH 08/47] IMP container list is now fetched and badly displayed

---
 pos_container/demo/demo.xml                  |  33 +-
 pos_container/static/src/js/container.js     | 345 +++++++++++++++++++
 pos_container/static/src/js/models.js        |  18 -
 pos_container/static/src/js/models_and_db.js | 180 ++++++++++
 pos_container/static/src/js/pos.js           |  57 ---
 pos_container/static/src/xml/pos.xml         |  52 ++-
 pos_container/templates/templates.xml        |   3 +-
 7 files changed, 589 insertions(+), 99 deletions(-)
 create mode 100644 pos_container/static/src/js/container.js
 delete mode 100644 pos_container/static/src/js/models.js
 create mode 100644 pos_container/static/src/js/models_and_db.js
 delete mode 100644 pos_container/static/src/js/pos.js

diff --git a/pos_container/demo/demo.xml b/pos_container/demo/demo.xml
index 489f162514..effd06e996 100644
--- a/pos_container/demo/demo.xml
+++ b/pos_container/demo/demo.xml
@@ -1,23 +1,20 @@
 <odoo>
-    <data>
+    <record id="container_1" model="pos.container">
+        <field name="name">Container 1</field>
+        <field name="barcode">4987654567897</field>
+        <field name="weight">123</field>
+    </record>
 
-           <record id="container_1" model="pos.container">
-             <field name="name">Container 1</field>
-             <field name="ean13">4987654567897</field>
-             <field name="weight">123</field>
-           </record>
+    <record id="container_2" model="pos.container">
+        <field name="name">Container 2</field>
+        <field name="barcode">4909876543567</field>
+        <field name="weight">234</field>
+    </record>
 
-           <record id="container_2" model="pos.container">
-             <field name="name">Container 2</field>
-             <field name="ean13">4909876543567</field>
-             <field name="weight">234</field>
-           </record>
+    <record id="container_3" model="pos.container">
+        <field name="name">Container 3</field>
+        <field name="barcode">4909876543987</field>
+        <field name="weight">23.4</field>
+    </record>
 
-           <record id="container_3" model="pos.container">
-             <field name="name">Container 3</field>
-             <field name="ean13">4909876543987</field>
-             <field name="weight">23.4</field>
-           </record>
-
-    </data>
 </odoo>
diff --git a/pos_container/static/src/js/container.js b/pos_container/static/src/js/container.js
new file mode 100644
index 0000000000..190598d1c7
--- /dev/null
+++ b/pos_container/static/src/js/container.js
@@ -0,0 +1,345 @@
+/*
+    Copyright 2019 Coop IT Easy SCRLfs
+    	    Robin Keunen <robin@coopiteasy.be>
+    	    Pierrick Brun <pierrick.brun@akretion.com>
+    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+*/
+
+
+odoo.define('pos_container.container', function (require) {
+    "use strict";
+
+    var models_and_db = require('pos_container.models_and_db');
+
+    var screens = require('point_of_sale.screens');
+    var gui = require('point_of_sale.gui');
+    var models = require('point_of_sale.models');
+
+    var core = require('web.core');
+    var QWeb = core.qweb;
+
+
+    var ContainerButton = screens.ActionButtonWidget.extend({
+        template: 'ContainerButton',
+        button_click: function(){
+            this.gui.show_screen('containerlist');
+        }
+    });
+
+    screens.define_action_button({
+        'name': 'container',
+        'widget': ContainerButton,
+    });
+
+    var ContainerListScreenWidget = screens.ScreenWidget.extend({
+        template: 'ContainerListScreenWidget',
+
+        init: function(parent, options){
+            this._super(parent, options);
+            this.container_cache = new screens.DomCache();
+        },
+
+        show: function(){
+            var self = this;
+            this._super();
+        
+            this.$('.back').click(function(){
+                self.gui.back();
+            });
+
+            this.$('.new-container').click(function(){
+                self.display_container_details('edit',{
+                });
+            });
+  
+            var containers = this.pos.db.get_containers_sorted(1000);
+            this.render_list(containers);
+
+            this.reload_containers();
+
+            if(this.old_container) {
+                this.display_container_details('show', this.old_container, 0);
+            }
+
+            this.$('.container-list-contents').delegate('.container-line',
+                    'click', function(event){
+                self.line_select(event,$(this),parseInt($(this).data('id')));
+            });
+
+            var search_timeout = null;
+
+            if(this.pos.config.iface_vkeyboard &&
+                    this.pos_widget.onscreen_keyboard){
+                this.pos_widget.onscreen_keyboard.connect(
+                    this.$('.searchbox input')
+                );
+            }
+
+            this.$('.searchbox input').on('keyup',function(event){
+                clearTimeout(search_timeout);
+
+                var query = this.value;
+
+                search_timeout = setTimeout(function(){
+                    self.perform_search(query,event.which === 13);
+                },70);
+            });
+
+            this.$('.searchbox .search-clear').click(function(){
+                self.clear_search();
+            });
+        },
+        perform_search: function(query, associate_result){
+            if(query){
+                var containers = this.pos.db.search_container(query);
+                this.display_container_details('hide');
+                if ( associate_result && containers.length === 1){
+                    this.new_container = containers[0];
+                    this.save_changes();
+                    this.pos_widget.screen_selector.back();
+                }
+                this.render_list(containers);
+            }else{
+                var containers = this.pos.db.get_containers_sorted();
+                this.render_list(containers);
+            }
+        },
+        clear_search: function(){
+            var containers = this.pos.db.get_containers_sorted(1000);
+            this.render_list(containers);
+            this.$('.searchbox input')[0].value = '';
+            this.$('.searchbox input').focus();
+        },
+        render_list: function(containers) {
+            var contents = this.$el[0].querySelector('.container-list-contents');
+            contents.innerHTML = "";
+            for(var i = 0, len = Math.min(containers.length,1000); i < len; i++){
+                var container    = containers[i];
+                var containerline_html = QWeb.render('ContainerLine',{widget: this, container:containers[i]});
+                var containerline = document.createElement('tbody');
+                containerline.innerHTML = containerline_html;
+                containerline = containerline.childNodes[1];
+
+                if(containers === this.new_container) {
+                    containerline.classList.add('highlight');
+                } else {
+                    containerline.classList.remove('highlight');
+                }
+
+                contents.appendChild(containerline);
+            }
+        },
+        save_changes: function(){
+            this.pos.get('selectedOrder').addContainer(this.new_container);
+        },
+        has_container_changed: function() {
+            if(this.old_container && this.new_container) {
+                return this.old_container.id !== this.new_container.id;
+            } else {
+                return !!this.old_container !== !!this.new_container;
+            }
+        },
+        toggle_save_button: function(){
+            var $button = this.$('.button.next');
+            if (this.editing_container) {
+                $button.addClass('oe_hidden');
+                return;
+            } else if(this.new_container) {
+                if(!this.old_container) {
+                    $button.text('Set Container');
+                } else {
+                    $button.text('Change Container');
+                }
+            } else {
+                $button.text('Deselect Container');
+            }
+            $button.toggleClass('oe_hidden',!this.has_container_changed());
+        },
+        line_select: function(event,$line,id){
+            var container = this.pos.db.get_container_by_id(id);
+            this.$('.container-list .lowlight').removeClass('lowlight');
+            if ( $line.hasClass('highlight') ){
+                $line.removeClass('highlight');
+                $line.addClass('lowlight');
+                this.display_container_details('hide',container);
+                this.new_container = null;
+                this.toggle_save_button();
+            }else{
+                this.$('.container-list .highlight').removeClass('highlight');
+                $line.addClass('highlight');
+                var y = event.pageY - $line.parent().offset().top
+                this.display_container_details('show',container,y);
+                this.new_container = container;
+                this.toggle_save_button();
+            }
+        },
+
+        // Ui handle for the 'edit selected container' action
+        edit_container_details: function(container){
+            this.display_container_details('edit',container);
+        },
+
+        // Ui handle for the 'cancel container edit changes' action
+        undo_container_details: function(container){
+            if (!container.id) {
+                this.display_container_details('hide');
+            } else {
+                this.display_container_details('show', container);
+            }
+        },
+
+        // What happens when we save the changes on the container edit form -> we fetch the fields, sanitize them,
+        // send them to the backend for update, and call saved_container_details() when the server tells us the
+        // save was successfull.
+        save_container_details: function(container){
+            var self = this;
+
+            var fields = {}
+            this.$('.container-details-contents .detail').each(function(idx,el){
+                fields[el.name] = el.value;
+            });
+            if (!fields.barcode) {
+                this.pos_widget.screen_selector.show_popup('error',{
+                    message: 'A Container Barcode Is Required',
+                });
+                return;
+            }
+            fields.weight = fields.weight.replace(',', '.')
+
+            fields.id = container.id || false;
+            fields.display_name = container.display_name || false;
+            fields.barcode = fields.barcode ? this.pos.barcode_reader.sanitize_ean(fields.barcode) : false;
+            fields.weight = fields.weight || false;
+
+            new instance.web.Model('pos.container').call(
+                    'create_from_ui',[fields]).then(function(container_id){
+                self.saved_container_details(container_id);
+            },function(err,event){
+                event.preventDefault();
+                self.pos_widget.screen_selector.show_popup('error',{
+                    'message':_t('Error: Could not Save Changes'),
+                    'comment':_t('Your Internet connection is probably down.'),
+                });
+            });
+        },
+        // What happens when we've just pushed modifications for a container of id container_id
+        saved_container_details: function(container_id){
+            var self = this;
+            this.reload_containers().then(function(){
+                var container = self.pos.db.get_container_by_id(container_id);
+                if (container) {
+                    self.new_container = container;
+                    self.toggle_save_button();
+                    self.display_container_details('show',container);
+                } else {
+                    // should never happen, because create_from_ui must return the id of the container it
+                    // has created, and reload_container() must have loaded the newly created container.
+                    self.display_container_details('hide');
+                }
+            });
+        },
+
+        // This fetches container changes on the server, and in case of changes,
+        // rerenders the affected views
+        reload_containers: function(){
+            var self = this;
+            return this.pos.load_new_containers().then(function(){
+                self.render_list(self.pos.db.get_containers_sorted(1000));
+
+                var last_orderline = self.pos.get_order().get_last_orderline();
+
+                if(last_orderline) {
+                    // update the currently assigned container if it has been changed in db.
+                    var curr_container = last_orderline.get_container();
+                }
+
+                if (curr_container) {
+                    last_orderline.set_container(
+                        self.pos.db.get_container_by_id(curr_container.id));
+                }
+            });
+        },
+
+        // Shows,hides or edit the container details box :
+        // visibility: 'show', 'hide' or 'edit'
+        // container:    the container object to show or edit
+        // clickpos:   the height of the click on the list (in pixel), used
+        //             to maintain consistent scroll.
+        display_container_details: function(visibility,container,clickpos){
+            var self = this;
+            var contents = this.$('.container-details-contents');
+            var parent   = this.$('.container-list').parent();
+            var scroll   = parent.scrollTop();
+            var height   = contents.height();
+
+            contents.off('click','.button.edit');
+            contents.off('click','.button.save');
+            contents.off('click','.button.undo');
+            contents.on('click','.button.edit',function(){self.edit_container_details(container);});
+            contents.on('click','.button.save',function(){self.save_container_details(container);});
+            contents.on('click','.button.undo',function(){self.undo_container_details(container);});
+            this.editing_container = false;
+
+            if(visibility === 'show'){
+
+                contents.empty();
+                contents.append($(QWeb.render('ContainerDetails',{widget:this, container:container})));
+
+                var new_height   = contents.height();
+
+                if(!this.details_visible){
+                    if(clickpos < scroll + new_height + 20 ){
+                        parent.scrollTop( clickpos - 20 );
+                    }else{
+                        parent.scrollTop(parent.scrollTop() + new_height);
+                    }
+                }else{
+                    parent.scrollTop(parent.scrollTop() - height + new_height);
+                }
+
+                this.details_visible = true;
+                this.toggle_save_button();
+
+            } else if (visibility === 'edit') {
+                this.editing_container = true;
+                contents.empty();
+                contents.append($(QWeb.render('ContainerDetailsEdit', {widget:this, container:container})));
+                this.toggle_save_button();
+            } else if (visibility === 'add_by_scan') {
+                new_container = {
+                    'display_name': 'Contenant',
+                    'barcode': container.parsed_code.base_code,
+                    'weight': 0
+                }
+                this.editing_container = true;
+                contents.empty();
+                contents.append($(QWeb.render('ContainerDetailsEdit', {widget:this, container:new_container})));
+                this.toggle_save_button();
+
+            } else if (visibility === 'hide') {
+                contents.empty();
+                if(height > scroll) {
+                    contents.css({height:height+'px'});
+                    contents.animate({height:0},400,function(){
+                        contents.css({height:''});
+                    });
+                } else {
+                    parent.scrollTop(parent.scrollTop() - height);
+                }
+                this.details_visible = false;
+                this.toggle_save_button();
+            }
+        },
+        close: function(){
+            this._super();
+        },
+
+        auto_back: true,
+    });
+
+    gui.define_screen({
+        name:'containerlist',
+        widget: ContainerListScreenWidget
+    });
+
+});
diff --git a/pos_container/static/src/js/models.js b/pos_container/static/src/js/models.js
deleted file mode 100644
index 88ec3531e3..0000000000
--- a/pos_container/static/src/js/models.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-    Copyright 2019 Coop IT Easy SCRLfs
-    	    Robin Keunen <robin@coopiteasy.be>
-    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-*/
-
-
-odoo.define('pos_container.pos_container', function (require) {
-    "use strict";
-
-
-    var models = require('point_of_sale.models');
-    var core = require('web.core');
-
-    // example: add field from defined model
-    // models.load_fields('res.partner','loyalty_points');
-
-});
diff --git a/pos_container/static/src/js/models_and_db.js b/pos_container/static/src/js/models_and_db.js
new file mode 100644
index 0000000000..c6b0d60da5
--- /dev/null
+++ b/pos_container/static/src/js/models_and_db.js
@@ -0,0 +1,180 @@
+/*
+    Copyright 2019 Coop IT Easy SCRLfs
+    	    Pierrick Brun <pierrick.brun@akretion.com>
+    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+*/
+
+
+odoo.define('pos_container.models_and_db', function (require) {
+    "use strict";
+
+    var PosDB = require('point_of_sale.DB');
+    var models = require('point_of_sale.models');
+    var rpc = require('web.rpc');
+
+    models.load_models({
+        model: 'pos.container',
+        fields: ['name','barcode', 'weight'],
+        // domain: [[]],
+        loaded: function(self, containers){
+            self.containers = containers;
+        },
+    });
+
+    // include not available => extend
+    models.PosModel = models.PosModel.extend({
+        scan_container: function(parsed_code){
+            var selectedOrder = this.get('selectedOrder');
+            if(parsed_code.encoding === 'barcode'){
+                var container = this.db.get_container_by_barcode(parsed_code.base_code);
+            }
+            if(!container){
+                self.pos_widget.screen_selector.set_current_screen('container_scale', {container: parsed_code.base_code});
+                return false;
+            }
+
+            selectedOrder.addContainer(container);
+
+            return true;
+        },
+        // reload the list of container, returns as a deferred that resolves if there were
+        // updated containers, and fails if not
+        load_new_containers: function(){
+            var self = this;
+            var def  = new $.Deferred();
+            var fields = _.find(this.models,function(model){
+                return model.model === 'pos.container';
+            }).fields;
+            var domain = [];
+            rpc.query({
+                model: 'pos.container',
+                method: 'search_read',
+                args: [domain, fields],
+            }, {
+                timeout: 3000,
+                shadow: true,
+            })
+            .then(function(containers){
+                if (self.db.add_containers(containers)) {
+                    // check if the partners we got were real updates
+                    def.resolve();
+                } else {
+                    def.reject();
+                }
+            }, function(type,err){ def.reject(); });
+           return def;
+        },
+    });
+
+    PosDB.include({
+        init: function(parent, options) {
+            this._super(parent, options);
+
+            this.container_sorted = [];
+            this.container_by_id = {};
+            this.container_by_barcode = {};
+            this.container_search_string = "";
+            this.container_write_date = null;
+
+        },
+        _container_search_string: function(container){
+
+            var str = '';
+
+            if(container.barcode){
+                str = '|' + container.barcode;
+            }
+            str = '' + container.id + ':' + str.replace(':','') + '\n';
+
+            return str;
+        },
+        add_containers: function(containers) {
+            var updated_count = 0;
+            var new_write_date = '';
+            for(var i = 0, len = containers.length; i < len; i++) {
+                var container = containers[i];
+
+                if (this.container_write_date &&
+                    this.container_by_id[container.id] &&
+                    new Date(this.container_write_date).getTime() + 1000 >=
+                    new Date(container.write_date).getTime() ) {
+                    // FIXME: The write_date is stored with milisec precision in the database
+                    // but the dates we get back are only precise to the second. This means when
+                    // you read containers modified strictly after time X, you get back containers that were
+                    // modified X - 1 sec ago.
+                    continue;
+                } else if ( new_write_date < container.write_date ) {
+                    new_write_date  = container.write_date;
+                }
+                if (!this.container_by_id[container.id]) {
+                    this.container_sorted.push(container.id);
+                }
+                this.container_by_id[container.id] = container;
+
+                updated_count += 1;
+            }
+
+            this.container_write_date = new_write_date || this.container_write_date;
+
+            if (updated_count) {
+                // If there were updates, we need to completely
+                // rebuild the search string and the barcode indexing
+
+                this.container_search_string = "";
+                this.container_by_barcode = {};
+
+                for (var id in this.container_by_id) {
+                    var container = this.container_by_id[id];
+
+                    if(container.barcode){
+                        this.container_by_barcode[container.barcode] = container;
+                    }
+                    this.container_search_string += this._container_search_string(container);
+                }
+            }
+            return updated_count;
+        },
+        get_container_write_date: function(){
+
+            return this.container_write_date;
+        },
+        get_container_by_id: function(id){
+            return this.container_by_id[id];
+        },
+        get_container_by_barcode: function(barcode){
+
+            return this.container_by_barcode[barcode];
+        },
+        get_containers_sorted: function(max_count){
+            max_count = max_count ? Math.min(this.container_sorted.length, max_count) : this.container_sorted.length;
+            var containers = [];
+            for (var i = 0; i < max_count; i++) {
+                containers.push(this.container_by_id[this.container_sorted[i]]);
+            }
+
+            return containers;
+        },
+        search_container: function(query) {
+            try {
+                query = query.replace(/[\[\]\(\)\+\*\?\.\-\!\&\^\$\|\~\_\{\}\:\,\\\/]/g,'.');
+                query = query.replace(' ','.+');
+                var re = RegExp("([0-9]+):.*?"+query,"gi");
+            } catch(e) {
+                return [];
+            }
+            var results = [];
+            for(var i = 0; i < this.limit; i++) {
+                r = re.exec(this.container_search_string);
+                if(r) {
+                    var id = Number(r[1]);
+                    results.push(this.get_container_by_id(id));
+                } else {
+                    break;
+                }
+            }
+
+            return results;
+        },
+
+    });
+});
diff --git a/pos_container/static/src/js/pos.js b/pos_container/static/src/js/pos.js
deleted file mode 100644
index 50325774e0..0000000000
--- a/pos_container/static/src/js/pos.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-    Copyright 2019 Coop IT Easy SCRLfs
-    	    Robin Keunen <robin@coopiteasy.be>
-    	    Pierrick Brun <pierrick.brun@akretion.com>
-    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-*/
-
-
-odoo.define('pos_container.pos_container', function (require) {
-    "use strict";
-
-    var screens = require('point_of_sale.screens');
-    var gui = require('point_of_sale.gui');
-    var models = require('point_of_sale.models');
-    var core = require('web.core');
-
-
-    // models.load_models([
-    //     {
-    //         model: 'pos.container',
-    //         fields: ['name','barcode', 'weight'],
-    //         // domain: function(self){ return [['id','=',self.config.loyalty_id[0]]]; },
-    //     }]
-    // )
-
-    var ContainerButton = screens.ActionButtonWidget.extend({
-        template: 'ContainerButton',
-        button_click: function(){
-            this.gui.show_screen('containerlist');
-        }
-    });
-
-    screens.define_action_button({
-        'name': 'container',
-        'widget': ContainerButton,
-    });
-
-    var ContainerListScreenWidget = screens.ScreenWidget.extend({
-        template: 'ContainerListScreenWidget',
-
-        init: function(parent, options){
-            this._super(parent, options);
-        },
-
-        auto_back: true,
-
-        show: function(){
-            this._super();
-        }
-    });
-
-    gui.define_screen({
-        name:'containerlist',
-        widget: ContainerListScreenWidget
-    });
-
-});
diff --git a/pos_container/static/src/xml/pos.xml b/pos_container/static/src/xml/pos.xml
index 0697159c74..abe326471f 100644
--- a/pos_container/static/src/xml/pos.xml
+++ b/pos_container/static/src/xml/pos.xml
@@ -48,7 +48,7 @@
                  <section class="top-content">
                      <span class="button back">
                          <i class="fa fa-angle-double-left"/>
-                         Annuler
+                         Cancel
                      </span>
                      <span class="searchbox">
                          <input placeholder="Search Containers"/>
@@ -60,7 +60,7 @@
                          <i class="fa fa-plus"/>
                      </span>
                      <span class="button next oe_hidden highlight">
-                         S&#xE9;lectionne un contenant
+                         Select a container
                          <i class="fa fa-angle-double-right"/>
                      </span>
                  </section>
@@ -78,9 +78,9 @@
                                      <table class="container-list">
                                          <thead>
                                              <tr>
-                                                 <th>Nom</th>
-                                                 <th>Code-barre</th>
-                                                 <th>Poids</th>
+                                                 <th>Name</th>
+                                                 <th>Barcode</th>
+                                                 <th>Weight</th>
                                              </tr>
                                          </thead>
                                          <tbody class="container-list-contents">
@@ -95,4 +95,46 @@
          </div>
      </t>
 
+    <t t-name="ContainerLine">
+        <tr class="container-line" t-att-data-id="container.id">
+            <td>
+                <t t-esc="container.name"/>
+            </td>
+            <td>
+                <t t-esc="container.barcode"/>
+            </td>
+            <td>
+                <t t-esc="container.weight"/>
+            </td>
+        </tr>
+    </t>
+
+    <t t-name="ContainerDetailsEdit">
+        <section class='container-details edit'>
+            <div class='container-details-box clearfix'>
+                <div class='container-details-left'>
+                    <div class='container-detail'>
+                        <span class='label'>name</span>
+                        <input class='detail container-name' name='name' t-att-value='container.display_name' placeholder='Nom'></input>
+                    </div>
+                    <div class='container-detail'>
+                        <span class='label'>Barcode</span>
+                        <input class='detail container-barcode' name='barcode' t-att-value='container.barcode' placeholder='Barcode'></input>
+                    </div>
+                </div>
+                <div class='container-details-right'>
+                    <div class='container-detail'>
+                        <span class='label'>Weight</span>
+                        <input class='detail container-weight' name='weight' t-att-value='container.weight' placeholder='Poids'></input>
+                    </div>
+                </div>
+                <div class='edit-buttons'>
+                    <div class='button undo'><i class='fa fa-undo' /></div>
+                    <div class='button save'><i class='fa fa-floppy-o' /></div>
+                </div>
+            </div>
+        </section>
+    </t>
+
+
 </templates>
diff --git a/pos_container/templates/templates.xml b/pos_container/templates/templates.xml
index 9ae5a74801..b8523b31f9 100644
--- a/pos_container/templates/templates.xml
+++ b/pos_container/templates/templates.xml
@@ -8,7 +8,8 @@
 <odoo>
     <template id="assets_frontend" inherit_id="point_of_sale.assets">
         <xpath expr="." position="inside">
-            <script type="text/javascript" src="/pos_container/static/src/js/pos.js"/>
+            <script type="text/javascript" src="/pos_container/static/src/js/models_and_db.js"/>
+            <script type="text/javascript" src="/pos_container/static/src/js/container.js"/>
         </xpath>
     </template>
 </odoo>

From a6d39dd28abdf172cc27f83e157545bddf0d6d25 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Fri, 22 Feb 2019 14:34:23 +0100
Subject: [PATCH 09/47] add some css

---
 pos_container/static/src/css/container.css | 67 ++++++++++++++++++++++
 pos_container/templates/templates.xml      |  1 +
 2 files changed, 68 insertions(+)
 create mode 100644 pos_container/static/src/css/container.css

diff --git a/pos_container/static/src/css/container.css b/pos_container/static/src/css/container.css
new file mode 100644
index 0000000000..243a329a7a
--- /dev/null
+++ b/pos_container/static/src/css/container.css
@@ -0,0 +1,67 @@
+/* firefox seems to ignore the relative positionning of the subwindow-container 
+ * putting this inside subwindow-container fixes it.                            
+ */                                                                             
+.pos .containerlist-screen .window,                                                
+.pos .containerlist-screen .full-content .subwindow{                               
+    display: block;                                                             
+}                                                                               
+.pos .containerlist-screen .full-content .subwindow-container{                     
+    display: block;                                                             
+    height: 100%;                                                               
+}                                                                               
+.pos .containerlist-screen .full-content .subwindow.collapsed,                     
+.pos .containerlist-screen .full-content .subwindow-container.collapsed{           
+    height: auto;                                                               
+} 
+
+
+/* e) The Container List Screen */
+
+.pos .containerlist-screen .container-list{
+    font-size: 16px;
+    width: 100%;
+    line-height: 40px;
+}
+.pos .containerlist-screen .container-list th,
+.pos .containerlist-screen .container-list td {
+    padding: 0px 8px;
+}
+.pos .containerlist-screen .container-list tr{
+    transition: all 150ms linear;
+    background: rgb(230,230,230);
+}
+.pos .containerlist-screen .container-list thead > tr,
+.pos .containerlist-screen .container-list tr:nth-child(even) {
+    background: rgb(247,247,247);
+}
+.pos .containerlist-screen .container-list tr.highlight{
+    transition: all 150ms linear;
+    background: rgb(110,200,155) !important;
+    color: white;
+}
+.pos .containerlist-screen .container-list tr.lowlight{
+    transition: all 150ms linear;
+    background: rgb(216, 238, 227);
+}
+.pos .containerlist-screen .container-list tr.lowlight:nth-child(even){
+    transition: all 150ms linear;
+    background: rgb(227, 246, 237);
+}
+.pos .containerlist-screen .container-details{
+    padding: 16px;
+    border-bottom: solid 5px rgb(110,200,155);
+}
+.pos .containerlist-screen .container-picture{
+    height: 64px;
+    width: 64px;
+    border-radius: 32px;
+    overflow: hidden;
+    text-align: center;
+    float: left;
+    margin-right: 16px;
+    background: white;
+    position: relative;
+}
+.pos .containerlist-screen .container-picture > img {
+    position: absolute;
+    top: -9999px;
diff --git a/pos_container/templates/templates.xml b/pos_container/templates/templates.xml
index b8523b31f9..9ae853c5b2 100644
--- a/pos_container/templates/templates.xml
+++ b/pos_container/templates/templates.xml
@@ -8,6 +8,7 @@
 <odoo>
     <template id="assets_frontend" inherit_id="point_of_sale.assets">
         <xpath expr="." position="inside">
+            <link href="/pos_container/static/src/css/container.css" rel="stylesheet"/>
             <script type="text/javascript" src="/pos_container/static/src/js/models_and_db.js"/>
             <script type="text/javascript" src="/pos_container/static/src/js/container.js"/>
         </xpath>

From fccadfb63b3bdbd8080073b58486b45166e2d3bc Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Fri, 22 Feb 2019 14:35:29 +0100
Subject: [PATCH 10/47] small fixes

---
 pos_container/static/src/css/container.css   | 95 ++++++++++++++++++++
 pos_container/static/src/js/container.js     | 10 ++-
 pos_container/static/src/js/models_and_db.js |  2 +-
 pos_container/static/src/xml/pos.xml         |  2 +-
 4 files changed, 104 insertions(+), 5 deletions(-)

diff --git a/pos_container/static/src/css/container.css b/pos_container/static/src/css/container.css
index 243a329a7a..71e0539f68 100644
--- a/pos_container/static/src/css/container.css
+++ b/pos_container/static/src/css/container.css
@@ -65,3 +65,98 @@
 .pos .containerlist-screen .container-picture > img {
     position: absolute;
     top: -9999px;
+    bottom: -9999px;
+    right: -9999px;
+    left: -9999px;
+    max-height: 64px;
+    margin: auto;
+}
+.pos .containerlist-screen .container-picture > .fa {
+    line-height: 64px;
+    font-size: 32px;
+}
+.pos .containerlist-screen .container-picture .image-uploader {
+    position: absolute;
+    z-index: 1000;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    opacity: 0;
+    cursor: pointer;
+}
+.pos .containerlist-screen .container-name {
+    font-size: 32px;
+    line-height: 64px;
+    margin-bottom:16px;
+}
+.pos .containerlist-screen .edit-buttons {
+    position: absolute;
+    right: 16px;
+    top: 10px;
+}
+.pos .containerlist-screen .edit-buttons .button{
+    display: inline-block;
+    margin-left: 16px;
+    color: rgb(128,128,128);
+    cursor: pointer;
+    font-size: 36px;
+}
+.pos .containerlist-screen .container-details-box{
+    position: relative;
+    font-size: 16px;
+}
+.pos .containerlist-screen .container-details-left{
+    width: 50%;
+    float: left;
+}
+.pos .containerlist-screen .container-details-right{
+    width: 50%;
+    float: left;
+}
+.pos .containerlist-screen .container-detail{
+    line-height: 24px;
+}
+.pos .containerlist-screen .container-detail > .label{
+    font-weight: bold;
+    display: inline-block;
+    width: 75px;
+    text-align: right;
+    margin-right: 8px;
+}
+.pos .containerlist-screen .container-details input,
+.pos .containerlist-screen .container-details select
+{
+    padding: 4px;
+    border-radius: 3px;
+    border: solid 1px #cecbcb;
+    margin-bottom: 4px;
+    background: white;
+    font-family: "Lato","Lucida Grande", Helvetica, Verdana, Arial;
+    color: #555555;
+    width: 340px;
+    font-size: 14px;
+    box-sizing: border-box;
+}
+.pos .containerlist-screen .container-details input.container-name {
+    font-size: 24px;
+    line-height: 24px;
+    margin: 18px 6px;
+    width: 340px;
+}
+.pos .containerlist-screen .container-detail > .empty{
+    opacity: 0.3;
+}
+.pos .containerlist-screen .searchbox{
+    right: auto;
+    margin-left: -90px;
+    margin-top:8px;
+    left: 50%;
+}
+.pos .containerlist-screen .searchbox input{
+    width: 120px;
+}
+.pos .containerlist-screen .button.new-customer {
+    left: 50%;
+    margin-left: 120px;
+}
diff --git a/pos_container/static/src/js/container.js b/pos_container/static/src/js/container.js
index 190598d1c7..00c0c249e5 100644
--- a/pos_container/static/src/js/container.js
+++ b/pos_container/static/src/js/container.js
@@ -16,6 +16,7 @@ odoo.define('pos_container.container', function (require) {
     var models = require('point_of_sale.models');
 
     var core = require('web.core');
+    var rpc = require('web.rpc');
     var QWeb = core.qweb;
 
 
@@ -208,11 +209,14 @@ odoo.define('pos_container.container', function (require) {
 
             fields.id = container.id || false;
             fields.display_name = container.display_name || false;
-            fields.barcode = fields.barcode ? this.pos.barcode_reader.sanitize_ean(fields.barcode) : false;
+            fields.barcode = fields.barcode ? this.pos.barcode_reader.barcode_parser.sanitize_ean(fields.barcode) : false;
             fields.weight = fields.weight || false;
 
-            new instance.web.Model('pos.container').call(
-                    'create_from_ui',[fields]).then(function(container_id){
+            rpc.query({
+                model: 'res.partner',
+                method: 'create_from_ui',
+                args: [fields],
+            }).then(function(container_id){
                 self.saved_container_details(container_id);
             },function(err,event){
                 event.preventDefault();
diff --git a/pos_container/static/src/js/models_and_db.js b/pos_container/static/src/js/models_and_db.js
index c6b0d60da5..7dae40d33f 100644
--- a/pos_container/static/src/js/models_and_db.js
+++ b/pos_container/static/src/js/models_and_db.js
@@ -164,7 +164,7 @@ odoo.define('pos_container.models_and_db', function (require) {
             }
             var results = [];
             for(var i = 0; i < this.limit; i++) {
-                r = re.exec(this.container_search_string);
+               var r = re.exec(this.container_search_string);
                 if(r) {
                     var id = Number(r[1]);
                     results.push(this.get_container_by_id(id));
diff --git a/pos_container/static/src/xml/pos.xml b/pos_container/static/src/xml/pos.xml
index abe326471f..5307030f62 100644
--- a/pos_container/static/src/xml/pos.xml
+++ b/pos_container/static/src/xml/pos.xml
@@ -55,7 +55,7 @@
                          <span class="search-clear"/>
                      </span>
                      <span class="searchbox"/>
-                     <span class="button new-container">
+                     <span class="button new-container" role="img" aria-label="Add a container" title="Add a container">
                          <i class="fa fa-beer"/>
                          <i class="fa fa-plus"/>
                      </span>

From 1d254e36f3e1ef41655b1f5437358b560ccfc87a Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Fri, 22 Feb 2019 16:55:50 +0100
Subject: [PATCH 11/47] ADD container creation

---
 pos_container/models/barcode.py              |  5 +-
 pos_container/models/container.py            | 11 +++-
 pos_container/static/src/js/container.js     | 18 ++++---
 pos_container/static/src/js/models_and_db.js | 54 ++++++++++++++++++++
 pos_container/static/src/xml/pos.xml         | 12 ++---
 5 files changed, 81 insertions(+), 19 deletions(-)

diff --git a/pos_container/models/barcode.py b/pos_container/models/barcode.py
index 64f4ab119d..78e1ab0399 100644
--- a/pos_container/models/barcode.py
+++ b/pos_container/models/barcode.py
@@ -2,13 +2,12 @@
 # 	    Pierrick Brun <pierrick.brun@akretion.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from odoo import models, fields, api
-from odoo.exceptions import ValidationError
+from odoo import models, fields
 
 
 class BarcodeRule(models.Model):
     _inherit = 'barcode.rule'
 
     type = fields.Selection(
-        selection_add = [('container', 'Container unit')],
+        selection_add=[('container', 'Container unit')],
     )
diff --git a/pos_container/models/container.py b/pos_container/models/container.py
index effaed9c54..3084d343dd 100644
--- a/pos_container/models/container.py
+++ b/pos_container/models/container.py
@@ -3,7 +3,6 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo import models, fields, api
-from odoo.exceptions import ValidationError
 
 
 class Container(models.Model):
@@ -21,7 +20,7 @@ class Container(models.Model):
         string='Weight (g)',
     )
     owner_id = fields.Many2one(
-        comodel_name='res.partner',
+        comodel_name='res.container',
         inverse_name='container_ids',
         string='Owner',
     )
@@ -32,3 +31,11 @@ class Container(models.Model):
             "A barcode can only be assigned to one container !"),
     ]
 
+    @api.model
+    def create_from_ui(self, container):
+        container_id = container.pop('id', False)
+        if container_id:  # Modifying existing container
+            self.browse(container_id).write(container)
+        else:
+            container_id = self.create(container).id
+        return container_id
diff --git a/pos_container/static/src/js/container.js b/pos_container/static/src/js/container.js
index 00c0c249e5..908ce675ae 100644
--- a/pos_container/static/src/js/container.js
+++ b/pos_container/static/src/js/container.js
@@ -69,9 +69,8 @@ odoo.define('pos_container.container', function (require) {
 
             var search_timeout = null;
 
-            if(this.pos.config.iface_vkeyboard &&
-                    this.pos_widget.onscreen_keyboard){
-                this.pos_widget.onscreen_keyboard.connect(
+            if(this.pos.config.iface_vkeyboard && this.chrome.widget.keyboard){
+                this.chrome.widget.keyboard.connect(
                     this.$('.searchbox input')
                 );
             }
@@ -97,7 +96,7 @@ odoo.define('pos_container.container', function (require) {
                 if ( associate_result && containers.length === 1){
                     this.new_container = containers[0];
                     this.save_changes();
-                    this.pos_widget.screen_selector.back();
+                    this.gui.back();
                 }
                 this.render_list(containers);
             }else{
@@ -131,7 +130,7 @@ odoo.define('pos_container.container', function (require) {
             }
         },
         save_changes: function(){
-            this.pos.get('selectedOrder').addContainer(this.new_container);
+            this.pos.get('selectedOrder').add_container(this.new_container);
         },
         has_container_changed: function() {
             if(this.old_container && this.new_container) {
@@ -200,7 +199,7 @@ odoo.define('pos_container.container', function (require) {
                 fields[el.name] = el.value;
             });
             if (!fields.barcode) {
-                this.pos_widget.screen_selector.show_popup('error',{
+                this.gui.show_popup('error',{
                     message: 'A Container Barcode Is Required',
                 });
                 return;
@@ -213,14 +212,14 @@ odoo.define('pos_container.container', function (require) {
             fields.weight = fields.weight || false;
 
             rpc.query({
-                model: 'res.partner',
+                model: 'pos.container',
                 method: 'create_from_ui',
                 args: [fields],
             }).then(function(container_id){
                 self.saved_container_details(container_id);
             },function(err,event){
                 event.preventDefault();
-                self.pos_widget.screen_selector.show_popup('error',{
+                self.gui.show_popup('error',{
                     'message':_t('Error: Could not Save Changes'),
                     'comment':_t('Your Internet connection is probably down.'),
                 });
@@ -248,6 +247,9 @@ odoo.define('pos_container.container', function (require) {
         reload_containers: function(){
             var self = this;
             return this.pos.load_new_containers().then(function(){
+                // containers may have changed in the backend
+                self.container_cache = new screens.DomCache();
+
                 self.render_list(self.pos.db.get_containers_sorted(1000));
 
                 var last_orderline = self.pos.get_order().get_last_orderline();
diff --git a/pos_container/static/src/js/models_and_db.js b/pos_container/static/src/js/models_and_db.js
index 7dae40d33f..bae7600b49 100644
--- a/pos_container/static/src/js/models_and_db.js
+++ b/pos_container/static/src/js/models_and_db.js
@@ -66,6 +66,60 @@ odoo.define('pos_container.models_and_db', function (require) {
         },
     });
 
+    models.Order = models.Order.extend({
+        add_container: function(container, options){
+            if(this._printed){
+                this.destroy();
+                return this.pos.get('selectedOrder').add_container(container, options);
+            }
+            options = options || {};
+            var attr = JSON.parse(JSON.stringify(container));
+            attr.pos = this.pos;
+            attr.order = this;
+            var line = new models.Orderline({}, {pos: this.pos, order: this, product: null});
+            this.get('orderLines').add(line);
+
+            self.pos_widget.reload_products(container.pos_categ_ids)
+
+            line.set_container(container);
+            this.selectLine(this.getLastOrderline());
+            this.pos.get('selectedOrder').display_container(container);
+
+        },
+    });
+    
+    // Add container to order line
+    models.Orderline = models.Orderline.extend({
+        get_container: function(){
+            return this.container;
+        },
+        set_container: function(container){
+            this.container = container;
+        },
+        set_tare: function(tare){
+            this.tare = tare;
+            this.container = null;
+            if(this.tare[0] == '.')
+            {
+                this.tare = '0' + this.tare
+            }
+            if (this.gross_weight && this.gross_weight != 'NaN')
+            {
+                this.set_quantity(this.gross_weight - tare);
+            }
+            else
+            {
+                this.gross_weight = this.quantity;
+                this.set_quantity(this.quantity - tare);
+            }
+            this.trigger('change', this);
+        },
+        get_tare: function(){
+            return this.tare;
+        },
+    });
+
+
     PosDB.include({
         init: function(parent, options) {
             this._super(parent, options);
diff --git a/pos_container/static/src/xml/pos.xml b/pos_container/static/src/xml/pos.xml
index 5307030f62..ffd2ecf949 100644
--- a/pos_container/static/src/xml/pos.xml
+++ b/pos_container/static/src/xml/pos.xml
@@ -13,13 +13,13 @@
              <div class="container-details-box clearfix">
                  <div class="container-details-left">
                      <div class="container-detail">
-                         <span class="label">Nom</span>
+                         <span class="label">Name</span>
                          <span class="detail container-name">
-                             <t t-esc="container.display_name"/>
+                             <t t-esc="container.name"/>
                          </span>
                      </div>
                      <div class="container-detail">
-                         <span class="label">Code-barre</span>
+                         <span class="label">Barcode</span>
                          <span class="detail container-barcode">
                              <t t-esc="container.barcode"/>
                          </span>
@@ -27,7 +27,7 @@
                  </div>
                  <div class="container-details-right">
                      <div class="container-detail">
-                         <span class="label">Poids</span>
+                         <span class="label">Weight</span>
                          <span class="detail container-weight">
                              <t t-esc="container.weight"/>
                          </span>
@@ -115,7 +115,7 @@
                 <div class='container-details-left'>
                     <div class='container-detail'>
                         <span class='label'>name</span>
-                        <input class='detail container-name' name='name' t-att-value='container.display_name' placeholder='Nom'></input>
+                        <input class='detail container-name' name='name' t-att-value='container.name' placeholder='Name'></input>
                     </div>
                     <div class='container-detail'>
                         <span class='label'>Barcode</span>
@@ -125,7 +125,7 @@
                 <div class='container-details-right'>
                     <div class='container-detail'>
                         <span class='label'>Weight</span>
-                        <input class='detail container-weight' name='weight' t-att-value='container.weight' placeholder='Poids'></input>
+                        <input class='detail container-weight' name='weight' t-att-value='container.weight' placeholder='Weight'></input>
                     </div>
                 </div>
                 <div class='edit-buttons'>

From 4121657ff2b3f2d18d8d479f6f1b6eae1958a597 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Wed, 27 Feb 2019 17:50:17 +0100
Subject: [PATCH 12/47] [IMP] handle container scan then product selection

---
 pos_container/__manifest__.py                |  2 +
 pos_container/data/product.xml               | 15 +++++
 pos_container/demo/demo.xml                  |  7 +--
 pos_container/models/container.py            |  2 +-
 pos_container/static/src/js/container.js     | 55 +++++++++++++++++
 pos_container/static/src/js/models_and_db.js | 64 ++++++++++++--------
 pos_container/static/src/xml/pos.xml         | 41 +++++++++++++
 7 files changed, 156 insertions(+), 30 deletions(-)
 create mode 100644 pos_container/data/product.xml

diff --git a/pos_container/__manifest__.py b/pos_container/__manifest__.py
index ae61ddca74..167e855807 100644
--- a/pos_container/__manifest__.py
+++ b/pos_container/__manifest__.py
@@ -1,5 +1,6 @@
 # Copyright 2019 Coop IT Easy SCRLfs
 # 	    Robin Keunen <robin@coopiteasy.be>
+#           Pierrick Brun <pierrick.brun@akretion.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).{
 {
     'name': "POS Container",
@@ -17,6 +18,7 @@
     'depends': ['point_of_sale'],
 
     'data': [
+        'data/product.xml',
         'views/container.xml',
         'templates/templates.xml',
         'security/ir.model.access.csv',
diff --git a/pos_container/data/product.xml b/pos_container/data/product.xml
new file mode 100644
index 0000000000..ec078ed786
--- /dev/null
+++ b/pos_container/data/product.xml
@@ -0,0 +1,15 @@
+<odoo>
+    <record id="temporary_container_product" model="product.product">
+        <field name="name">Container without product</field>
+            <!-- The barcode is used to find it from the POS -->
+        <field name="barcode">CONTAINER</field>
+        <field name="uom_id" ref="uom.product_uom_kgm"/>
+        <field name="uom_po_id" ref="uom.product_uom_kgm"/>
+        <field name="purchase_ok" eval="False"/>
+        <field name="description">
+            This product is used to describe POS order lines having a container but no product yet
+        </field>
+        <field name="list_price">0</field>
+        <field name="available_in_pos" eval="True"/>
+    </record>
+</odoo>
diff --git a/pos_container/demo/demo.xml b/pos_container/demo/demo.xml
index effd06e996..ee65b42f1b 100644
--- a/pos_container/demo/demo.xml
+++ b/pos_container/demo/demo.xml
@@ -2,19 +2,18 @@
     <record id="container_1" model="pos.container">
         <field name="name">Container 1</field>
         <field name="barcode">4987654567897</field>
-        <field name="weight">123</field>
+        <field name="weight">0.123</field>
     </record>
 
     <record id="container_2" model="pos.container">
         <field name="name">Container 2</field>
         <field name="barcode">4909876543567</field>
-        <field name="weight">234</field>
+        <field name="weight">0.234</field>
     </record>
 
     <record id="container_3" model="pos.container">
         <field name="name">Container 3</field>
         <field name="barcode">4909876543987</field>
-        <field name="weight">23.4</field>
+        <field name="weight">0.567</field>
     </record>
-
 </odoo>
diff --git a/pos_container/models/container.py b/pos_container/models/container.py
index 3084d343dd..036032c44b 100644
--- a/pos_container/models/container.py
+++ b/pos_container/models/container.py
@@ -20,7 +20,7 @@ class Container(models.Model):
         string='Weight (g)',
     )
     owner_id = fields.Many2one(
-        comodel_name='res.container',
+        comodel_name='res.partner',
         inverse_name='container_ids',
         string='Owner',
     )
diff --git a/pos_container/static/src/js/container.js b/pos_container/static/src/js/container.js
index 908ce675ae..470d582f8d 100644
--- a/pos_container/static/src/js/container.js
+++ b/pos_container/static/src/js/container.js
@@ -348,4 +348,59 @@ odoo.define('pos_container.container', function (require) {
         widget: ContainerListScreenWidget
     });
 
+    // add container barcode scan
+    screens.ScreenWidget.include({
+        barcode_container_action: function(code){
+            var self = this;
+            if (self.pos.scan_container(code)) {
+                //self.gui.show_screen(
+                //    self.barcode_container_screen, null, null, true);
+            } else {
+                self.gui.show_screen(
+                    'scale_container', {container: code.base_code});
+            }
+        },
+        show: function(){
+            var self = this;
+            this._super();
+            this.pos.barcode_reader.set_action_callback({
+                'container': _.bind(self.barcode_container_action, self),
+            });
+        },
+    });
+
+    screens.ProductScreenWidget.include({
+        click_product: function(product) {
+            var order = this.pos.get_order();
+            var selected_orderline = order.get_selected_orderline();
+            if (product.to_weight && selected_orderline &&
+                    selected_orderline.product === this.pos.get_container_product()){
+                var container = selected_orderline.get_container();
+                this.gui.show_screen('scale',{
+                    product: product, container: container,
+                    old_orderline: selected_orderline});
+            } else {
+                this._super(product);
+            }
+        },
+    });
+
+    screens.ScaleScreenWidget.include({
+        order_product: function(){
+            this._super();
+            var order = this.pos.get_order();
+            var container = this.gui.get_current_screen_param('container');
+            var old_orderline = this.gui.get_current_screen_param(
+                'old_orderline');
+            if (container){
+                var orderline = order.get_last_orderline();
+                orderline.set_container(container);
+                if (old_orderline){
+                    order.remove_orderline(old_orderline);
+                }
+                orderline.trigger('change', orderline);
+            }
+        },
+    });
+
 });
diff --git a/pos_container/static/src/js/models_and_db.js b/pos_container/static/src/js/models_and_db.js
index bae7600b49..68e72178dd 100644
--- a/pos_container/static/src/js/models_and_db.js
+++ b/pos_container/static/src/js/models_and_db.js
@@ -12,29 +12,27 @@ odoo.define('pos_container.models_and_db', function (require) {
     var models = require('point_of_sale.models');
     var rpc = require('web.rpc');
 
-    models.load_models({
-        model: 'pos.container',
-        fields: ['name','barcode', 'weight'],
-        // domain: [[]],
-        loaded: function(self, containers){
-            self.containers = containers;
-        },
-    });
-
     // include not available => extend
     models.PosModel = models.PosModel.extend({
-        scan_container: function(parsed_code){
-            var selectedOrder = this.get('selectedOrder');
-            if(parsed_code.encoding === 'barcode'){
-                var container = this.db.get_container_by_barcode(parsed_code.base_code);
+        get_container_product: function(){
+            // assign value if not already assigned.
+            // Avoids rewriting init function
+            if (!this.container_product){
+                this.container_product = this.db.get_product_by_barcode(
+                    'CONTAINER');
             }
+            return this.container_product
+        },
+        scan_container: function(parsed_code){
+            var selected_order = this.get_order();
+            var container = this.db.get_container_by_barcode(
+                parsed_code.base_code);
+
             if(!container){
-                self.pos_widget.screen_selector.set_current_screen('container_scale', {container: parsed_code.base_code});
                 return false;
             }
 
-            selectedOrder.addContainer(container);
-
+            selected_order.add_container(container);
             return true;
         },
         // reload the list of container, returns as a deferred that resolves if there were
@@ -70,21 +68,22 @@ odoo.define('pos_container.models_and_db', function (require) {
         add_container: function(container, options){
             if(this._printed){
                 this.destroy();
-                return this.pos.get('selectedOrder').add_container(container, options);
+                return this.pos.get_order().add_container(container, options);
             }
             options = options || {};
             var attr = JSON.parse(JSON.stringify(container));
             attr.pos = this.pos;
             attr.order = this;
-            var line = new models.Orderline({}, {pos: this.pos, order: this, product: null});
-            this.get('orderLines').add(line);
-
-            self.pos_widget.reload_products(container.pos_categ_ids)
+            var product = this.pos.get_container_product();
+            var line = new models.Orderline({},
+                {pos: this.pos, order: this, product: product});
 
             line.set_container(container);
-            this.selectLine(this.getLastOrderline());
-            this.pos.get('selectedOrder').display_container(container);
+            this.orderlines.add(line);
+            //self.pos_widget.reload_products(container.pos_categ_ids)
 
+            this.select_orderline(this.get_last_orderline());
+            //this.pos.get_order().display_container(container);
         },
     });
     
@@ -117,6 +116,13 @@ odoo.define('pos_container.models_and_db', function (require) {
         get_tare: function(){
             return this.tare;
         },
+        get_gross_weight: function(){
+            return this.gross_weight;
+        },
+        set_gross_weight: function(weight){
+            this.gross_weight = weight;
+            this.trigger('change', this);
+        },
     });
 
 
@@ -129,7 +135,6 @@ odoo.define('pos_container.models_and_db', function (require) {
             this.container_by_barcode = {};
             this.container_search_string = "";
             this.container_write_date = null;
-
         },
         _container_search_string: function(container){
 
@@ -196,7 +201,6 @@ odoo.define('pos_container.models_and_db', function (require) {
             return this.container_by_id[id];
         },
         get_container_by_barcode: function(barcode){
-
             return this.container_by_barcode[barcode];
         },
         get_containers_sorted: function(max_count){
@@ -231,4 +235,14 @@ odoo.define('pos_container.models_and_db', function (require) {
         },
 
     });
+
+    models.load_models({
+        model: 'pos.container',
+        fields: ['name','barcode', 'weight'],
+        // domain: [[]],
+        loaded: function(self, containers){
+            self.db.add_containers(containers);
+        },
+    });
+
 });
diff --git a/pos_container/static/src/xml/pos.xml b/pos_container/static/src/xml/pos.xml
index ffd2ecf949..0f19d48635 100644
--- a/pos_container/static/src/xml/pos.xml
+++ b/pos_container/static/src/xml/pos.xml
@@ -136,5 +136,46 @@
         </section>
     </t>
 
+    <t t-extend='Orderline'>
+        <t t-jquery='.info-list:last-child' t-operation='prepend'>
+            <t t-if="line.get_container()">
+                <ul class="info-list">
+                    <ul class="info-list">
+                        <i><t t-if="line.get_gross_weight()">
+                            <li class="info">
+                                Gross : <t t-esc="line.get_gross_weight()"/> kg
+                            </li>
+                        </t>
+                        <li class="info">
+                            <i class='fa fa-beer'/> :
+                            <t t-esc="line.get_container().weight"/> kg 
+                            - 
+                            <t t-esc="line.get_container().name"/>
+                        </li></i>
+                    </ul>
+                </ul>
+            </t>
+            <t t-if="line.get_tare()">
+                <ul class="info-list">
+                    <ul class="info-list">
+                        <i><t t-if="line.get_gross_weight()">
+                            <li class="info">
+                                Gross : <t t-esc="line.get_gross_weight()"/> kg
+                            </li>
+                        </t>
+                        <li class="info">
+                            <i class='fa fa-beer'/> :
+                            <t t-esc="line.get_tare()"/> kg 
+                            - Manual tare
+                        </li></i>
+                    </ul>
+                </ul>
+            </t>
+            <!--<div class="pos-right-align">
+                <t t-esc="line.get_tare_manual()"/>
+            </div> -->
+        </t>
+    </t>
+
 
 </templates>

From 6c1651d86856f30d2a38768a1500bc55b2132f97 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Thu, 28 Feb 2019 14:56:27 +0100
Subject: [PATCH 13/47] [FIX] container creation

---
 pos_container/static/src/js/container.js | 164 +++++++++++++++++++----
 pos_container/static/src/xml/pos.xml     |  27 +++-
 2 files changed, 161 insertions(+), 30 deletions(-)

diff --git a/pos_container/static/src/js/container.js b/pos_container/static/src/js/container.js
index 470d582f8d..e4f5ba2fbc 100644
--- a/pos_container/static/src/js/container.js
+++ b/pos_container/static/src/js/container.js
@@ -18,12 +18,16 @@ odoo.define('pos_container.container', function (require) {
     var core = require('web.core');
     var rpc = require('web.rpc');
     var QWeb = core.qweb;
+    var _t = core._t;
 
 
     var ContainerButton = screens.ActionButtonWidget.extend({
         template: 'ContainerButton',
         button_click: function(){
-            this.gui.show_screen('containerlist');
+            var oline = this.pos.get_order().get_selected_orderline();
+            var old_container = oline.get_container();
+            this.gui.show_screen('containerlist',
+                {old_container: old_container});
         }
     });
 
@@ -49,8 +53,7 @@ odoo.define('pos_container.container', function (require) {
             });
 
             this.$('.new-container').click(function(){
-                self.display_container_details('edit',{
-                });
+                self.gui.show_screen('containerscale', {barcode: null});
             });
   
             var containers = this.pos.db.get_containers_sorted(1000);
@@ -130,7 +133,7 @@ odoo.define('pos_container.container', function (require) {
             }
         },
         save_changes: function(){
-            this.pos.get('selectedOrder').add_container(this.new_container);
+            this.pos.get_order().add_container(this.new_container);
         },
         has_container_changed: function() {
             if(this.old_container && this.new_container) {
@@ -187,13 +190,10 @@ odoo.define('pos_container.container', function (require) {
                 this.display_container_details('show', container);
             }
         },
-
-        // What happens when we save the changes on the container edit form -> we fetch the fields, sanitize them,
-        // send them to the backend for update, and call saved_container_details() when the server tells us the
-        // save was successfull.
         save_container_details: function(container){
             var self = this;
 
+            console.log(container);
             var fields = {}
             this.$('.container-details-contents .detail').each(function(idx,el){
                 fields[el.name] = el.value;
@@ -207,8 +207,8 @@ odoo.define('pos_container.container', function (require) {
             fields.weight = fields.weight.replace(',', '.')
 
             fields.id = container.id || false;
-            fields.display_name = container.display_name || false;
-            fields.barcode = fields.barcode ? this.pos.barcode_reader.barcode_parser.sanitize_ean(fields.barcode) : false;
+            fields.name = container.name || false;
+            fields.barcode = fields.barcode || false;
             fields.weight = fields.weight || false;
 
             rpc.query({
@@ -217,15 +217,23 @@ odoo.define('pos_container.container', function (require) {
                 args: [fields],
             }).then(function(container_id){
                 self.saved_container_details(container_id);
-            },function(err,event){
-                event.preventDefault();
-                self.gui.show_popup('error',{
-                    'message':_t('Error: Could not Save Changes'),
-                    'comment':_t('Your Internet connection is probably down.'),
-                });
-            });
+            },function(err,ev){
+                ev.preventDefault();
+                var error_body = _t('Your Internet connection is probably down.');
+                    if (err.data) {
+                        var except = err.data;
+                        error_body = except.arguments && except.arguments[0] || except.message || error_body;
+                    }
+                    self.gui.show_popup('error',{
+                        'title': _t('Error: Could not Save Changes'),
+                        'body': error_body,
+                    });
+                    contents.on('click','.button.save',function(){
+                        self.save_container_details(container);
+                    });
+                }
+            );
         },
-        // What happens when we've just pushed modifications for a container of id container_id
         saved_container_details: function(container_id){
             var self = this;
             this.reload_containers().then(function(){
@@ -239,6 +247,10 @@ odoo.define('pos_container.container', function (require) {
                     // has created, and reload_container() must have loaded the newly created container.
                     self.display_container_details('hide');
                 }
+            }).always(function(){
+                $(".container-details-contents").on('click','.button.save',function(){
+                    self.save_container_details(container);
+                });
             });
         },
 
@@ -281,15 +293,22 @@ odoo.define('pos_container.container', function (require) {
             contents.off('click','.button.edit');
             contents.off('click','.button.save');
             contents.off('click','.button.undo');
-            contents.on('click','.button.edit',function(){self.edit_container_details(container);});
-            contents.on('click','.button.save',function(){self.save_container_details(container);});
-            contents.on('click','.button.undo',function(){self.undo_container_details(container);});
+            contents.on('click','.button.edit',function(){
+                self.edit_container_details(container);
+            });
+            contents.on('click','.button.save',function(){
+                self.save_container_details(container);
+            });
+            contents.on('click','.button.undo',function(){
+                self.undo_container_details(container);
+            });
             this.editing_container = false;
 
             if(visibility === 'show'){
 
                 contents.empty();
-                contents.append($(QWeb.render('ContainerDetails',{widget:this, container:container})));
+                contents.append($(QWeb.render('ContainerDetails',{
+                    widget:this, container:container})));
 
                 var new_height   = contents.height();
 
@@ -309,17 +328,19 @@ odoo.define('pos_container.container', function (require) {
             } else if (visibility === 'edit') {
                 this.editing_container = true;
                 contents.empty();
-                contents.append($(QWeb.render('ContainerDetailsEdit', {widget:this, container:container})));
+                contents.append($(QWeb.render('ContainerDetailsEdit', {
+                    widget:this, container:container})));
                 this.toggle_save_button();
             } else if (visibility === 'add_by_scan') {
                 new_container = {
-                    'display_name': 'Contenant',
+                    'name': 'Contenant',
                     'barcode': container.parsed_code.base_code,
                     'weight': 0
                 }
                 this.editing_container = true;
                 contents.empty();
-                contents.append($(QWeb.render('ContainerDetailsEdit', {widget:this, container:new_container})));
+                contents.append($(QWeb.render('ContainerDetailsEdit', {
+                    widget:this, container:new_container})));
                 this.toggle_save_button();
 
             } else if (visibility === 'hide') {
@@ -353,11 +374,10 @@ odoo.define('pos_container.container', function (require) {
         barcode_container_action: function(code){
             var self = this;
             if (self.pos.scan_container(code)) {
-                //self.gui.show_screen(
-                //    self.barcode_container_screen, null, null, true);
+                // nothing to do now, the container is added
+                // as an orderline if found.
             } else {
-                self.gui.show_screen(
-                    'scale_container', {container: code.base_code});
+                self.gui.show_screen('containerscale', {barcode: code.base_code});
             }
         },
         show: function(){
@@ -386,8 +406,11 @@ odoo.define('pos_container.container', function (require) {
     });
 
     screens.ScaleScreenWidget.include({
+
         order_product: function(){
             this._super();
+            // Replace the orderline if the product is the placeholder
+            // container product.
             var order = this.pos.get_order();
             var container = this.gui.get_current_screen_param('container');
             var old_orderline = this.gui.get_current_screen_param(
@@ -403,4 +426,87 @@ odoo.define('pos_container.container', function (require) {
         },
     });
 
+    var ContainerScaleScreenWidget = screens.ScaleScreenWidget.extend({
+        template: 'ContainerScaleScreenWidget',
+
+        next_screen: 'products',
+        previous_screen: 'products',
+
+        init: function(parent, options){
+            this._super(parent, options);
+        },
+
+        show: function(){
+            this._super();
+            var self = this;
+
+            this.$('.next,.add-container').click(function(){
+                self.create_container();
+            });
+        },
+        get_product: function(){
+            return this.pos.get_container_product();
+        },
+        create_container: function(){
+            var self = this;
+            var fields = {}
+            if (!this.weight)
+            {
+                this.$('.weight').each(function(idx,el){
+                    fields['weight'] = parseFloat(el.textContent);
+                });
+            }
+            else
+            {
+                fields['weight'] = this.weight;
+            }
+
+            this.$('.container-name .detail').each(function(idx,el){
+                fields[el.name] = el.value;
+            });
+
+            fields.barcode = this.gui.get_current_screen_param('barcode') || false;
+            fields.name = fields.name || 'Contenant';
+
+            rpc.query({
+                model: 'pos.container',
+                method: 'create_from_ui',
+                args: [fields],
+            }).then(function(container_id){
+                self.created_container(container_id);
+            },function(err,ev){
+                ev.preventDefault();
+                var error_body = _t('Your Internet connection is probably down.');
+                    if (err.data) {
+                        var except = err.data;
+                        error_body = except.arguments && except.arguments[0] || except.message || error_body;
+                    }
+                    self.gui.show_popup('error',{
+                        'title': _t('Error: Could not Save Changes'),
+                        'body': error_body,
+                    });
+                }
+            );
+        },
+        created_container: function(container_id){
+            var self = this;
+            self.pos.load_new_containers().then(function(){
+                var container = self.pos.db.get_container_by_id(container_id);
+                if (container) {
+                    self.gui.show_screen(self.next_screen);
+                    self.order_container(container);
+                }
+            });
+        },
+        order_container: function(container){
+            this.pos.get_order().add_container(container);
+        },
+
+    });
+
+    gui.define_screen({
+        name:'containerscale',
+        widget: ContainerScaleScreenWidget,
+    });
+
 });
diff --git a/pos_container/static/src/xml/pos.xml b/pos_container/static/src/xml/pos.xml
index 0f19d48635..043171a6a3 100644
--- a/pos_container/static/src/xml/pos.xml
+++ b/pos_container/static/src/xml/pos.xml
@@ -177,5 +177,30 @@
         </t>
     </t>
 
-
+    <t t-name="ContainerScaleScreenWidget">
+        <div class="scale-screen screen">
+            <div class="screen-content">
+                <div class="top-content">
+                    <span class='button back'>
+                        <i class='fa fa-angle-double-left'></i>
+                        Back
+                    </span>
+                    <h1 class='product-name'>Add a container</h1>
+                </div>
+                <div class="centered-content">
+                    <div class='weight js-weight'>
+                        <t t-esc="widget.get_product_weight_string()" />
+                    </div>
+                    <div class='container-name'>
+                        <span class='label'>Container name: </span><br/>
+                        <input class='detail container-name' name='container_name' placeholder="Container"></input>
+                    </div>
+                    <div class='add-container'>
+                        Save
+                        <i class='fa fa-angle-double-right'></i>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </t>
 </templates>

From 6e485cb9bd51f84cf95e7c07e3871032b8ec5178 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Thu, 28 Feb 2019 16:09:19 +0100
Subject: [PATCH 14/47] [IMP] now possible to manually select a container

---
 pos_container/static/src/css/container.css | 20 +++++++
 pos_container/static/src/js/container.js   | 63 ++++++++--------------
 2 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/pos_container/static/src/css/container.css b/pos_container/static/src/css/container.css
index 71e0539f68..da37cf592e 100644
--- a/pos_container/static/src/css/container.css
+++ b/pos_container/static/src/css/container.css
@@ -14,6 +14,26 @@
     height: auto;                                                               
 } 
 
+/* The Scale Container Screen */
+.pos .scale-screen .add-container{
+    text-align: center;
+    font-size: 32px;
+    background: rgb(110,200,155);
+    color: white;
+    border-radius: 3px;
+    padding: 16px;
+    margin: 16px;
+    cursor: pointer;
+}
+
+.pos .scale-screen .container-name,.container-barcode{
+    text-align: center;
+    font-size: 25px;
+    border-radius: 3px;
+    padding-top: 10px;
+    padding-bottom:10px;
+    margin-top: 5px;
+}
 
 /* e) The Container List Screen */
 
diff --git a/pos_container/static/src/js/container.js b/pos_container/static/src/js/container.js
index e4f5ba2fbc..357c377517 100644
--- a/pos_container/static/src/js/container.js
+++ b/pos_container/static/src/js/container.js
@@ -24,10 +24,7 @@ odoo.define('pos_container.container', function (require) {
     var ContainerButton = screens.ActionButtonWidget.extend({
         template: 'ContainerButton',
         button_click: function(){
-            var oline = this.pos.get_order().get_selected_orderline();
-            var old_container = oline.get_container();
-            this.gui.show_screen('containerlist',
-                {old_container: old_container});
+            this.gui.show_screen('containerlist');
         }
     });
 
@@ -48,10 +45,17 @@ odoo.define('pos_container.container', function (require) {
             var self = this;
             this._super();
         
+            this.renderElement();
+            this.details_visible = false;
             this.$('.back').click(function(){
                 self.gui.back();
             });
 
+            this.$('.next').click(function(){
+                self.save_changes();
+                self.gui.show_screen('products');
+            });
+
             this.$('.new-container').click(function(){
                 self.gui.show_screen('containerscale', {barcode: null});
             });
@@ -61,10 +65,6 @@ odoo.define('pos_container.container', function (require) {
 
             this.reload_containers();
 
-            if(this.old_container) {
-                this.display_container_details('show', this.old_container, 0);
-            }
-
             this.$('.container-list-contents').delegate('.container-line',
                     'click', function(event){
                 self.line_select(event,$(this),parseInt($(this).data('id')));
@@ -97,7 +97,7 @@ odoo.define('pos_container.container', function (require) {
                 var containers = this.pos.db.search_container(query);
                 this.display_container_details('hide');
                 if ( associate_result && containers.length === 1){
-                    this.new_container = containers[0];
+                    this.container = containers[0];
                     this.save_changes();
                     this.gui.back();
                 }
@@ -123,7 +123,7 @@ odoo.define('pos_container.container', function (require) {
                 containerline.innerHTML = containerline_html;
                 containerline = containerline.childNodes[1];
 
-                if(containers === this.new_container) {
+                if(containers === this.container) {
                     containerline.classList.add('highlight');
                 } else {
                     containerline.classList.remove('highlight');
@@ -133,30 +133,19 @@ odoo.define('pos_container.container', function (require) {
             }
         },
         save_changes: function(){
-            this.pos.get_order().add_container(this.new_container);
-        },
-        has_container_changed: function() {
-            if(this.old_container && this.new_container) {
-                return this.old_container.id !== this.new_container.id;
-            } else {
-                return !!this.old_container !== !!this.new_container;
-            }
+            this.pos.get_order().add_container(this.container);
         },
         toggle_save_button: function(){
             var $button = this.$('.button.next');
             if (this.editing_container) {
                 $button.addClass('oe_hidden');
                 return;
-            } else if(this.new_container) {
-                if(!this.old_container) {
-                    $button.text('Set Container');
-                } else {
-                    $button.text('Change Container');
-                }
+            } else if(this.container) {
+                $button.text('Set Container');
             } else {
                 $button.text('Deselect Container');
             }
-            $button.toggleClass('oe_hidden',!this.has_container_changed());
+            $button.toggleClass('oe_hidden', !this.container);
         },
         line_select: function(event,$line,id){
             var container = this.pos.db.get_container_by_id(id);
@@ -165,14 +154,14 @@ odoo.define('pos_container.container', function (require) {
                 $line.removeClass('highlight');
                 $line.addClass('lowlight');
                 this.display_container_details('hide',container);
-                this.new_container = null;
+                // this.container = null;
                 this.toggle_save_button();
             }else{
                 this.$('.container-list .highlight').removeClass('highlight');
                 $line.addClass('highlight');
-                var y = event.pageY - $line.parent().offset().top
+                var y = event.pageY - $line.parent().offset().top;
                 this.display_container_details('show',container,y);
-                this.new_container = container;
+                this.container = container;
                 this.toggle_save_button();
             }
         },
@@ -193,7 +182,6 @@ odoo.define('pos_container.container', function (require) {
         save_container_details: function(container){
             var self = this;
 
-            console.log(container);
             var fields = {}
             this.$('.container-details-contents .detail').each(function(idx,el){
                 fields[el.name] = el.value;
@@ -211,6 +199,9 @@ odoo.define('pos_container.container', function (require) {
             fields.barcode = fields.barcode || false;
             fields.weight = fields.weight || false;
 
+            var contents = this.$('.container-details-content');
+            contents.off('click', '.button.save');
+
             rpc.query({
                 model: 'pos.container',
                 method: 'create_from_ui',
@@ -239,7 +230,7 @@ odoo.define('pos_container.container', function (require) {
             this.reload_containers().then(function(){
                 var container = self.pos.db.get_container_by_id(container_id);
                 if (container) {
-                    self.new_container = container;
+                    self.container = container;
                     self.toggle_save_button();
                     self.display_container_details('show',container);
                 } else {
@@ -331,18 +322,6 @@ odoo.define('pos_container.container', function (require) {
                 contents.append($(QWeb.render('ContainerDetailsEdit', {
                     widget:this, container:container})));
                 this.toggle_save_button();
-            } else if (visibility === 'add_by_scan') {
-                new_container = {
-                    'name': 'Contenant',
-                    'barcode': container.parsed_code.base_code,
-                    'weight': 0
-                }
-                this.editing_container = true;
-                contents.empty();
-                contents.append($(QWeb.render('ContainerDetailsEdit', {
-                    widget:this, container:new_container})));
-                this.toggle_save_button();
-
             } else if (visibility === 'hide') {
                 contents.empty();
                 if(height > scroll) {

From 814947a4bc1d371ed1a9133e431b728c0125ffe6 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Thu, 28 Feb 2019 17:21:39 +0100
Subject: [PATCH 15/47] ADD readme

---
 pos_container/README.rst                    |  81 ++++
 pos_container/readme/CONTRIBUTORS.rst       |   2 +
 pos_container/readme/DESCRIPTION.rst        |   5 +
 pos_container/readme/USAGE.rst              |   2 +
 pos_container/static/description/index.html | 431 ++++++++++++++++++++
 5 files changed, 521 insertions(+)
 create mode 100644 pos_container/README.rst
 create mode 100644 pos_container/readme/CONTRIBUTORS.rst
 create mode 100644 pos_container/readme/DESCRIPTION.rst
 create mode 100644 pos_container/readme/USAGE.rst
 create mode 100644 pos_container/static/description/index.html

diff --git a/pos_container/README.rst b/pos_container/README.rst
new file mode 100644
index 0000000000..28f80f3061
--- /dev/null
+++ b/pos_container/README.rst
@@ -0,0 +1,81 @@
+=============
+POS Container
+=============
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/github-OCA%2Fpos-lightgray.png?logo=github
+    :target: https://github.com/OCA/pos/tree/12.0/pos_container
+    :alt: OCA/pos
+.. |badge3| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/pos-12-0/pos-12-0-pos_container
+    :alt: Translate me on Weblate
+.. |badge4| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
+    :target: https://runbot.odoo-community.org/runbot/184/12.0
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| 
+
+This module allows to handle use of reusable containers in POS,
+this is useful to handle selling product in bulk without having to calculate
+the tare of the container.
+
+Each container is identified by a barcode, the weight is stored in Odoo.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Usage
+=====
+
+You have to create a Barcode Nomenclature to handle containers before using the
+module.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/pos/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/pos/issues/new?body=module:%20pos_container%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Coop IT Easy SCRLfs
+
+Contributors
+~~~~~~~~~~~~
+
+ * Pierrick Brun <pierrick.brun@akretion.com>
+ * Robin Keunen <robin.keunen@coopiteasy.be>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+This module is part of the `OCA/pos <https://github.com/OCA/pos/tree/12.0/pos_container>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/pos_container/readme/CONTRIBUTORS.rst b/pos_container/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000000..872a7eafc5
--- /dev/null
+++ b/pos_container/readme/CONTRIBUTORS.rst
@@ -0,0 +1,2 @@
+ * Pierrick Brun <pierrick.brun@akretion.com>
+ * Robin Keunen <robin.keunen@coopiteasy.be>
diff --git a/pos_container/readme/DESCRIPTION.rst b/pos_container/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..1bba872cf1
--- /dev/null
+++ b/pos_container/readme/DESCRIPTION.rst
@@ -0,0 +1,5 @@
+This module allows to handle use of reusable containers in POS,
+this is useful to handle selling product in bulk without having to calculate
+the tare of the container.
+
+Each container is identified by a barcode, the weight is stored in Odoo.
diff --git a/pos_container/readme/USAGE.rst b/pos_container/readme/USAGE.rst
new file mode 100644
index 0000000000..f5a5c7aee7
--- /dev/null
+++ b/pos_container/readme/USAGE.rst
@@ -0,0 +1,2 @@
+You have to create a Barcode Nomenclature to handle containers before using the
+module.
diff --git a/pos_container/static/description/index.html b/pos_container/static/description/index.html
new file mode 100644
index 0000000000..a141c55724
--- /dev/null
+++ b/pos_container/static/description/index.html
@@ -0,0 +1,431 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
+<title>POS Container</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="pos-container">
+<h1 class="title">POS Container</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="https://github.com/OCA/pos/tree/12.0/pos_container"><img alt="OCA/pos" src="https://img.shields.io/badge/github-OCA%2Fpos-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/pos-12-0/pos-12-0-pos_container"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/184/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>This module allows to handle use of reusable containers in POS,
+this is useful to handle selling product in bulk without having to calculate
+the tare of the container.</p>
+<p>Each container is identified by a barcode, the weight is stored in Odoo.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#usage" id="id1">Usage</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id2">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id3">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id4">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id5">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id6">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id1">Usage</a></h1>
+<p>You have to create a Barcode Nomenclature to handle containers before using the
+module.</p>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/pos/issues">GitHub Issues</a>.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/pos/issues/new?body=module:%20pos_container%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<p>Do not contact contributors directly about support or help with technical issues.</p>
+</div>
+<div class="section" id="credits">
+<h1><a class="toc-backref" href="#id3">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id4">Authors</a></h2>
+<ul class="simple">
+<li>Coop IT Easy SCRLfs</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id5">Contributors</a></h2>
+<blockquote>
+<ul class="simple">
+<li>Pierrick Brun &lt;<a class="reference external" href="mailto:pierrick.brun&#64;akretion.com">pierrick.brun&#64;akretion.com</a>&gt;</li>
+<li>Robin Keunen &lt;<a class="reference external" href="mailto:robin.keunen&#64;coopiteasy.be">robin.keunen&#64;coopiteasy.be</a>&gt;</li>
+</ul>
+</blockquote>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#id6">Maintainers</a></h2>
+<p>This module is maintained by the OCA.</p>
+<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/pos/tree/12.0/pos_container">OCA/pos</a> project on GitHub.</p>
+<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
+</div>
+</div>
+</div>
+</body>
+</html>

From ecf34af29ac74ae228a2181869687ed540328d02 Mon Sep 17 00:00:00 2001
From: "robin.keunen" <robin@keunen.net>
Date: Tue, 5 Mar 2019 11:11:57 +0100
Subject: [PATCH 16/47] [IMP] pos_container: remove tare from weight

---
 pos_container/static/src/js/container.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pos_container/static/src/js/container.js b/pos_container/static/src/js/container.js
index 357c377517..4c4c8e51e0 100644
--- a/pos_container/static/src/js/container.js
+++ b/pos_container/static/src/js/container.js
@@ -375,9 +375,11 @@ odoo.define('pos_container.container', function (require) {
             if (product.to_weight && selected_orderline &&
                     selected_orderline.product === this.pos.get_container_product()){
                 var container = selected_orderline.get_container();
-                this.gui.show_screen('scale',{
-                    product: product, container: container,
-                    old_orderline: selected_orderline});
+                this.gui.show_screen(
+                    'scale',
+                    {product: product,
+                     container: container,
+                     old_orderline: selected_orderline});
             } else {
                 this._super(product);
             }
@@ -392,14 +394,14 @@ odoo.define('pos_container.container', function (require) {
             // container product.
             var order = this.pos.get_order();
             var container = this.gui.get_current_screen_param('container');
-            var old_orderline = this.gui.get_current_screen_param(
-                'old_orderline');
+            var old_orderline = this.gui.get_current_screen_param('old_orderline');
             if (container){
                 var orderline = order.get_last_orderline();
                 orderline.set_container(container);
                 if (old_orderline){
                     order.remove_orderline(old_orderline);
                 }
+                orderline.set_quantity(orderline.quantity - container.weight);
                 orderline.trigger('change', orderline);
             }
         },
@@ -478,6 +480,7 @@ odoo.define('pos_container.container', function (require) {
             });
         },
         order_container: function(container){
+            // fixme add_container takes a list ?
             this.pos.get_order().add_container(container);
         },
 

From f52e3b230d90b7176ef2ddb502bec213a00eb6ea Mon Sep 17 00:00:00 2001
From: "robin.keunen" <robin@keunen.net>
Date: Tue, 5 Mar 2019 11:12:34 +0100
Subject: [PATCH 17/47] [IMP] pos_container: prefix container barcode 049

---
 pos_container/demo/demo.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pos_container/demo/demo.xml b/pos_container/demo/demo.xml
index ee65b42f1b..ed417ae9cb 100644
--- a/pos_container/demo/demo.xml
+++ b/pos_container/demo/demo.xml
@@ -1,19 +1,19 @@
 <odoo>
     <record id="container_1" model="pos.container">
         <field name="name">Container 1</field>
-        <field name="barcode">4987654567897</field>
+        <field name="barcode">0498765456789</field>
         <field name="weight">0.123</field>
     </record>
 
     <record id="container_2" model="pos.container">
         <field name="name">Container 2</field>
-        <field name="barcode">4909876543567</field>
+        <field name="barcode">0490987654356</field>
         <field name="weight">0.234</field>
     </record>
 
     <record id="container_3" model="pos.container">
         <field name="name">Container 3</field>
-        <field name="barcode">4909876543987</field>
+        <field name="barcode">0490987654398</field>
         <field name="weight">0.567</field>
     </record>
 </odoo>

From f517e1e7137e3de2acdee7ba10063266bcc61b49 Mon Sep 17 00:00:00 2001
From: "robin.keunen" <robin@keunen.net>
Date: Tue, 5 Mar 2019 11:28:27 +0100
Subject: [PATCH 18/47] [IMP] pos_container: save container name

---
 pos_container/static/src/js/container.js | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/pos_container/static/src/js/container.js b/pos_container/static/src/js/container.js
index 4c4c8e51e0..c75f840fb3 100644
--- a/pos_container/static/src/js/container.js
+++ b/pos_container/static/src/js/container.js
@@ -430,20 +430,13 @@ odoo.define('pos_container.container', function (require) {
         },
         create_container: function(){
             var self = this;
-            var fields = {}
-            if (!this.weight)
-            {
-                this.$('.weight').each(function(idx,el){
-                    fields['weight'] = parseFloat(el.textContent);
-                });
-            }
-            else
-            {
-                fields['weight'] = this.weight;
-            }
+            var fields = {};
+
+            fields['weight'] = this.weight;
 
             this.$('.container-name .detail').each(function(idx,el){
-                fields[el.name] = el.value;
+                fields['name'] = el.value;
+
             });
 
             fields.barcode = this.gui.get_current_screen_param('barcode') || false;

From 56049d1ab29be32128d7d1d31f235865423c2c0d Mon Sep 17 00:00:00 2001
From: "robin.keunen" <robin@keunen.net>
Date: Tue, 5 Mar 2019 12:01:57 +0100
Subject: [PATCH 19/47] [IMP] pos_container: container search by name

---
 pos_container/static/src/js/models_and_db.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pos_container/static/src/js/models_and_db.js b/pos_container/static/src/js/models_and_db.js
index 68e72178dd..53c43dcf10 100644
--- a/pos_container/static/src/js/models_and_db.js
+++ b/pos_container/static/src/js/models_and_db.js
@@ -141,7 +141,10 @@ odoo.define('pos_container.models_and_db', function (require) {
             var str = '';
 
             if(container.barcode){
-                str = '|' + container.barcode;
+                str += '|' + container.barcode;
+            }
+            if(container.name) {
+                str += '|' + container.name;
             }
             str = '' + container.id + ':' + str.replace(':','') + '\n';
 

From 43774c8571132c1f18b4cf583f0fcf4819256550 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Wed, 6 Mar 2019 10:53:46 +0100
Subject: [PATCH 20/47] [IMP] remove useless content

---
 pos_container/static/src/js/container.js | 155 -----------------------
 pos_container/static/src/xml/pos.xml     |  71 -----------
 2 files changed, 226 deletions(-)

diff --git a/pos_container/static/src/js/container.js b/pos_container/static/src/js/container.js
index c75f840fb3..1cea6389b0 100644
--- a/pos_container/static/src/js/container.js
+++ b/pos_container/static/src/js/container.js
@@ -46,7 +46,6 @@ odoo.define('pos_container.container', function (require) {
             this._super();
         
             this.renderElement();
-            this.details_visible = false;
             this.$('.back').click(function(){
                 self.gui.back();
             });
@@ -56,10 +55,6 @@ odoo.define('pos_container.container', function (require) {
                 self.gui.show_screen('products');
             });
 
-            this.$('.new-container').click(function(){
-                self.gui.show_screen('containerscale', {barcode: null});
-            });
-  
             var containers = this.pos.db.get_containers_sorted(1000);
             this.render_list(containers);
 
@@ -95,7 +90,6 @@ odoo.define('pos_container.container', function (require) {
         perform_search: function(query, associate_result){
             if(query){
                 var containers = this.pos.db.search_container(query);
-                this.display_container_details('hide');
                 if ( associate_result && containers.length === 1){
                     this.container = containers[0];
                     this.save_changes();
@@ -153,98 +147,16 @@ odoo.define('pos_container.container', function (require) {
             if ( $line.hasClass('highlight') ){
                 $line.removeClass('highlight');
                 $line.addClass('lowlight');
-                this.display_container_details('hide',container);
-                // this.container = null;
                 this.toggle_save_button();
             }else{
                 this.$('.container-list .highlight').removeClass('highlight');
                 $line.addClass('highlight');
                 var y = event.pageY - $line.parent().offset().top;
-                this.display_container_details('show',container,y);
                 this.container = container;
                 this.toggle_save_button();
             }
         },
 
-        // Ui handle for the 'edit selected container' action
-        edit_container_details: function(container){
-            this.display_container_details('edit',container);
-        },
-
-        // Ui handle for the 'cancel container edit changes' action
-        undo_container_details: function(container){
-            if (!container.id) {
-                this.display_container_details('hide');
-            } else {
-                this.display_container_details('show', container);
-            }
-        },
-        save_container_details: function(container){
-            var self = this;
-
-            var fields = {}
-            this.$('.container-details-contents .detail').each(function(idx,el){
-                fields[el.name] = el.value;
-            });
-            if (!fields.barcode) {
-                this.gui.show_popup('error',{
-                    message: 'A Container Barcode Is Required',
-                });
-                return;
-            }
-            fields.weight = fields.weight.replace(',', '.')
-
-            fields.id = container.id || false;
-            fields.name = container.name || false;
-            fields.barcode = fields.barcode || false;
-            fields.weight = fields.weight || false;
-
-            var contents = this.$('.container-details-content');
-            contents.off('click', '.button.save');
-
-            rpc.query({
-                model: 'pos.container',
-                method: 'create_from_ui',
-                args: [fields],
-            }).then(function(container_id){
-                self.saved_container_details(container_id);
-            },function(err,ev){
-                ev.preventDefault();
-                var error_body = _t('Your Internet connection is probably down.');
-                    if (err.data) {
-                        var except = err.data;
-                        error_body = except.arguments && except.arguments[0] || except.message || error_body;
-                    }
-                    self.gui.show_popup('error',{
-                        'title': _t('Error: Could not Save Changes'),
-                        'body': error_body,
-                    });
-                    contents.on('click','.button.save',function(){
-                        self.save_container_details(container);
-                    });
-                }
-            );
-        },
-        saved_container_details: function(container_id){
-            var self = this;
-            this.reload_containers().then(function(){
-                var container = self.pos.db.get_container_by_id(container_id);
-                if (container) {
-                    self.container = container;
-                    self.toggle_save_button();
-                    self.display_container_details('show',container);
-                } else {
-                    // should never happen, because create_from_ui must return the id of the container it
-                    // has created, and reload_container() must have loaded the newly created container.
-                    self.display_container_details('hide');
-                }
-            }).always(function(){
-                $(".container-details-contents").on('click','.button.save',function(){
-                    self.save_container_details(container);
-                });
-            });
-        },
-
         // This fetches container changes on the server, and in case of changes,
         // rerenders the affected views
         reload_containers: function(){
@@ -269,73 +181,6 @@ odoo.define('pos_container.container', function (require) {
             });
         },
 
-        // Shows,hides or edit the container details box :
-        // visibility: 'show', 'hide' or 'edit'
-        // container:    the container object to show or edit
-        // clickpos:   the height of the click on the list (in pixel), used
-        //             to maintain consistent scroll.
-        display_container_details: function(visibility,container,clickpos){
-            var self = this;
-            var contents = this.$('.container-details-contents');
-            var parent   = this.$('.container-list').parent();
-            var scroll   = parent.scrollTop();
-            var height   = contents.height();
-
-            contents.off('click','.button.edit');
-            contents.off('click','.button.save');
-            contents.off('click','.button.undo');
-            contents.on('click','.button.edit',function(){
-                self.edit_container_details(container);
-            });
-            contents.on('click','.button.save',function(){
-                self.save_container_details(container);
-            });
-            contents.on('click','.button.undo',function(){
-                self.undo_container_details(container);
-            });
-            this.editing_container = false;
-
-            if(visibility === 'show'){
-
-                contents.empty();
-                contents.append($(QWeb.render('ContainerDetails',{
-                    widget:this, container:container})));
-
-                var new_height   = contents.height();
-
-                if(!this.details_visible){
-                    if(clickpos < scroll + new_height + 20 ){
-                        parent.scrollTop( clickpos - 20 );
-                    }else{
-                        parent.scrollTop(parent.scrollTop() + new_height);
-                    }
-                }else{
-                    parent.scrollTop(parent.scrollTop() - height + new_height);
-                }
-
-                this.details_visible = true;
-                this.toggle_save_button();
-
-            } else if (visibility === 'edit') {
-                this.editing_container = true;
-                contents.empty();
-                contents.append($(QWeb.render('ContainerDetailsEdit', {
-                    widget:this, container:container})));
-                this.toggle_save_button();
-            } else if (visibility === 'hide') {
-                contents.empty();
-                if(height > scroll) {
-                    contents.css({height:height+'px'});
-                    contents.animate({height:0},400,function(){
-                        contents.css({height:''});
-                    });
-                } else {
-                    parent.scrollTop(parent.scrollTop() - height);
-                }
-                this.details_visible = false;
-                this.toggle_save_button();
-            }
-        },
         close: function(){
             this._super();
         },
diff --git a/pos_container/static/src/xml/pos.xml b/pos_container/static/src/xml/pos.xml
index 043171a6a3..2a38e1254c 100644
--- a/pos_container/static/src/xml/pos.xml
+++ b/pos_container/static/src/xml/pos.xml
@@ -8,40 +8,6 @@
         </button>
     </t>
 
-    <t t-name="ContainerDetails">
-         <section class="container-details">
-             <div class="container-details-box clearfix">
-                 <div class="container-details-left">
-                     <div class="container-detail">
-                         <span class="label">Name</span>
-                         <span class="detail container-name">
-                             <t t-esc="container.name"/>
-                         </span>
-                     </div>
-                     <div class="container-detail">
-                         <span class="label">Barcode</span>
-                         <span class="detail container-barcode">
-                             <t t-esc="container.barcode"/>
-                         </span>
-                     </div>
-                 </div>
-                 <div class="container-details-right">
-                     <div class="container-detail">
-                         <span class="label">Weight</span>
-                         <span class="detail container-weight">
-                             <t t-esc="container.weight"/>
-                         </span>
-                     </div>
-                 </div>
-                 <div class="edit-buttons">
-                     <div class="button edit">
-                         <i class="fa fa-pencil-square"/>
-                     </div>
-                 </div>
-             </div>
-         </section>
-     </t>
-
     <t t-name="ContainerListScreenWidget">
          <div class="containerlist-screen screen">
              <div class="screen-content">
@@ -55,10 +21,6 @@
                          <span class="search-clear"/>
                      </span>
                      <span class="searchbox"/>
-                     <span class="button new-container" role="img" aria-label="Add a container" title="Add a container">
-                         <i class="fa fa-beer"/>
-                         <i class="fa fa-plus"/>
-                     </span>
                      <span class="button next oe_hidden highlight">
                          Select a container
                          <i class="fa fa-angle-double-right"/>
@@ -66,12 +28,6 @@
                  </section>
                  <section class="full-content">
                      <div class="window">
-                         <section class="subwindow collapsed">
-                             <div class="subwindow-container collapsed">
-                                 <div class="subwindow-container-fix container-details-contents">
-                                 </div>
-                             </div>
-                         </section>
                          <section class="subwindow">
                              <div class="subwindow-container">
                                  <div class="subwindow-container-fix touch-scrollable scrollable-y">
@@ -109,33 +65,6 @@
         </tr>
     </t>
 
-    <t t-name="ContainerDetailsEdit">
-        <section class='container-details edit'>
-            <div class='container-details-box clearfix'>
-                <div class='container-details-left'>
-                    <div class='container-detail'>
-                        <span class='label'>name</span>
-                        <input class='detail container-name' name='name' t-att-value='container.name' placeholder='Name'></input>
-                    </div>
-                    <div class='container-detail'>
-                        <span class='label'>Barcode</span>
-                        <input class='detail container-barcode' name='barcode' t-att-value='container.barcode' placeholder='Barcode'></input>
-                    </div>
-                </div>
-                <div class='container-details-right'>
-                    <div class='container-detail'>
-                        <span class='label'>Weight</span>
-                        <input class='detail container-weight' name='weight' t-att-value='container.weight' placeholder='Weight'></input>
-                    </div>
-                </div>
-                <div class='edit-buttons'>
-                    <div class='button undo'><i class='fa fa-undo' /></div>
-                    <div class='button save'><i class='fa fa-floppy-o' /></div>
-                </div>
-            </div>
-        </section>
-    </t>
-
     <t t-extend='Orderline'>
         <t t-jquery='.info-list:last-child' t-operation='prepend'>
             <t t-if="line.get_container()">

From 56e95b81096aa5a814eebb55c72fa952d93a4c31 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Wed, 6 Mar 2019 17:26:21 +0100
Subject: [PATCH 21/47] [IMP] allow container deletion from POS fix CSS too

---
 pos_container/__init__.py                  |  2 +-
 pos_container/static/src/css/container.css |  4 +-
 pos_container/static/src/js/container.js   | 55 +++++++++++++++++++---
 pos_container/static/src/xml/pos.xml       |  4 ++
 4 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/pos_container/__init__.py b/pos_container/__init__.py
index a3326d8405..02179fb044 100644
--- a/pos_container/__init__.py
+++ b/pos_container/__init__.py
@@ -1,2 +1,2 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from . import models
\ No newline at end of file
+from . import models
diff --git a/pos_container/static/src/css/container.css b/pos_container/static/src/css/container.css
index da37cf592e..44ef0cd79f 100644
--- a/pos_container/static/src/css/container.css
+++ b/pos_container/static/src/css/container.css
@@ -171,12 +171,12 @@
     right: auto;
     margin-left: -90px;
     margin-top:8px;
-    left: 50%;
+    left: 45%;
 }
 .pos .containerlist-screen .searchbox input{
     width: 120px;
 }
-.pos .containerlist-screen .button.new-customer {
+.pos .containerlist-screen .button.delete-container {
     left: 50%;
     margin-left: 120px;
 }
diff --git a/pos_container/static/src/js/container.js b/pos_container/static/src/js/container.js
index 1cea6389b0..3be1bdc9b9 100644
--- a/pos_container/static/src/js/container.js
+++ b/pos_container/static/src/js/container.js
@@ -55,6 +55,20 @@ odoo.define('pos_container.container', function (require) {
                 self.gui.show_screen('products');
             });
 
+            this.$('.delete-container').click(function(){
+                if (self.container){
+                    self.gui.show_popup('confirm', {
+                        'title': _t('Container deletion'),
+                        'body': _t(
+                            'Do you want to delete this container ?\n').concat(
+                                self.container.name),
+                        confirm: function(){
+                            self.delete_selected_container();
+                        },
+                    });
+                }
+            });
+
             var containers = this.pos.db.get_containers_sorted(1000);
             this.render_list(containers);
 
@@ -87,6 +101,34 @@ odoo.define('pos_container.container', function (require) {
                 self.clear_search();
             });
         },
+        delete_selected_container: function(){
+            var self = this;
+
+            rpc.query({
+                model: 'pos.container',
+                method: 'unlink',
+                args: [self.container.id],
+            }).then(function(){
+                self.deleted_container();
+            },function(err,ev){
+                ev.preventDefault();
+                var error_body = _t('Your Internet connection is probably down.');
+                    if (err.data) {
+                        var except = err.data;
+                        error_body = except.arguments && except.arguments[0] || except.message || error_body;
+                    }
+                    self.gui.show_popup('error',{
+                        'title': _t('Error: Could not Save Changes'),
+                        'body': error_body,
+                    });
+                }
+            );
+        },
+        deleted_container: function(){
+            var self = this;
+            this.$('.container-list .highlight').remove()
+            self.container = null;
+        },
         perform_search: function(query, associate_result){
             if(query){
                 var containers = this.pos.db.search_container(query);
@@ -129,15 +171,14 @@ odoo.define('pos_container.container', function (require) {
         save_changes: function(){
             this.pos.get_order().add_container(this.container);
         },
+        toggle_delete_button: function(){
+            var $button = this.$('.button.delete-container');
+            $button.toggleClass('oe_hidden', !this.container);
+        },
         toggle_save_button: function(){
             var $button = this.$('.button.next');
-            if (this.editing_container) {
-                $button.addClass('oe_hidden');
-                return;
-            } else if(this.container) {
+            if (this.container) {
                 $button.text('Set Container');
-            } else {
-                $button.text('Deselect Container');
             }
             $button.toggleClass('oe_hidden', !this.container);
         },
@@ -147,12 +188,14 @@ odoo.define('pos_container.container', function (require) {
             if ( $line.hasClass('highlight') ){
                 $line.removeClass('highlight');
                 $line.addClass('lowlight');
+                this.toggle_delete_button();
                 this.toggle_save_button();
             }else{
                 this.$('.container-list .highlight').removeClass('highlight');
                 $line.addClass('highlight');
                 var y = event.pageY - $line.parent().offset().top;
                 this.container = container;
+                this.toggle_delete_button();
                 this.toggle_save_button();
             }
         },
diff --git a/pos_container/static/src/xml/pos.xml b/pos_container/static/src/xml/pos.xml
index 2a38e1254c..f98f6775ca 100644
--- a/pos_container/static/src/xml/pos.xml
+++ b/pos_container/static/src/xml/pos.xml
@@ -21,6 +21,10 @@
                          <span class="search-clear"/>
                      </span>
                      <span class="searchbox"/>
+                     <span class="button delete-container oe_hidden" role="img" aria-label="Delete container" title="Delete container">
+                         <i class="fa fa-beer"/>
+                         <i class="fa fa-trash"/>
+                     </span>
                      <span class="button next oe_hidden highlight">
                          Select a container
                          <i class="fa fa-angle-double-right"/>

From d436278d34a25bb1709b841b1ffae60a78e614cf Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Thu, 7 Mar 2019 16:45:28 +0100
Subject: [PATCH 22/47] [IMP] add tare manual/auto logic

---
 pos_container/data/product.xml               |  1 +
 pos_container/static/src/css/container.css   |  9 ++++
 pos_container/static/src/js/container.js     | 48 +++++++++++++++++++-
 pos_container/static/src/js/models_and_db.js |  9 ++++
 pos_container/static/src/xml/pos.xml         | 14 ++++--
 5 files changed, 75 insertions(+), 6 deletions(-)

diff --git a/pos_container/data/product.xml b/pos_container/data/product.xml
index ec078ed786..af6ffd07d3 100644
--- a/pos_container/data/product.xml
+++ b/pos_container/data/product.xml
@@ -11,5 +11,6 @@
         </field>
         <field name="list_price">0</field>
         <field name="available_in_pos" eval="True"/>
+        <field name="to_weight" eval="True"/>
     </record>
 </odoo>
diff --git a/pos_container/static/src/css/container.css b/pos_container/static/src/css/container.css
index 44ef0cd79f..17260fd2bc 100644
--- a/pos_container/static/src/css/container.css
+++ b/pos_container/static/src/css/container.css
@@ -180,3 +180,12 @@
     left: 50%;
     margin-left: 120px;
 }
+
+/* Container Action buttons */
+.pos .control-button.main {
+    width: 75%;
+}
+.pos .control-button.second {
+    width: 15%;
+    flex-grow: 0;
+}
diff --git a/pos_container/static/src/js/container.js b/pos_container/static/src/js/container.js
index 3be1bdc9b9..e9aa1b76d1 100644
--- a/pos_container/static/src/js/container.js
+++ b/pos_container/static/src/js/container.js
@@ -21,6 +21,25 @@ odoo.define('pos_container.container', function (require) {
     var _t = core._t;
 
 
+    var TareButton = screens.ActionButtonWidget.extend({
+        template: 'TareButton',
+    });
+
+    screens.define_action_button({
+        'name': 'tare',
+        'widget': TareButton,
+    });
+
+    screens.NumpadWidget.include({
+        // to put selected-mode on tare button outside the numpadwidget
+        changedMode: function() {
+            this._super();
+            if (this.state.get('mode') === 'tare'){
+                $('.mode-button[data-mode="tare"]').addClass('selected-mode');
+            }
+        },
+    });
+
     var ContainerButton = screens.ActionButtonWidget.extend({
         template: 'ContainerButton',
         button_click: function(){
@@ -257,6 +276,13 @@ odoo.define('pos_container.container', function (require) {
     });
 
     screens.ProductScreenWidget.include({
+        // to use Tare Button from outside the NumpadWidget
+        start: function(){
+            this._super();
+            var tare_button = $('.mode-button[data-mode="tare"]');
+            tare_button.click(_.bind(this.numpad.clickChangeMode, this.numpad));
+        },
+        // to add a product to a container orderline
         click_product: function(product) {
             var order = this.pos.get_order();
             var selected_orderline = order.get_selected_orderline();
@@ -275,21 +301,24 @@ odoo.define('pos_container.container', function (require) {
     });
 
     screens.ScaleScreenWidget.include({
-
         order_product: function(){
             this._super();
             // Replace the orderline if the product is the placeholder
             // container product.
             var order = this.pos.get_order();
             var container = this.gui.get_current_screen_param('container');
-            var old_orderline = this.gui.get_current_screen_param('old_orderline');
             if (container){
                 var orderline = order.get_last_orderline();
                 orderline.set_container(container);
+                var old_orderline = this.gui.get_current_screen_param(
+                    'old_orderline');
                 if (old_orderline){
                     order.remove_orderline(old_orderline);
                 }
                 orderline.set_quantity(orderline.quantity - container.weight);
+                var gross_weight = (this.weight + container.weight).toFixed(3);
+                orderline.set_gross_weight(gross_weight);
+                orderline.set_tare_mode('AUTO');
                 orderline.trigger('change', orderline);
             }
         },
@@ -372,4 +401,19 @@ odoo.define('pos_container.container', function (require) {
         widget: ContainerScaleScreenWidget,
     });
 
+    screens.OrderWidget.include({
+        set_value: function(val) {
+            this._super(val);
+            var order = this.pos.get_order();
+            var oline = order.get_selected_orderline();
+            if (oline) {
+                var mode = this.numpad_state.get('mode');
+                if( mode === 'tare'){
+                    oline.set_tare_mode('MAN');
+                    oline.set_tare(val);
+                }
+            }
+        },
+    });
+
 });
diff --git a/pos_container/static/src/js/models_and_db.js b/pos_container/static/src/js/models_and_db.js
index 53c43dcf10..cd044592c2 100644
--- a/pos_container/static/src/js/models_and_db.js
+++ b/pos_container/static/src/js/models_and_db.js
@@ -95,6 +95,15 @@ odoo.define('pos_container.models_and_db', function (require) {
         set_container: function(container){
             this.container = container;
         },
+        set_tare_mode: function(mode){
+            if (['MAN', 'AUTO'].indexOf(mode)){
+                this.tare_mode = mode;
+                this.trigger('change', this);
+            }
+        },
+        get_tare_mode: function() {
+            return this.tare_mode;
+        },
         set_tare: function(tare){
             this.tare = tare;
             this.container = null;
diff --git a/pos_container/static/src/xml/pos.xml b/pos_container/static/src/xml/pos.xml
index f98f6775ca..07c813dc39 100644
--- a/pos_container/static/src/xml/pos.xml
+++ b/pos_container/static/src/xml/pos.xml
@@ -2,12 +2,18 @@
 <templates id="template" xml:space="preserve">
 
     <t t-name="ContainerButton">
-        <button class="control-button">
+        <button class="control-button main">
             <i class="fa fa-beer" role="img" aria-label="Container" title="Container"/>
             Container
         </button>
     </t>
 
+    <t t-name="TareButton">
+        <button class="control-button second mode-button" data-mode="tare">
+            Tare
+        </button>
+    </t>
+
     <t t-name="ContainerListScreenWidget">
          <div class="containerlist-screen screen">
              <div class="screen-content">
@@ -104,9 +110,9 @@
                     </ul>
                 </ul>
             </t>
-            <!--<div class="pos-right-align">
-                <t t-esc="line.get_tare_manual()"/>
-            </div> -->
+            <div class="pos-right-align">
+                <t t-esc="line.get_tare_mode()"/>
+            </div>
         </t>
     </t>
 

From 265cc7bcf794e6a53fee0804042200725fcf6318 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Fri, 8 Mar 2019 10:17:42 +0100
Subject: [PATCH 23/47] [FIX] tabs instead of spaces

---
 pos_container/__manifest__.py                | 3 ++-
 pos_container/static/src/js/container.js     | 4 ++--
 pos_container/static/src/js/models_and_db.js | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pos_container/__manifest__.py b/pos_container/__manifest__.py
index 167e855807..e0c9c6a375 100644
--- a/pos_container/__manifest__.py
+++ b/pos_container/__manifest__.py
@@ -11,7 +11,8 @@
 
     "author": "Coop IT Easy SCRLfs, "
               "Odoo Community Association (OCA)",
-    'website': "https://odoo-community.org/",
+    'license': "AGPL-3",
+    'website': "https://github.com/OCA/pos/",
 
     'category': 'Point of Sale',
 
diff --git a/pos_container/static/src/js/container.js b/pos_container/static/src/js/container.js
index e9aa1b76d1..0fa5ccda7d 100644
--- a/pos_container/static/src/js/container.js
+++ b/pos_container/static/src/js/container.js
@@ -1,7 +1,7 @@
 /*
     Copyright 2019 Coop IT Easy SCRLfs
-    	    Robin Keunen <robin@coopiteasy.be>
-    	    Pierrick Brun <pierrick.brun@akretion.com>
+            Robin Keunen <robin@coopiteasy.be>
+            Pierrick Brun <pierrick.brun@akretion.com>
     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 */
 
diff --git a/pos_container/static/src/js/models_and_db.js b/pos_container/static/src/js/models_and_db.js
index cd044592c2..420cdfdb65 100644
--- a/pos_container/static/src/js/models_and_db.js
+++ b/pos_container/static/src/js/models_and_db.js
@@ -1,6 +1,6 @@
 /*
     Copyright 2019 Coop IT Easy SCRLfs
-    	    Pierrick Brun <pierrick.brun@akretion.com>
+            Pierrick Brun <pierrick.brun@akretion.com>
     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 */
 

From 00666b7e3695a5d1fa3fff8fdd4f3b8b0c17d68f Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Wed, 13 Mar 2019 12:01:55 +0100
Subject: [PATCH 24/47] [FIX] gross weight

---
 pos_container/models/container.py        | 4 ++--
 pos_container/static/src/js/container.js | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pos_container/models/container.py b/pos_container/models/container.py
index 036032c44b..3dfc2fe1db 100644
--- a/pos_container/models/container.py
+++ b/pos_container/models/container.py
@@ -27,8 +27,8 @@ class Container(models.Model):
 
     _sql_constraints = [
         ('barcode_uniq',
-            'unique(barcode)',
-            "A barcode can only be assigned to one container !"),
+         'unique(barcode)',
+         "A barcode can only be assigned to one container !"),
     ]
 
     @api.model
diff --git a/pos_container/static/src/js/container.js b/pos_container/static/src/js/container.js
index 0fa5ccda7d..7ec40037cf 100644
--- a/pos_container/static/src/js/container.js
+++ b/pos_container/static/src/js/container.js
@@ -305,9 +305,9 @@ odoo.define('pos_container.container', function (require) {
             this._super();
             // Replace the orderline if the product is the placeholder
             // container product.
-            var order = this.pos.get_order();
             var container = this.gui.get_current_screen_param('container');
             if (container){
+                var order = this.pos.get_order();
                 var orderline = order.get_last_orderline();
                 orderline.set_container(container);
                 var old_orderline = this.gui.get_current_screen_param(
@@ -315,9 +315,8 @@ odoo.define('pos_container.container', function (require) {
                 if (old_orderline){
                     order.remove_orderline(old_orderline);
                 }
-                orderline.set_quantity(orderline.quantity - container.weight);
-                var gross_weight = (this.weight + container.weight).toFixed(3);
-                orderline.set_gross_weight(gross_weight);
+                orderline.set_quantity(this.weight - container.weight);
+                orderline.set_gross_weight(this.weight);
                 orderline.set_tare_mode('AUTO');
                 orderline.trigger('change', orderline);
             }

From 2d2229b2a6fa08f8e9a8f35bbecadf3dca5d8129 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Thu, 14 Mar 2019 15:31:55 +0100
Subject: [PATCH 25/47] [IMP] add tare info on PosTicket

---
 pos_container/static/src/js/models_and_db.js |  14 +-
 pos_container/static/src/xml/pos.xml         | 131 +++++++++++++++++++
 2 files changed, 142 insertions(+), 3 deletions(-)

diff --git a/pos_container/static/src/js/models_and_db.js b/pos_container/static/src/js/models_and_db.js
index 420cdfdb65..8b051a6098 100644
--- a/pos_container/static/src/js/models_and_db.js
+++ b/pos_container/static/src/js/models_and_db.js
@@ -85,6 +85,16 @@ odoo.define('pos_container.models_and_db', function (require) {
             this.select_orderline(this.get_last_orderline());
             //this.pos.get_order().display_container(container);
         },
+        has_tare_line: function(mode){
+            var orderlines = this.orderlines.models
+            for(var i=0; i < orderlines.length; i++){
+                var line = orderlines[i];
+                if(line && line.get_tare_mode() === mode){
+                    return true;
+                }
+            }
+            return false;
+        },
     });
     
     // Add container to order line
@@ -96,9 +106,8 @@ odoo.define('pos_container.models_and_db', function (require) {
             this.container = container;
         },
         set_tare_mode: function(mode){
-            if (['MAN', 'AUTO'].indexOf(mode)){
+            if (['MAN', 'AUTO'].indexOf(mode) != -1){
                 this.tare_mode = mode;
-                this.trigger('change', this);
             }
         },
         get_tare_mode: function() {
@@ -134,7 +143,6 @@ odoo.define('pos_container.models_and_db', function (require) {
         },
     });
 
-
     PosDB.include({
         init: function(parent, options) {
             this._super(parent, options);
diff --git a/pos_container/static/src/xml/pos.xml b/pos_container/static/src/xml/pos.xml
index 07c813dc39..9631bbbb67 100644
--- a/pos_container/static/src/xml/pos.xml
+++ b/pos_container/static/src/xml/pos.xml
@@ -142,4 +142,135 @@
             </div>
         </div>
     </t>
+
+    <t t-extend="PosTicket">
+        <t t-jquery='.receipt-orderlines' t-operation='replace'>              
+            <table>
+                <colgroup>
+                    <col width='50%' />
+                    <col width='25%' />
+                    <col width='25%' />
+                </colgroup>
+                <tr t-foreach="orderlines" t-as="orderline">
+                    <t t-if="orderline.get_tare_mode() == undefined">
+                        <td>
+                            <t t-esc="orderline.get_product().display_name"/>
+                            <t t-if="orderline.get_discount() > 0">
+                                <div class="pos-disc-font">
+                                    With a <t t-esc="orderline.get_discount()"/>% discount
+                                </div>
+                            </t>
+                       </td>
+                       <td class="pos-right-align">
+                            <t t-esc="orderline.get_quantity_str_with_unit()"/>
+                       </td>
+                       <td class="pos-right-align">
+                            <t t-esc="widget.format_currency(orderline.get_display_price())"/>
+                       </td>
+                    </t>
+                </tr>
+            </table>
+            <t t-if="order.has_tare_line('AUTO')">
+                <table>
+                    <colgroup>
+                        <col width='20%' />
+                        <col width='60%' />
+                        <col width='20%' />
+                    </colgroup>
+                    <td></td>
+                    <td>
+                        <center>------------------------</center>
+                        <center>Pesée automatique</center>
+                        <center>------------------------</center>
+                    </td>
+                </table>
+            </t>
+            <table>
+                <colgroup>
+                    <col width='50%' />
+                    <col width='25%' />
+                    <col width='25%' />
+                </colgroup>
+                <tr t-foreach="orderlines" t-as="orderline">
+                    <t t-if="orderline.get_tare_mode() == 'AUTO'">
+                        <tr>
+                            <td>
+                                <t t-esc="orderline.get_product().display_name"/>
+                                <t t-if="orderline.get_discount() > 0">
+                                    <div class="pos-disc-font">
+                                        With a <t t-esc="orderline.get_discount()"/>% discount
+                                    </div>
+                                </t>
+                            </td>
+                            <td class="pos-right-align">
+                                <t t-esc="orderline.get_quantity_str_with_unit()"/>
+                            </td>
+                            <td class="pos-right-align">
+                                <t t-esc="widget.format_currency(orderline.get_display_price())"/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <div style="margin-left:5%">
+                                    TW : <t t-esc="orderline.gross_weight"/>
+                                    <t t-esc="orderline.get_unit().name"/>
+                                </div>
+                            </td>
+                        </tr>
+                    </t>
+                </tr>
+            </table>
+            <t t-if="order.has_tare_line('MAN')">
+                <table>
+                    <colgroup>
+                        <col width='20%' />
+                        <col width='60%' />
+                        <col width='20%' />
+                    </colgroup>
+                    <td></td>
+                    <td>
+                        <center>------------------------</center>
+                        <center>Saisie manuelle</center>
+                        <center>------------------------</center>
+                    </td>
+                </table>
+            </t>
+            <table>
+                <colgroup>
+                    <col width='50%' />
+                    <col width='25%' />
+                    <col width='25%' />
+                </colgroup>
+                <tr t-foreach="orderlines" t-as="orderline">
+                    <t t-if="orderline.get_tare_mode() == 'MAN'">
+                        <tr>
+                            <td>
+                                <t t-esc="orderline.get_product().display_name"/>
+                                <t t-if="orderline.get_discount() > 0">
+                                    <div class="pos-disc-font">
+                                        With a <t t-esc="orderline.get_discount()"/>% discount
+                                    </div>
+                                </t>
+                            </td>
+                            <td class="pos-right-align">
+                                <t t-esc="orderline.get_quantity_str_with_unit()"/>
+                            </td>
+                            <td class="pos-right-align">
+                                <t t-esc="widget.format_currency(orderline.get_display_price())"/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                               <div style="margin-left:5%">
+                                   TW : <t t-esc="orderline.gross_weight"/>
+                                   <t t-esc="orderline.get_unit().name"/>
+                               </div>
+                            </td>
+                        </tr>
+                    </t>
+                </tr>
+            </table>
+        </t>
+    </t>
+
 </templates>

From 7b7a98739fc8cdb674f140416f81fad3a9bbb877 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Tue, 26 Mar 2019 12:10:26 +0100
Subject: [PATCH 26/47] [FIX] container deletion mechanism

---
 pos_container/static/src/js/container.js     |  9 +++++----
 pos_container/static/src/js/models_and_db.js | 12 +++++++++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/pos_container/static/src/js/container.js b/pos_container/static/src/js/container.js
index 7ec40037cf..a1c97a0314 100644
--- a/pos_container/static/src/js/container.js
+++ b/pos_container/static/src/js/container.js
@@ -128,7 +128,7 @@ odoo.define('pos_container.container', function (require) {
                 method: 'unlink',
                 args: [self.container.id],
             }).then(function(){
-                self.deleted_container();
+                self.deleted_container(self.container.id);
             },function(err,ev){
                 ev.preventDefault();
                 var error_body = _t('Your Internet connection is probably down.');
@@ -143,10 +143,11 @@ odoo.define('pos_container.container', function (require) {
                 }
             );
         },
-        deleted_container: function(){
+        deleted_container: function(id){
             var self = this;
-            this.$('.container-list .highlight').remove()
-            self.container = null;
+            this.pos.db.remove_containers([id]);
+            this.$('.container-list .highlight').remove();
+            this.container = null;
         },
         perform_search: function(query, associate_result){
             if(query){
diff --git a/pos_container/static/src/js/models_and_db.js b/pos_container/static/src/js/models_and_db.js
index 8b051a6098..4df2d0c38b 100644
--- a/pos_container/static/src/js/models_and_db.js
+++ b/pos_container/static/src/js/models_and_db.js
@@ -213,8 +213,18 @@ odoo.define('pos_container.models_and_db', function (require) {
             }
             return updated_count;
         },
+        remove_containers: function(ids){
+            for(var i = 0; i < ids.length; i++) {
+                var container = this.container_by_id[ids[i]];
+                if (container){
+                    var index_s = this.container_sorted.indexOf(container.id);
+                    this.container_sorted.splice(index_s, 1);
+                    delete this.container_by_id[container.id];
+                    delete this.container_by_barcode[container.barcode];
+                }
+            }
+        },
         get_container_write_date: function(){
-
             return this.container_write_date;
         },
         get_container_by_id: function(id){

From 31042171bac76b6febf8448e19bc103b239aff6a Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Thu, 28 Mar 2019 12:22:52 +0100
Subject: [PATCH 27/47] [FIX] set container only lines qty to 0

---
 pos_container/static/src/js/models_and_db.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pos_container/static/src/js/models_and_db.js b/pos_container/static/src/js/models_and_db.js
index 4df2d0c38b..5c26203e6c 100644
--- a/pos_container/static/src/js/models_and_db.js
+++ b/pos_container/static/src/js/models_and_db.js
@@ -75,15 +75,14 @@ odoo.define('pos_container.models_and_db', function (require) {
             attr.pos = this.pos;
             attr.order = this;
             var product = this.pos.get_container_product();
-            var line = new models.Orderline({},
-                {pos: this.pos, order: this, product: product});
+            var line = new models.Orderline({}, {
+                pos: this.pos, order: this,
+                quantity: 0, product: product, });
 
             line.set_container(container);
             this.orderlines.add(line);
-            //self.pos_widget.reload_products(container.pos_categ_ids)
 
             this.select_orderline(this.get_last_orderline());
-            //this.pos.get_order().display_container(container);
         },
         has_tare_line: function(mode){
             var orderlines = this.orderlines.models

From dd348c0ec86b1c6ab057198be6867cb71d34b2db Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Thu, 28 Mar 2019 12:49:47 +0100
Subject: [PATCH 28/47] [FIX] Do not show container-only lines on ticket

---
 pos_container/static/src/xml/pos.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pos_container/static/src/xml/pos.xml b/pos_container/static/src/xml/pos.xml
index 9631bbbb67..04fc770822 100644
--- a/pos_container/static/src/xml/pos.xml
+++ b/pos_container/static/src/xml/pos.xml
@@ -152,7 +152,8 @@
                     <col width='25%' />
                 </colgroup>
                 <tr t-foreach="orderlines" t-as="orderline">
-                    <t t-if="orderline.get_tare_mode() == undefined">
+                    <t t-if="orderline.get_tare_mode() == undefined
+                            and orderline.product.barcode != 'CONTAINER'">
                         <td>
                             <t t-esc="orderline.get_product().display_name"/>
                             <t t-if="orderline.get_discount() > 0">

From da0e5c6238f79a554b5e3226278982a245210408 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Wed, 10 Apr 2019 11:16:58 +0200
Subject: [PATCH 29/47] [IMP] add basic testing

---
 pos_container/static/src/js/tests.js      | 73 +++++++++++++++++++++++
 pos_container/static/src/xml/pos.xml      |  8 +--
 pos_container/templates/templates.xml     |  1 +
 pos_container/tests/__init__.py           |  1 +
 pos_container/tests/test_pos_container.py |  8 +++
 5 files changed, 87 insertions(+), 4 deletions(-)
 create mode 100644 pos_container/static/src/js/tests.js
 create mode 100644 pos_container/tests/__init__.py
 create mode 100644 pos_container/tests/test_pos_container.py

diff --git a/pos_container/static/src/js/tests.js b/pos_container/static/src/js/tests.js
new file mode 100644
index 0000000000..d6332a99b0
--- /dev/null
+++ b/pos_container/static/src/js/tests.js
@@ -0,0 +1,73 @@
+odoo.define('pos_container.tour.tare', function (require) {
+    "use strict";
+
+    var Tour = require('web_tour.tour');
+
+    function click_numpad(num) {
+        return {
+            content: "click on numpad button '" + num + "'",
+            trigger: ".input-button.number-char:contains('"+num+"')"
+        }
+    }
+
+    var steps = [{
+        content: 'waiting for loading to finish',
+        trigger: '.o_main_content:has(.loader:hidden)',
+        run: function () {}
+    }, {
+        content: "click container button",
+        trigger: ".control-button.o_container_button",
+    }, {
+        content: "select a container",
+        trigger: ".container-line:contains('Container 1')",
+    }, {
+        content: "confirm selection",
+        trigger: ".containerlist-screen .next",
+    }, {
+        content: "Container should be present in the orderlines",
+        trigger: ".orderline.selected:contains('Container without product')",
+        run: function () {}, // it's a check
+    }, {
+        content: "select product",
+        trigger: ".product:contains('Whiteboard Pen')", //UoM = kg
+    }, {
+        content: "validate weight",
+        trigger: ".buy-product",
+    }, {
+        content: "Orderline should be in AUTO tare mode",
+        trigger: ".orderline.selected:contains('AUTO')",
+        run: function () {}, // it's a check
+    }, {
+        content: "Orderline should have the Pen as product",
+        trigger: ".orderline.selected .product-name:contains('Whiteboard Pen')",
+        run: function () {}, // it's a check
+    }, {
+        content: "Orderline should have the Container shown",
+        trigger: ".orderline.selected .info:contains('Container 1')",
+        run: function () {}, // it's a check
+    }, {
+        content: "Orderline should have the tared weight as quantity",
+        trigger: ".orderline.selected .info:contains('-0.123')",
+        run: function () {}, // it's a check
+    }, {
+        content: "select product again", // defaults to 1kg
+        trigger: ".product:contains('Whiteboard Pen')", //UoM = kg
+    }, {
+        content: "switch numpad to tare mode",
+        trigger: ".control-button.o_tare_button",
+    },
+    click_numpad(0),
+    click_numpad('.'),
+    click_numpad(6),
+    {
+        content: "Orderline should be in MAN tare mode",
+        trigger: ".orderline.selected:contains('MAN')",
+        run: function () {}, // it's a check
+    }, {
+        content: "Orderline should have the tared weight as quantity",
+        trigger: ".orderline.selected .info:contains('0.4')",
+        run: function () {}, // it's a check
+    }];
+
+    Tour.register('pos_container', { test: true, url: '/pos/web' }, steps);
+});
diff --git a/pos_container/static/src/xml/pos.xml b/pos_container/static/src/xml/pos.xml
index 04fc770822..d24b825c6c 100644
--- a/pos_container/static/src/xml/pos.xml
+++ b/pos_container/static/src/xml/pos.xml
@@ -2,14 +2,14 @@
 <templates id="template" xml:space="preserve">
 
     <t t-name="ContainerButton">
-        <button class="control-button main">
+        <button class="control-button main o_container_button">
             <i class="fa fa-beer" role="img" aria-label="Container" title="Container"/>
             Container
         </button>
     </t>
 
     <t t-name="TareButton">
-        <button class="control-button second mode-button" data-mode="tare">
+        <button class="control-button second mode-button o_tare_button" data-mode="tare">
             Tare
         </button>
     </t>
@@ -213,7 +213,7 @@
                         <tr>
                             <td>
                                 <div style="margin-left:5%">
-                                    TW : <t t-esc="orderline.gross_weight"/>
+                                    Tare : <t t-esc="orderline.tare"/>
                                     <t t-esc="orderline.get_unit().name"/>
                                 </div>
                             </td>
@@ -263,7 +263,7 @@
                         <tr>
                             <td>
                                <div style="margin-left:5%">
-                                   TW : <t t-esc="orderline.gross_weight"/>
+                                   Tare : <t t-esc="orderline.tare"/>
                                    <t t-esc="orderline.get_unit().name"/>
                                </div>
                             </td>
diff --git a/pos_container/templates/templates.xml b/pos_container/templates/templates.xml
index 9ae853c5b2..a7828db80d 100644
--- a/pos_container/templates/templates.xml
+++ b/pos_container/templates/templates.xml
@@ -11,6 +11,7 @@
             <link href="/pos_container/static/src/css/container.css" rel="stylesheet"/>
             <script type="text/javascript" src="/pos_container/static/src/js/models_and_db.js"/>
             <script type="text/javascript" src="/pos_container/static/src/js/container.js"/>
+            <script type="text/javascript" src="/pos_container/static/src/js/tests.js"/>
         </xpath>
     </template>
 </odoo>
diff --git a/pos_container/tests/__init__.py b/pos_container/tests/__init__.py
new file mode 100644
index 0000000000..443509263d
--- /dev/null
+++ b/pos_container/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_pos_container
diff --git a/pos_container/tests/test_pos_container.py b/pos_container/tests/test_pos_container.py
new file mode 100644
index 0000000000..af1869432d
--- /dev/null
+++ b/pos_container/tests/test_pos_container.py
@@ -0,0 +1,8 @@
+import odoo.tests
+
+
+@odoo.tests.tagged('pos_install', '-at-install')
+class testUi(odoo.tests.HttpCase):
+
+    def test_01_pos_container_tour(self):
+        self.phantom_js("/web", "odoo.__DEBUG__.services['web_tour.tour'].run('pos_container_tour')", "odoo.__DEBUG__.services['web_tour.tour'].tours.pos_container_tour.ready", login="admin")

From dee19ec5ff457e9691078939ad9d151c98daffa9 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Thu, 11 Apr 2019 15:29:39 +0200
Subject: [PATCH 30/47] [FIX] container weight in kg

---
 pos_container/models/container.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pos_container/models/container.py b/pos_container/models/container.py
index 3dfc2fe1db..8473dfb596 100644
--- a/pos_container/models/container.py
+++ b/pos_container/models/container.py
@@ -17,7 +17,7 @@ class Container(models.Model):
         size=13,
     )
     weight = fields.Float(
-        string='Weight (g)',
+        string='Weight (kg)',
     )
     owner_id = fields.Many2one(
         comodel_name='res.partner',

From dc2f75b148efd30447def63032ee7ccad4a058b3 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Thu, 11 Apr 2019 18:00:22 +0200
Subject: [PATCH 31/47] [FIX] correctly display XmlReceipt

---
 pos_container/static/src/js/models_and_db.js | 127 ++++++++++++++++
 pos_container/static/src/xml/pos.xml         | 143 ++++++++++++++++++-
 2 files changed, 267 insertions(+), 3 deletions(-)

diff --git a/pos_container/static/src/js/models_and_db.js b/pos_container/static/src/js/models_and_db.js
index 5c26203e6c..ff29e2bde0 100644
--- a/pos_container/static/src/js/models_and_db.js
+++ b/pos_container/static/src/js/models_and_db.js
@@ -94,6 +94,111 @@ odoo.define('pos_container.models_and_db', function (require) {
             }
             return false;
         },
+        export_for_printing: function(){
+            var orderlines = [];
+            var self = this;
+
+            this.orderlines.each(function(orderline){
+                orderlines.push(orderline.export_for_printing());
+            });
+
+            var paymentlines = [];
+            this.paymentlines.each(function(paymentline){
+                paymentlines.push(paymentline.export_for_printing());
+            });
+            var client  = this.get('client');
+            var cashier = this.pos.get_cashier();
+            var company = this.pos.company;
+            var shop    = this.pos.shop;
+            var date    = new Date();
+
+            function is_xml(subreceipt){
+                return subreceipt ? (subreceipt.split('\n')[0].indexOf('<!DOCTYPE QWEB') >= 0) : false;
+            }
+
+            function render_xml(subreceipt){
+                if (!is_xml(subreceipt)) {
+                    return subreceipt;
+                } else {
+                    subreceipt = subreceipt.split('\n').slice(1).join('\n');
+                    var qweb = new QWeb2.Engine();
+                        qweb.debug = config.debug;
+                        qweb.default_dict = _.clone(QWeb.default_dict);
+                        qweb.add_template('<templates><t t-name="subreceipt">'+subreceipt+'</t></templates>');
+
+                    return qweb.render('subreceipt',{'pos':self.pos,'widget':self.pos.chrome,'order':self, 'receipt': receipt}) ;
+                }
+            }
+
+            var receipt = {
+                orderlines: orderlines,
+                paymentlines: paymentlines,
+                subtotal: this.get_subtotal(),
+                total_with_tax: this.get_total_with_tax(),
+                total_without_tax: this.get_total_without_tax(),
+                total_tax: this.get_total_tax(),
+                total_paid: this.get_total_paid(),
+                total_discount: this.get_total_discount(),
+                tax_details: this.get_tax_details(),
+                change: this.get_change(),
+                name : this.get_name(),
+                client: client ? client.name : null ,
+                invoice_id: null,   //TODO
+                cashier: cashier ? cashier.name : null,
+                precision: {
+                    price: 2,
+                    money: 2,
+                    quantity: 3,
+                },
+                date: {
+                    year: date.getFullYear(),
+                    month: date.getMonth(),
+                    date: date.getDate(),       // day of the month
+                    day: date.getDay(),         // day of the week
+                    hour: date.getHours(),
+                    minute: date.getMinutes() ,
+                    isostring: date.toISOString(),
+                    localestring: date.toLocaleString(),
+                },
+                company:{
+                    email: company.email,
+                    website: company.website,
+                    company_registry: company.company_registry,
+                    contact_address: company.partner_id[1],
+                    vat: company.vat,
+                    vat_label: company.country && company.country.vat_label || '',
+                    name: company.name,
+                    phone: company.phone,
+                    logo:  this.pos.company_logo_base64,
+                },
+                shop:{
+                    name: shop.name,
+                },
+                currency: this.pos.currency,
+                //custom here
+                has_tare_mode: {
+                    auto: this.has_tare_line('AUTO'),
+                    manual: this.has_tare_line('MAN'),
+                }
+                //custom end
+            };
+
+            if (is_xml(this.pos.config.receipt_header)){
+                receipt.header = '';
+                receipt.header_xml = render_xml(this.pos.config.receipt_header);
+            } else {
+                receipt.header = this.pos.config.receipt_header || '';
+            }
+
+            if (is_xml(this.pos.config.receipt_footer)){
+                receipt.footer = '';
+                receipt.footer_xml = render_xml(this.pos.config.receipt_footer);
+            } else {
+                receipt.footer = this.pos.config.receipt_footer || '';
+            }
+
+            return receipt;
+        },
     });
     
     // Add container to order line
@@ -140,6 +245,28 @@ odoo.define('pos_container.models_and_db', function (require) {
             this.gross_weight = weight;
             this.trigger('change', this);
         },
+        //used to create a json of the ticket, to be sent to the printer
+        export_for_printing: function(){
+            return {
+                quantity:           this.get_quantity(),
+                unit_name:          this.get_unit().name,
+                price:              this.get_unit_price(),
+                discount:           this.get_discount(),
+                product_name:       this.get_product().display_name,
+                product_name_wrapped: this.generate_wrapped_product_name(),
+                price_display :     this.get_display_price(),
+                price_with_tax :    this.get_price_with_tax(),
+                price_without_tax:  this.get_price_without_tax(),
+                tax:                this.get_tax(),
+                product_description:      this.get_product().description,
+                product_description_sale: this.get_product().description_sale,
+                // extension starts here
+                container:          this.get_container(),
+                tare:               this.get_tare(),
+                tare_mode:          this.get_tare_mode(),
+                gross_weight:       this.get_gross_weight(),
+            };
+        },
     });
 
     PosDB.include({
diff --git a/pos_container/static/src/xml/pos.xml b/pos_container/static/src/xml/pos.xml
index d24b825c6c..9e1ee6fe2e 100644
--- a/pos_container/static/src/xml/pos.xml
+++ b/pos_container/static/src/xml/pos.xml
@@ -144,7 +144,7 @@
     </t>
 
     <t t-extend="PosTicket">
-        <t t-jquery='.receipt-orderlines' t-operation='replace'>              
+        <t t-jquery='.receipt-orderlines' t-operation='inner'>              
             <table>
                 <colgroup>
                     <col width='50%' />
@@ -181,7 +181,7 @@
                     <td></td>
                     <td>
                         <center>------------------------</center>
-                        <center>Pesée automatique</center>
+                        <center>Automatic Weighing</center>
                         <center>------------------------</center>
                     </td>
                 </table>
@@ -231,7 +231,7 @@
                     <td></td>
                     <td>
                         <center>------------------------</center>
-                        <center>Saisie manuelle</center>
+                        <center>Manual Input</center>
                         <center>------------------------</center>
                     </td>
                 </table>
@@ -274,4 +274,141 @@
         </t>
     </t>
 
+    <t t-extend="XmlReceipt">
+        <t t-jquery='.orderlines' t-operation='inner'>              
+            <t t-foreach='receipt.orderlines' t-as='line'>
+                <t t-if="line.tare_mode == undefined">
+                    <t t-set='simple' t-value='line.discount === 0 and line.unit_name === "Unit(s)" and line.quantity === 1' />
+                    <t t-if='simple'>
+                        <line>
+                            <left><t t-esc='line.product_name_wrapped[0]' /></left>
+                            <right><value t-att-value-decimals='pos.currency.decimals'><t t-esc='line.price_display' /></value></right>
+                        </line>
+                        <t t-call="XmlReceiptWrappedProductNameLines"/>
+                    </t>
+                    <t t-if='!simple'>
+                        <line><left><t t-esc='line.product_name_wrapped[0]' /></left></line>
+                        <t t-call="XmlReceiptWrappedProductNameLines"/>
+                        <t t-if='line.discount !== 0'>
+                            <line indent='1'><left>Discount: <t t-esc='line.discount' />%</left></line>
+                        </t>
+                        <line indent='1'>
+                            <left>
+                                <value t-att-value-decimals='pos.dp["Product Unit of Measure"]' value-autoint='on'>
+                                    <t t-esc='line.quantity' />
+                                </value>
+                                <t t-if='line.unit_name !== "Unit(s)"'>
+                                    <t t-esc='line.unit_name' />
+                                </t>
+                                x
+                                <value t-att-value-decimals='pos.dp["Product Price"]'>
+                                    <t t-esc='line.price' />
+                                </value>
+                            </left>
+                            <right>
+                                <value t-att-value-decimals='pos.currency.decimals'><t t-esc='line.price_display' /></value>
+                            </right>
+                        </line>
+                    </t>
+                </t>
+            </t>
+            <div>------------------</div>
+            <t t-if="receipt.has_tare_mode.auto">
+                Automatic Weighing
+                <div>------------------</div>
+                <t t-foreach='receipt.orderlines' t-as='line'>
+                    <t t-if="line.tare_mode == 'AUTO'">
+                        <t t-set='simple' t-value='line.discount === 0 and line.unit_name === "Unit(s)" and line.quantity === 1' />
+                        <t t-if='simple'>
+                            <line>
+                                <left><t t-esc='line.product_name_wrapped[0]' /></left>
+                                <right><value t-att-value-decimals='pos.currency.decimals'><t t-esc='line.price_display' /></value></right>
+                            </line>
+                            <t t-call="XmlReceiptWrappedProductNameLines"/>
+                        </t>
+                        <t t-if='!simple'>
+                            <line><left><t t-esc='line.product_name_wrapped[0]' /></left></line>
+                            <t t-call="XmlReceiptWrappedProductNameLines"/>
+                            <t t-if='line.discount !== 0'>
+                                <line indent='1'><left>Discount: <t t-esc='line.discount' />%</left></line>
+                            </t>
+                            <line indent='1'>
+                                <left>
+                                    <value t-att-value-decimals='pos.dp["Product Unit of Measure"]' value-autoint='on'>
+                                        <t t-esc='line.quantity' />
+                                    </value>
+                                    <t t-if='line.unit_name !== "Unit(s)"'>
+                                        <t t-esc='line.unit_name' />
+                                    </t>
+                                    x
+                                    <value t-att-value-decimals='pos.dp["Product Price"]'>
+                                        <t t-esc='line.price' />
+                                    </value>
+                                </left>
+                                <right>
+                                    <value t-att-value-decimals='pos.currency.decimals'><t t-esc='line.price_display' /></value>
+                                </right>
+                            </line>
+                        </t>
+                    </t>
+                    <t t-if='line.container'>
+                        <line indent='1'>
+                            <left>
+                                Tare : <t t-esc='line.container.weight' /><t t-esc='line.unit_name' />
+                            </left>
+                        </line>
+                    </t>
+                </t>
+                <div>------------------</div>
+            </t>
+            <t t-if="receipt.has_tare_mode.manual">
+                Manual Input
+                <div>------------------</div>
+                <t t-foreach='receipt.orderlines' t-as='line'>
+                    <t t-if="line.tare_mode == 'MAN'">
+                        <t t-set='simple' t-value='line.discount === 0 and line.unit_name === "Unit(s)" and line.quantity === 1' />
+                        <t t-if='simple'>
+                            <line>
+                                <left><t t-esc='line.product_name_wrapped[0]' /></left>
+                                <right><value t-att-value-decimals='pos.currency.decimals'><t t-esc='line.price_display' /></value></right>
+                            </line>
+                            <t t-call="XmlReceiptWrappedProductNameLines"/>
+                        </t>
+                        <t t-if='!simple'>
+                            <line><left><t t-esc='line.product_name_wrapped[0]' /></left></line>
+                            <t t-call="XmlReceiptWrappedProductNameLines"/>
+                            <t t-if='line.discount !== 0'>
+                                <line indent='1'><left>Discount: <t t-esc='line.discount' />%</left></line>
+                            </t>
+                            <line indent='1'>
+                                <left>
+                                    <value t-att-value-decimals='pos.dp["Product Unit of Measure"]' value-autoint='on'>
+                                        <t t-esc='line.quantity' />
+                                    </value>
+                                    <t t-if='line.unit_name !== "Unit(s)"'>
+                                        <t t-esc='line.unit_name' />
+                                    </t>
+                                    x
+                                    <value t-att-value-decimals='pos.dp["Product Price"]'>
+                                        <t t-esc='line.price' />
+                                    </value>
+                                </left>
+                                <right>
+                                    <value t-att-value-decimals='pos.currency.decimals'><t t-esc='line.price_display' /></value>
+                                </right>
+                            </line>
+                        </t>
+                    </t>
+                    <t t-if='line.tare'>
+                        <line indent='1'>
+                            <left>
+                                Tare : <t t-esc='line.tare' /><t t-esc='line.unit_name' />
+                            </left>
+                        </line>
+                    </t>
+                </t>
+            </t>
+        </t>
+    </t>
+
 </templates>

From 9e64dd8a20caf88da3e0926e73a8f8bbb0a09cb5 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Tue, 16 Apr 2019 12:05:38 +0200
Subject: [PATCH 32/47] [IMP] correctly display tare/container data when
 loading past orders

---
 pos_container/models/__init__.py              |  3 +-
 pos_container/models/pos_order_line.py        | 15 ++++++
 pos_container/static/src/js/models_and_db.js  | 26 +++++++++-
 pos_container/static/src/xml/pos.xml          |  2 +-
 pos_container/tests/test_pos_container.py     |  8 ++-
 pos_order_mgmt_container/__init__.py          |  1 +
 pos_order_mgmt_container/__manifest__.py      | 19 +++++++
 pos_order_mgmt_container/models/__init__.py   |  1 +
 pos_order_mgmt_container/models/pos_order.py  | 18 +++++++
 .../readme/DESCRIPTION.rst                    |  3 ++
 .../static/src/js/widgets.js                  | 52 +++++++++++++++++++
 .../templates/templates.xml                   | 14 +++++
 12 files changed, 156 insertions(+), 6 deletions(-)
 create mode 100644 pos_container/models/pos_order_line.py
 create mode 100644 pos_order_mgmt_container/__init__.py
 create mode 100644 pos_order_mgmt_container/__manifest__.py
 create mode 100644 pos_order_mgmt_container/models/__init__.py
 create mode 100644 pos_order_mgmt_container/models/pos_order.py
 create mode 100644 pos_order_mgmt_container/readme/DESCRIPTION.rst
 create mode 100644 pos_order_mgmt_container/static/src/js/widgets.js
 create mode 100644 pos_order_mgmt_container/templates/templates.xml

diff --git a/pos_container/models/__init__.py b/pos_container/models/__init__.py
index 1f047343e2..b662490e74 100644
--- a/pos_container/models/__init__.py
+++ b/pos_container/models/__init__.py
@@ -1,4 +1,3 @@
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
 from . import container
 from . import barcode
+from . import pos_order_line
diff --git a/pos_container/models/pos_order_line.py b/pos_container/models/pos_order_line.py
new file mode 100644
index 0000000000..1a0899cab5
--- /dev/null
+++ b/pos_container/models/pos_order_line.py
@@ -0,0 +1,15 @@
+# Copyright 2019 Coop IT Easy SCRLfs
+# @author Pierrick Brun <pierrick.brun@akretion.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class PosOrderLine(models.Model):
+    _inherit = 'pos.order.line'
+
+    tare = fields.Float('Tare')
+    container_weight = fields.Float('Container Weight')
+    container_id = fields.Many2one(
+        'pos.container',
+        'Container')
diff --git a/pos_container/static/src/js/models_and_db.js b/pos_container/static/src/js/models_and_db.js
index ff29e2bde0..555bd40fa5 100644
--- a/pos_container/static/src/js/models_and_db.js
+++ b/pos_container/static/src/js/models_and_db.js
@@ -245,6 +245,29 @@ odoo.define('pos_container.models_and_db', function (require) {
             this.gross_weight = weight;
             this.trigger('change', this);
         },
+		export_as_JSON: function(){
+			var pack_lot_ids = [];
+			if (this.has_product_lot){
+				this.pack_lot_lines.each(_.bind( function(item) {
+					return pack_lot_ids.push([0, 0, item.export_as_JSON()]);
+				}, this));
+			}
+			return {
+				qty: this.get_quantity(),
+				price_unit: this.get_unit_price(),
+				price_subtotal: this.get_price_without_tax(),
+				price_subtotal_incl: this.get_price_with_tax(),
+				discount: this.get_discount(),
+				product_id: this.get_product().id,
+				tax_ids: [[6, false, _.map(this.get_applicable_taxes(), function(tax){ return tax.id; })]],
+				id: this.id,
+				pack_lot_ids: pack_lot_ids,
+				//custom starts here
+				tare: this.get_tare(),
+				container_id: this.get_container() ? this.get_container().id : null,
+				container_weight: this.get_container() ? this.get_container().weight : null,
+			};
+		},
         //used to create a json of the ticket, to be sent to the printer
         export_for_printing: function(){
             return {
@@ -394,8 +417,7 @@ odoo.define('pos_container.models_and_db', function (require) {
 
     models.load_models({
         model: 'pos.container',
-        fields: ['name','barcode', 'weight'],
-        // domain: [[]],
+		fields: ['name','barcode', 'weight'],
         loaded: function(self, containers){
             self.db.add_containers(containers);
         },
diff --git a/pos_container/static/src/xml/pos.xml b/pos_container/static/src/xml/pos.xml
index 9e1ee6fe2e..2ec8eb81dc 100644
--- a/pos_container/static/src/xml/pos.xml
+++ b/pos_container/static/src/xml/pos.xml
@@ -213,7 +213,7 @@
                         <tr>
                             <td>
                                 <div style="margin-left:5%">
-                                    Tare : <t t-esc="orderline.tare"/>
+                                    Tare : <t t-esc="orderline.get_container().weight"/>
                                     <t t-esc="orderline.get_unit().name"/>
                                 </div>
                             </td>
diff --git a/pos_container/tests/test_pos_container.py b/pos_container/tests/test_pos_container.py
index af1869432d..afe2f6b66f 100644
--- a/pos_container/tests/test_pos_container.py
+++ b/pos_container/tests/test_pos_container.py
@@ -5,4 +5,10 @@
 class testUi(odoo.tests.HttpCase):
 
     def test_01_pos_container_tour(self):
-        self.phantom_js("/web", "odoo.__DEBUG__.services['web_tour.tour'].run('pos_container_tour')", "odoo.__DEBUG__.services['web_tour.tour'].tours.pos_container_tour.ready", login="admin")
+        self.phantom_js(
+            "/web",
+            "odoo.__DEBUG__.services['web_tour.tour']" +
+            ".run('pos_container_tour')",
+            "odoo.__DEBUG__.services['web_tour.tour']" +
+            ".tours.pos_container_tour.ready",
+            login="admin")
diff --git a/pos_order_mgmt_container/__init__.py b/pos_order_mgmt_container/__init__.py
new file mode 100644
index 0000000000..0650744f6b
--- /dev/null
+++ b/pos_order_mgmt_container/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/pos_order_mgmt_container/__manifest__.py b/pos_order_mgmt_container/__manifest__.py
new file mode 100644
index 0000000000..1d7b5faf01
--- /dev/null
+++ b/pos_order_mgmt_container/__manifest__.py
@@ -0,0 +1,19 @@
+{
+    "name": "PoS Order Management Container",
+    "summary": "Glue module for pos_order_mgmt and pos_container",
+    "version": " 12.0.1.0.0",
+    "category": "Point of sale",
+    "website": "https://github.com/OCA/pos",
+    "author": "Coop IT Easy SCRLfs",
+    "license": "AGPL-3",
+    "application": False,
+    "installable": True,
+    "depends": [
+        "pos_order_mgmt",
+        "pos_container",
+    ],
+    "data": [
+        "templates/templates.xml",
+    ],
+    "auto_install": True,
+}
diff --git a/pos_order_mgmt_container/models/__init__.py b/pos_order_mgmt_container/models/__init__.py
new file mode 100644
index 0000000000..e9ab911ddc
--- /dev/null
+++ b/pos_order_mgmt_container/models/__init__.py
@@ -0,0 +1 @@
+from . import pos_order
diff --git a/pos_order_mgmt_container/models/pos_order.py b/pos_order_mgmt_container/models/pos_order.py
new file mode 100644
index 0000000000..8985da4be4
--- /dev/null
+++ b/pos_order_mgmt_container/models/pos_order.py
@@ -0,0 +1,18 @@
+# Copyright 2019 Coop IT Easy SCRLfs
+# @author Pierrick Brun <pierrick.brun@akretion.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, models
+
+
+class PosOrder(models.Model):
+    _inherit = 'pos.order'
+
+    @api.multi
+    def _prepare_done_order_line_for_pos(self, order_line):
+        res = super(PosOrder, self)\
+            ._prepare_done_order_line_for_pos(order_line)
+        res['container_id'] = order_line.container_id.id
+        res['container_weight'] = order_line.container_weight
+        res['tare'] = order_line.tare
+        return res
diff --git a/pos_order_mgmt_container/readme/DESCRIPTION.rst b/pos_order_mgmt_container/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..a10b15640c
--- /dev/null
+++ b/pos_order_mgmt_container/readme/DESCRIPTION.rst
@@ -0,0 +1,3 @@
+This is a glue module between pos_container and pos_order_mgmt.
+When installed the returned orders and reprinted tickets will correctly display
+the tare/container weight associated with the shopping.
diff --git a/pos_order_mgmt_container/static/src/js/widgets.js b/pos_order_mgmt_container/static/src/js/widgets.js
new file mode 100644
index 0000000000..67c75f2a57
--- /dev/null
+++ b/pos_order_mgmt_container/static/src/js/widgets.js
@@ -0,0 +1,52 @@
+/* Copyright 2019 Coop IT Easy SCRLfs - Pierrick Brun
+   License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl). */
+
+odoo.define('pos_order_mgmt_container.widgets', function (require) {
+    "use strict";
+
+    var screens = require('pos_order_mgmt.widgets');
+	//var pos = require('point_of_sale.models');
+
+    screens.OrderListScreenWidget.include({
+        _prepare_orderlines_from_order_data: function (order, order_data, orderLines) {
+			var self = this;
+			_.each(orderLines, function(line) {
+				// In case of local data
+				if (line.length === 3) {
+					line = line[2];
+				}
+				var product = self.pos.db.get_product_by_id(line.product_id);
+
+				if (line['container_id']){
+					var container = self.pos.db.get_container_by_id(line.container_id);
+				}
+				// Check if product are available in pos
+				if (_.isUndefined(product)) {
+					self.unknown_products.push(String(line.product_id));
+				} else {
+					// Create a new order line
+					order.add_product(product, {
+						price: line.price_unit,
+						quantity: order_data.return ? line.qty * -1 : line.qty,
+						discount: line.discount,
+						merge: false,
+					});
+					var oline = order.get_last_orderline();
+					if (line.tare){
+						oline.set_tare_mode('MAN');
+						oline.set_tare(line.tare);
+						// cancels set_tare quantity substraction
+						oline.set_quantity(line.qty);
+					}
+					if(!_.isUndefined(container)){
+						oline.set_container(container);
+						oline.set_gross_weight(line.qty + line.container_weight);
+						oline.set_quantity(line.qty);
+						oline.set_tare_mode('AUTO');
+					}
+				}
+			});
+        },
+	});
+
+});
diff --git a/pos_order_mgmt_container/templates/templates.xml b/pos_order_mgmt_container/templates/templates.xml
new file mode 100644
index 0000000000..efa42b686b
--- /dev/null
+++ b/pos_order_mgmt_container/templates/templates.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2019 Coop IT Easy SCRLfs
+    	    Pierrick Brun <pierrick.brun@akretion.com>
+    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+-->
+
+<odoo>
+    <template id="assets_frontend" inherit_id="point_of_sale.assets">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/pos_order_mgmt_container/static/src/js/widgets.js"/>
+        </xpath>
+    </template>
+</odoo>

From 3c9f0d279b8034c84418e7abae8dfff5aeaa7807 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Wed, 17 Apr 2019 10:52:24 +0200
Subject: [PATCH 33/47] [FIX] price change/discount is also a manual input

---
 pos_container/static/src/js/container.js       |  4 +++-
 pos_container/static/src/xml/pos.xml           | 18 ++++++++++--------
 .../static/src/js/widgets.js                   |  6 ++++--
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pos_container/static/src/js/container.js b/pos_container/static/src/js/container.js
index a1c97a0314..4f587a3865 100644
--- a/pos_container/static/src/js/container.js
+++ b/pos_container/static/src/js/container.js
@@ -409,9 +409,11 @@ odoo.define('pos_container.container', function (require) {
             if (oline) {
                 var mode = this.numpad_state.get('mode');
                 if( mode === 'tare'){
-                    oline.set_tare_mode('MAN');
                     oline.set_tare(val);
                 }
+				if (['tare', 'discount', 'price'].indexOf(mode) != -1) {
+					oline.set_tare_mode('MAN');
+				}
             }
         },
     });
diff --git a/pos_container/static/src/xml/pos.xml b/pos_container/static/src/xml/pos.xml
index 2ec8eb81dc..7496e475e6 100644
--- a/pos_container/static/src/xml/pos.xml
+++ b/pos_container/static/src/xml/pos.xml
@@ -260,14 +260,16 @@
                                 <t t-esc="widget.format_currency(orderline.get_display_price())"/>
                             </td>
                         </tr>
-                        <tr>
-                            <td>
-                               <div style="margin-left:5%">
-                                   Tare : <t t-esc="orderline.tare"/>
-                                   <t t-esc="orderline.get_unit().name"/>
-                               </div>
-                            </td>
-                        </tr>
+						<t t-if="orderline.get_tare()">
+							<tr>
+								<td>
+								   <div style="margin-left:5%">
+									   Tare : <t t-esc="orderline.tare"/>
+									   <t t-esc="orderline.get_unit().name"/>
+								   </div>
+								</td>
+							</tr>
+						</t>
                     </t>
                 </tr>
             </table>
diff --git a/pos_order_mgmt_container/static/src/js/widgets.js b/pos_order_mgmt_container/static/src/js/widgets.js
index 67c75f2a57..a7f167b793 100644
--- a/pos_order_mgmt_container/static/src/js/widgets.js
+++ b/pos_order_mgmt_container/static/src/js/widgets.js
@@ -5,7 +5,7 @@ odoo.define('pos_order_mgmt_container.widgets', function (require) {
     "use strict";
 
     var screens = require('pos_order_mgmt.widgets');
-	//var pos = require('point_of_sale.models');
+	var pos = require('pos_container.models_and_db');
 
     screens.OrderListScreenWidget.include({
         _prepare_orderlines_from_order_data: function (order, order_data, orderLines) {
@@ -33,11 +33,13 @@ odoo.define('pos_order_mgmt_container.widgets', function (require) {
 					});
 					var oline = order.get_last_orderline();
 					if (line.tare){
-						oline.set_tare_mode('MAN');
 						oline.set_tare(line.tare);
 						// cancels set_tare quantity substraction
 						oline.set_quantity(line.qty);
 					}
+					if (line.tare || line.discount || line.price_unit != product.lst_price) {
+						oline.set_tare_mode('MAN');
+					}
 					if(!_.isUndefined(container)){
 						oline.set_container(container);
 						oline.set_gross_weight(line.qty + line.container_weight);

From 5de627eb5cb294a97692edc9627609046b2a0f8a Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Thu, 18 Apr 2019 12:26:27 +0200
Subject: [PATCH 34/47] [FIX] do not add orderline on container creation

---
 pos_container/static/src/js/container.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pos_container/static/src/js/container.js b/pos_container/static/src/js/container.js
index 4f587a3865..d54e7dd34e 100644
--- a/pos_container/static/src/js/container.js
+++ b/pos_container/static/src/js/container.js
@@ -357,7 +357,7 @@ odoo.define('pos_container.container', function (require) {
             });
 
             fields.barcode = this.gui.get_current_screen_param('barcode') || false;
-            fields.name = fields.name || 'Contenant';
+            fields.name = fields.name || _t('Container');
 
             rpc.query({
                 model: 'pos.container',
@@ -385,14 +385,9 @@ odoo.define('pos_container.container', function (require) {
                 var container = self.pos.db.get_container_by_id(container_id);
                 if (container) {
                     self.gui.show_screen(self.next_screen);
-                    self.order_container(container);
                 }
             });
         },
-        order_container: function(container){
-            // fixme add_container takes a list ?
-            this.pos.get_order().add_container(container);
-        },
 
     });
 

From 025f5fc85b4f33f8dd48088a3141a112e9f068a5 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Thu, 18 Apr 2019 16:37:28 +0200
Subject: [PATCH 35/47] [IMP] add detailed tour testing

---
 pos_container/static/src/js/tests.js          | 225 +++++++++++++++---
 .../static/src/js/tests.js                    |  19 ++
 .../templates/templates.xml                   |   1 +
 3 files changed, 211 insertions(+), 34 deletions(-)
 create mode 100644 pos_order_mgmt_container/static/src/js/tests.js

diff --git a/pos_container/static/src/js/tests.js b/pos_container/static/src/js/tests.js
index d6332a99b0..6e49097b75 100644
--- a/pos_container/static/src/js/tests.js
+++ b/pos_container/static/src/js/tests.js
@@ -10,63 +10,220 @@ odoo.define('pos_container.tour.tare', function (require) {
         }
     }
 
+	function scan(barcode) {
+		return {
+			content: "Scanning barcode " + barcode,
+			trigger: "input.ean",
+			run: "text " + barcode
+		}
+	}
+
+	function confirm_scan() {
+		return {
+			content: "Confirm barcode",
+			trigger: ".button.barcode",
+		}
+	}
+
+	function set_weight(weight) {
+		return {
+			content: "Setting weight " + weight,
+			trigger: "input.weight",
+			run: "text " + weight
+		}
+	}
+
+	function confirm_weight() {
+		return {
+			content: "Confirm weight",
+			trigger: ".button.set_weight",
+		}
+	}
+
+	function check_selected_orderline(message, check) {
+		return {
+			content: message,
+			trigger: ".orderline.selected " + check,
+			run: function () {}, // it's a check
+		}
+	}
+
+
     var steps = [{
         content: 'waiting for loading to finish',
         trigger: '.o_main_content:has(.loader:hidden)',
-        run: function () {}
-    }, {
+        run: function () {},
+    },
+	scan('0499999999998'),
+	confirm_scan(),
+	set_weight(0.1),
+	confirm_weight(),
+    {
+        content: "Click on save",
+        trigger: ".add-container",
+    },
+	// Test a second time with a custom name
+	scan('0499999999981'),
+	confirm_scan(),
+	set_weight(0.2),
+	confirm_weight(),
+	{
+		content: "Set a custom name",
+		trigger:"input.container-name",
+		run:"text TOTO",
+	}, {
+        content: "Click on save",
+        trigger: ".add-container",
+    },
+	// Scan du premier contenant 
+	scan('0499999999998'),
+	confirm_scan(),
+	check_selected_orderline("Check: empty container in the orderline", ".product-name:contains('Container without product')"),
+	check_selected_orderline("Check: the name is 'Container'", ".info:contains('Container')"),
+    {
+        content: "select product",
+        trigger: ".product:contains('Whiteboard Pen')", //UoM = kg
+    },
+	set_weight(0.3),
+	confirm_weight(),
+	{
+        content: "validate weight",
+        trigger: ".buy-product",
+    },
+	check_selected_orderline("Check: the name is 'Container'", ".info:contains('Container')"),
+	check_selected_orderline("Check: orderline in AUTO tare mode", ".pos-right-align:contains('AUTO')"),
+	check_selected_orderline("Check: orderline's product is the Pen", ".product-name:contains('Whiteboard Pen')"),
+	check_selected_orderline("Check: the quantity is the tared weight", ".info:contains('0.200')"),
+    {
         content: "click container button",
         trigger: ".control-button.o_container_button",
     }, {
-        content: "select a container",
-        trigger: ".container-line:contains('Container 1')",
+        content: "Search Container TOTO",
+        trigger: ".searchbox input",
+        run: "text TOTO",
     }, {
-        content: "confirm selection",
-        trigger: ".containerlist-screen .next",
+        content: "Select container TOTO",
+        trigger: ".container-line:contains('TOTO')", 
     }, {
-        content: "Container should be present in the orderlines",
-        trigger: ".orderline.selected:contains('Container without product')",
-        run: function () {}, // it's a check
+        content: "Click delete",
+        trigger: ".button.delete-container",
     }, {
-        content: "select product",
-        trigger: ".product:contains('Whiteboard Pen')", //UoM = kg
+        content: "Click cancel",
+        trigger: ".button.cancel",
     }, {
-        content: "validate weight",
-        trigger: ".buy-product",
+        content: "Click delete",
+        trigger: ".button.delete-container",
     }, {
-        content: "Orderline should be in AUTO tare mode",
-        trigger: ".orderline.selected:contains('AUTO')",
-        run: function () {}, // it's a check
+        content: "Click confirm",
+        trigger: ".button.confirm",
     }, {
-        content: "Orderline should have the Pen as product",
-        trigger: ".orderline.selected .product-name:contains('Whiteboard Pen')",
-        run: function () {}, // it's a check
+        content: "Search by barcode",
+        trigger: ".searchbox input",
+        run: "text 0499999999998",
     }, {
-        content: "Orderline should have the Container shown",
-        trigger: ".orderline.selected .info:contains('Container 1')",
-        run: function () {}, // it's a check
+        content: "select the searched container",
+        trigger: ".container-line:contains('Container')", 
     }, {
-        content: "Orderline should have the tared weight as quantity",
-        trigger: ".orderline.selected .info:contains('-0.123')",
-        run: function () {}, // it's a check
+        content: "confirm selection",
+        trigger: ".containerlist-screen .next",
     }, {
-        content: "select product again", // defaults to 1kg
-        trigger: ".product:contains('Whiteboard Pen')", //UoM = kg
+        content: "remove orderline quantity",
+        trigger: ".input-button.numpad-backspace",
+    }, {
+        content: "delete orderline",
+        trigger: ".input-button.numpad-backspace",
+    }, {
+        content: "select another product",
+        trigger: ".product:contains('Desk Organizer')", //UoM = kg
+    },
+	set_weight(0.5),
+	confirm_weight(),
+	{
+        content: "confirm purchase",
+        trigger: ".buy-product",
     }, {
         content: "switch numpad to tare mode",
         trigger: ".control-button.o_tare_button",
     },
     click_numpad(0),
     click_numpad('.'),
-    click_numpad(6),
+    click_numpad(2),
+	check_selected_orderline("Check: orderline in MAN tare mode", ".pos-right-align:contains('MAN')"),
+	check_selected_orderline("Check: orderline's product is the Organizer", ".product-name:contains('Desk Organizer')"),
+	check_selected_orderline("Check: the quantity is the tared weight", ".info:contains('0.300')"),
     {
-        content: "Orderline should be in MAN tare mode",
-        trigger: ".orderline.selected:contains('MAN')",
-        run: function () {}, // it's a check
+        content: "click orderline auto",
+        trigger: ".orderline .pos-right-align:contains('AUTO')",
+    }, {
+        content: "switch numpad to tare mode",
+        trigger: ".control-button.o_tare_button",
+    },
+    click_numpad(0),
+    click_numpad('.'),
+    click_numpad(2),
+	check_selected_orderline("Check: orderline in MAN tare mode", ".pos-right-align:contains('MAN')"),
+	check_selected_orderline("Check: orderline's product is the Pen", ".product-name:contains('Whiteboard Pen')"),
+	check_selected_orderline("Check: the quantity is the tared weight", ".info:contains('0.100')"),
+    {
+        content: "Add a unit product",
+        trigger: ".product:contains('Large Cabinet')",
+    }, {
+        content: "click discount",
+        trigger: ".mode-button[data-mode='discount']",
+    },
+    click_numpad(1),
+    click_numpad(0),
+	check_selected_orderline("Check: orderline in MAN tare mode", ".pos-right-align:contains('MAN')"),
+    {
+        content: "Add a unit product",
+        trigger: ".product:contains('Large Cabinet')",
+    }, {
+        content: "click price change",
+        trigger: ".mode-button[data-mode='price']",
+    },
+    click_numpad(2),
+    click_numpad(0),
+    click_numpad(0),
+	check_selected_orderline("Check: orderline in MAN tare mode", ".pos-right-align:contains('MAN')"),
+	// Ajouter une ligne en AUTO
+	scan('0499999999998'),
+	confirm_scan(),
+    {
+        content: "select product",
+        trigger: ".product:contains('Whiteboard Pen')", //UoM = kg
+    },
+	set_weight(0.3),
+	confirm_weight(),
+	{
+        content: "validate weight",
+        trigger: ".buy-product",
+    },
+	{
+        content: "pay",
+        trigger: ".button.pay",
+    },
+    click_numpad(2),
+    click_numpad(0),
+    click_numpad(0),
+    click_numpad(0),
+	{
+        content: "validate",
+        trigger: ".button.next",
+    }];
+
+
+    var autre = [{
+        content: "relancer POS",
+        trigger: "",
+    }, {
+        content: "click commandes",
+        trigger: "",
+    }, {
+        content: "sélectionner dernière commande",
+        trigger: "",
     }, {
-        content: "Orderline should have the tared weight as quantity",
-        trigger: ".orderline.selected .info:contains('0.4')",
-        run: function () {}, // it's a check
+        content: "click reprint",
+        trigger: "",
     }];
 
     Tour.register('pos_container', { test: true, url: '/pos/web' }, steps);
diff --git a/pos_order_mgmt_container/static/src/js/tests.js b/pos_order_mgmt_container/static/src/js/tests.js
new file mode 100644
index 0000000000..9efece4729
--- /dev/null
+++ b/pos_order_mgmt_container/static/src/js/tests.js
@@ -0,0 +1,19 @@
+odoo.define('pos_order_mgmt_container.tour.reprint', function (require) {
+    "use strict";
+
+    var Tour = require('web_tour.tour');
+
+    var steps = [{
+        content: 'waiting for loading to finish',
+        trigger: '.o_main_content:has(.loader:hidden)',
+        run: function () {},
+    }, {
+        content: "click orders",
+        trigger: ".header-button.order-list-button",
+    }, {
+        content: "reprint last orderline",
+        trigger: ".order-line .order-list-reprint",
+    }];
+
+    Tour.register('pos_order_mgmt_container', { test: true, url: '/pos/web' }, steps);
+});
diff --git a/pos_order_mgmt_container/templates/templates.xml b/pos_order_mgmt_container/templates/templates.xml
index efa42b686b..25b1681bac 100644
--- a/pos_order_mgmt_container/templates/templates.xml
+++ b/pos_order_mgmt_container/templates/templates.xml
@@ -9,6 +9,7 @@
     <template id="assets_frontend" inherit_id="point_of_sale.assets">
         <xpath expr="." position="inside">
             <script type="text/javascript" src="/pos_order_mgmt_container/static/src/js/widgets.js"/>
+            <script type="text/javascript" src="/pos_order_mgmt_container/static/src/js/tests.js"/>
         </xpath>
     </template>
 </odoo>

From 750ffc02d5ba2a63a8fdec57e7980b57da94b9f0 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Tue, 23 Apr 2019 15:57:22 +0200
Subject: [PATCH 36/47] [FIX] flake8

---
 pos_container/static/src/js/container.js      |   6 +-
 pos_container/static/src/js/models_and_db.js  |  48 +-
 pos_container/static/src/js/tests.js          | 156 +++----
 pos_container/static/src/xml/pos.xml          |  20 +-
 pos_container/tests/test_pos_container.py     |   2 +-
 pos_order_mgmt_container/README.rst           |  70 +++
 .../static/description/index.html             | 414 ++++++++++++++++++
 .../static/src/js/widgets.js                  |  80 ++--
 8 files changed, 640 insertions(+), 156 deletions(-)
 create mode 100644 pos_order_mgmt_container/README.rst
 create mode 100644 pos_order_mgmt_container/static/description/index.html

diff --git a/pos_container/static/src/js/container.js b/pos_container/static/src/js/container.js
index d54e7dd34e..d71c905b48 100644
--- a/pos_container/static/src/js/container.js
+++ b/pos_container/static/src/js/container.js
@@ -406,9 +406,9 @@ odoo.define('pos_container.container', function (require) {
                 if( mode === 'tare'){
                     oline.set_tare(val);
                 }
-				if (['tare', 'discount', 'price'].indexOf(mode) != -1) {
-					oline.set_tare_mode('MAN');
-				}
+                if (['tare', 'discount', 'price'].indexOf(mode) != -1) {
+                    oline.set_tare_mode('MAN');
+                }
             }
         },
     });
diff --git a/pos_container/static/src/js/models_and_db.js b/pos_container/static/src/js/models_and_db.js
index 555bd40fa5..0f8bb64d79 100644
--- a/pos_container/static/src/js/models_and_db.js
+++ b/pos_container/static/src/js/models_and_db.js
@@ -245,29 +245,29 @@ odoo.define('pos_container.models_and_db', function (require) {
             this.gross_weight = weight;
             this.trigger('change', this);
         },
-		export_as_JSON: function(){
-			var pack_lot_ids = [];
-			if (this.has_product_lot){
-				this.pack_lot_lines.each(_.bind( function(item) {
-					return pack_lot_ids.push([0, 0, item.export_as_JSON()]);
-				}, this));
-			}
-			return {
-				qty: this.get_quantity(),
-				price_unit: this.get_unit_price(),
-				price_subtotal: this.get_price_without_tax(),
-				price_subtotal_incl: this.get_price_with_tax(),
-				discount: this.get_discount(),
-				product_id: this.get_product().id,
-				tax_ids: [[6, false, _.map(this.get_applicable_taxes(), function(tax){ return tax.id; })]],
-				id: this.id,
-				pack_lot_ids: pack_lot_ids,
-				//custom starts here
-				tare: this.get_tare(),
-				container_id: this.get_container() ? this.get_container().id : null,
-				container_weight: this.get_container() ? this.get_container().weight : null,
-			};
-		},
+        export_as_JSON: function(){
+            var pack_lot_ids = [];
+            if (this.has_product_lot){
+                this.pack_lot_lines.each(_.bind( function(item) {
+                    return pack_lot_ids.push([0, 0, item.export_as_JSON()]);
+                }, this));
+            }
+            return {
+                qty: this.get_quantity(),
+                price_unit: this.get_unit_price(),
+                price_subtotal: this.get_price_without_tax(),
+                price_subtotal_incl: this.get_price_with_tax(),
+                discount: this.get_discount(),
+                product_id: this.get_product().id,
+                tax_ids: [[6, false, _.map(this.get_applicable_taxes(), function(tax){ return tax.id; })]],
+                id: this.id,
+                pack_lot_ids: pack_lot_ids,
+                //custom starts here
+                tare: this.get_tare(),
+                container_id: this.get_container() ? this.get_container().id : null,
+                container_weight: this.get_container() ? this.get_container().weight : null,
+            };
+        },
         //used to create a json of the ticket, to be sent to the printer
         export_for_printing: function(){
             return {
@@ -417,7 +417,7 @@ odoo.define('pos_container.models_and_db', function (require) {
 
     models.load_models({
         model: 'pos.container',
-		fields: ['name','barcode', 'weight'],
+        fields: ['name','barcode', 'weight'],
         loaded: function(self, containers){
             self.db.add_containers(containers);
         },
diff --git a/pos_container/static/src/js/tests.js b/pos_container/static/src/js/tests.js
index 6e49097b75..9cfadb616b 100644
--- a/pos_container/static/src/js/tests.js
+++ b/pos_container/static/src/js/tests.js
@@ -10,43 +10,43 @@ odoo.define('pos_container.tour.tare', function (require) {
         }
     }
 
-	function scan(barcode) {
-		return {
-			content: "Scanning barcode " + barcode,
-			trigger: "input.ean",
-			run: "text " + barcode
-		}
-	}
+    function scan(barcode) {
+        return {
+            content: "Scanning barcode " + barcode,
+            trigger: "input.ean",
+            run: "text " + barcode
+        }
+    }
 
-	function confirm_scan() {
-		return {
-			content: "Confirm barcode",
-			trigger: ".button.barcode",
-		}
-	}
+    function confirm_scan() {
+        return {
+            content: "Confirm barcode",
+            trigger: ".button.barcode",
+        }
+    }
 
-	function set_weight(weight) {
-		return {
-			content: "Setting weight " + weight,
-			trigger: "input.weight",
-			run: "text " + weight
-		}
-	}
+    function set_weight(weight) {
+        return {
+            content: "Setting weight " + weight,
+            trigger: "input.weight",
+            run: "text " + weight
+        }
+    }
 
-	function confirm_weight() {
-		return {
-			content: "Confirm weight",
-			trigger: ".button.set_weight",
-		}
-	}
+    function confirm_weight() {
+        return {
+            content: "Confirm weight",
+            trigger: ".button.set_weight",
+        }
+    }
 
-	function check_selected_orderline(message, check) {
-		return {
-			content: message,
-			trigger: ".orderline.selected " + check,
-			run: function () {}, // it's a check
-		}
-	}
+    function check_selected_orderline(message, check) {
+        return {
+            content: message,
+            trigger: ".orderline.selected " + check,
+            run: function () {}, // it's a check
+        }
+    }
 
 
     var steps = [{
@@ -54,46 +54,46 @@ odoo.define('pos_container.tour.tare', function (require) {
         trigger: '.o_main_content:has(.loader:hidden)',
         run: function () {},
     },
-	scan('0499999999998'),
-	confirm_scan(),
-	set_weight(0.1),
-	confirm_weight(),
+    scan('0499999999998'),
+    confirm_scan(),
+    set_weight(0.1),
+    confirm_weight(),
     {
         content: "Click on save",
         trigger: ".add-container",
     },
-	// Test a second time with a custom name
-	scan('0499999999981'),
-	confirm_scan(),
-	set_weight(0.2),
-	confirm_weight(),
-	{
-		content: "Set a custom name",
-		trigger:"input.container-name",
-		run:"text TOTO",
-	}, {
+    // Test a second time with a custom name
+    scan('0499999999981'),
+    confirm_scan(),
+    set_weight(0.2),
+    confirm_weight(),
+    {
+        content: "Set a custom name",
+        trigger:"input.container-name",
+        run:"text TOTO",
+    }, {
         content: "Click on save",
         trigger: ".add-container",
     },
-	// Scan du premier contenant 
-	scan('0499999999998'),
-	confirm_scan(),
-	check_selected_orderline("Check: empty container in the orderline", ".product-name:contains('Container without product')"),
-	check_selected_orderline("Check: the name is 'Container'", ".info:contains('Container')"),
+    // Scan du premier contenant 
+    scan('0499999999998'),
+    confirm_scan(),
+    check_selected_orderline("Check: empty container in the orderline", ".product-name:contains('Container without product')"),
+    check_selected_orderline("Check: the name is 'Container'", ".info:contains('Container')"),
     {
         content: "select product",
         trigger: ".product:contains('Whiteboard Pen')", //UoM = kg
     },
-	set_weight(0.3),
-	confirm_weight(),
-	{
+    set_weight(0.3),
+    confirm_weight(),
+    {
         content: "validate weight",
         trigger: ".buy-product",
     },
-	check_selected_orderline("Check: the name is 'Container'", ".info:contains('Container')"),
-	check_selected_orderline("Check: orderline in AUTO tare mode", ".pos-right-align:contains('AUTO')"),
-	check_selected_orderline("Check: orderline's product is the Pen", ".product-name:contains('Whiteboard Pen')"),
-	check_selected_orderline("Check: the quantity is the tared weight", ".info:contains('0.200')"),
+    check_selected_orderline("Check: the name is 'Container'", ".info:contains('Container')"),
+    check_selected_orderline("Check: orderline in AUTO tare mode", ".pos-right-align:contains('AUTO')"),
+    check_selected_orderline("Check: orderline's product is the Pen", ".product-name:contains('Whiteboard Pen')"),
+    check_selected_orderline("Check: the quantity is the tared weight", ".info:contains('0.200')"),
     {
         content: "click container button",
         trigger: ".control-button.o_container_button",
@@ -136,9 +136,9 @@ odoo.define('pos_container.tour.tare', function (require) {
         content: "select another product",
         trigger: ".product:contains('Desk Organizer')", //UoM = kg
     },
-	set_weight(0.5),
-	confirm_weight(),
-	{
+    set_weight(0.5),
+    confirm_weight(),
+    {
         content: "confirm purchase",
         trigger: ".buy-product",
     }, {
@@ -148,9 +148,9 @@ odoo.define('pos_container.tour.tare', function (require) {
     click_numpad(0),
     click_numpad('.'),
     click_numpad(2),
-	check_selected_orderline("Check: orderline in MAN tare mode", ".pos-right-align:contains('MAN')"),
-	check_selected_orderline("Check: orderline's product is the Organizer", ".product-name:contains('Desk Organizer')"),
-	check_selected_orderline("Check: the quantity is the tared weight", ".info:contains('0.300')"),
+    check_selected_orderline("Check: orderline in MAN tare mode", ".pos-right-align:contains('MAN')"),
+    check_selected_orderline("Check: orderline's product is the Organizer", ".product-name:contains('Desk Organizer')"),
+    check_selected_orderline("Check: the quantity is the tared weight", ".info:contains('0.300')"),
     {
         content: "click orderline auto",
         trigger: ".orderline .pos-right-align:contains('AUTO')",
@@ -161,9 +161,9 @@ odoo.define('pos_container.tour.tare', function (require) {
     click_numpad(0),
     click_numpad('.'),
     click_numpad(2),
-	check_selected_orderline("Check: orderline in MAN tare mode", ".pos-right-align:contains('MAN')"),
-	check_selected_orderline("Check: orderline's product is the Pen", ".product-name:contains('Whiteboard Pen')"),
-	check_selected_orderline("Check: the quantity is the tared weight", ".info:contains('0.100')"),
+    check_selected_orderline("Check: orderline in MAN tare mode", ".pos-right-align:contains('MAN')"),
+    check_selected_orderline("Check: orderline's product is the Pen", ".product-name:contains('Whiteboard Pen')"),
+    check_selected_orderline("Check: the quantity is the tared weight", ".info:contains('0.100')"),
     {
         content: "Add a unit product",
         trigger: ".product:contains('Large Cabinet')",
@@ -173,7 +173,7 @@ odoo.define('pos_container.tour.tare', function (require) {
     },
     click_numpad(1),
     click_numpad(0),
-	check_selected_orderline("Check: orderline in MAN tare mode", ".pos-right-align:contains('MAN')"),
+    check_selected_orderline("Check: orderline in MAN tare mode", ".pos-right-align:contains('MAN')"),
     {
         content: "Add a unit product",
         trigger: ".product:contains('Large Cabinet')",
@@ -184,21 +184,21 @@ odoo.define('pos_container.tour.tare', function (require) {
     click_numpad(2),
     click_numpad(0),
     click_numpad(0),
-	check_selected_orderline("Check: orderline in MAN tare mode", ".pos-right-align:contains('MAN')"),
-	// Ajouter une ligne en AUTO
-	scan('0499999999998'),
-	confirm_scan(),
+    check_selected_orderline("Check: orderline in MAN tare mode", ".pos-right-align:contains('MAN')"),
+    // Ajouter une ligne en AUTO
+    scan('0499999999998'),
+    confirm_scan(),
     {
         content: "select product",
         trigger: ".product:contains('Whiteboard Pen')", //UoM = kg
     },
-	set_weight(0.3),
-	confirm_weight(),
-	{
+    set_weight(0.3),
+    confirm_weight(),
+    {
         content: "validate weight",
         trigger: ".buy-product",
     },
-	{
+    {
         content: "pay",
         trigger: ".button.pay",
     },
@@ -206,7 +206,7 @@ odoo.define('pos_container.tour.tare', function (require) {
     click_numpad(0),
     click_numpad(0),
     click_numpad(0),
-	{
+    {
         content: "validate",
         trigger: ".button.next",
     }];
diff --git a/pos_container/static/src/xml/pos.xml b/pos_container/static/src/xml/pos.xml
index 7496e475e6..d006c1f3cc 100644
--- a/pos_container/static/src/xml/pos.xml
+++ b/pos_container/static/src/xml/pos.xml
@@ -260,16 +260,16 @@
                                 <t t-esc="widget.format_currency(orderline.get_display_price())"/>
                             </td>
                         </tr>
-						<t t-if="orderline.get_tare()">
-							<tr>
-								<td>
-								   <div style="margin-left:5%">
-									   Tare : <t t-esc="orderline.tare"/>
-									   <t t-esc="orderline.get_unit().name"/>
-								   </div>
-								</td>
-							</tr>
-						</t>
+                        <t t-if="orderline.get_tare()">
+                            <tr>
+                                <td>
+                                   <div style="margin-left:5%">
+                                       Tare : <t t-esc="orderline.tare"/>
+                                       <t t-esc="orderline.get_unit().name"/>
+                                   </div>
+                                </td>
+                            </tr>
+                        </t>
                     </t>
                 </tr>
             </table>
diff --git a/pos_container/tests/test_pos_container.py b/pos_container/tests/test_pos_container.py
index afe2f6b66f..d09512036f 100644
--- a/pos_container/tests/test_pos_container.py
+++ b/pos_container/tests/test_pos_container.py
@@ -2,7 +2,7 @@
 
 
 @odoo.tests.tagged('pos_install', '-at-install')
-class testUi(odoo.tests.HttpCase):
+class TestUi(odoo.tests.HttpCase):
 
     def test_01_pos_container_tour(self):
         self.phantom_js(
diff --git a/pos_order_mgmt_container/README.rst b/pos_order_mgmt_container/README.rst
new file mode 100644
index 0000000000..c4db19330a
--- /dev/null
+++ b/pos_order_mgmt_container/README.rst
@@ -0,0 +1,70 @@
+==============================
+PoS Order Management Container
+==============================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fpos-lightgray.png?logo=github
+    :target: https://github.com/OCA/pos/tree/12.0/pos_order_mgmt_container
+    :alt: OCA/pos
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/pos-12-0/pos-12-0-pos_order_mgmt_container
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
+    :target: https://runbot.odoo-community.org/runbot/184/12.0
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+This is a glue module between pos_container and pos_order_mgmt.
+When installed the returned orders and reprinted tickets will correctly display
+the tare/container weight associated with the shopping.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/pos/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/pos/issues/new?body=module:%20pos_order_mgmt_container%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Coop IT Easy SCRLfs
+
+Maintainers
+~~~~~~~~~~~
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+This module is part of the `OCA/pos <https://github.com/OCA/pos/tree/12.0/pos_order_mgmt_container>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/pos_order_mgmt_container/static/description/index.html b/pos_order_mgmt_container/static/description/index.html
new file mode 100644
index 0000000000..2695d2ed6a
--- /dev/null
+++ b/pos_order_mgmt_container/static/description/index.html
@@ -0,0 +1,414 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
+<title>PoS Order Management Container</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="pos-order-management-container">
+<h1 class="title">PoS Order Management Container</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/pos/tree/12.0/pos_order_mgmt_container"><img alt="OCA/pos" src="https://img.shields.io/badge/github-OCA%2Fpos-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/pos-12-0/pos-12-0-pos_order_mgmt_container"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/184/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>This is a glue module between pos_container and pos_order_mgmt.
+When installed the returned orders and reprinted tickets will correctly display
+the tare/container weight associated with the shopping.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="id1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id3">Authors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id4">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/pos/issues">GitHub Issues</a>.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/pos/issues/new?body=module:%20pos_order_mgmt_container%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<p>Do not contact contributors directly about support or help with technical issues.</p>
+</div>
+<div class="section" id="credits">
+<h1><a class="toc-backref" href="#id2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id3">Authors</a></h2>
+<ul class="simple">
+<li>Coop IT Easy SCRLfs</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#id4">Maintainers</a></h2>
+<p>This module is maintained by the OCA.</p>
+<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/pos/tree/12.0/pos_order_mgmt_container">OCA/pos</a> project on GitHub.</p>
+<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/pos_order_mgmt_container/static/src/js/widgets.js b/pos_order_mgmt_container/static/src/js/widgets.js
index a7f167b793..c9c9eaedf6 100644
--- a/pos_order_mgmt_container/static/src/js/widgets.js
+++ b/pos_order_mgmt_container/static/src/js/widgets.js
@@ -5,50 +5,50 @@ odoo.define('pos_order_mgmt_container.widgets', function (require) {
     "use strict";
 
     var screens = require('pos_order_mgmt.widgets');
-	var pos = require('pos_container.models_and_db');
+    var pos = require('pos_container.models_and_db');
 
     screens.OrderListScreenWidget.include({
         _prepare_orderlines_from_order_data: function (order, order_data, orderLines) {
-			var self = this;
-			_.each(orderLines, function(line) {
-				// In case of local data
-				if (line.length === 3) {
-					line = line[2];
-				}
-				var product = self.pos.db.get_product_by_id(line.product_id);
+            var self = this;
+            _.each(orderLines, function(line) {
+                // In case of local data
+                if (line.length === 3) {
+                    line = line[2];
+                }
+                var product = self.pos.db.get_product_by_id(line.product_id);
 
-				if (line['container_id']){
-					var container = self.pos.db.get_container_by_id(line.container_id);
-				}
-				// Check if product are available in pos
-				if (_.isUndefined(product)) {
-					self.unknown_products.push(String(line.product_id));
-				} else {
-					// Create a new order line
-					order.add_product(product, {
-						price: line.price_unit,
-						quantity: order_data.return ? line.qty * -1 : line.qty,
-						discount: line.discount,
-						merge: false,
-					});
-					var oline = order.get_last_orderline();
-					if (line.tare){
-						oline.set_tare(line.tare);
-						// cancels set_tare quantity substraction
-						oline.set_quantity(line.qty);
-					}
-					if (line.tare || line.discount || line.price_unit != product.lst_price) {
-						oline.set_tare_mode('MAN');
-					}
-					if(!_.isUndefined(container)){
-						oline.set_container(container);
-						oline.set_gross_weight(line.qty + line.container_weight);
-						oline.set_quantity(line.qty);
-						oline.set_tare_mode('AUTO');
-					}
-				}
-			});
+                if (line['container_id']){
+                    var container = self.pos.db.get_container_by_id(line.container_id);
+                }
+                // Check if product are available in pos
+                if (_.isUndefined(product)) {
+                    self.unknown_products.push(String(line.product_id));
+                } else {
+                    // Create a new order line
+                    order.add_product(product, {
+                        price: line.price_unit,
+                        quantity: order_data.return ? line.qty * -1 : line.qty,
+                        discount: line.discount,
+                        merge: false,
+                    });
+                    var oline = order.get_last_orderline();
+                    if (line.tare){
+                        oline.set_tare(line.tare);
+                        // cancels set_tare quantity substraction
+                        oline.set_quantity(line.qty);
+                    }
+                    if (line.tare || line.discount || line.price_unit != product.lst_price) {
+                        oline.set_tare_mode('MAN');
+                    }
+                    if(!_.isUndefined(container)){
+                        oline.set_container(container);
+                        oline.set_gross_weight(line.qty + line.container_weight);
+                        oline.set_quantity(line.qty);
+                        oline.set_tare_mode('AUTO');
+                    }
+                }
+            });
         },
-	});
+    });
 
 });

From e1fdc40849a0d49b019a01d8d03efa63e4e95c9a Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Tue, 30 Apr 2019 15:47:00 +0200
Subject: [PATCH 37/47] [FIX] set empty orderline qty to 0

---
 pos_container/static/src/js/models_and_db.js | 4 ++--
 pos_container/static/src/js/tests.js         | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pos_container/static/src/js/models_and_db.js b/pos_container/static/src/js/models_and_db.js
index 0f8bb64d79..04b3e71ab6 100644
--- a/pos_container/static/src/js/models_and_db.js
+++ b/pos_container/static/src/js/models_and_db.js
@@ -76,10 +76,10 @@ odoo.define('pos_container.models_and_db', function (require) {
             attr.order = this;
             var product = this.pos.get_container_product();
             var line = new models.Orderline({}, {
-                pos: this.pos, order: this,
-                quantity: 0, product: product, });
+				pos: this.pos, order: this, product: product});
 
             line.set_container(container);
+            line.set_quantity(0);
             this.orderlines.add(line);
 
             this.select_orderline(this.get_last_orderline());
diff --git a/pos_container/static/src/js/tests.js b/pos_container/static/src/js/tests.js
index 9cfadb616b..fc32c4473d 100644
--- a/pos_container/static/src/js/tests.js
+++ b/pos_container/static/src/js/tests.js
@@ -80,6 +80,7 @@ odoo.define('pos_container.tour.tare', function (require) {
     confirm_scan(),
     check_selected_orderline("Check: empty container in the orderline", ".product-name:contains('Container without product')"),
     check_selected_orderline("Check: the name is 'Container'", ".info:contains('Container')"),
+    check_selected_orderline("Check: the quantity is 0", ".info em:contains('0.000')"),
     {
         content: "select product",
         trigger: ".product:contains('Whiteboard Pen')", //UoM = kg

From 46130e448a64c2fd5c571c52591f66c38549abd4 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Fri, 3 May 2019 14:25:56 +0200
Subject: [PATCH 38/47] [FIX] update gross weight when tare is manually changed
 also fix quantity set to null when tare is set to null

---
 pos_container/static/src/js/models_and_db.js | 57 ++++++++++++++++----
 pos_container/static/src/js/tests.js         | 15 +++++-
 2 files changed, 60 insertions(+), 12 deletions(-)

diff --git a/pos_container/static/src/js/models_and_db.js b/pos_container/static/src/js/models_and_db.js
index 04b3e71ab6..eb7a3c4942 100644
--- a/pos_container/static/src/js/models_and_db.js
+++ b/pos_container/static/src/js/models_and_db.js
@@ -12,6 +12,11 @@ odoo.define('pos_container.models_and_db', function (require) {
     var models = require('point_of_sale.models');
     var rpc = require('web.rpc');
 
+	var utils = require('web.utils');
+	var field_utils = require('web.field_utils');
+	var round_di = utils.round_decimals;
+	var round_pr = utils.round_precision;
+
     // include not available => extend
     models.PosModel = models.PosModel.extend({
         get_container_product: function(){
@@ -218,20 +223,18 @@ odoo.define('pos_container.models_and_db', function (require) {
             return this.tare_mode;
         },
         set_tare: function(tare){
-            this.tare = tare;
+			if(tare === 'remove'){
+				this.order.remove_orderline(this);
+				return;
+			}
+            this.tare = parseFloat(tare) || 0;
             this.container = null;
-            if(this.tare[0] == '.')
-            {
-                this.tare = '0' + this.tare
-            }
-            if (this.gross_weight && this.gross_weight != 'NaN')
-            {
-                this.set_quantity(this.gross_weight - tare);
+            if (this.gross_weight && this.gross_weight != 'NaN'){
+                this.set_quantity(this.gross_weight - parseFloat(tare));
             }
-            else
-            {
+            else{
                 this.gross_weight = this.quantity;
-                this.set_quantity(this.quantity - tare);
+                this.set_quantity(this.quantity - parseFloat(tare));
             }
             this.trigger('change', this);
         },
@@ -245,6 +248,38 @@ odoo.define('pos_container.models_and_db', function (require) {
             this.gross_weight = weight;
             this.trigger('change', this);
         },
+		set_quantity: function(quantity, keep_price){
+			// copied from odoo core
+			this.order.assert_editable();
+			if(quantity === 'remove'){
+				this.order.remove_orderline(this);
+				return;
+			}else{
+				var quant = parseFloat(quantity) || 0;
+				var unit = this.get_unit();
+				if(unit){
+					if (unit.rounding) {
+						this.quantity    = round_pr(quant, unit.rounding);
+						var decimals = this.pos.dp['Product Unit of Measure'];
+						this.quantity = round_di(this.quantity, decimals)
+						this.quantityStr = field_utils.format.float(this.quantity, {digits: [69, decimals]});
+					} else {
+						this.quantity    = round_pr(quant, 1);
+						this.quantityStr = this.quantity.toFixed(0);
+					}
+				}else{
+					this.quantity    = quant;
+					this.quantityStr = '' + this.quantity;
+				}
+			}
+			// surcharge starts here
+			if (this.tare){
+				console.log('tare ' + this.tare);
+				console.log('tare ' + parseFloat(this.tare));
+				console.log('quantity ' + this.quantity);
+				this.set_gross_weight(this.quantity + parseFloat(this.tare));
+			}
+		},
         export_as_JSON: function(){
             var pack_lot_ids = [];
             if (this.has_product_lot){
diff --git a/pos_container/static/src/js/tests.js b/pos_container/static/src/js/tests.js
index fc32c4473d..8083aca0d5 100644
--- a/pos_container/static/src/js/tests.js
+++ b/pos_container/static/src/js/tests.js
@@ -164,7 +164,19 @@ odoo.define('pos_container.tour.tare', function (require) {
     click_numpad(2),
     check_selected_orderline("Check: orderline in MAN tare mode", ".pos-right-align:contains('MAN')"),
     check_selected_orderline("Check: orderline's product is the Pen", ".product-name:contains('Whiteboard Pen')"),
-    check_selected_orderline("Check: the quantity is the tared weight", ".info:contains('0.100')"),
+    check_selected_orderline("Check: the quantity is the tared weight", ".info em:contains('0.100')"),
+    {
+        content: "switch numpad to quantity mode",
+        trigger: ".mode-button[data-mode='quantity']",
+    },
+    click_numpad(0),
+    click_numpad('.'),
+    click_numpad(6),
+    check_selected_orderline("Check: orderline in MAN tare mode", ".pos-right-align:contains('MAN')"),
+    check_selected_orderline("Check: orderline's product is the Pen", ".product-name:contains('Whiteboard Pen')"),
+    check_selected_orderline("Check: the quantity is 0.6", ".info em:contains('0.600')"),
+    check_selected_orderline("Check: the tare is unchanged", ".info:contains('0.2')"),
+    check_selected_orderline("Check: the gross weight is the tare + the quantity", ".info:contains('Gross : 0.8 kg')"),
     {
         content: "Add a unit product",
         trigger: ".product:contains('Large Cabinet')",
@@ -175,6 +187,7 @@ odoo.define('pos_container.tour.tare', function (require) {
     click_numpad(1),
     click_numpad(0),
     check_selected_orderline("Check: orderline in MAN tare mode", ".pos-right-align:contains('MAN')"),
+    check_selected_orderline("Check: the undiscounted price is still 320", ".info:contains('320.00')"),
     {
         content: "Add a unit product",
         trigger: ".product:contains('Large Cabinet')",

From 31c2c3a4e3a4cec6efda988803f79faddb033cde Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Thu, 9 May 2019 11:50:33 +0200
Subject: [PATCH 39/47] [FIX] display virtual keyboard when needed

---
 pos_container/static/src/js/container.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pos_container/static/src/js/container.js b/pos_container/static/src/js/container.js
index d71c905b48..510cc3e86c 100644
--- a/pos_container/static/src/js/container.js
+++ b/pos_container/static/src/js/container.js
@@ -246,6 +246,9 @@ odoo.define('pos_container.container', function (require) {
 
         close: function(){
             this._super();
+			if (this.pos.config.iface_vkeyboard && this.chrome.widget.keyboard) {
+				this.chrome.widget.keyboard.hide();
+			}
         },
 
         auto_back: true,
@@ -341,6 +344,10 @@ odoo.define('pos_container.container', function (require) {
             this.$('.next,.add-container').click(function(){
                 self.create_container();
             });
+
+			if(this.pos.config.iface_vkeyboard && this.chrome.widget.keyboard){
+				this.chrome.widget.keyboard.connect($(this.el.querySelector('.container-name input')));
+			}
         },
         get_product: function(){
             return this.pos.get_container_product();
@@ -388,7 +395,12 @@ odoo.define('pos_container.container', function (require) {
                 }
             });
         },
-
+        close: function(){
+            this._super();
+			if (this.pos.config.iface_vkeyboard && this.chrome.widget.keyboard) {
+				this.chrome.widget.keyboard.hide();
+			}
+        },
     });
 
     gui.define_screen({

From 757a36569cba1dd33f658518ac20d59cd4289877 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Thu, 9 May 2019 13:05:11 +0200
Subject: [PATCH 40/47] [FIX] always trigger change on set_quantity

---
 pos_container/static/src/js/container.js     | 27 ++++++++++----------
 pos_container/static/src/js/models_and_db.js | 14 +++++-----
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/pos_container/static/src/js/container.js b/pos_container/static/src/js/container.js
index 510cc3e86c..7617975e5e 100644
--- a/pos_container/static/src/js/container.js
+++ b/pos_container/static/src/js/container.js
@@ -246,9 +246,9 @@ odoo.define('pos_container.container', function (require) {
 
         close: function(){
             this._super();
-			if (this.pos.config.iface_vkeyboard && this.chrome.widget.keyboard) {
-				this.chrome.widget.keyboard.hide();
-			}
+            if (this.pos.config.iface_vkeyboard && this.chrome.widget.keyboard) {
+                this.chrome.widget.keyboard.hide();
+            }
         },
 
         auto_back: true,
@@ -312,7 +312,7 @@ odoo.define('pos_container.container', function (require) {
             var container = this.gui.get_current_screen_param('container');
             if (container){
                 var order = this.pos.get_order();
-                var orderline = order.get_last_orderline();
+                var orderline = order.get_selected_orderline();
                 orderline.set_container(container);
                 var old_orderline = this.gui.get_current_screen_param(
                     'old_orderline');
@@ -345,9 +345,9 @@ odoo.define('pos_container.container', function (require) {
                 self.create_container();
             });
 
-			if(this.pos.config.iface_vkeyboard && this.chrome.widget.keyboard){
-				this.chrome.widget.keyboard.connect($(this.el.querySelector('.container-name input')));
-			}
+            if(this.pos.config.iface_vkeyboard && this.chrome.widget.keyboard){
+                this.chrome.widget.keyboard.connect($(this.el.querySelector('.container-name input')));
+            }
         },
         get_product: function(){
             return this.pos.get_container_product();
@@ -397,9 +397,9 @@ odoo.define('pos_container.container', function (require) {
         },
         close: function(){
             this._super();
-			if (this.pos.config.iface_vkeyboard && this.chrome.widget.keyboard) {
-				this.chrome.widget.keyboard.hide();
-			}
+            if (this.pos.config.iface_vkeyboard && this.chrome.widget.keyboard) {
+                this.chrome.widget.keyboard.hide();
+            }
         },
     });
 
@@ -412,14 +412,13 @@ odoo.define('pos_container.container', function (require) {
         set_value: function(val) {
             this._super(val);
             var order = this.pos.get_order();
-            var oline = order.get_selected_orderline();
-            if (oline) {
+            if (order.get_selected_orderline()) {
                 var mode = this.numpad_state.get('mode');
                 if( mode === 'tare'){
-                    oline.set_tare(val);
+                    order.get_selected_orderline().set_tare(val);
                 }
                 if (['tare', 'discount', 'price'].indexOf(mode) != -1) {
-                    oline.set_tare_mode('MAN');
+                    order.get_selected_orderline().set_tare_mode('MAN');
                 }
             }
         },
diff --git a/pos_container/static/src/js/models_and_db.js b/pos_container/static/src/js/models_and_db.js
index eb7a3c4942..9aae774e2b 100644
--- a/pos_container/static/src/js/models_and_db.js
+++ b/pos_container/static/src/js/models_and_db.js
@@ -223,10 +223,6 @@ odoo.define('pos_container.models_and_db', function (require) {
             return this.tare_mode;
         },
         set_tare: function(tare){
-			if(tare === 'remove'){
-				this.order.remove_orderline(this);
-				return;
-			}
             this.tare = parseFloat(tare) || 0;
             this.container = null;
             if (this.gross_weight && this.gross_weight != 'NaN'){
@@ -272,13 +268,17 @@ odoo.define('pos_container.models_and_db', function (require) {
 					this.quantityStr = '' + this.quantity;
 				}
 			}
+			// just like in sale.order changing the quantity will recompute the unit price
+			if(! keep_price && ! this.price_manually_set){
+				this.set_unit_price(this.product.get_price(this.order.pricelist, this.get_quantity()));
+				this.order.fix_tax_included_price(this);
+			}
+
 			// surcharge starts here
 			if (this.tare){
-				console.log('tare ' + this.tare);
-				console.log('tare ' + parseFloat(this.tare));
-				console.log('quantity ' + this.quantity);
 				this.set_gross_weight(this.quantity + parseFloat(this.tare));
 			}
+			this.trigger('change', this);
 		},
         export_as_JSON: function(){
             var pack_lot_ids = [];

From d25e23138c00b6d702c32ebcb800c632b5f6caa9 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Thu, 9 May 2019 14:46:04 +0200
Subject: [PATCH 41/47] [FIX] bad rounding on gross_weight and tare

---
 pos_container/static/src/js/models_and_db.js | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pos_container/static/src/js/models_and_db.js b/pos_container/static/src/js/models_and_db.js
index 9aae774e2b..d2487ab975 100644
--- a/pos_container/static/src/js/models_and_db.js
+++ b/pos_container/static/src/js/models_and_db.js
@@ -223,7 +223,7 @@ odoo.define('pos_container.models_and_db', function (require) {
             return this.tare_mode;
         },
         set_tare: function(tare){
-            this.tare = parseFloat(tare) || 0;
+            this.tare = this.get_value_rounded(tare);
             this.container = null;
             if (this.gross_weight && this.gross_weight != 'NaN'){
                 this.set_quantity(this.gross_weight - parseFloat(tare));
@@ -241,7 +241,7 @@ odoo.define('pos_container.models_and_db', function (require) {
             return this.gross_weight;
         },
         set_gross_weight: function(weight){
-            this.gross_weight = weight;
+            this.gross_weight = this.get_value_rounded(weight);
             this.trigger('change', this);
         },
 		set_quantity: function(quantity, keep_price){
@@ -280,6 +280,20 @@ odoo.define('pos_container.models_and_db', function (require) {
 			}
 			this.trigger('change', this);
 		},
+		get_value_rounded: function(value){
+            var value = parseFloat(value) || 0;
+            var unit = this.get_unit();
+            if(unit){
+                if (unit.rounding) {
+                    value = round_pr(value, unit.rounding);
+                    var decimals = this.pos.dp['Product Unit of Measure'];
+                    value = round_di(value, decimals)
+                } else {
+                    value = round_pr(value, 1);
+                }
+            }
+			return value
+		},
         export_as_JSON: function(){
             var pack_lot_ids = [];
             if (this.has_product_lot){

From ffb15136418d0fca8707577d3b9807c393f4cef2 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Wed, 5 Jun 2019 12:41:20 +0200
Subject: [PATCH 42/47] [IMP] allow to use inactivated empty container product

---
 pos_container/static/src/js/models_and_db.js | 108 +++++++++++--------
 1 file changed, 64 insertions(+), 44 deletions(-)

diff --git a/pos_container/static/src/js/models_and_db.js b/pos_container/static/src/js/models_and_db.js
index d2487ab975..3437c2ee5e 100644
--- a/pos_container/static/src/js/models_and_db.js
+++ b/pos_container/static/src/js/models_and_db.js
@@ -12,10 +12,10 @@ odoo.define('pos_container.models_and_db', function (require) {
     var models = require('point_of_sale.models');
     var rpc = require('web.rpc');
 
-	var utils = require('web.utils');
-	var field_utils = require('web.field_utils');
-	var round_di = utils.round_decimals;
-	var round_pr = utils.round_precision;
+    var utils = require('web.utils');
+    var field_utils = require('web.field_utils');
+    var round_di = utils.round_decimals;
+    var round_pr = utils.round_precision;
 
     // include not available => extend
     models.PosModel = models.PosModel.extend({
@@ -67,6 +67,25 @@ odoo.define('pos_container.models_and_db', function (require) {
             }, function(type,err){ def.reject(); });
            return def;
         },
+        // load placeholder product for containers.
+        // it is done here to load it even if inactivated.
+        load_placeholder_product: function(){
+            var self = this;
+            var fields = _.find(this.models,function(model){
+                return model.model === 'product.product';
+            }).fields;
+            var domain = [['barcode', '=', 'CONTAINER'], ['active', '=', false]];
+            // no need to load it when active because it is already done in standard
+            return rpc.query({
+                model: 'product.product',
+                method: 'search_read',
+                args: [domain, fields],
+            }).then(function(products){
+                self.db.add_products(_.map(products, function (product) {
+                    return new models.Product({}, product);
+                }));
+            });
+        },
     });
 
     models.Order = models.Order.extend({
@@ -81,7 +100,7 @@ odoo.define('pos_container.models_and_db', function (require) {
             attr.order = this;
             var product = this.pos.get_container_product();
             var line = new models.Orderline({}, {
-				pos: this.pos, order: this, product: product});
+                pos: this.pos, order: this, product: product});
 
             line.set_container(container);
             line.set_quantity(0);
@@ -244,43 +263,43 @@ odoo.define('pos_container.models_and_db', function (require) {
             this.gross_weight = this.get_value_rounded(weight);
             this.trigger('change', this);
         },
-		set_quantity: function(quantity, keep_price){
-			// copied from odoo core
-			this.order.assert_editable();
-			if(quantity === 'remove'){
-				this.order.remove_orderline(this);
-				return;
-			}else{
-				var quant = parseFloat(quantity) || 0;
-				var unit = this.get_unit();
-				if(unit){
-					if (unit.rounding) {
-						this.quantity    = round_pr(quant, unit.rounding);
-						var decimals = this.pos.dp['Product Unit of Measure'];
-						this.quantity = round_di(this.quantity, decimals)
-						this.quantityStr = field_utils.format.float(this.quantity, {digits: [69, decimals]});
-					} else {
-						this.quantity    = round_pr(quant, 1);
-						this.quantityStr = this.quantity.toFixed(0);
-					}
-				}else{
-					this.quantity    = quant;
-					this.quantityStr = '' + this.quantity;
-				}
-			}
-			// just like in sale.order changing the quantity will recompute the unit price
-			if(! keep_price && ! this.price_manually_set){
-				this.set_unit_price(this.product.get_price(this.order.pricelist, this.get_quantity()));
-				this.order.fix_tax_included_price(this);
-			}
-
-			// surcharge starts here
-			if (this.tare){
-				this.set_gross_weight(this.quantity + parseFloat(this.tare));
-			}
-			this.trigger('change', this);
-		},
-		get_value_rounded: function(value){
+        set_quantity: function(quantity, keep_price){
+            // copied from odoo core
+            this.order.assert_editable();
+            if(quantity === 'remove'){
+                this.order.remove_orderline(this);
+                return;
+            }else{
+                var quant = parseFloat(quantity) || 0;
+                var unit = this.get_unit();
+                if(unit){
+                    if (unit.rounding) {
+                        this.quantity    = round_pr(quant, unit.rounding);
+                        var decimals = this.pos.dp['Product Unit of Measure'];
+                        this.quantity = round_di(this.quantity, decimals)
+                        this.quantityStr = field_utils.format.float(this.quantity, {digits: [69, decimals]});
+                    } else {
+                        this.quantity    = round_pr(quant, 1);
+                        this.quantityStr = this.quantity.toFixed(0);
+                    }
+                }else{
+                    this.quantity    = quant;
+                    this.quantityStr = '' + this.quantity;
+                }
+            }
+            // just like in sale.order changing the quantity will recompute the unit price
+            if(! keep_price && ! this.price_manually_set){
+                this.set_unit_price(this.product.get_price(this.order.pricelist, this.get_quantity()));
+                this.order.fix_tax_included_price(this);
+            }
+
+            // surcharge starts here
+            if (this.tare){
+                this.set_gross_weight(this.quantity + parseFloat(this.tare));
+            }
+            this.trigger('change', this);
+        },
+        get_value_rounded: function(value){
             var value = parseFloat(value) || 0;
             var unit = this.get_unit();
             if(unit){
@@ -292,8 +311,8 @@ odoo.define('pos_container.models_and_db', function (require) {
                     value = round_pr(value, 1);
                 }
             }
-			return value
-		},
+            return value
+        },
         export_as_JSON: function(){
             var pack_lot_ids = [];
             if (this.has_product_lot){
@@ -469,6 +488,7 @@ odoo.define('pos_container.models_and_db', function (require) {
         fields: ['name','barcode', 'weight'],
         loaded: function(self, containers){
             self.db.add_containers(containers);
+            return self.load_placeholder_product();
         },
     });
 

From 80ac878944bfce0722fe302d97f7d6850a50321d Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Wed, 3 Jul 2019 16:05:41 +0200
Subject: [PATCH 43/47] [FIX] technical product is now created inactive

---
 pos_container/data/product.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pos_container/data/product.xml b/pos_container/data/product.xml
index af6ffd07d3..675787358e 100644
--- a/pos_container/data/product.xml
+++ b/pos_container/data/product.xml
@@ -12,5 +12,6 @@
         <field name="list_price">0</field>
         <field name="available_in_pos" eval="True"/>
         <field name="to_weight" eval="True"/>
+        <field name="active" eval="False"/>
     </record>
 </odoo>

From 5e858e14c4755da5cf7292653897a43ec3f9b961 Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Tue, 16 Jul 2019 09:20:25 +0200
Subject: [PATCH 44/47] !fixup technical product is now really created inative

---
 pos_container/data/product.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pos_container/data/product.xml b/pos_container/data/product.xml
index 675787358e..d09932ee2d 100644
--- a/pos_container/data/product.xml
+++ b/pos_container/data/product.xml
@@ -14,4 +14,7 @@
         <field name="to_weight" eval="True"/>
         <field name="active" eval="False"/>
     </record>
+    <record id="temporary_container_product_product_template" model="product.template">
+        <field name="active" eval="False"/>
+    </record>
 </odoo>

From ffaec5f54a46549c8e93a43a615bcc4247e155be Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Tue, 16 Jul 2019 09:50:40 +0200
Subject: [PATCH 45/47] [IMP] also hide technical product in PoS

---
 pos_container/static/src/js/container.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pos_container/static/src/js/container.js b/pos_container/static/src/js/container.js
index 7617975e5e..5f722ecad1 100644
--- a/pos_container/static/src/js/container.js
+++ b/pos_container/static/src/js/container.js
@@ -408,6 +408,16 @@ odoo.define('pos_container.container', function (require) {
         widget: ContainerScaleScreenWidget,
     });
 
+	screens.ProductListWidget.include({
+		render_product: function(product){
+			if(product.barcode != 'CONTAINER'){
+				return this._super(product);
+			} else {
+				return document.createElement('div');
+			}
+		}
+	});
+
     screens.OrderWidget.include({
         set_value: function(val) {
             this._super(val);

From 267ca05303fd5a58f296ed7ed165d805b71522aa Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Tue, 16 Jul 2019 15:46:44 +0200
Subject: [PATCH 46/47] [FIX] missing import

---
 pos_container/static/src/js/models_and_db.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pos_container/static/src/js/models_and_db.js b/pos_container/static/src/js/models_and_db.js
index 3437c2ee5e..ffd1290c40 100644
--- a/pos_container/static/src/js/models_and_db.js
+++ b/pos_container/static/src/js/models_and_db.js
@@ -11,6 +11,10 @@ odoo.define('pos_container.models_and_db', function (require) {
     var PosDB = require('point_of_sale.DB');
     var models = require('point_of_sale.models');
     var rpc = require('web.rpc');
+    var config = require('web.config');
+
+    var core = require('web.core');
+    var QWeb = core.qweb;
 
     var utils = require('web.utils');
     var field_utils = require('web.field_utils');

From b2216b236d21664cb86bbb89f53c89ddcd056b6b Mon Sep 17 00:00:00 2001
From: Pierrick Brun <pierrick.brun@akretion.com>
Date: Fri, 20 Sep 2019 10:09:55 +0200
Subject: [PATCH 47/47] [FIX] report changes from pos_order_mgmt

---
 .../static/src/js/widgets.js                     | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pos_order_mgmt_container/static/src/js/widgets.js b/pos_order_mgmt_container/static/src/js/widgets.js
index c9c9eaedf6..7c6652ed80 100644
--- a/pos_order_mgmt_container/static/src/js/widgets.js
+++ b/pos_order_mgmt_container/static/src/js/widgets.js
@@ -8,9 +8,14 @@ odoo.define('pos_order_mgmt_container.widgets', function (require) {
     var pos = require('pos_container.models_and_db');
 
     screens.OrderListScreenWidget.include({
-        _prepare_orderlines_from_order_data: function (order, order_data, orderLines) {
+        _prepare_orderlines_from_order_data: function (
+			order, order_data, action) {
+
+            var orderLines = order_data.line_ids || order_data.lines || [];
+
             var self = this;
-            _.each(orderLines, function(line) {
+            _.each(orderLines, function (orderLine) {
+                var line = orderLine;
                 // In case of local data
                 if (line.length === 3) {
                     line = line[2];
@@ -24,10 +29,15 @@ odoo.define('pos_order_mgmt_container.widgets', function (require) {
                 if (_.isUndefined(product)) {
                     self.unknown_products.push(String(line.product_id));
                 } else {
+                    var qty = line.qty;
+                    if (['return'].indexOf(action) !== -1) {
+                        // Invert line quantities
+                        qty *= -1;
+                    }
                     // Create a new order line
                     order.add_product(product, {
                         price: line.price_unit,
-                        quantity: order_data.return ? line.qty * -1 : line.qty,
+                        quantity: qty,
                         discount: line.discount,
                         merge: false,
                     });