From b87343f01755667b0b4fcd0dba475352c594a915 Mon Sep 17 00:00:00 2001 From: liaodanlong Date: Mon, 13 Jan 2025 17:02:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/purchase_order.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sf_manufacturing/models/purchase_order.py b/sf_manufacturing/models/purchase_order.py index 313d2e73..72ed971e 100644 --- a/sf_manufacturing/models/purchase_order.py +++ b/sf_manufacturing/models/purchase_order.py @@ -29,7 +29,7 @@ class PurchaseOrder(models.Model): # 如果你需要list形式的结果，可以将set转换为list account_moves = list(account_moves) if account_moves: - raise UserError(_("请联系工厂生产经理对该采购单的账单进行取消")) + raise UserError(_("请联系工厂生产经理对该采购单的供应商账单进行取消")) return super(PurchaseOrder, self).button_cancel() def action_view_production(self): origins = [order.name for order in self.picking_ids] From 4467865b869ae8389e1017367801c4e02fae168b Mon Sep 17 00:00:00 2001 From: hyyy <123@qq.com> Date: Mon, 13 Jan 2025 17:04:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=96=E6=B6=88=20->=20=E6=94=BE?= =?UTF-8?q?=E5=BC=83=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jikimo_frontend/static/src/js/custom_form_status_indicator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jikimo_frontend/static/src/js/custom_form_status_indicator.js b/jikimo_frontend/static/src/js/custom_form_status_indicator.js index 4992872a..f6dcbe85 100644 --- a/jikimo_frontend/static/src/js/custom_form_status_indicator.js +++ b/jikimo_frontend/static/src/js/custom_form_status_indicator.js @@ -62,7 +62,7 @@ patch(FormStatusIndicator.prototype, 'jikimo_frontend.FormStatusIndicator', { const dom1 = buttonsDom.children('.o_form_button_save') const dom2 = buttonsDom.children('.o_form_button_cancel') dom1.append('保存') - dom2.append('取消') + dom2.append('放弃保存') } } catch (e) { console.log(e) From 6cf4bf10058cfb8192db36bc82bf87725e546673 Mon Sep 17 00:00:00 2001 From: liaodanlong Date: Mon, 13 Jan 2025 17:16:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/mrp_production.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py index aa9df917..25ad34b4 100644 --- a/sf_manufacturing/models/mrp_production.py +++ b/sf_manufacturing/models/mrp_production.py @@ -443,10 +443,6 @@ class MrpProduction(models.Model): for deleted_design in deleted_designs: workorder = self.env['mrp.workorder'].search([('technology_design_id', '=', deleted_design.id)]) purchase = workorder._get_surface_technics_purchase_ids() - account = self.env['account.move'].search([('id', 'in', purchase.invoice_ids.ids)]) - if account.state not in ['cancel', False]: - if account.name not in account_moves: - account_moves.append(account.name) if purchase.state not in ['cancel', 'draft', False]: purchase_orders.append(purchase.name) special_design = self.technology_design_ids.filtered( @@ -460,10 +456,6 @@ class MrpProduction(models.Model): if not product_production_process: if special.process_parameters_id not in process_parameters: process_parameters.append(special.process_parameters_id.display_name) - - if account_moves: - raise UserError(_("请联系工厂生产经理对该（%s）账单进行取消", ", ".join(account_moves))) - if purchase_orders: raise UserError(_("请联系工厂生产经理对该（%s）采购订单进行取消", ", ".join(purchase_orders))) if parameters_not: