From 8291ae295ae53f346e7d955a3c64139465754599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20E=2E=20G=C3=B3mez?= Date: Mon, 31 May 2021 21:15:53 -0500 Subject: [PATCH] [ADD] account_menu and web_company_color to OCA --- .../20210420_auth-oauth-multi-token_error-in-login.patch | 9 ++++----- selected_oca_modules.txt | 4 +++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/patches/20210420_auth-oauth-multi-token_error-in-login.patch b/patches/20210420_auth-oauth-multi-token_error-in-login.patch index 00bebb2..4201b46 100644 --- a/patches/20210420_auth-oauth-multi-token_error-in-login.patch +++ b/patches/20210420_auth-oauth-multi-token_error-in-login.patch @@ -1,7 +1,7 @@ diff -rupN auth_oauth_multi_token/models/res_users.py auth_oauth_multi_token.patch/models/res_users.py ---- auth_oauth_multi_token/models/res_users.py 2021-04-15 03:35:47.362795561 +0000 -+++ auth_oauth_multi_token.patch/models/res_users.py 2021-04-20 22:54:51.992899568 +0000 -@@ -69,10 +69,10 @@ class ResUsers(models.Model): +--- auth_oauth_multi_token/models/res_users.py 2021-05-31 18:39:08.015127916 -0500 ++++ auth_oauth_multi_token.patch/models/res_users.py 2021-05-31 20:37:17.138888645 -0500 +@@ -66,10 +66,10 @@ class ResUsers(models.Model): res.oauth_master_uuid = self._generate_oauth_master_uuid() @api.model @@ -13,5 +13,4 @@ diff -rupN auth_oauth_multi_token/models/res_users.py auth_oauth_multi_token.pat + return super()._check_credentials(password, env) except exceptions.AccessDenied: res = self.multi_token_model.sudo().search( - [ - + [("user_id", "=", self.env.uid), ("oauth_access_token", "=", password)] diff --git a/selected_oca_modules.txt b/selected_oca_modules.txt index e3fcfc3..46f7797 100644 --- a/selected_oca_modules.txt +++ b/selected_oca_modules.txt @@ -1,4 +1,5 @@ account-financial-tools/account_asset_management/ +account-financial-tools/account_menu/ credit-control/account_credit_control/ account-financial-reporting/account_financial_report/ account-financial-reporting/account_tax_balance/ @@ -14,5 +15,6 @@ helpdesk/helpdesk_mgmt/ hr/hr_branch/ reporting-engine/report_xlsx/ reporting-engine/report_xlsx_helper/ +web/web_company_color/ web/web_m2x_options/ -web/web_responsive/ \ No newline at end of file +web/web_responsive/