From 8f1783c93a7b215cca2fed053966152ae278f7fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Wed, 29 Apr 2026 11:21:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/inherit_purchase_order_views.xml    | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/yuthon_purchase/views/inherit_purchase_order_views.xml b/yuthon_purchase/views/inherit_purchase_order_views.xml
index 5d1e340e0..03617209b 100644
--- a/yuthon_purchase/views/inherit_purchase_order_views.xml
+++ b/yuthon_purchase/views/inherit_purchase_order_views.xml
@@ -183,6 +183,15 @@
                 <xpath expr="//field[@name='order_line']//tree//field[@name='product_id']" position="after">
                     <field name="brand_spec" string="品牌/规格" optional="show"/>
                 </xpath>
+                <!-- 隐藏采购历史按钮原位置（已在 price_subtotal 后重新插入） -->
+                <xpath expr="//field[@name='order_line']//tree//button[@name='action_purchase_history']" position="replace"/>
+                <!-- 将 product_packaging_qty 和 product_packaging_id 移到 product_qty 前面 -->
+                <xpath expr="//field[@name='order_line']//tree//field[@name='product_packaging_qty']" position="replace"/>
+                <xpath expr="//field[@name='order_line']//tree//field[@name='product_packaging_id']" position="replace"/>
+                <xpath expr="//field[@name='order_line']//tree//field[@name='product_qty']" position="before">
+                    <field name="product_packaging_qty" invisible="not product_id or not product_packaging_id" groups="product.group_stock_packaging" optional="show"/>
+                    <field name="product_packaging_id" invisible="not product_id" context="{'default_product_id': product_id, 'tree_view_ref':'product.product_packaging_tree_view', 'form_view_ref':'product.product_packaging_form_view'}" groups="product.group_stock_packaging" optional="show"/>
+                </xpath>
 <!--                <xpath expr="//field[@name='order_line']" position="attributes">-->
 <!--                    <attribute name="context">{'default_category_id': category_id}</attribute>-->
 <!--                </xpath>-->
@@ -218,4 +227,22 @@
         <field name="res_model">purchase.order</field>
         <field name="context">{'default_order': 'display_end_time desc'}</field>
     </record>
+
+    <!-- 重新排列明细行按钮：继承 purchase_stock 的视图，将按钮移到金额后面 -->
+    <record id="inherit_purchase_order_form_move_buttons" model="ir.ui.view">
+        <field name="name">purchase.order.form.move.buttons</field>
+        <field name="model">purchase.order</field>
+        <field name="inherit_id" ref="purchase_stock.purchase_order_view_form_inherit"/>
+        <field name="arch" type="xml">
+            <!-- 移除预估报表按钮原位置 -->
+            <xpath expr="//field[@name='order_line']//tree//button[@name='action_product_forecast_report'][1]" position="replace"/>
+            <xpath expr="//field[@name='order_line']//tree//button[@name='action_product_forecast_report'][1]" position="replace"/>
+            <!-- 在 price_subtotal 后插入按钮 -->
+            <xpath expr="//field[@name='order_line']//tree//field[@name='price_subtotal']" position="after">
+                <button name="action_purchase_history" type="object" icon="fa-history" title="采购历史" invisible="not id"/>
+                <button type="object" name="action_product_forecast_report" title="预估报表" icon="fa-area-chart" invisible="not id or not forecasted_issue or product_type != 'product'" class="text-danger"/>
+                <button type="object" name="action_product_forecast_report" title="预估报表" icon="fa-area-chart" invisible="not id or forecasted_issue or product_type != 'product'"/>
+            </xpath>
+        </field>
+    </record>
 </odoo>

From 0a32e73756b7e17ae7ab57a55a2d1fa0a31f3f3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Wed, 29 Apr 2026 11:28:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 room/views/room_booking_views.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/room/views/room_booking_views.xml b/room/views/room_booking_views.xml
index 888738615..9b46497c1 100644
--- a/room/views/room_booking_views.xml
+++ b/room/views/room_booking_views.xml
@@ -249,10 +249,10 @@
                         </page>
                     </notebook>
                 </sheet>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids"/>
-                    <field name="message_ids"/>
-                </div>
+<!--                <div class="oe_chatter">-->
+<!--                    <field name="message_follower_ids"/>-->
+<!--                    <field name="message_ids"/>-->
+<!--                </div>-->
             </form>
         </field>
     </record>