From 6db5e727529d0731d170815c7c1c9942bf4d51a2 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 23 Dec 2024 17:13:12 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=87=87=E8=B4=AD=E5=8D=95=E7=9A=84?=
=?UTF-8?q?=E9=87=87=E8=B4=AD=E7=B1=BB=E5=9E=8B=E4=BC=98=E5=8C=96=EF=BC=8C?=
=?UTF-8?q?=E5=A4=96=E5=8D=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_sale/models/sale_order.py | 6 +++---
sf_sale/views/purchase_order_view.xml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index d41b0e0d..3679316a 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -282,7 +282,7 @@ class RePurchaseOrder(models.Model):
store=True)
purchase_type = fields.Selection(
- [('standard', '标准采购'), ('consignment', '委外加工'), ('outsourcing', '工序外协'), ('outside', '外购订单')],
+ [('standard', '标准采购'), ('consignment', '工序外协'), ('outsourcing', '委外加工'), ('outside', '外购订单')],
string='采购类型', default='standard', store=True, compute='_compute_purchase_type')
origin_sale_id = fields.Many2one('sale.order', string='销售订单号', compute='_compute_origin_sale_id')
@@ -300,7 +300,7 @@ class RePurchaseOrder(models.Model):
break
elif order_line.supply_method == 'outsourcing':
if order_line.product_id.id in product_list:
- purchase.purchase_type = 'consignment'
+ purchase.purchase_type = 'outsourcing'
break
@api.depends('order_line.move_dest_ids.group_id.mrp_production_ids',
@@ -365,7 +365,7 @@ class RePurchaseOrder(models.Model):
'partner_id': server_template.seller_ids[0].partner_id.id,
'origin': production.name,
'state': 'draft',
- 'purchase_type': 'outsourcing',
+ 'purchase_type': 'consignment',
'order_line': server_product_process})
pp.purchase_id = [(6, 0, [purchase_order.id])]
# self.env.cr.commit()
diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index bb2b957b..7b53cf0b 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -135,7 +135,7 @@
hide
-
+