Migrate to v10

pos_product_template/README.rst

@@ -0,0 +1,90 @@
+.. image:: https://img.shields.io/badge/license-AGPL--3-blue.png
+   :target: https://www.gnu.org/licenses/agpl
+   :alt: License: AGPL-3
+
+====================
+POS Product Template
+====================
+
+
+    * In Point Of Sale Front End - Products list:
+        * Display only one product per template;
+        * Display template name instead of product name;
+        * Display products quantity instead of price;
+        * Click on template displays an extra screen to select Variant;
+
+    * In Point Of Sale Front End - Variants list:
+        * Display all the products of the selected variant;
+        * Click on a attribute value filters products;
+        * Click on a product adds it to the current Order or display normal
+          extra screen if it is a weightable product;
+
+
+Usage
+=====
+
+Open the Point of Sale, search an article with variants.
+You will see one article instead of all the variants.
+
+#. Go to ...
+
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+   :alt: Try me on Runbot
+   :target: https://runbot.odoo-community.org/runbot/pos/10.0
+
+
+Known issues / Roadmap
+======================
+
+* Templates with lot of variants are not shown. See https://github.com/OCA/pos/pull/135 
+
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+<https://github.com/OCA/{project_repo}/issues>`_. In case of trouble, please
+check there if your issue has already been reported. If you spotted it first,
+help us smash it by providing detailed and welcomed feedback.
+
+Credits
+=======
+
+Images
+------
+
+* Odoo Community Association: `Icon <https://odoo-community.org/logo.png>`_.
+
+Contributors
+------------
+
+* Sylvain LE GAL (https://twitter.com/legalsylvain)
+* Navarromiguel (https://github.com/navarromiguel)
+* Damendieta (https://github.com/damendieta)
+* Raphaël Reverdy (https://akretion.com)
+
+
+Do not contact contributors directly about support or help with technical issues.
+
+Funders
+-------
+
+The development of this module has been financially supported by:
+
+* Akretion
+
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+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.
+
+To contribute to this module, please visit https://odoo-community.org.

pos_product_template/__manifest__.py

@@ -1,61 +1,10 @@
 # -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    Point Of Sale - Product Template module for Odoo
-#    Copyright (C) 2014-Today Akretion (http://www.akretion.com)
-#    @author Sylvain LE GAL (https://twitter.com/legalsylvain)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
 {
-    'name': 'Point Of Sale - Product Template',
-    'summary': 'Manage Product Template in Front End Point Of Sale',
-    'version': '9.0.0.0.1',
+    'name': 'POS - Product Template',
+    'version': '10.0.1.0.1',
     'category': 'Point Of Sale',
-    'description': """
-Manage Product Template in Front End Point Of Sale
-==================================================
-
-Functionality:
---------------
-    * In Point Of Sale Front End - Products list:
-        * Display only one product per template;
-        * Display template name instead of product name;
-        * Display products quantity instead of price;
-        * Click on template displays an extra screen to select Variant;
-
-    * In Point Of Sale Front End - Variants list:
-        * Display all the products of the selected variant;
-        * Click on a attribute value filters products;
-        * Click on a product adds it to the current Order or display normal
-          extra screen if it is a weightable product;
-
-Technical Information:
-----------------------
-    * Load extra model in Point Of Sale Front End:
-        * product.template;
-        * product.attribute;
-        * product.attribute.value;
-
-Copyright, Authors and Licence:
--------------------------------
-    * Copyright: 2014-Today, Akretion;
-    * Author:
-        * Sylvain LE GAL (https://twitter.com/legalsylvain);
-    * Licence: AGPL-3 (http://www.gnu.org/licenses/);""",
     'author': "Akretion,Odoo Community Association (OCA)",
+    'summary': 'Manage Product Template in Front End Point Of Sale',
     'website': 'http://www.akretion.com',
     'license': 'AGPL-3',
     'depends': [

pos_product_template/static/src/js/ppt.js

@@ -1,21 +1,10 @@
-/******************************************************************************
-    Point Of Sale - Product Template module for Odoo
-    Copyright (C) 2014-Today Akretion (http://www.akretion.com)
+/* Copyright (C) 2014-Today Akretion (https://www.akretion.com) 
     @author Sylvain LE GAL (https://twitter.com/legalsylvain)
+    @author Navarromiguel (https://github.com/navarromiguel)
+    @author Raphaël Reverdy (https://www.akretion.com)
+    License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl).
+*/
 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
-    published by the Free Software Foundation, either version 3 of the
-    License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-******************************************************************************/
 odoo.define("pos_product_template.pos_product_template", function(require){
     "use strict";
     
@@ -42,53 +31,50 @@ odoo.define("pos_product_template.pos_product_template", function(require){
           variant, displaying an extra scren to select the variant;
     *********************************************************** */
     var _render_product_ = screens.ProductListWidget.prototype.render_product;
-    screens.ProductListWidget.include({
-
-        init: function(parent, options) {
-            this._super(parent,options);
-            var self = this;
-            // OVERWRITE 'click_product_handler' function to do
-            // a different behaviour if template with one or many variants
-            // are selected.
-            this.click_product_handler = function(event){
-                var product = self.pos.db.get_product_by_id(this.dataset['productId']);
 
-                if (product.product_variant_count == 1) {
-                    // Normal behaviour, The template has only one variant
-                    options.click_product_action(product);
+    screens.ProductScreenWidget.include({
+        click_product: function(product) {
+            if (product.product_variant_count > 1) {
+                this.gui.show_popup('select-variant-popup', product.product_tmpl_id);
+            } else {
+                this._super(product);
             }
-                else{
-                    // Display for selection all the variants of a template
-                     //self.pos.pos_widget.screen_selector.show_popup('select-variant-popup', product.product_tmpl_id);
-                     self.gui.show_popup('select-variant-popup', product.product_tmpl_id);    
         }
-            };
-        },
+    });
+    screens.ProductListWidget.include({
 
+        set_product_list: function(product_list) {
             /* ************************************************
             Overload: 'set_product_list'
 
             'set_product_list' is a function called before displaying Products.
             (at the beginning, after a category selection, after a research, etc.
-        we just splice all products that are not the 'primary variant'
+            we just remove all products that are not the 'primary variant'
             */
-        set_product_list: function(product_list){
-            for (var i = product_list.length - 1; i >= 0; i--){
-                if (!product_list[i].is_primary_variant){
-                    product_list.splice(i, 1);
-                }
-            }
-            this._super(product_list);
+            var list = product_list.filter(function(product) {
+                return product.is_primary_variant;
+            });
+            this._super(list);
         },
         
         render_product: function(product){
-            self = this;
+            var self = this;
     
             if (product.product_variant_count == 1){
                 // Normal Display
-                return _render_product_.call(this, product);
-            }
-            else{
+                return this._super(product);
+            }
+            if (!product.is_primary_variant) {
+                //because screens.js:556: renderElement is called
+                //once before set_product_list
+                //So we get product.is_primary_variant
+                //which are not to be displayed
+                //
+                //Here we return mock element for
+                //products which will not be displayed
+                return document.createElement('div');
+            }
+            //TODO reuse upper function
             var cached = this.product_cache.get_node(product.id);
             if(!cached) {
                 var image_url = this.get_product_image_url(product);
@@ -104,7 +90,6 @@ odoo.define("pos_product_template.pos_product_template", function(require){
                 return product_node;
             }
             return cached;
-            }
         },
     });
     
@@ -159,19 +144,17 @@ odoo.define("pos_product_template.pos_product_template", function(require){
 
             // Render Variants
             var variant_ids = this.pos.db.template_by_id[product_tmpl_id].product_variant_ids;
-            var variant_list = [];
-            for (var i = 0, len = variant_ids.length; i < len; i++) {
-                variant_list.push(this.pos.db.get_product_by_id(variant_ids[i]));
-            }
+            var variant_list = variant_ids.map(function (variant) {
+                return this.pos.db.get_product_by_id(variant);
+            }, this);
             this.variant_list_widget.filters = {}
             this.variant_list_widget.set_variant_list(variant_list);
 
             // Render Attributes
             var attribute_ids = this.pos.db.attribute_by_template_id(template.id);
-            var attribute_list = [];
-            for (var i = 0, len = attribute_ids.length; i < len; i++) {
-                attribute_list.push(this.pos.db.get_product_attribute_by_id(attribute_ids[i]));
-            }
+            var attribute_list = attribute_ids.map(function (attribute) {
+                return this.pos.db.get_product_attribute_by_id(attribute);
+            }, this);
             this.attribute_list_widget.set_attribute_list(attribute_list, template);
             
             if(this.$el){
@@ -227,7 +210,7 @@ odoo.define("pos_product_template.pos_product_template", function(require){
         },
 
         filter_variant: function(){
-            var value_list = []
+            var value_list = [];
             for (var item in this.filters){
                 value_list.push(parseInt(this.filters[item]));
             }
@@ -499,25 +482,23 @@ Overload: point_of_sale.PosModel
          - Load 'name' field of model product.product;
          - Load product.template model;
     *********************************************************** */
-    var _initialize_ = models.PosModel.prototype.initialize;
-    models.PosModel.prototype.initialize = function(session, attributes){
-        self = this;
-        // Add the load of the field product_product.name
-        // that is the name of the template
-        // Add the load of attribute values
-        for (var i = 0 ; i < this.models.length; i++){
-            if (this.models[i].model == 'product.product'){
-                if (this.models[i].fields.indexOf('name') == -1) {
-                    this.models[i].fields.push('name');
-                }
-                if (this.models[i].fields.indexOf('attribute_value_ids') == -1) {
-                    this.models[i].fields.push('attribute_value_ids');
-                }
+    // change product.product call
+    models.PosModel.prototype.models.some(function (model) {
+        if (model.model !== 'product.product') {
+            return false;
         }
+        // add name and attribute_value_ids to list of fields
+        // to fetch for product.product
+        ['name', 'attribute_value_ids'].forEach(function (field) {
+            if (model.fields.indexOf(field) == -1) {
+                model.fields.push(field);
             }
+        });
+        return true; //exit early the iteration of this.models
+    });
 
-        // Load Product Template
-        var model = {
+    //Add our new models
+    models.PosModel.prototype.models.push({
         model: 'product.template',
         fields: [
             'name',
@@ -538,11 +519,8 @@ Overload: point_of_sale.PosModel
         loaded: function(self, templates){
              self.db.add_templates(templates);
         },
-        }
-        this.models.push(model);
-
-        // Load Product Attribute
-        model = {
+    },
+    {
         model: 'product.attribute',
         fields: [
             'name',
@@ -551,11 +529,8 @@ Overload: point_of_sale.PosModel
         loaded: function(self, attributes){
              self.db.add_product_attributes(attributes);
         },
-        }
-        this.models.push(model);
-
-        // Load Product Attribute Value
-        model = {
+    },
+    {
         model: 'product.attribute.value',
         fields: [
             'name',
@@ -564,10 +539,10 @@ Overload: point_of_sale.PosModel
         loaded: function(self, values){
              self.db.add_product_attribute_values(values);
         },
-        }
-        this.models.push(model);
-
-        return _initialize_.call(this, session, attributes);
+    });
+    return {
+        'SelectVariantPopupWidget': SelectVariantPopupWidget,
+        'VariantListWidget': VariantListWidget,
+        'AttributeListWidget': AttributeListWidget,
     };
-
 });

pos_product_template/static/src/xml/ppt.xml

@@ -1,25 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- ********************************************************************** -->
-<!--Point Of Sale - Product Template module for Odoo                        -->
-<!--Copyright (C) 2014-Today Akretion (http://www.akretion.com)             -->
-<!--@author Sylvain LE GAL (https://twitter.com/legalsylvain)               -->
-
-<!--Some part of code come from Odoo Project.                               -->
-<!--Copyright (C) 2004-Today Odoo SA. (<http://odoo.com>).                  -->
-
-<!--This program is free software: you can redistribute it and/or modify    -->
-<!--it under the terms of the GNU Affero General Public License as          -->
-<!--published by the Free Software Foundation, either version 3 of the      -->
-<!--License, or (at your option) any later version.                         -->
-
-<!--This program is distributed in the hope that it will be useful,         -->
-<!--but WITHOUT ANY WARRANTY; without even the implied warranty of          -->
-<!--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           -->
-<!--GNU Affero General Public License for more details.                     -->
-
-<!--You should have received a copy of the GNU Affero General Public License-->
-<!--along with this program.  If not, see <http://www.gnu.org/licenses/>.   -->
-<!-- ********************************************************************** -->
+<!-- Copyright (C) 2014-Today Akretion (https://www.akretion.com)
+     @author Sylvain LE GAL (https://twitter.com/legalsylvain)
+     License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl). -->
 <template>
 
 <!-- Pop Up Widget -->

pos_product_template/view/view.xml

@@ -1,24 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- ********************************************************************** -->
-<!--Point Of Sale - Product Template module for Odoo                        -->
-<!--Copyright (C) 2014-Today Akretion (http://www.akretion.com)             -->
-<!--@author Sylvain LE GAL (https://twitter.com/legalsylvain)               -->
-
-<!--This program is free software: you can redistribute it and/or modify    -->
-<!--it under the terms of the GNU Affero General Public License as          -->
-<!--published by the Free Software Foundation, either version 3 of the      -->
-<!--License, or (at your option) any later version.                         -->
-
-<!--This program is distributed in the hope that it will be useful,         -->
-<!--but WITHOUT ANY WARRANTY; without even the implied warranty of          -->
-<!--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           -->
-<!--GNU Affero General Public License for more details.                     -->
-
-<!--You should have received a copy of the GNU Affero General Public License-->
-<!--along with this program.  If not, see <http://www.gnu.org/licenses/>.   -->
-<!-- ********************************************************************** -->
-<openerp>
-    <data>
+<!-- Copyright (C) 2014-Today Akretion (https://www.akretion.com)
+     @author Sylvain LE GAL (https://twitter.com/legalsylvain)
+     License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl). -->
+<odoo>
     <!-- Add: JS Files -->
     <template id="assets_backend" name="point_of_sale assets2" inherit_id="web.assets_backend">
         <xpath expr="." position="inside">
@@ -32,6 +16,4 @@
             <link rel="stylesheet" href="/pos_product_template/static/src/css/ppt.css" id="pos_product_template-stylesheet"/>
         </xpath>
     </template>
-
-    </data>
-</openerp>
+</odoo>