From 394c3f9870b0c4bf4af750f5aa4f12f571610568 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Thu, 26 Dec 2024 13:16:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8C=89=E9=92=AE=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_purchase_tier_validation/models/models.py | 2 ++
 jikimo_purchase_tier_validation/views/views.xml  | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/jikimo_purchase_tier_validation/models/models.py b/jikimo_purchase_tier_validation/models/models.py
index 880faf09..879d51dd 100644
--- a/jikimo_purchase_tier_validation/models/models.py
+++ b/jikimo_purchase_tier_validation/models/models.py
@@ -9,6 +9,8 @@ class jikimo_purchase_tier_validation(models.Model):
     _name = 'purchase.order'
     _inherit = ['purchase.order', 'tier.validation']
 
+    _tier_validation_buttons_xpath = "/form/header/button[@id='draft_confirm'][1]"
+
     contract_document_id = fields.Many2one('documents.document', string='合同文件')
     contract_file = fields.Binary(related='contract_document_id.datas', string='合同文件内容')
     contract_file_name = fields.Char(related='contract_document_id.attachment_id.name', string='文件名')
diff --git a/jikimo_purchase_tier_validation/views/views.xml b/jikimo_purchase_tier_validation/views/views.xml
index e26a7372..6d6995ef 100644
--- a/jikimo_purchase_tier_validation/views/views.xml
+++ b/jikimo_purchase_tier_validation/views/views.xml
@@ -6,7 +6,14 @@
             <field name="model">purchase.order</field>
             <field name="inherit_id" ref="purchase.purchase_order_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//header" position="inside">
+                <xpath expr="//header/button[@name='button_cancel']" position="replace">
+                </xpath>
+
+                <xpath expr="//header/button[last()]" position="after">
+                    <button name="button_cancel" states="draft,to approve,sent,purchase" string="取消" type="object" data-hotkey="x" />
+                </xpath>
+
+                <xpath expr="//header/button[@name='action_rfq_send'][1]" position="before">
                     <field name="validation_status" invisible="1"/>
                     <field name="is_upload_contract_file" invisible="1"/>
                     <button name="upload_contract_file" string="上传合同" type="object" class="oe_highlight" attrs="{'invisible': ['|', ('validation_status', '!=', 'no'), ('is_upload_contract_file', '=', True)]}"/>