From 62a2aed7d98bae35ff0958afc136299f46033020 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Tue, 8 Oct 2024 14:26:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E9=A1=BA=E5=BA=8F=E4=BC=98=E5=8C=96=E4=B8=BA=EF=BC=9A?=
 =?UTF-8?q?=20=20=E7=A1=AE=E8=AE=A4=E6=8E=A5=E5=8D=95/=E6=8B=92=E7=BB=9D?=
 =?UTF-8?q?=E6=8E=A5=E5=8D=95/=E5=88=9B=E5=BB=BA=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E5=8D=95/=E9=80=9A=E8=BF=87Email=E5=8F=91=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/views/sale_order_view.xml | 38 +++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index 506f5b8d..a5c7a6fa 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -17,11 +17,6 @@
                 <xpath expr="//field[@name='user_id']" position="replace">
                     <field name="user_id" widget="many2one_avatar_user" context="{'is_sale': True }"/>
                 </xpath>
-                <xpath expr="//form/header/button[@name='action_quotation_send'][1]" position="replace">
-                    <button name="action_quotation_send" string="通过EMAIL发送" type="object"
-                            class="btn-primary" data-hotkey="g" context="{'validate_analytic': True}"
-                            attrs="{'invisible': ['|','&amp;',('check_status', '!=', 'approved'),('state', 'in', ['draft','cancel']),'&amp;',('check_status', '=', 'approved'),('state', 'in', ['sale','cancel'])]}"/>
-                </xpath>
                 <xpath expr="//form/header/button[@name='action_confirm']" position="after">
                     <button name="submit" string="提交" type="object"
                             context="{'default_order_id':active_id}"
@@ -52,6 +47,39 @@
                     </attribute>
                     <attribute name="string">拒绝接单</attribute>
                 </xpath>
+
+
+                <!--  ======================= 销售订单按钮顺序优化 start ======================= -->
+                <xpath expr="//form/header/button[@name='action_quotation_send'][1]" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </xpath>
+                <xpath expr="//form/header/button[@name='action_quotation_send'][4]" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </xpath>
+                <xpath expr="//form/header/button[@id='create_invoice']" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </xpath>
+                <xpath expr="//form/header/button[@id='create_invoice_percentage']" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </xpath>
+                <xpath expr="//form/header/button[@name='action_cancel']" position="after">
+                    <button id="create_invoice" name="%(sale.action_view_sale_advance_payment_inv)d"
+                            string="创建结算单"
+                            type="action" class="btn-primary" data-hotkey="q"
+                            attrs="{'invisible': [('invoice_status', '!=', 'to invoice')]}"/>
+                    <button id="create_invoice_percentage" name="%(sale.action_view_sale_advance_payment_inv)d"
+                            string="创建结算单"
+                            type="action" context="{'default_advance_payment_method': 'percentage'}" data-hotkey="q"
+                            attrs="{'invisible': ['|',('invoice_status', '!=', 'no'), ('state', '!=', 'sale')]}"/>
+                    <button name="action_quotation_send" string="通过EMAIL发送" type="object"
+                            class="btn-primary" data-hotkey="g" context="{'validate_analytic': True}"
+                            attrs="{'invisible': ['|','&amp;',('check_status', '!=', 'approved'),('state', 'in', ['draft','cancel']),'&amp;',('check_status', '=', 'approved'),('state', 'in', ['sale','cancel'])]}"/>
+                    <button name="action_quotation_send" string="通过EMAIL发送" type="object" states="sent,sale"
+                            data-hotkey="g" context="{'validate_analytic': True}"/>
+                </xpath>
+                <!--  ====================== 销售订单按钮顺序优化 end======================== -->
+
+
                 <xpath expr="//form/header/button[@name='action_draft']" position="attributes">
                     <attribute name="invisible">1</attribute>
                 </xpath>