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

…0-c6e7e846da21776622829dd972eba34049060fd6
itpp-labs · Nov 7, 2019 · 427392b · 427392b
2 parents 389c574 + d119983
commit 427392b
Show file tree

Hide file tree

Showing 435 changed files with 7,672 additions and 7,609 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1 @@
+ko_fi: itprojectsllc # This is supposed to bring some coffee for us
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,16 @@
+name: Telegram Notifications
+
+on: 
+  issues:
+    types: [opened, reopened, deleted, closed]
+
+jobs:
+  notify:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Send notifications to Telegram
+      run: curl -s -X POST https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage -d chat_id=${{ secrets.TELEGRAM_CHAT_ID }} -d text="${MESSAGE}" >> /dev/null
+      env:
+        MESSAGE: "Issue ${{ github.event.action }}: \n${{ github.event.issue.html_url }}"
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,8 @@ addons:
 
 env:
   global:
-  - VERSION="11.0" TESTS="0" LINT_CHECK="0" UNIT_TEST="0"
+  - VERSION="12.0" TESTS="0" LINT_CHECK="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"
 

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 
-[![Build Status](https://travis-ci.com/it-projects-llc/pos-addons.svg?branch=11.0)](https://travis-ci.com/it-projects-llc/pos-addons)
+[![Build Status](https://travis-ci.com/it-projects-llc/pos-addons.svg?branch=12.0)](https://travis-ci.com/it-projects-llc/pos-addons)
 
 Odoo POS addons
 ===============

diff --git a/hw_printer_network/__manifest__.py b/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": "[email protected]",
-    "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",

diff --git a/hw_printer_network/controllers/__init__.py b/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
diff --git a/hw_printer_network/controllers/hw_printer_network_controller.py b/hw_printer_network/controllers/hw_printer_network_controller.py
@@ -2,7 +2,7 @@
 # Copyright 2018 Tom Blauwendraat <[email protected]>
 # 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"
diff --git a/hw_twitter_printing/__manifest__.py b/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",

diff --git a/pos_cashier_select/README.rst b/pos_cashier_select/README.rst
@@ -22,12 +22,12 @@ Maintainers
 Further information
 ===================
 
-Demo: http://runbot.it-projects.info/demo/pos-addons/11.0
+Demo: http://runbot.it-projects.info/demo/pos-addons/12.0
 
-HTML Description: https://apps.odoo.com/apps/modules/11.0/pos_cashier_select/
+HTML Description: https://apps.odoo.com/apps/modules/12.0/pos_cashier_select/
 
 Usage instructions: `<doc/index.rst>`__
 
 Changelog: `<doc/changelog.rst>`__
 
-Tested on Odoo 11.0 ffba5c688ff74a0630f9f70be1d7760a43a7deba
+Tested on Odoo 12.0 53dcdd5a9e22429a9638f68674264436ce21e42b
diff --git a/pos_cashier_select/__manifest__.py b/pos_cashier_select/__manifest__.py
@@ -8,12 +8,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.2",
+    "version": "12.0.1.0.2",
     "application": False,
 
     "author": "IT-Projects LLC, Artyom Losev",
     "support": "[email protected]",
-    "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",

diff --git a/pos_cashier_select/i18n/pos_cashier_select.pot b/pos_cashier_select/i18n/pos_cashier_select.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 11.0\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: <>\n"
 "Language-Team: \n"

diff --git a/pos_cashier_select/static/src/js/tour.js b/pos_cashier_select/static/src/js/tour.js
@@ -20,7 +20,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',
         }];
     }
@@ -32,7 +32,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;
@@ -77,10 +77,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>",
@@ -102,11 +108,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());
 
@@ -118,7 +124,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
         },

diff --git a/pos_cashier_select/tests/test_default.py b/pos_cashier_select/tests/test_default.py
@@ -3,15 +3,14 @@
 # License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html).
 
 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

diff --git a/pos_category_multi/README.rst b/pos_category_multi/README.rst
@@ -30,7 +30,7 @@ Maintainers
 
       To get a guaranteed support
       you are kindly requested to purchase the module
-      at `odoo apps store <https://apps.odoo.com/apps/modules/10.0/pos_category_multi/>`__.
+      at `odoo apps store <https://apps.odoo.com/apps/modules/12.0/pos_category_multi/>`__.
 
       Thank you for understanding!
 
@@ -39,13 +39,12 @@ 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>`_
 
 Changelog: `<doc/changelog.rst>`_
 
-Notifications on updates: `via Atom <https://github.com/it-projects-llc/pos-addons/commits/10.0/pos_category_multi.atom>`_, `by Email <https://blogtrottr.com/?subscribe=https://github.com/it-projects-llc/pos-addons/commits/10.0/pos_category_multi.atom>`_
-
-Tested on Odoo 11.0 ee2b9fae3519c2494f34dacf15d0a3b5bd8fbd06
+Notifications on updates: `via Atom <https://github.com/it-projects-llc/pos-addons/commits/12.0/pos_category_multi.atom>`_, `by Email <https://blogtrottr.com/?subscribe=https://github.com/it-projects-llc/pos-addons/commits/12.0/pos_category_multi.atom>`_
 
+Tested on Odoo 12.0 530f364547af1cc4ccfa9baa66cd70e564bc62cb
diff --git a/pos_category_multi/__init__.py b/pos_category_multi/__init__.py
@@ -1,2 +1 @@
-
 from . import models
