From 3fe8c957be816d4a8f269efef03eb88bb3049c4a Mon Sep 17 00:00:00 2001 From: liaodanlong Date: Wed, 23 Oct 2024 10:41:32 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E7=B2=BE=E5=BA=A6?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- quality/i18n/zh_CN.po | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/quality/i18n/zh_CN.po b/quality/i18n/zh_CN.po index 267c0196..84e781d7 100644 --- a/quality/i18n/zh_CN.po +++ b/quality/i18n/zh_CN.po @@ -1050,3 +1050,7 @@ msgstr "工作中心故障" #: model:ir.model.fields,field_description:quality.field_quality_point_test_type__active msgid "active" msgstr "有效" + +#: quality.point.test_type(name) +msgid "Instructions" +msgstr "指令" \ No newline at end of file From 3b1caca62b3d1b5f48b0b77934c1391b2b9cee10 Mon Sep 17 00:00:00 2001 From: liaodanlong Date: Wed, 23 Oct 2024 11:00:19 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- quality/i18n/zh_CN.po | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/quality/i18n/zh_CN.po b/quality/i18n/zh_CN.po index 84e781d7..544bcba2 100644 --- a/quality/i18n/zh_CN.po +++ b/quality/i18n/zh_CN.po @@ -1049,8 +1049,4 @@ msgstr "工作中心故障" #. module: quality #: model:ir.model.fields,field_description:quality.field_quality_point_test_type__active msgid "active" -msgstr "有效" - -#: quality.point.test_type(name) -msgid "Instructions" -msgstr "指令" \ No newline at end of file +msgstr "有效" \ No newline at end of file From 7e6fa7b6c72f2c213d01bb26006e85d2e4df24e1 Mon Sep 17 00:00:00 2001 From: liaodanlong Date: Wed, 23 Oct 2024 17:02:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- quality_control/models/__init__.py | 1 + quality_control/models/product_category.py | 24 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 quality_control/models/product_category.py diff --git a/quality_control/models/__init__.py b/quality_control/models/__init__.py index b31b19e7..c6817692 100644 --- a/quality_control/models/__init__.py +++ b/quality_control/models/__init__.py @@ -6,3 +6,4 @@ from . import stock_move from . import stock_move_line from . import stock_picking from . import stock_lot +from . import product_category \ No newline at end of file diff --git a/quality_control/models/product_category.py b/quality_control/models/product_category.py new file mode 100644 index 00000000..9b5535d4 --- /dev/null +++ b/quality_control/models/product_category.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. +from math import sqrt +from dateutil.relativedelta import relativedelta +from datetime import datetime + +import random + +from odoo import api, models, fields, _ +from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT, float_round +from odoo.osv.expression import OR + + +class ProductCategory(models.Model): + _inherit = 'product.category' + @api.model + def name_search(self, name='', args=None, operator='ilike', limit=100): + if args is None: + args = [] + # 添加过滤条件，确保只返回名称为 'abc' 的记录 + args += [('name', 'not in', ['Saleable', 'Expenses', 'Deliveries'])] + + # 调用父类的 name_search 方法 + return super(ProductCategory, self).name_search(name, args=args, operator=operator, limit=limit) \ No newline at end of file From add7d404a0d735321676cad45c635725948e56b9 Mon Sep 17 00:00:00 2001 From: liaodanlong Date: Wed, 23 Oct 2024 17:03:16 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E5=8D=95=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mrp_workorder/i18n/zh_CN.po | 15 +++++++++++++++ quality/i18n/zh_CN.po | 12 +++++++++++- quality/models/quality.py | 2 +- quality_control/i18n/zh_CN.po | 11 +++++++++++ 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/mrp_workorder/i18n/zh_CN.po b/mrp_workorder/i18n/zh_CN.po index 79a02876..18363c0a 100644 --- a/mrp_workorder/i18n/zh_CN.po +++ b/mrp_workorder/i18n/zh_CN.po @@ -1273,3 +1273,18 @@ msgstr "" #: model:product.template,description_sale:mrp_workorder.product_template_stool_top msgid "wooden stool top" msgstr "" + +#. module: mrp_workorder +#: model:quality.point.test_type,name:mrp_workorder.test_type_register_consumed_materials +msgid "Register Consumed Materials" +msgstr "登记消耗材料" + +#. module: mrp_workorder +#: model:quality.point.test_type,name:mrp_workorder.test_type_register_byproducts +msgid "Register By-products" +msgstr "按产品注册" + +#. module: mrp_workorder +#: model:quality.point.test_type,name:mrp_workorder.test_type_print_label +msgid "Print label" +msgstr "打印标签" \ No newline at end of file diff --git a/quality/i18n/zh_CN.po b/quality/i18n/zh_CN.po index 544bcba2..68834fbc 100644 --- a/quality/i18n/zh_CN.po +++ b/quality/i18n/zh_CN.po @@ -1049,4 +1049,14 @@ msgstr "工作中心故障" #. module: quality #: model:ir.model.fields,field_description:quality.field_quality_point_test_type__active msgid "active" -msgstr "有效" \ No newline at end of file +msgstr "有效" + +#. module: quality +#: model:quality.point.test_type,name:quality.test_type_instructions +msgid "Instructions" +msgstr "使用说明" + +#. module: quality +#: model:quality.point.test_type,name:quality.test_type_picture +msgid "Take a Picture" +msgstr "照片" \ No newline at end of file diff --git a/quality/models/quality.py b/quality/models/quality.py index 7edff2c7..83fd2258 100644 --- a/quality/models/quality.py +++ b/quality/models/quality.py @@ -15,7 +15,7 @@ class TestType(models.Model): _description = "Quality Control Test Type" # Used instead of selection field in order to hide a choice depending on the view. - name = fields.Char('Name', required=True) + name = fields.Char('Name', required=True,translate=True) technical_name = fields.Char('Technical name', required=True) active = fields.Boolean('active', default=True) diff --git a/quality_control/i18n/zh_CN.po b/quality_control/i18n/zh_CN.po index 8fd98237..d091d9b5 100644 --- a/quality_control/i18n/zh_CN.po +++ b/quality_control/i18n/zh_CN.po @@ -1185,3 +1185,14 @@ msgstr "请先进行质量检查！" #: model_terms:ir.ui.view,arch_db:quality_control.quality_alert_team_view_form msgid "e.g. The QA Masters" msgstr "例如：QA大师" + + +#. module: quality_control +#: model:quality.point.test_type,name:quality_control.test_type_passfail +msgid "Pass - Fail" +msgstr "通过-失败" + +#. module: quality_control +#: model:quality.point.test_type,name:quality_control.test_type_measure +msgid "Measure" +msgstr "测量" \ No newline at end of file From a094946428d3fdb507b546193b57fa299b9fd668 Mon Sep 17 00:00:00 2001 From: liaodanlong Date: Thu, 24 Oct 2024 10:37:50 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_sale/views/purchase_order_view.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml index 445bded6..7a9836c5 100644 --- a/sf_sale/views/purchase_order_view.xml +++ b/sf_sale/views/purchase_order_view.xml @@ -6,6 +6,25 @@ purchase.order + + +