diff --git a/sf_manufacturing/models/tray.py b/sf_manufacturing/models/tray.py index a572f52c..4af97865 100644 --- a/sf_manufacturing/models/tray.py +++ b/sf_manufacturing/models/tray.py @@ -18,42 +18,7 @@ class Tray(models.Model): @api.onchange('production_id') def updateTrayState(self): - - if self.workorder_id != False: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + if self.workorder_id != False and self.create_date != False: self.state = '占用' else: diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml index 49704ca0..272ef796 100644 --- a/sf_manufacturing/views/mrp_workorder_view.xml +++ b/sf_manufacturing/views/mrp_workorder_view.xml @@ -57,7 +57,7 @@ - 工单详情 + 工单 ir.actions.act_window mrp.workorder tree,kanban,form @@ -66,7 +66,7 @@ (0, 0, {'view_mode': 'kanban', 'view_id': ref('mrp.workcenter_line_kanban')}) ]"/> current - [('state', 'not in', ['done', 'cancel'])] + [('state', '!=', 'cancel')] {'search_default_workcenter_id': active_id}

diff --git a/vista_backend_theme/__init__.py b/vista_backend_theme/__init__.py index 5a4f93eb..0e0b6dfa 100644 --- a/vista_backend_theme/__init__.py +++ b/vista_backend_theme/__init__.py @@ -21,3 +21,5 @@ ############################################################################# from .hooks import test_pre_init_hook, test_post_init_hook from . import wizard +from . import models + diff --git a/vista_backend_theme/__manifest__.py b/vista_backend_theme/__manifest__.py index 8cbb14af..8582050b 100644 --- a/vista_backend_theme/__manifest__.py +++ b/vista_backend_theme/__manifest__.py @@ -30,7 +30,7 @@ 'company': 'Cybrosys Techno Solutions', 'maintainer': 'Cybrosys Techno Solutions', 'website': "https://www.cybrosys.com", - "depends": ['base', 'web', 'mail'], + "depends": ['base', 'web', 'mail', 'base_setup'], "data": [ 'security/ir.model.access.csv', 'views/icons.xml', @@ -38,6 +38,7 @@ 'views/theme.xml', 'views/assets.xml', 'data/theme_data.xml', + 'views/res_config.xml', ], 'assets': { 'web.assets_backend': { @@ -47,15 +48,18 @@ '/vista_backend_theme/static/src/js/chrome/sidebar_menu.js', '/vista_backend_theme/static/src/xml/systray.xml', '/vista_backend_theme/static/src/xml/top_bar.xml', + '/vista_backend_theme/static/src/js/web_window_title.js', }, 'web.assets_frontend': { '/vista_backend_theme/static/src/scss/login.scss', '/vista_backend_theme/static/src/scss/login.scss', + }, }, 'images': [ 'static/description/banner.png', 'static/description/theme_screenshot.png', + 'static/description/main_screenshot.png', ], 'license': 'LGPL-3', 'pre_init_hook': 'test_pre_init_hook', diff --git a/vista_backend_theme/data/demo.xml b/vista_backend_theme/data/demo.xml new file mode 100644 index 00000000..937ce77e --- /dev/null +++ b/vista_backend_theme/data/demo.xml @@ -0,0 +1,11 @@ + + + + + + web.base.title + Demo + + + + \ No newline at end of file diff --git a/vista_backend_theme/models/__init__.py b/vista_backend_theme/models/__init__.py new file mode 100644 index 00000000..b4db3f9a --- /dev/null +++ b/vista_backend_theme/models/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- + +from . import ir_ui_view +from . import res_config diff --git a/vista_backend_theme/models/ir_ui_view.py b/vista_backend_theme/models/ir_ui_view.py new file mode 100644 index 00000000..633dbc95 --- /dev/null +++ b/vista_backend_theme/models/ir_ui_view.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- + +import logging + +from odoo import api, fields, models, _ + +_logger = logging.getLogger(__name__) + +class View(models.Model): + _inherit = 'ir.ui.view' + + @api.model + def _render_template(self, template, values=None): + if template in ['web.login', 'web.webclient_bootstrap']: + if not values: + values = {} + values["title"] = self.env['ir.config_parameter'].sudo().get_param("web.base.title", "") + return super(View, self)._render_template(template, values) diff --git a/vista_backend_theme/models/res_config.py b/vista_backend_theme/models/res_config.py new file mode 100644 index 00000000..dcacb5de --- /dev/null +++ b/vista_backend_theme/models/res_config.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- + +import logging + +from odoo import api, fields, models, _ + +_logger = logging.getLogger(__name__) + +CONFIG_PARAM_WEB_WINDOW_TITLE = "web.base.title" + +class ResConfigSettings(models.TransientModel): + _inherit = 'res.config.settings' + + web_window_title = fields.Char('Window Title') + + @api.model + def get_values(self): + res = super(ResConfigSettings, self).get_values() + ir_config = self.env['ir.config_parameter'].sudo() + web_window_title = ir_config.get_param(CONFIG_PARAM_WEB_WINDOW_TITLE, default='') + res.update( + web_window_title=web_window_title + ) + return res + + def set_values(self): + super(ResConfigSettings, self).set_values() + ir_config = self.env['ir.config_parameter'].sudo() + ir_config.set_param(CONFIG_PARAM_WEB_WINDOW_TITLE, self.web_window_title or "") diff --git a/vista_backend_theme/static/description/main_screenshot.png b/vista_backend_theme/static/description/main_screenshot.png new file mode 100644 index 00000000..fdca2294 Binary files /dev/null and b/vista_backend_theme/static/description/main_screenshot.png differ diff --git a/vista_backend_theme/static/src/js/web_window_title.js b/vista_backend_theme/static/src/js/web_window_title.js new file mode 100644 index 00000000..f6fd3635 --- /dev/null +++ b/vista_backend_theme/static/src/js/web_window_title.js @@ -0,0 +1,12 @@ +/** @odoo-module alias=web.window.title **/ + +import { WebClient } from "@web/webclient/webclient"; +import {patch} from "@web/core/utils/patch"; + +patch(WebClient.prototype, "Web Window Title", { + setup() { + const title = document.title; + this._super(); + this.title.setParts({ zopenerp: title }); + } +}); diff --git a/vista_backend_theme/views/res_config.xml b/vista_backend_theme/views/res_config.xml new file mode 100644 index 00000000..86514a18 --- /dev/null +++ b/vista_backend_theme/views/res_config.xml @@ -0,0 +1,33 @@ + + + + + + res.config.settings.web.window.title + res.config.settings + + +

+

视窗

+
+
+
+ 标题 +
+ 自定义网站窗口标题 +
+
+
+
+
+
+
+
+
+ + + + + \ No newline at end of file