From 1f1bdd08ed8fad993c8b2c7f82a05d20bf062b1e Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Fri, 29 Nov 2024 15:59:04 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=A6=82=E8=A7=88=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_plan_management/i18n/zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sf_plan_management/i18n/zh_CN.po b/sf_plan_management/i18n/zh_CN.po index 8863c213..91b32d41 100644 --- a/sf_plan_management/i18n/zh_CN.po +++ b/sf_plan_management/i18n/zh_CN.po @@ -16133,7 +16133,7 @@ msgstr "库存概览" #. module: stock #: model:ir.actions.act_window,name:stock.stock_picking_type_action msgid "Internal Transfers" -msgstr "厂内出入库" +msgstr "库存概览" #. module: stock #: model:ir.model.fields,field_description:stock.field_stock_quant__inventory_quantity_set From dc68ecb58439cd47f8bd27a19678f18fa36bfc2d Mon Sep 17 00:00:00 2001 From: hy <123@qq.com> Date: Fri, 29 Nov 2024 16:26:32 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=8E=92=E7=A8=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=92=8C=E5=B7=A5=E5=8D=95=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=A1=B9=E5=92=8C=E6=95=B0=E9=87=8F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=87=8D=E5=8F=A0=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jikimo_frontend/static/src/scss/custom_style.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss index 8eb76259..6904dbac 100644 --- a/jikimo_frontend/static/src/scss/custom_style.scss +++ b/jikimo_frontend/static/src/scss/custom_style.scss @@ -536,3 +536,7 @@ div:has(.o_required_modifier) > label::before { position: unset; } +// 修复搜索面板checkbox样式 +.o_search_panel .form-check .form-check-label span { + position: relative; +} \ No newline at end of file From 4baa7a9b445b9d86f06f1e96b9d56e73e445f354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= Date: Mon, 2 Dec 2024 10:06:11 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=BB=93=E6=9E=84=EF=BC=8C=E8=A7=A3=E5=86=B3=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jikimo_sale_multiple_supply_methods/controllers/__init__.py | 1 - jikimo_sale_multiple_supply_methods/models/__init__.py | 1 - sf_manufacturing/controllers/__init__.py | 1 + .../controllers/main.py | 0 sf_manufacturing/models/__init__.py | 2 ++ .../models/quick_easy_order.py | 0 .../models/sale_order.py | 0 7 files changed, 3 insertions(+), 2 deletions(-) rename {jikimo_sale_multiple_supply_methods => sf_manufacturing}/controllers/main.py (100%) rename {jikimo_sale_multiple_supply_methods => sf_manufacturing}/models/quick_easy_order.py (100%) rename {jikimo_sale_multiple_supply_methods => sf_manufacturing}/models/sale_order.py (100%) diff --git a/jikimo_sale_multiple_supply_methods/controllers/__init__.py b/jikimo_sale_multiple_supply_methods/controllers/__init__.py index cd4d6a8b..40a96afc 100644 --- a/jikimo_sale_multiple_supply_methods/controllers/__init__.py +++ b/jikimo_sale_multiple_supply_methods/controllers/__init__.py @@ -1,2 +1 @@ # -*- coding: utf-8 -*- -from . import main \ No newline at end of file diff --git a/jikimo_sale_multiple_supply_methods/models/__init__.py b/jikimo_sale_multiple_supply_methods/models/__init__.py index 6629e86d..0674dbe8 100644 --- a/jikimo_sale_multiple_supply_methods/models/__init__.py +++ b/jikimo_sale_multiple_supply_methods/models/__init__.py @@ -1,4 +1,3 @@ # -*- coding: utf-8 -*- from . import product_template -from . import sale_order from . import mrp_bom diff --git a/sf_manufacturing/controllers/__init__.py b/sf_manufacturing/controllers/__init__.py index 4d20cb33..4b95e252 100644 --- a/sf_manufacturing/controllers/__init__.py +++ b/sf_manufacturing/controllers/__init__.py @@ -1,2 +1,3 @@ from . import controllers from . import workpiece +from . import main diff --git a/jikimo_sale_multiple_supply_methods/controllers/main.py b/sf_manufacturing/controllers/main.py similarity index 100% rename from jikimo_sale_multiple_supply_methods/controllers/main.py rename to sf_manufacturing/controllers/main.py diff --git a/sf_manufacturing/models/__init__.py b/sf_manufacturing/models/__init__.py index b0c295f5..9f77d841 100644 --- a/sf_manufacturing/models/__init__.py +++ b/sf_manufacturing/models/__init__.py @@ -13,3 +13,5 @@ from . import agv_scheduling from . import res_config_setting from . import sf_technology_design from . import sf_production_common +from . import sale_order +from . import quick_easy_order diff --git a/jikimo_sale_multiple_supply_methods/models/quick_easy_order.py b/sf_manufacturing/models/quick_easy_order.py similarity index 100% rename from jikimo_sale_multiple_supply_methods/models/quick_easy_order.py rename to sf_manufacturing/models/quick_easy_order.py diff --git a/jikimo_sale_multiple_supply_methods/models/sale_order.py b/sf_manufacturing/models/sale_order.py similarity index 100% rename from jikimo_sale_multiple_supply_methods/models/sale_order.py rename to sf_manufacturing/models/sale_order.py From 7c13e57ea2318dcd12f6674b7f96de6da0ca9659 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= Date: Mon, 2 Dec 2024 10:36:06 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jikimo_sale_multiple_supply_methods/__manifest__.py | 1 - sf_manufacturing/__manifest__.py | 1 + .../views/sale_order_views.xml | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {jikimo_sale_multiple_supply_methods => sf_manufacturing}/views/sale_order_views.xml (100%) diff --git a/jikimo_sale_multiple_supply_methods/__manifest__.py b/jikimo_sale_multiple_supply_methods/__manifest__.py index a7d39ac7..735593cb 100644 --- a/jikimo_sale_multiple_supply_methods/__manifest__.py +++ b/jikimo_sale_multiple_supply_methods/__manifest__.py @@ -11,7 +11,6 @@ 'security/ir.model.access.csv', 'data/stock_routes.xml', 'data/product_data.xml', - 'views/sale_order_views.xml', # 'views/product_product_views.xml', ],'assets': { # 'web.assets_backend': [ diff --git a/sf_manufacturing/__manifest__.py b/sf_manufacturing/__manifest__.py index 35620913..991b26ab 100644 --- a/sf_manufacturing/__manifest__.py +++ b/sf_manufacturing/__manifest__.py @@ -37,6 +37,7 @@ 'views/agv_setting_views.xml', 'views/sf_maintenance_equipment.xml', 'views/res_config_settings_views.xml', + 'views/sale_order_views.xml', ], 'assets': { diff --git a/jikimo_sale_multiple_supply_methods/views/sale_order_views.xml b/sf_manufacturing/views/sale_order_views.xml similarity index 100% rename from jikimo_sale_multiple_supply_methods/views/sale_order_views.xml rename to sf_manufacturing/views/sale_order_views.xml From 5406224c6fe77468defb217232a9ab7569ec8d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= Date: Mon, 2 Dec 2024 11:02:32 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/views/sale_order_views.xml | 12 ------------ sf_stock/__manifest__.py | 3 ++- sf_stock/views/sale_order_view.xml | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 sf_stock/views/sale_order_view.xml diff --git a/sf_manufacturing/views/sale_order_views.xml b/sf_manufacturing/views/sale_order_views.xml index 8b1a85d0..5de69b64 100644 --- a/sf_manufacturing/views/sale_order_views.xml +++ b/sf_manufacturing/views/sale_order_views.xml @@ -1,17 +1,5 @@ - - view.sale.order.form.inherit.sf - - sale.order - - - - - - - - view.sale.order.form.inherit.supply.method diff --git a/sf_stock/__manifest__.py b/sf_stock/__manifest__.py index 1b5f44c4..574bccdc 100644 --- a/sf_stock/__manifest__.py +++ b/sf_stock/__manifest__.py @@ -25,7 +25,8 @@ 'data': [ # 'security/ir.model.access.csv', 'views/stock_picking.xml', - 'views/stock_product_template.xml' + 'views/stock_product_template.xml', + 'views/sale_order_view.xml', ], # only loaded in demonstration mode 'demo': [ diff --git a/sf_stock/views/sale_order_view.xml b/sf_stock/views/sale_order_view.xml new file mode 100644 index 00000000..81e9f7d8 --- /dev/null +++ b/sf_stock/views/sale_order_view.xml @@ -0,0 +1,14 @@ + + + + view.sale.order.form.inherit.sf + + sale.order + + + + + + + + \ No newline at end of file From 7025bde56e2bf7461b2bcdcea2ff072d99df342c Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Mon, 2 Dec 2024 13:46:20 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E8=BF=94=E5=B7=A5=E6=8A=A5=E5=BA=9F=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/mrp_workorder.py | 2 +- sf_manufacturing/views/mrp_workorder_view.xml | 2 +- sf_quality/models/quality_cnc_test.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 7bd9d1c8..4ea08f94 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -126,7 +126,7 @@ class ResMrpWorkOrder(models.Model): Y10_axis = fields.Float(default=0) Z10_axis = fields.Float(default=0) X_deviation_angle = fields.Integer(string="X轴偏差度", default=0) - test_results = fields.Selection([("合格", "合格"), ("返工", "返工"), ("报废", "报废")], default='合格', + test_results = fields.Selection([("合格", "合格")], default='合格', string="检测结果", tracking=True) cnc_ids = fields.One2many("sf.cnc.processing", 'workorder_id', string="CNC加工程序") cmm_ids = fields.One2many("sf.cmm.program", 'workorder_id', string="CMM程序") diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml index 13fff868..be1a6523 100644 --- a/sf_manufacturing/views/mrp_workorder_view.xml +++ b/sf_manufacturing/views/mrp_workorder_view.xml @@ -200,7 +200,7 @@ -