Merge branch '12.0' of https://github.com/it-projects-llc/pos-addons …

…into 12.0-04881835b583e44955e4591f10b244896e8f8b8d

.travis.yml

@@ -7,14 +7,17 @@ sudo: false
 cache: pip
 
 addons:
+  # odoo 12.0+ uses command "INSERT ... ON CONFLICT ...", which is available in 9.5+ only
+  postgresql: "9.5"
   apt:
     packages:
       - expect-dev  # provides unbuffer utility
       - python-lxml  # because pip installation is slow
 
 env:
   global:
-  - VERSION="11.0" TESTS="0" LINT_CHECK="0" TRANSIFEX="0" UNIT_TEST="0"
+  - VERSION="12.0" TESTS="0" LINT_CHECK="0" TRANSIFEX="0" UNIT_TEST="0"
+  - SERVER_OPTIONS="--log-handler=odoo.addons.pos_longpolling:DEBUG"
   - EXCLUDE="hw_printer_network,hw_twitter_printing"
   - PYLINT_ODOO_JSLINTRC="/home/travis/maintainer-quality-tools/travis/cfg/.jslintrc"
   - TRANSIFEX_USER='i18n-bot@it-projects.info'

hw_printer_network/__manifest__.py

@@ -7,12 +7,12 @@
     "summary": """Hardware Driver for Network Printers""",
     "category": "Point of Sale",
     "images": [],
-    "version": "11.0.2.0.1",
+    "version": "12.0.2.0.1",
     "application": False,
 
     "author": "IT-Projects LLC, Dinar Gabbasov",
     "support": "pos@it-projects.info",
-    "website": "https://twitter.com/gabbasov_dinar",
+    "website": "https://apps.odoo.com/apps/modules/12.0/hw_printer_network/",
     "license": "LGPL-3",
     "price": 59.00,
     "currency": "EUR",

hw_printer_network/controllers/__init__.py

@@ -1,3 +1,2 @@
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
-
 from . import hw_printer_network_controller

hw_printer_network/controllers/hw_printer_network_controller.py

@@ -2,7 +2,7 @@
 # Copyright 2018 Tom Blauwendraat <tom@sunflowerweb.nl>
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
-from openerp import http
+from odoo import http
 import logging
 import time
 import socket
@@ -15,11 +15,11 @@
 
 
 try:
-    from openerp.addons.hw_escpos.escpos import escpos
-    from openerp.addons.hw_escpos.controllers.main import EscposProxy
-    from openerp.addons.hw_escpos.controllers.main import EscposDriver
-    from openerp.addons.hw_escpos.escpos.printer import Network
-    import openerp.addons.hw_proxy.controllers.main as hw_proxy
+    from odoo.addons.hw_escpos.escpos import escpos
+    from odoo.addons.hw_escpos.controllers.main import EscposProxy
+    from odoo.addons.hw_escpos.controllers.main import EscposDriver
+    from odoo.addons.hw_escpos.escpos.printer import Network
+    import odoo.addons.hw_proxy.controllers.main as hw_proxy
 except ImportError:
     EscposProxy = object
     EscposDriver = object
@@ -180,8 +180,3 @@ def network_printers(self, network_printers=None):
     @http.route('/hw_proxy/status_network_printers', type='json', auth='none', cors='*')
     def network_printers_status(self):
         return network_driver.network_printers
-
-    @http.route('/hw_proxy/without_usb', type='http', auth='none', cors='*')
-    def without_usb(self):
-        """ Old pos_printer_network module expects this to work """
-        return "ping"

hw_twitter_printing/__manifest__.py

@@ -4,7 +4,7 @@
     "category": "Point of Sale",
     # "live_test_URL": "",
     "images": [],
-    "version": "11.0.1.0.0",
+    "version": "12.0.1.0.0",
     "application": False,
 
     "author": "IT-Projects LLC, Dinar Gabbasov",

pos_barcode_sync/__manifest__.py

@@ -8,12 +8,12 @@
     "category": "Point of Sale",
     "live_test_url": "http://apps.it-projects.info/shop/product/pos-barcode-sync?version=10.0",
     "images": ["images/pos_barcode_sync_main.jpeg"],
-    "version": "10.0.1.0.0",
+    "version": "12.0.1.0.0",
     "application": False,
 
     "author": "IT-Projects LLC, Kolushov Alexandr",
     "support": "pos@it-projects.info",
