From 3fcb74533a19210f280d3cf6877a70367f8ae3a8 Mon Sep 17 00:00:00 2001 From: Antoine Guenet Date: Fri, 13 May 2022 08:54:39 +0000 Subject: [PATCH] [MOV] web_editor, point_of_sale: move html2canvas to web_editor This moves the `html2canvas` library from `point_of_sale` to `web_editor` so as to be able to use it in `convert_inline`. `point_of_sale`, depending from `web_editor`, doesn't lose access to the library. task-2856858 Part-of: odoo/odoo#91314 --- addons/point_of_sale/__manifest__.py | 1 + addons/web_editor/__manifest__.py | 1 + .../static/lib/html2canvas.js | 0 debian/copyright | 8 ++++---- 4 files changed, 6 insertions(+), 4 deletions(-) rename addons/{point_of_sale => web_editor}/static/lib/html2canvas.js (100%) diff --git a/addons/point_of_sale/__manifest__.py b/addons/point_of_sale/__manifest__.py index 9984788e025..049494561a7 100644 --- a/addons/point_of_sale/__manifest__.py +++ b/addons/point_of_sale/__manifest__.py @@ -120,6 +120,7 @@ # Here includes the lib and POS UI assets. 'point_of_sale/static/lib/**/*.js', + 'web_editor/static/lib/html2canvas.js', 'point_of_sale/static/src/js/**/*.js', ], # This bundle contains the code responsible for starting the POS UI. diff --git a/addons/web_editor/__manifest__.py b/addons/web_editor/__manifest__.py index 43c53789ebb..3a71ebdc627 100644 --- a/addons/web_editor/__manifest__.py +++ b/addons/web_editor/__manifest__.py @@ -34,6 +34,7 @@ Odoo Web Editor widget. 'web_editor/static/lib/jQuery.transfo.js', 'web/static/lib/nearest/jquery.nearest.js', 'web_editor/static/lib/webgl-image-filter/webgl-image-filter.js', + 'web_editor/static/lib/html2canvas.js', # needed for convert_inline.js # odoo-editor 'web_editor/static/lib/odoo-editor/src/style.css', diff --git a/addons/point_of_sale/static/lib/html2canvas.js b/addons/web_editor/static/lib/html2canvas.js similarity index 100% rename from addons/point_of_sale/static/lib/html2canvas.js rename to addons/web_editor/static/lib/html2canvas.js diff --git a/debian/copyright b/debian/copyright index f96573d186d..51c91487bdc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -205,10 +205,6 @@ Files: addons/point_of_sale/models/account_bank_statement.py addons/point_of_sal Copyright: 2004-2008 PC Solutions () License: LGPL-3+ -Files: addons/point_of_sale/static/lib/html2canvas.js -Copyright: 2013 Niklas von Hertzen; 2010 John Resig -License: MIT - Files: addons/pos_epson_printer/static/lib/epos-2.12.0.js Copyright: Seiko Epson Corporation 2016 - 2019; 2011 LearnBoost License: MIT @@ -434,6 +430,10 @@ Files: addons/web_editor/static/lib/webgl-image-filter/* Copyright: 2020 Dominic Szablewski License: MIT +Files: addons/web_editor/static/lib/html2canvas.js +Copyright: 2013 Niklas von Hertzen; 2010 John Resig +License: MIT + Files: addons/website_event_track/static/lib/idb-keyval/idb-keyval.js Copyright: 2016 Jake Archibald License: Apache-2.0