diff --git a/pos_category_multi/__manifest__.py b/pos_category_multi/__manifest__.py
@@ -1,25 +1,49 @@
+# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
 {
     "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",
+    # "live_test_url": "http://apps.it-projects.info/shop/product/DEMO-URL?version=12.0",
     "images": [],
+    "version": "12.0.1.0.1",
+    "application": False,
+
     "author": "IT-Projects LLC, Pavel Romanchenko",
     "support": "[email protected]",
-    "website": "https://it-projects.info",
-    "license": "AGPL-3",
+    'website': 'https://www.odoo.com/apps/modules/12.0/pos_category_multi/',
+    "license": "LGPL-3",
     "price": 15.00,
     "currency": "EUR",
 
     "depends": [
-        'point_of_sale',
+        "point_of_sale",
     ],
     "external_dependencies": {"python": [], "bin": []},
     "data": [
-        'template.xml',
-        'view.xml',
+        "template.xml",
+        "view.xml",
     ],
-    "demo": [],
-    "installable": True,
+    "demo": [
+    ],
+    "qweb": [
+    ],
+
+    "post_load": None,
+    "pre_init_hook": None,
+    "post_init_hook": None,
+    "uninstall_hook": None,
+
     "auto_install": False,
+    "installable": True,
+
+    # "demo_title": "{MODULE_NAME}",
+    # "demo_addons": [
+    # ],
+    # "demo_addons_hidden": [
+    # ],
+    # "demo_url": "DEMO-URL",
+    # "demo_summary": "{SHORT_DESCRIPTION_OF_THE_MODULE}",
+    # "demo_images": [
+    #    "images/MAIN_IMAGE",
+    # ]
 }
diff --git a/pos_category_multi/i18n/de.po b/pos_category_multi/i18n/de.po
@@ -6,7 +6,7 @@
 # Ermin Trevisan <[email protected]>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-14 10:52+0000\n"
 "PO-Revision-Date: 2017-10-14 10:52+0000\n"
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: pos_category_multi
-#: model:ir.model.fields,field_description:pos_category_multi.field_product_product_pos_category_ids
-#: model:ir.model.fields,field_description:pos_category_multi.field_product_template_pos_category_ids
+#: model:ir.model.fields,field_description:pos_category_multi.field_product_product__pos_category_ids
+#: model:ir.model.fields,field_description:pos_category_multi.field_product_template__pos_category_ids
 msgid "Point of Sale Categories"
 msgstr "Point of Sale-Kategorien"
 
@@ -31,12 +31,12 @@ msgid "Product Template"
 msgstr "Produktvorlage"
 
 #. module: pos_category_multi
-#: model:ir.ui.view,arch_db:pos_category_multi.product_template_form_view
+#: model_terms:ir.ui.view,arch_db:pos_category_multi.product_template_form_view
 msgid "These categories are shared across all Product Variants"
 msgstr "Diese Kategorien werden für alle Produktvarianten verwendet"
 
 #. module: pos_category_multi
-#: model:ir.model.fields,help:pos_category_multi.field_product_product_pos_category_ids
-#: model:ir.model.fields,help:pos_category_multi.field_product_template_pos_category_ids
+#: model:ir.model.fields,help:pos_category_multi.field_product_product__pos_category_ids
+#: model:ir.model.fields,help:pos_category_multi.field_product_template__pos_category_ids
 msgid "Those categories are used to group similar products for point of sale."
 msgstr "Diese Kategorien gruppieren ähnliche Produkte für den Point of Sale."
diff --git a/pos_category_multi/i18n/es.po b/pos_category_multi/i18n/es.po
@@ -6,7 +6,7 @@
 # Gustavo Valverde <[email protected]>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-30 15:22+0000\n"
 "PO-Revision-Date: 2017-09-30 15:22+0000\n"
@@ -20,8 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: pos_category_multi
-#: model:ir.model.fields,field_description:pos_category_multi.field_product_product_pos_category_ids
-#: model:ir.model.fields,field_description:pos_category_multi.field_product_template_pos_category_ids
+#: model:ir.model.fields,field_description:pos_category_multi.field_product_product__pos_category_ids
+#: model:ir.model.fields,field_description:pos_category_multi.field_product_template__pos_category_ids
 msgid "Point of Sale Categories"
 msgstr "Categorías del Punto de Venta"
 
@@ -31,14 +31,14 @@ msgid "Product Template"
 msgstr "Plantilla de Producto"
 
 #. module: pos_category_multi
-#: model:ir.ui.view,arch_db:pos_category_multi.product_template_form_view
+#: model_terms:ir.ui.view,arch_db:pos_category_multi.product_template_form_view
 msgid "These categories are shared across all Product Variants"
 msgstr ""
 "Estas categorias son compartidas a través de todas las Variantes de Productos"
 
 #. module: pos_category_multi
-#: model:ir.model.fields,help:pos_category_multi.field_product_product_pos_category_ids
-#: model:ir.model.fields,help:pos_category_multi.field_product_template_pos_category_ids
+#: model:ir.model.fields,help:pos_category_multi.field_product_product__pos_category_ids
+#: model:ir.model.fields,help:pos_category_multi.field_product_template__pos_category_ids
 msgid "Those categories are used to group similar products for point of sale."
 msgstr ""
 "Aquellas categorías son utilizadas para agrupar productos similares para el "
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ko_fi: itprojectsllc # This is supposed to bring some coffee for us
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,2 @@
		# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).

		from . import hw_printer_network_controller