From 15eb36a5bc7b9107e551b4a0754552537a251329 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 18 Dec 2024 16:39:54 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5=E3=80=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA=EF=BC=9B?=
 =?UTF-8?q?2=E3=80=81=E4=BC=98=E5=8C=96=E6=96=B0=E5=A2=9E=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5=E3=80=81?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/models/sale_order.py          |  7 +++++++
 sf_sale/views/purchase_order_view.xml | 12 ++++++++++++
 sf_sale/views/sale_order_view.xml     |  6 +++++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index a0e321a0..2e99de70 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -263,6 +263,7 @@ class ProductTemplate(models.Model):
     _inherit = 'product.template'
 
     manual_quotation = fields.Boolean('人工编程', default=False)
+    part_name = fields.Char(string='零件名称', readonly=True)
 
 
 class RePurchaseOrder(models.Model):
@@ -378,6 +379,12 @@ class RePurchaseOrder(models.Model):
         return result
 
 
+class PurchaseOrderLine(models.Model):
+    _inherit = 'purchase.order.line'
+
+    part_name = fields.Char('零件名称', related='product_id.part_name', readonly=True)
+
+
 class ResPartnerToSale(models.Model):
     _inherit = 'res.partner'
 
diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index f70dbb6d..ccdee1d0 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -130,6 +130,12 @@
                 <xpath expr="//field[@name='order_line']/tree/field[@name='product_id']" position="attributes">
                     <attribute name="options">{'no_create': True}</attribute>
                 </xpath>
+                <xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="attributes">
+                    <attribute name="optional">hide</attribute>
+                </xpath>
+                <xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="after">
+                    <field name="part_name" string="零件名称" optional="show"/>
+                </xpath>
                 <xpath expr="//field[@name='date_order']" position="attributes">
                     <attribute name="string">报价截止日期</attribute>
                 </xpath>
@@ -191,9 +197,15 @@
                     <attribute name="string">报价截止日期</attribute>
                     <attribute name="widget">''</attribute>
                 </xpath>
+                <xpath expr="//field[@name='date_order']" position="after">
+                    <field name="date_planned"/>
+                </xpath>
                 <xpath expr="//field[@name='name']" position="after">
                     <field name="purchase_type"/>
                 </xpath>
+                <xpath expr="//field[@name='name']" position="attributes">
+                    <attribute name="class">purchase_order_list_name</attribute>
+                </xpath>
             </field>
         </record>
 
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index 4373689d..d6247823 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -169,9 +169,10 @@
                     <field name="manual_quotation" />
                     <field name="is_incoming_material"/>
                 </xpath>
-                <xpath expr="//field[@name='date_order']" position="attributes">
+                <xpath expr="//sheet//group//group[@name='order_details']//div[@class='o_td_label'][2]//label[@for='date_order']" position="attributes">
                     <attribute name="string">下单日期</attribute>
                 </xpath>
+
             </field>
         </record>
 
@@ -287,6 +288,9 @@
                 <field name="amount_total" position="after">
                     <field name="delivery_warning" invisible="1"/>
                 </field>
+                <field name="date_order" position="attributes">
+                    <attribute name="string">下单日期</attribute>
+                </field>
                 <xpath expr="//field[@name='date_order']" position="after">
                     <field name="order_code"/>
                     <field name="deadline_of_delivery"/>