imp: support odoo 17.0

Tardo · Nov 20, 2023 · fa945ac · fa945ac
1 parent 9c923e1
commit fa945ac
Show file tree

Hide file tree

Showing 28 changed files with 302 additions and 137 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,17 @@
 # Changelog
 
+**10.4.2**
+
+```
+IMP: Browse action icon badge (issue #129)
+```
+
 **10.4.1**
 
 ```
 IMP: Tests messages
 
-FIX: Trash: Interpreter (issue #128)
+FIX: TraSH: Interpreter (issue #128)
 FIX: User input: key up (prev. history)
 ```
 

diff --git a/package.json b/package.json
@@ -93,6 +93,7 @@
       "moment": "readonly",
       "odoo": "readonly",
       "owl": "readonly",
+      "luxon": "readonly",
       "openerp": "off"
     },
     "rules": {

diff --git a/src/js/common/constants.mjs b/src/js/common/constants.mjs
@@ -46,6 +46,8 @@ export const COMPATIBLE_VERSIONS = [
   'saas~14',
   '15.',
   'saas~15',
-  '16.0',
-  'saas~16.0',
+  '16.',
+  'saas~16',
+  '17.0',
+  'saas~17.0',
 ];
diff --git a/src/js/page/odoo/base/do_action.mjs b/src/js/page/odoo/base/do_action.mjs
@@ -2,23 +2,23 @@
 // License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 import asyncSleep from '@terminal/utils/async_sleep';
-import getOdooVersionMajor from '@odoo/utils/get_odoo_version_major';
+import getOdooVersion from '@odoo/utils/get_odoo_version';
 import getOdooRoot from '@odoo/utils/get_odoo_root';
 import doTrigger from './do_trigger';
 
 export default async function (action, options) {
-  const OdooVer = getOdooVersionMajor();
-  if (OdooVer >= 17) {
-    return getOdooRoot().actionService.doAction(action, options);
-  } else if (OdooVer >= 14) {
+  const OdooVerMajor = getOdooVersion('major');
+  if (OdooVerMajor >= 17) {
+    return await getOdooRoot().actionService.doAction(action, options);
+  } else if (OdooVerMajor >= 14) {
     doTrigger('do-action', {action, options});
     // Simulate end of the 'action'
     // FIXME: This makes me cry
     await asyncSleep(1800);
     return {id: action};
   }
 
-  return new Promise((resolve, reject) => {
+  return await new Promise((resolve, reject) => {
     doTrigger('do_action', {
       action: action,
       options: options,

diff --git a/src/js/page/odoo/base/do_trigger.mjs b/src/js/page/odoo/base/do_trigger.mjs
@@ -2,14 +2,14 @@
 // License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 import getOdooEnv from '@odoo/utils/get_odoo_env';
-import getOdooVersionMajor from '@odoo/utils/get_odoo_version_major';
+import getOdooVersion from '@odoo/utils/get_odoo_version';
 
 export default function (event_name, event_options) {
-  const OdooVer = getOdooVersionMajor();
+  const OdooVerMajor = getOdooVersion('major');
   const OdooEnv = getOdooEnv();
   let trigger = null;
   let context = null;
-  if (OdooVer >= 14) {
+  if (OdooVerMajor >= 14) {
     trigger = OdooEnv.bus.trigger;
     context = OdooEnv.bus;
   } else {

diff --git a/src/js/page/odoo/base/execute_action.mjs b/src/js/page/odoo/base/execute_action.mjs
@@ -1,12 +1,12 @@
 // Copyright  Alexandre Díaz <dev@redneboa.es>
 // License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-import getOdooVersionMajor from '@odoo/utils/get_odoo_version_major';
+import getOdooVersion from '@odoo/utils/get_odoo_version';
 import doTrigger from './do_trigger';
 
 export default function (payload) {
-  const OdooVer = getOdooVersionMajor();
-  if (OdooVer < 15) {
+  const OdooVerMajor = getOdooVersion('major');
+  if (OdooVerMajor < 15) {
     return;
   }
   doTrigger('execute-action', payload);

diff --git a/src/js/page/odoo/base/show_effect.mjs b/src/js/page/odoo/base/show_effect.mjs
@@ -1,12 +1,12 @@
 // Copyright  Alexandre Díaz <dev@redneboa.es>
 // License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-import getOdooVersionMajor from '@odoo/utils/get_odoo_version_major';
+import getOdooVersion from '@odoo/utils/get_odoo_version';
 import doTrigger from './do_trigger';
 
 export default function (type, options) {
-  const OdooVer = getOdooVersionMajor();
-  if (OdooVer < 15) {
+  const OdooVerMajor = getOdooVersion('major');
+  if (OdooVerMajor < 15) {
     return;
   }
   const payload = Object.assign({}, options, {type: type});

diff --git a/src/js/page/odoo/commands/backoffice/action.mjs b/src/js/page/odoo/commands/backoffice/action.mjs
@@ -5,7 +5,7 @@ import doAction from '@odoo/base/do_action';
 import {ARG} from '@trash/constants';
 
 async function cmdCallAction(kwargs) {
-  return doAction(kwargs.action, kwargs.options);
+  return await doAction(kwargs.action, kwargs.options);
 }
 
 export default {

diff --git a/src/js/page/odoo/commands/backoffice/effect.mjs b/src/js/page/odoo/commands/backoffice/effect.mjs
@@ -3,12 +3,13 @@
 
 import showEffect from '@odoo/base/show_effect';
 import getOdooService from '@odoo/utils/get_odoo_service';
-import getOdooVersionMajor from '@odoo/utils/get_odoo_version_major';
+import getOdooVersion from '@odoo/utils/get_odoo_version';
 import isEmpty from '@terminal/utils/is_empty';
 import {ARG} from '@trash/constants';
 
 async function cmdShowEffect(kwargs, screen) {
-  if (getOdooVersionMajor() < 15) {
+  const OdooVerMajor = getOdooVersion('major');
+  if (OdooVerMajor < 15) {
     // Soft-Error
     screen.printError('This command is only available in Odoo 15.0+');
     return;

diff --git a/src/js/page/odoo/commands/backoffice/view.mjs b/src/js/page/odoo/commands/backoffice/view.mjs
@@ -4,13 +4,13 @@
 import doAction from '@odoo/base/do_action';
 import getParentAdapter from '@odoo/utils/get_parent_adapter';
 import getOdooService from '@odoo/utils/get_odoo_service';
-import getOdooVersionMajor from '@odoo/utils/get_odoo_version_major';
+import getOdooVersion from '@odoo/utils/get_odoo_version';
 import cachedSearchRead from '@odoo/utils/cached_search_read';
 import {ARG} from '@trash/constants';
 
 function openSelectCreateDialog(model, title, domain, on_selected) {
-  const OdooVer = getOdooVersionMajor();
-  if (OdooVer < 16) {
+  const OdooVerMajor = getOdooVersion('major');
+  if (OdooVerMajor < 16) {
     const dialogs = getOdooService('web.view_dialogs');
     const dialog = new dialogs.SelectCreateDialog(getParentAdapter(), {
       res_model: model,

diff --git a/src/js/page/odoo/commands/common/barcode.mjs b/src/js/page/odoo/commands/common/barcode.mjs
@@ -2,7 +2,7 @@
 // License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 import getOdooService from '@odoo/utils/get_odoo_service';
-import getOdooVersionMajor from '@odoo/utils/get_odoo_version_major';
+import getOdooVersion from '@odoo/utils/get_odoo_version';
 import asyncSleep from '@terminal/utils/async_sleep';
 import {ARG} from '@trash/constants';
 
@@ -17,8 +17,8 @@ const AVAILABLE_BARCODE_COMMANDS = [
 ];
 
 function getBarcodeEvent(data) {
-  const OdooVer = getOdooVersionMajor();
-  if (OdooVer >= 16) {
+  const OdooVerMajor = getOdooVersion('major');
+  if (OdooVerMajor >= 16) {
     return new KeyboardEvent('keydown', {
       key: data,
     });
@@ -31,8 +31,8 @@ function getBarcodeEvent(data) {
 }
 
 function getBarcodeInfo(barcodeService) {
-  const OdooVer = getOdooVersionMajor();
-  if (OdooVer >= 16) {
+  const OdooVerMajor = getOdooVersion('major');
+  if (OdooVerMajor >= 16) {
     return [
       `Max. time between keys (ms): ${barcodeService.barcodeService.maxTimeBetweenKeysInMs}`,
       'Reserved barcode prefixes: O-BTN., O-CMD.',

diff --git a/src/js/page/odoo/commands/common/context.mjs b/src/js/page/odoo/commands/common/context.mjs
@@ -2,14 +2,14 @@
 // License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 import getOdooSession from '@odoo/utils/get_odoo_session';
-import getOdooVersionMajor from '@odoo/utils/get_odoo_version_major';
+import getOdooVersion from '@odoo/utils/get_odoo_version';
 import {ARG} from '@trash/constants';
 
 const session = getOdooSession();
 
 async function cmdContextOperation(kwargs, screen) {
-  const OdooVer = getOdooVersionMajor();
-  if (OdooVer >= 15) {
+  const OdooVerMajor = getOdooVersion('major');
+  if (OdooVerMajor >= 15) {
     if (
       kwargs.operation === 'set' ||
       kwargs.operation === 'write' ||

diff --git a/src/js/page/odoo/commands/common/depends.mjs b/src/js/page/odoo/commands/common/depends.mjs
@@ -3,13 +3,13 @@
 
 import callModel from '@odoo/osv/call_model';
 import cachedSearchRead from '@odoo/utils/cached_search_read';
-import getOdooVersionMajor from '@odoo/utils/get_odoo_version_major';
+import getOdooVersion from '@odoo/utils/get_odoo_version';
 import isEmpty from '@terminal/utils/is_empty';
 import {ARG} from '@trash/constants';
 
 function sanitizeCmdModuleDepends(module_name) {
-  const OdooVer = getOdooVersionMajor();
-  if (OdooVer >= 16) {
+  const OdooVerMajor = getOdooVersion('major');
+  if (OdooVerMajor >= 16) {
     return `_______${module_name}`;
   }
   return module_name;

diff --git a/src/js/page/odoo/commands/common/now.mjs b/src/js/page/odoo/commands/common/now.mjs
@@ -1,29 +1,58 @@
 // Copyright  Alexandre Díaz <dev@redneboa.es>
 // License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
+import getOdooVersion from '@odoo/utils/get_odoo_version';
 import getOdooService from '@odoo/utils/get_odoo_service';
+import getUserTZ from '@odoo/utils/get_user_tz';
 import {ARG} from '@trash/constants';
 
 async function cmdNow(kwargs, screen) {
-  const time = getOdooService('web.time');
+  const time = getOdooService('web.time', '@web/core/l10n/dates');
+  const OdooVerMajor = getOdooVersion('major');
   let res = false;
   if (kwargs.type === 'full') {
-    if (kwargs.tz) {
-      res = moment().format(time.getLangDatetimeFormat());
+    if (OdooVerMajor >= 17) {
+      if (kwargs.tz) {
+        res = time.formatDateTime(luxon.DateTime.local().setZone(getUserTZ()));
+      } else {
+        res = time.serializeDateTime(luxon.DateTime.local());
+      }
     } else {
-      res = time.datetime_to_str(new Date());
+      if (kwargs.tz) {
+        res = moment().format(time.getLangDatetimeFormat());
+      } else {
+        res = time.datetime_to_str(new Date());
+      }
     }
   } else if (kwargs.type === 'date') {
-    if (kwargs.tz) {
-      res = moment().format(time.getLangDateFormat());
+    if (OdooVerMajor >= 17) {
+      if (kwargs.tz) {
+        res = time.formatDate(luxon.DateTime.local().setZone(getUserTZ()));
+      } else {
+        res = time.serializeDate(luxon.DateTime.local());
+      }
     } else {
-      res = time.date_to_str(new Date());
+      if (kwargs.tz) {
+        res = moment().format(time.getLangDateFormat());
+      } else {
+        res = time.date_to_str(new Date());
+      }
     }
   } else if (kwargs.type === 'time') {
-    if (kwargs.tz) {
-      res = moment().format(time.getLangTimeFormat());
+    if (OdooVerMajor >= 17) {
+      if (kwargs.tz) {
+        res = time
+          .formatDateTime(luxon.DateTime.local().setZone(getUserTZ()))
+          .split(' ')[1];
+      } else {
+        res = time.serializeDateTime(luxon.DateTime.local()).split(' ')[1];
+      }
     } else {
-      res = time.time_to_str(new Date());
+      if (kwargs.tz) {
+        res = moment().format(time.getLangTimeFormat());
+      } else {
+        res = time.time_to_str(new Date());
+      }
     }
   }
 

diff --git a/src/js/page/odoo/commands/common/ref.mjs b/src/js/page/odoo/commands/common/ref.mjs
@@ -2,14 +2,14 @@
 // License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 import callModel from '@odoo/osv/call_model';
-import getOdooVersionMajor from '@odoo/utils/get_odoo_version_major';
+import getOdooVersion from '@odoo/utils/get_odoo_version';
 import {ARG} from '@trash/constants';
 
 async function cmdRef(kwargs, screen) {
-  const OdooVer = getOdooVersionMajor();
+  const OdooVerMajor = getOdooVersion('major');
   const tasks = [];
   for (const xmlid of kwargs.xmlid) {
-    if (OdooVer < 15) {
+    if (OdooVerMajor < 15) {
       tasks.push(
         callModel(
           'ir.model.data',