-    "website": "https://it-projects.info/team/KolushovAlexandr",
+    "website": "https://apps.odoo.com/apps/modules/12.0/pos_barcode_sync/",
     "license": "LGPL-3",
     "price": 29.00,
     "currency": "EUR",
@@ -33,7 +33,7 @@
     "uninstall_hook": None,
 
     "auto_install": False,
-    "installable": False,
+    "installable": True,
 
     "demo_title": "Sync Barcodes in POS",
     "demo_addons": [

pos_barcode_sync/static/src/js/pos_barcode_sync.js

@@ -3,16 +3,10 @@
  * License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). */
 odoo.define('pos_barcode_sync.pos', function (require) {
 
-    var session = require('web.session');
-    var Backbone = window.Backbone;
-    var core = require('web.core');
-    var screens = require('point_of_sale.screens');
-    var models = require('point_of_sale.models');
-    var longpolling = require('pos_longpolling');
+    var models = require('pos_longpolling.pos');
+    var longpolling = require('pos_longpolling.connection');
     var gui = require('point_of_sale.gui');
 
-    var _t = core._t;
-
     var PosModelSuper = models.PosModel;
     models.PosModel = models.PosModel.extend({
         initialize: function(){

pos_cashier_select/__manifest__.py

@@ -3,12 +3,12 @@
     "summary": """Forced choose a cashier before switching to payment screen""",
     "category": "Point of Sale",
     "images": ['images/pos_cashier_select.png'],
-    "version": "11.0.1.0.0",
+    "version": "12.0.1.0.0",
     "application": False,
 
     "author": "IT-Projects LLC, Artyom Losev",
     "support": "pos@it-projects.info",
-    "website": "https://it-projects.info",
+    "website": "https://apps.odoo.com/apps/modules/12.0/pos_cashier_select/",
     "license": "LGPL-3",
     "price": 39.00,
     "currency": "EUR",

pos_cashier_select/static/src/js/tour.js

@@ -18,7 +18,7 @@ odoo.define('pos_cashier_select.tour', function(require) {
 
     function cashier_select() {
         return [{
-            trigger: '.modal-dialog.cashier .selection-item',
+            trigger: '.modal-dialog.cashier .selection-item:contains("Mitchell Admin")',
             content: 'select first cashier',
         }];
     }
@@ -30,7 +30,7 @@ odoo.define('pos_cashier_select.tour', function(require) {
         }];
         steps = steps.concat(cashier_select());
         steps = steps.concat([{
-            trigger: '.paymentmethod:contains("Cash")',
+            trigger: '.paymentmethod:contains("Cash (USD)")',
             content: "pay with cash",
         }]);
         return steps;
@@ -75,10 +75,16 @@ odoo.define('pos_cashier_select.tour', function(require) {
         }];
     }
 
-    var steps = [{
-        trigger: '.o_app[data-menu-xmlid="point_of_sale.menu_point_root"], .oe_menu_toggler[data-menu-xmlid="point_of_sale.menu_point_root"]',
+    var steps = [tour.STEPS.SHOW_APPS_MENU_ITEM, {
+        trigger: '.o_app[data-menu-xmlid="point_of_sale.menu_point_root"]',
+        content: "Ready to launch your <b>point of sale</b>? <i>Click here</i>.",
+        position: 'right',
+        edition: 'community'
+    }, {
+        trigger: '.o_app[data-menu-xmlid="point_of_sale.menu_point_root"]',
         content: "Ready to launch your <b>point of sale</b>? <i>Click here</i>.",
         position: 'bottom',
+        edition: 'enterprise'
     }, {
         trigger: ".o_pos_kanban button.oe_kanban_action_button",
         content: "<p>Click to start the point of sale interface. It <b>runs on tablets</b>, laptops, or industrial hardware.</p><p>Once the session launched, the system continues to run without an internet connection.</p>",
@@ -100,11 +106,11 @@ odoo.define('pos_cashier_select.tour', function(require) {
         position: "bottom"
     });
 
-    steps = steps.concat(add_product_to_order('Peaches'));
+    steps = steps.concat(add_product_to_order('LED Lamp'));
 
     steps = steps.concat(goto_payment_screen_and_select_payment_method());
 
-    steps = steps.concat(generate_payment_screen_keypad_steps("5.10"));
+    steps = steps.concat(generate_payment_screen_keypad_steps("0.90"));
 
     steps = steps.concat(finish_order());
 
@@ -116,7 +122,7 @@ odoo.define('pos_cashier_select.tour', function(require) {
         content: "confirm closing the frontend",
     }, {
         content: "wait until backend is opened",
-        trigger: '.o_app[data-menu-xmlid="point_of_sale.menu_point_root"], .oe_menu_toggler[data-menu-xmlid="point_of_sale.menu_point_root"]',
+        trigger: '.o_pos_kanban button.oe_kanban_action_button',
         run: function () {
             // no need to click on trigger
         },

pos_cashier_select/tests/test_default.py

@@ -1,13 +1,12 @@
 import odoo.tests
-from odoo.api import Environment
 
 
 @odoo.tests.common.at_install(True)
 @odoo.tests.common.post_install(True)
 class TestUi(odoo.tests.HttpCase):
 
     def test_01_pos_is_loaded(self):
-        env = Environment(self.registry.test_cr, self.uid, {})
+        env = self.env
         # needed because tests are run before the module is marked as
         # installed. In js web will only load qweb coming from modules
         # that are returned by the backend in module_boot. Without

pos_category_multi/README.rst

@@ -39,7 +39,7 @@ Maintainers
 Further information
 ===================
 
-HTML Description: https://apps.odoo.com/apps/modules/11.0/pos_category_multi/
+HTML Description: https://apps.odoo.com/apps/modules/12.0/pos_category_multi/
 
 Usage instructions: `<doc/index.rst>`_
 

pos_category_multi/__manifest__.py

@@ -2,7 +2,7 @@
     "name": """Multiple categories per product in POS""",
     "summary": """Specify as many categories for a product as you need""",
     "category": "Point of Sale",
-    "version": "11.0.1.0.1",
+    "version": "12.0.1.0.1",
     "images": [],
     "author": "IT-Projects LLC, Pavel Romanchenko",
     "support": "pos@it-projects.info",
@@ -20,6 +20,6 @@
         'view.xml',
     ],
     "demo": [],
-    "installable": True,
+    "installable": False,
     "auto_install": False,
 }

pos_category_multi/static/src/js/tour.js

@@ -6,6 +6,7 @@ odoo.define('pos_category_multi.tour', function(require) {
     var steps = [{
         trigger: '.o_main_content:has(.loader:hidden)',
         content: 'waiting for loading to finish',
+        timeout: 20000,
         run: function () {
             // it's a check
         },
@@ -48,7 +49,7 @@ odoo.define('pos_category_multi.tour', function(require) {
         content: "confirm closing the frontend",
     }, {
         content: "wait until backend is opened",
-        trigger: '.o_app[data-menu-xmlid="point_of_sale.menu_point_root"], .oe_menu_toggler[data-menu-xmlid="point_of_sale.menu_point_root"]',
+        trigger: '.o_pos_kanban button.oe_kanban_action_button',
         run: function () {
             // no need to click on trigger
         },

pos_category_multi/tests/test_default.py

@@ -1,14 +1,12 @@
 import odoo.tests
-from odoo.api import Environment
 
 
 @odoo.tests.common.at_install(True)
 @odoo.tests.common.post_install(True)
 class TestUi(odoo.tests.HttpCase):
 
     def test_01_pos_is_loaded(self):
-        # see more https://odoo-development.readthedocs.io/en/latest/dev/tests/js.html#phantom-js-python-tests
-        env = Environment(self.registry.test_cr, self.uid, {})
+        env = self.env
         product = env.ref('point_of_sale.boni_orange')
         product.write({
             'pos_category_ids': [(4, category.id) for category in env['pos.category'].search([])]

pos_debranding/__manifest__.py

@@ -1,11 +1,11 @@
 {
     'name': "POS debranding",
-    'version': '11.0.1.0.0',
+    'version': '12.0.1.0.0',
     'author': 'IT-Projects LLC, Ivan Yelizariev',
     'license': 'LGPL-3',
     'category': 'Debranding',
     "support": "pos@it-projects.info",
-    'website': 'https://twitter.com/yelizariev',
+    'website': 'https://www.odoo.com/apps/modules/12.0/pos_debranding/',
     'depends': ['point_of_sale'],
     # 'price': 30.00,
     # 'currency': 'EUR',

pos_debranding/static/src/js/tour.js

@@ -3,14 +3,16 @@ odoo.define('pos_debranding.tour', function(require) {
 
     var tour = require('web_tour.tour');
 
-
-    tour.register('pos_debranding_tour', {
-        url: "/web",
-        test: true,
-    }, [{
-        trigger: '.o_app[data-menu-xmlid="point_of_sale.menu_point_root"], .oe_menu_toggler[data-menu-xmlid="point_of_sale.menu_point_root"]',
+    var steps = [tour.STEPS.SHOW_APPS_MENU_ITEM, {
+        trigger: '.o_app[data-menu-xmlid="point_of_sale.menu_point_root"]',
+        content: "Ready to launch your <b>point of sale</b>? <i>Click here</i>.",
+        position: 'right',
+        edition: 'community'
+    }, {
+        trigger: '.o_app[data-menu-xmlid="point_of_sale.menu_point_root"]',
         content: "Ready to launch your <b>point of sale</b>? <i>Click here</i>.",
         position: 'bottom',
+        edition: 'enterprise'
     }, {
         trigger: ".o_pos_kanban button.oe_kanban_action_button",
         content: "<p>Click to start the point of sale interface. It <b>runs on tablets</b>, laptops, or industrial hardware.</p><p>Once the session launched, the system continues to run without an internet connection.</p>",
@@ -21,7 +23,7 @@ odoo.define('pos_debranding.tour', function(require) {
         timeout: 20000,
         run: function () {
             // it's a check
-        }
+        },
     }, {
         content: "Switch to table or make dummy action",
         trigger: '.table:not(.oe_invisible .neworder-button), .order-button.selected',
@@ -32,5 +34,8 @@ odoo.define('pos_debranding.tour', function(require) {
         run: function () {
             // it's a check
         }
-    }]);
+    }];
+
+    tour.register('pos_debranding_tour', {test: true, url: '/web' }, steps);
+
 });

pos_debranding/tests/test_default.py

@@ -1,19 +1,17 @@
 import odoo.tests
-from odoo.api import Environment
 
 
 @odoo.tests.common.at_install(True)
 @odoo.tests.common.post_install(True)
 class TestUi(odoo.tests.HttpCase):
 
     def test_01_check_logo(self):
-        env = Environment(self.registry.test_cr, self.uid, {})
+        env = self.env
         # needed because tests are run before the module is marked as
         # installed. In js web will only load qweb coming from modules
         # that are returned by the backend in module_boot. Without
         # this you end up with js, css but no qweb.
         env['ir.module.module'].search([('name', '=', 'pos_debranding')], limit=1).state = 'installed'
-        self.registry.cursor().release()
         self.phantom_js(
             '/web',
 

pos_debt_notebook/README.rst

@@ -61,4 +61,4 @@ Usage instructions: `<doc/index.rst>`__
 
 Changelog: `<doc/changelog.rst>`__
 
-Tested on Odoo 11.0 e7eb3eeba11111e7b1424aa3edfbe20a59755cba
+Tested on Odoo 12.0 b05e34a0d9b13a1c6971b99ed3e5fa20199f3545

pos_debt_notebook/__manifest__.py

@@ -13,20 +13,19 @@
     'name': 'POS Debt & Credit notebook',
     'summary': 'Comfortable sales for your regular customers. Debt payment method for POS',
     'category': 'Point Of Sale',
-    'live_test_url': 'http://apps.it-projects.info/shop/product/pos-debt-notebook?version=11.0',
+    'live_test_url': 'http://apps.it-projects.info/shop/product/pos-debt-notebook?version=12.0',
     "images": ['images/debt_notebook.png'],
-    'version': '11.0.5.1.3',
+    'version': '12.0.5.1.3',
     'author': 'IT-Projects LLC, Ivan Yelizariev',
     "support": "pos@it-projects.info",
-    'website': 'https://it-projects.info',
+    'website': 'https://apps.odoo.com/apps/modules/12.0/pos_debt_notebook/',
     'license': 'LGPL-3',
     "price": 280.00,
     "currency": "EUR",
 
     "external_dependencies": {"python": [], "bin": []},
     'depends': [
         'point_of_sale',
-        'base_groupby_extra',
     ],
     'data': [
         'security/pos_debt_notebook_security.xml',

pos_debt_notebook/data/demo.xml

@@ -15,7 +15,7 @@
             <field name="available_in_pos" eval="True"/>
             <field name="list_price">1</field>
             <field name="type">service</field>
-            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="description">This is a product for purchasing "Credits".</field>
         </record>
 

pos_debt_notebook/data/product.xml

@@ -12,7 +12,7 @@
             <field name="available_in_pos" eval="True"/>
             <field name="list_price">0</field>
             <field name="type">service</field>
-            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="description">This is a dummy product used when a customer pays his debt without ordering new products. This is a workaround to the fact that Odoo needs to have at least one product on the order to validate the transaction.</field>
         </record>