From 0b9ec87c27739d622d4e0f58ec6a85599fbeff21 Mon Sep 17 00:00:00 2001 From: ivan deng Date: Sun, 27 Jan 2019 02:10:37 +0800 Subject: [PATCH] opt customize --- app_odoo_customize/__manifest__.py | 2 +- app_odoo_customize/models/__init__.py | 1 - .../models/app_theme_config_settings.py | 12 ---- .../models/res_config_settings.py | 55 +++---------------- 4 files changed, 9 insertions(+), 61 deletions(-) delete mode 100644 app_odoo_customize/models/app_theme_config_settings.py diff --git a/app_odoo_customize/__manifest__.py b/app_odoo_customize/__manifest__.py index 7dfe20f7..102f83ee 100644 --- a/app_odoo_customize/__manifest__.py +++ b/app_odoo_customize/__manifest__.py @@ -23,7 +23,7 @@ { 'name': 'App Odoo Customize(Backend Debranding Title,Language,Documentation,Quick Debug,Clear Data)', - 'version': '12.19.1.20', + 'version': '12.19.1.27', 'author': 'Sunpop.cn', 'category': 'Productivity', 'website': 'http://www.sunpop.cn', diff --git a/app_odoo_customize/models/__init__.py b/app_odoo_customize/models/__init__.py index 4f0b3cf7..4c83a9e1 100644 --- a/app_odoo_customize/models/__init__.py +++ b/app_odoo_customize/models/__init__.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- from . import res_config_settings -from . import app_theme_config_settings from . import ir_ui_view from . import base_language_install # from . import mail_thread diff --git a/app_odoo_customize/models/app_theme_config_settings.py b/app_odoo_customize/models/app_theme_config_settings.py deleted file mode 100644 index 8fe391ac..00000000 --- a/app_odoo_customize/models/app_theme_config_settings.py +++ /dev/null @@ -1,12 +0,0 @@ -# -*- coding: utf-8 -*- - -import logging - -from odoo import api, fields, models, _ - -_logger = logging.getLogger(__name__) - -# 为兼容而保留 -class AppThemeConfigSettings(models.TransientModel): - _inherit = 'res.config.settings' - _name = 'app.theme.config.settings' diff --git a/app_odoo_customize/models/res_config_settings.py b/app_odoo_customize/models/res_config_settings.py index 1e471a77..d33c1825 100644 --- a/app_odoo_customize/models/res_config_settings.py +++ b/app_odoo_customize/models/res_config_settings.py @@ -125,8 +125,6 @@ class ResConfigSettings(models.TransientModel): seq.write({ 'number_next': 1, }) - sql = "update ir_sequence set number_next=1 where code ='sale.order';" - self._cr.execute(sql) except Exception as e: raise Warning(e) return True @@ -150,8 +148,6 @@ class ResConfigSettings(models.TransientModel): seq.write({ 'number_next': 1, }) - sql = "update ir_sequence set number_next=1 where code ='product.product';" - self._cr.execute(sql) except Exception as e: pass # raise Warning(e) return True @@ -193,8 +189,6 @@ class ResConfigSettings(models.TransientModel): seq.write({ 'number_next': 1, }) - sql = "update ir_sequence set number_next=1 where code ='pos.order';" - self._cr.execute(sql) except Exception as e: pass # raise Warning(e) return True @@ -218,13 +212,12 @@ class ResConfigSettings(models.TransientModel): # 更新序号 seqs = self.env['ir.sequence'].search([ '|', ('code', '=', 'purchase.order'), - '|', ('code', '=', 'purchase.requisition.blanket.order'), - ('code', '=', 'purchase.requisition.purchase.tender ')]) + '|', ('code', '=', 'purchase.requisition.purchase.tender'), + ('code', '=', 'purchase.requisition.blanket.order')]) for seq in seqs: seq.write({ 'number_next': 1, }) - sql = "update ir_sequence set number_next=1 where code ='purchase.order';" self._cr.execute(sql) except Exception as e: pass # raise Warning(e) @@ -253,13 +246,14 @@ class ResConfigSettings(models.TransientModel): sql = "delete from %s" % obj._table self._cr.execute(sql) # 更新序号 - seqs = self.env['ir.sequence'].search(['|', ('code', '=', 'mrp.production'), ('code', '=', 'mrp.unbuild')]) + seqs = self.env['ir.sequence'].search([ + '|', ('code', '=', 'mrp.production'), + ('code', '=', 'mrp.unbuild'), + ]) for seq in seqs: seq.write({ 'number_next': 1, }) - sql = "update ir_sequence set number_next=1 where (code ='mrp.production' or code ='mrp.unbuild');" - self._cr.execute(sql) except Exception as e: pass # raise Warning(e) return True @@ -323,26 +317,10 @@ class ResConfigSettings(models.TransientModel): '|', ('prefix', '=', 'WH/PACK/'), ('prefix', '=', 'WH/PICK/') ]) - for seq in seqs: seq.write({ 'number_next': 1, }) - sql = "update ir_sequence set number_next=1 where (" \ - "code ='stock.lot.serial' " \ - "or code ='stock.lot.tracking' " \ - "or code ='stock.orderpoint'" \ - "or code ='stock.picking'" \ - "or code ='stock.quant.package'" \ - "or code ='stock.scrap'" \ - "or code ='stock.picking'" \ - "or prefix ='WH/IN/'" \ - "or prefix ='WH/INT/'" \ - "or prefix ='WH/OUT/'" \ - "or prefix ='WH/PACK/'" \ - "or prefix ='WH/PICK/'" \ - ");" - self._cr.execute(sql) except Exception as e: pass # raise Warning(e) return True @@ -387,30 +365,13 @@ class ResConfigSettings(models.TransientModel): '|', ('prefix', 'like', 'INV/'), '|', ('prefix', 'like', 'EXCH/'), '|', ('prefix', 'like', 'MISC/'), - '|', ('prefix', 'like', u'账单/'), - ('prefix', 'like', u'杂项/') + '|', ('prefix', 'like', '账单/'), + ('prefix', 'like', '杂项/') ]) - for seq in seqs: seq.write({ 'number_next': 1, }) - # todo: 帐单 or BILL/% - sql = "update ir_sequence set number_next=1 where (" \ - "code ='account.reconcile' " \ - "or code ='account.payment.customer.invoice' " \ - "or code ='account.payment.customer.refund' " \ - "or code ='account.payment.supplier.invoice' " \ - "or code ='account.payment.supplier.refund' " \ - "or prefix like 'BNK1/%'" \ - "or prefix like 'CSH1/%'" \ - "or prefix like 'INV/%'" \ - "or prefix like 'EXCH/%'" \ - "or prefix like 'MISC/%'" \ - "or prefix like '账单/%'" \ - "or prefix like '杂项/%'" \ - ");" - self._cr.execute(sql) except Exception as e: pass # raise Warning(e) return True