From 1f8e118965433a0f85bfd9a2221e634a9785b940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Fri, 23 May 2025 09:39:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=87=87=E8=B4=AD=E5=8D=95?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E8=AF=A5=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=8D=95=E5=85=B3=E8=81=94=E7=9A=84=E5=BA=93=E5=AD=98=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E6=98=AF=E7=94=B1=E9=87=87=E8=B4=AD=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=9A=84=EF=BC=8C=E5=88=99=E4=B8=8D=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_purchase_request/__manifest__.py                |  1 +
 jikimo_purchase_request/models/purchase_order.py       | 10 ++++++++++
 .../views/purchase_request_menu_views.xml              |  8 ++++++++
 .../views/purchase_request_view.xml                    |  6 ++++++
 4 files changed, 25 insertions(+)
 create mode 100644 jikimo_purchase_request/views/purchase_request_menu_views.xml

diff --git a/jikimo_purchase_request/__manifest__.py b/jikimo_purchase_request/__manifest__.py
index 2c8bb641..b71d2896 100644
--- a/jikimo_purchase_request/__manifest__.py
+++ b/jikimo_purchase_request/__manifest__.py
@@ -14,6 +14,7 @@
         'wizard/purchase_request_line_make_purchase_order_view.xml',
         'views/purchase_request_line_view.xml',
         'views/stock_picking_views.xml',
+        'views/purchase_request_menu_views.xml',
     ],
     'assets': {
               'web.assets_backend': [
diff --git a/jikimo_purchase_request/models/purchase_order.py b/jikimo_purchase_request/models/purchase_order.py
index b5734b78..59a7959c 100644
--- a/jikimo_purchase_request/models/purchase_order.py
+++ b/jikimo_purchase_request/models/purchase_order.py
@@ -27,4 +27,14 @@ class PurchaseOrder(models.Model):
         if reverse_move_ids:
             reverse_move_ids.picking_id.action_cancel()
         return res
+    
+    def button_cancel(self):
+        """
+            将取消的采购订单关联的库存移动撤销
+        """
+        move_ids = self.order_line.move_dest_ids.filtered(lambda move: move.state != 'done' and not move.scrapped)
+        res =super(PurchaseOrder, self).button_cancel()
+        if move_ids.mapped('created_purchase_request_line_id'):
+            move_ids.write({'state': 'waiting', 'is_done': False})
+        return res
 
diff --git a/jikimo_purchase_request/views/purchase_request_menu_views.xml b/jikimo_purchase_request/views/purchase_request_menu_views.xml
new file mode 100644
index 00000000..b5775099
--- /dev/null
+++ b/jikimo_purchase_request/views/purchase_request_menu_views.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <menuitem id="purchase_request.menu_purchase_request_pro_mgt" sequence="0"/>
+        <menuitem id="purchase.menu_purchase_rfq" sequence="1"/>
+    </data>
+</odoo>
+
diff --git a/jikimo_purchase_request/views/purchase_request_view.xml b/jikimo_purchase_request/views/purchase_request_view.xml
index 9976b52a..9f603c7b 100644
--- a/jikimo_purchase_request/views/purchase_request_view.xml
+++ b/jikimo_purchase_request/views/purchase_request_view.xml
@@ -7,6 +7,12 @@
             <xpath expr="//button[@name='button_draft']" position="attributes">
                 <attribute name="string">重置草稿</attribute>
             </xpath>
+            <xpath expr="//button[@name='button_done']" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </xpath>
+            <xpath expr="//button[@name='%(purchase_request.action_purchase_request_line_make_purchase_order)d']" position="attributes">
+                <attribute name="class">oe_highlight</attribute>
+            </xpath>
             <xpath expr="//field[@name='line_ids']//field[@name='purchased_qty']" position="after">
                 <field name="supply_method"/>
             </xpath>