From 79dc45b24bfca603c89f76ee001a7a89e559e1fb Mon Sep 17 00:00:00 2001 From: Chill Date: Mon, 11 Mar 2024 16:42:04 +0800 Subject: [PATCH] =?UTF-8?q?[FIX]=20app=5Fcommon,app=5Fodoo=5Fcustomize,?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app_common/__manifest__.py | 2 +- app_common/models/base.py | 2 +- app_common/static/description/index.html | 2 +- app_odoo_customize/__manifest__.py | 2 +- .../models/res_config_settings.py | 36 +++++++++---------- .../static/description/index.html | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/app_common/__manifest__.py b/app_common/__manifest__.py index 3e09817e..26aadcc2 100644 --- a/app_common/__manifest__.py +++ b/app_common/__manifest__.py @@ -39,7 +39,7 @@ { 'name': "odooAi Common Util and Tools,欧度智能基础核心优化", - 'version': '16.23.11.24', + 'version': '16.24.03.11', 'author': 'odooai.cn', 'category': 'Base', 'website': 'https://www.odooai.cn', diff --git a/app_common/models/base.py b/app_common/models/base.py index e1a95317..79809b85 100644 --- a/app_common/models/base.py +++ b/app_common/models/base.py @@ -107,7 +107,7 @@ class Base(models.AbstractModel): return dt.astimezone(pytz_timezone).strftime(return_format) @api.model - def get_image_from_url(self, url): + def _get_image_from_url(self, url): # 返回这个图片的base64编码 if not self._app_check_sys_op(): return False diff --git a/app_common/static/description/index.html b/app_common/static/description/index.html index 0f6725fd..8156bc20 100644 --- a/app_common/static/description/index.html +++ b/app_common/static/description/index.html @@ -4,7 +4,7 @@

odooAi Common Util and Tools

Network and media and base tools

-

Latest update: v16.22.02.02

+

Latest update: v16.24.03.11

diff --git a/app_odoo_customize/__manifest__.py b/app_odoo_customize/__manifest__.py index bc7cf157..2e354bd6 100644 --- a/app_odoo_customize/__manifest__.py +++ b/app_odoo_customize/__manifest__.py @@ -23,7 +23,7 @@ { 'name': 'odoo17 Tweak,Ai Employee,Boost,Customize All in One. Customize,UI,Boost,Security,Data', - 'version': '16.24.03.08', + 'version': '16.24.03.11', 'author': 'odooai.cn', 'category': 'Extra Tools', 'website': 'https://www.odooai.cn', diff --git a/app_odoo_customize/models/res_config_settings.py b/app_odoo_customize/models/res_config_settings.py index 374c7742..62552040 100644 --- a/app_odoo_customize/models/res_config_settings.py +++ b/app_odoo_customize/models/res_config_settings.py @@ -82,7 +82,7 @@ class ResConfigSettings(models.TransientModel): pass # 清数据，o=对象, s=序列 - def remove_app_data(self, o, s=[]): + def _remove_app_data(self, o, s=[]): if not self._app_check_sys_op(): raise UserError(_('Not allow.')) @@ -137,7 +137,7 @@ class ResConfigSettings(models.TransientModel): seqs = [ 'sale', ] - return self.remove_app_data(to_removes, seqs) + return self._remove_app_data(to_removes, seqs) def remove_product(self): to_removes = [ @@ -148,7 +148,7 @@ class ResConfigSettings(models.TransientModel): seqs = [ 'product.product', ] - return self.remove_app_data(to_removes, seqs) + return self._remove_app_data(to_removes, seqs) def remove_product_attribute(self): to_removes = [ @@ -157,7 +157,7 @@ class ResConfigSettings(models.TransientModel): 'product.attribute', ] seqs = [] - return self.remove_app_data(to_removes, seqs) + return self._remove_app_data(to_removes, seqs) def remove_pos(self): @@ -173,7 +173,7 @@ class ResConfigSettings(models.TransientModel): seqs = [ 'pos.', ] - res = self.remove_app_data(to_removes, seqs) + res = self._remove_app_data(to_removes, seqs) # 更新要关帐的值，因为 store=true 的计算字段要重置 @@ -196,7 +196,7 @@ class ResConfigSettings(models.TransientModel): seqs = [ 'purchase.', ] - return self.remove_app_data(to_removes, seqs) + return self._remove_app_data(to_removes, seqs) def remove_expense(self): to_removes = [ @@ -209,7 +209,7 @@ class ResConfigSettings(models.TransientModel): seqs = [ 'hr.expense.', ] - return self.remove_app_data(to_removes, seqs) + return self._remove_app_data(to_removes, seqs) def remove_mrp(self): to_removes = [ @@ -228,7 +228,7 @@ class ResConfigSettings(models.TransientModel): seqs = [ 'mrp.', ] - return self.remove_app_data(to_removes, seqs) + return self._remove_app_data(to_removes, seqs) def remove_mrp_bom(self): to_removes = [ @@ -237,7 +237,7 @@ class ResConfigSettings(models.TransientModel): 'mrp.bom', ] seqs = [] - return self.remove_app_data(to_removes, seqs) + return self._remove_app_data(to_removes, seqs) def remove_inventory(self): to_removes = [ @@ -265,7 +265,7 @@ class ResConfigSettings(models.TransientModel): 'product.tracking.default', 'WH/', ] - return self.remove_app_data(to_removes, seqs) + return self._remove_app_data(to_removes, seqs) def remove_account(self): to_removes = [ @@ -286,7 +286,7 @@ class ResConfigSettings(models.TransientModel): 'hr.expense.sheet', 'account.move', ] - res = self.remove_app_data(to_removes, []) + res = self._remove_app_data(to_removes, []) # extra 更新序号 domain = [ @@ -395,7 +395,7 @@ class ResConfigSettings(models.TransientModel): self.env.company.write({ 'chart_template_id': False, }) - res = self.remove_app_data(to_removes, seqs) + res = self._remove_app_data(to_removes, seqs) return res def remove_project(self): @@ -420,7 +420,7 @@ class ResConfigSettings(models.TransientModel): self._cr.commit() except Exception as e: _logger.error('remove data error: %s,%s', 'project: project_sale_line_employee_map', e) - return self.remove_app_data(to_removes, seqs) + return self._remove_app_data(to_removes, seqs) def remove_quality(self): to_removes = [ @@ -439,7 +439,7 @@ class ResConfigSettings(models.TransientModel): 'quality.alert', # 'quality.point', ] - return self.remove_app_data(to_removes, seqs) + return self._remove_app_data(to_removes, seqs) def remove_quality_setting(self): to_removes = [ @@ -451,7 +451,7 @@ class ResConfigSettings(models.TransientModel): 'quality.reason', 'quality.tag', ] - return self.remove_app_data(to_removes) + return self._remove_app_data(to_removes) def remove_website(self): to_removes = [ @@ -472,7 +472,7 @@ class ResConfigSettings(models.TransientModel): # 'website', ] seqs = [] - return self.remove_app_data(to_removes, seqs) + return self._remove_app_data(to_removes, seqs) def remove_message(self): to_removes = [ @@ -482,7 +482,7 @@ class ResConfigSettings(models.TransientModel): 'mail.activity', ] seqs = [] - return self.remove_app_data(to_removes, seqs) + return self._remove_app_data(to_removes, seqs) def remove_workflow(self): to_removes = [ @@ -491,7 +491,7 @@ class ResConfigSettings(models.TransientModel): # 'wkf.instance', ] seqs = [] - return self.remove_app_data(to_removes, seqs) + return self._remove_app_data(to_removes, seqs) def remove_all_biz(self): self.remove_account() diff --git a/app_odoo_customize/static/description/index.html b/app_odoo_customize/static/description/index.html index 80fa9ed6..c050d8a8 100644 --- a/app_odoo_customize/static/description/index.html +++ b/app_odoo_customize/static/description/index.html @@ -20,7 +20,7 @@
-

This is a Long Term Support Apps.Update: v16.24.03.08

+

This is a Long Term Support Apps.Update: v16.24.03.11

  • 1. Deletes Odoo label in footer