From 6cbc21cc4ebed35bceb92fb8cbdc61f2480a39ef Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 4 Mar 2024 10:58:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BF=85=E5=A1=AB?=
 =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E7=BB=84=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_quality/views/view.xml             | 10 ++++++++--
 sf_sale/views/purchase_order_view.xml | 20 +++++++++++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/sf_quality/views/view.xml b/sf_quality/views/view.xml
index fcbfe71c..1159a8d0 100644
--- a/sf_quality/views/view.xml
+++ b/sf_quality/views/view.xml
@@ -46,11 +46,16 @@
                         groups="sf_base.group_quality_director"
                         class="oe_highlight"/>
             </xpath>
-            <xpath expr="//sheet//group//group//field[@name='title']" position="replace">
-                <field name="title" class="custom_required"/>
+<!--             <xpath expr="//sheet//group//group//field[@name='title']" position="replace"> -->
+<!--                 <field name="title" class="custom_required" required="1"/> -->
+<!--             </xpath> -->
+            <xpath expr="//sheet//group//group//field[@name='title']" position="attributes">
+                <attribute name="class">custom_required</attribute>
+                <attribute name="required">1</attribute>
             </xpath>
             <xpath expr="//sheet//group//group//field[@name='picking_type_ids']" position="attributes">
                 <attribute name="class">custom_required</attribute>
+                <attribute name="required">1</attribute>
             </xpath>
         </field>
     </record>
@@ -62,6 +67,7 @@
         <field name="arch" type="xml">
             <xpath expr="//field[@name='measure_on']" position="attributes">
                 <attribute name="class">custom_required</attribute>
+
             </xpath>
             <xpath expr="//field[@name='measure_frequency_type']" position="attributes">
                 <attribute name="class">custom_required</attribute>
diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index 30883841..7e929fe4 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -55,9 +55,12 @@
 <!--                    <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute> -->
                    <button name="action_create_invoice" string="创建账单" type="object" class="oe_highlight" context="{'create_bill':True}" attrs="{'invisible': ['|', ('state', 'not in', ('purchase', 'done')), ('invoice_status', 'in', ('no', 'invoiced'))]}" data-hotkey="w" groups="sf_base.group_purchase,sf_base.group_purchase_director"/>
                </xpath>
-               <xpath expr="//form/header/button[@name='button_confirm']" position="replace">
-<!--                    <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute> -->
-                   <button name="action_create_invoice" string="创建账单" type="object" class="oe_highlight" context="{'create_bill':True}" attrs="{'invisible': ['|', ('state', 'not in', ('purchase', 'done')), ('invoice_status', 'in', ('no', 'invoiced'))]}" data-hotkey="w" groups="sf_base.group_purchase,sf_base.group_purchase_director"/>
+               <xpath expr="//form/header/button[@name='action_create_invoice'][2]" position="attributes">
+                   <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>
+               </xpath>
+               <xpath expr="//form/header/button[@name='button_confirm']" position="attributes">
+                   <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>
+<!--                    <button name="action_create_invoice" string="创建账单" type="object" class="oe_highlight" context="{'create_bill':True}" attrs="{'invisible': ['|', ('state', 'not in', ('purchase', 'done')), ('invoice_status', 'in', ('no', 'invoiced'))]}" data-hotkey="w" groups="sf_base.group_purchase,sf_base.group_purchase_director"/> -->
                </xpath>
                 <!--                <xpath expr="//form/header/button[@name='action_create_invoice[2]']" position="attributes">-->
                 <!--                    <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>-->
@@ -122,6 +125,17 @@
             </field>
         </record>
 
+        <record id="purchase_order_kpis_tree_inherit_sf" model="ir.ui.view">
+            <field name="name">purchase.stock.order.tree.inherit.sf</field>
+            <field name="model">purchase.order</field>
+            <field name="inherit_id" ref="purchase.purchase_order_kpis_tree"/>
+            <field name="arch" type="xml">
+                <xpath expr="//tree//header//button[@name='action_create_invoice']" position="attributes">
+                    <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>
+                </xpath>
+            </field>
+        </record>
+
 
         <record id="purchase_stock_order_view_form_inherit_sf" model="ir.ui.view">
             <field name="name">purchase.stock.order.form.inherit.sf</field>

From 3c0649392e85a88dd0280a4f635b742985de327f Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 4 Mar 2024 11:52:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_frontend/__manifest__.py                           | 2 +-
 sf_manufacturing/views/mrp_production_addional_change.xml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jikimo_frontend/__manifest__.py b/jikimo_frontend/__manifest__.py
index 2711118a..65a11379 100644
--- a/jikimo_frontend/__manifest__.py
+++ b/jikimo_frontend/__manifest__.py
@@ -36,7 +36,7 @@
             # 'jikimo_frontend/static/src/list/custom_import.js',
             # 'jikimo_frontend/static/src/list/custom_width.js',
             'jikimo_frontend/static/src/views/list_nums/extent_purchase.xml',
-            # 'jikimo_frontend/static/src/css/list_border_styles.css',
+            'jikimo_frontend/static/src/css/list_border_styles.css',
 
         ],
 
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index b7e35f7b..cca86f6e 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -275,10 +275,10 @@
                     <button name="action_open_wizard" type="object" icon="fa-external-link" class="oe_edit_only"
                             title="Open Work Order"
                             context="{'default_workcenter_id': workcenter_id}" groups="sf_base.group_sf_mrp_user"/>
-                    =======
-                    <button name="button_start" type="object" string="开始" class="btn-success"
-                            attrs="{'invisible': ['|', '|', '|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')), ('is_user_working', '!=', False)]}"
-                            groups="sf_base.group_sf_mrp_user"/>
+<!--                     ======= -->
+<!--                     <button name="button_start" type="object" string="开始" class="btn-success" -->
+<!--                             attrs="{'invisible': ['|', '|', '|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')), ('is_user_working', '!=', False)]}" -->
+<!--                             groups="sf_base.group_sf_mrp_user"/> -->
                 </xpath>
                 <xpath expr="//tree//button[@name='button_pending']" position="replace">
                     <button name="button_pending" type="object" string="暂停" class="btn-warning"