jegomez/odoo14-dev-environment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ADD] account_menu and web_company_color to OCA

Browse Source
This commit is contained in:
Jorge Enrique Gómez Gómez 2021-05-31 21:15:53 -05:00
parent b229022f8b
commit 8291ae295a
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
patches/20210420_auth-oauth-multi-token_error-in-login.patch
View File

@ -1,7 +1,7 @@
diff -rupN auth_oauth_multi_token/models/res_users.py auth_oauth_multi_token.patch/models/res_users.py 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/models/res_users.py 2021-05-31 18:39:08.015127916 -0500
+++ auth_oauth_multi_token.patch/models/res_users.py 2021-04-20 22:54:51.992899568 +0000 +++ auth_oauth_multi_token.patch/models/res_users.py 2021-05-31 20:37:17.138888645 -0500
@@ -69,10 +69,10 @@ class ResUsers(models.Model): @@ -66,10 +66,10 @@ class ResUsers(models.Model):
res.oauth_master_uuid = self._generate_oauth_master_uuid() res.oauth_master_uuid = self._generate_oauth_master_uuid()
@api.model @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) + return super()._check_credentials(password, env)
except exceptions.AccessDenied: except exceptions.AccessDenied:
res = self.multi_token_model.sudo().search( res = self.multi_token_model.sudo().search(
[ [("user_id", "=", self.env.uid), ("oauth_access_token", "=", password)]

2
selected_oca_modules.txt
View File

@ -1,4 +1,5 @@
account-financial-tools/account_asset_management/ account-financial-tools/account_asset_management/
account-financial-tools/account_menu/
credit-control/account_credit_control/ credit-control/account_credit_control/
account-financial-reporting/account_financial_report/ account-financial-reporting/account_financial_report/
account-financial-reporting/account_tax_balance/ account-financial-reporting/account_tax_balance/
@ -14,5 +15,6 @@ helpdesk/helpdesk_mgmt/
hr/hr_branch/ hr/hr_branch/
reporting-engine/report_xlsx/ reporting-engine/report_xlsx/
reporting-engine/report_xlsx_helper/ reporting-engine/report_xlsx_helper/
web/web_company_color/
web/web_m2x_options/ web/web_m2x_options/
web/web_responsive/ web/web_responsive/