From 33dc25f400bebeb710528cb1d2d3b3f165c494f0 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 4 Mar 2024 09:18:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=A8=E9=87=8F?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=BF=BB=E8=AF=91=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_quality/__manifest__.py |  2 +-
 sf_quality/views/view.xml  | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/sf_quality/__manifest__.py b/sf_quality/__manifest__.py
index cec1a0f9..c41e1a24 100644
--- a/sf_quality/__manifest__.py
+++ b/sf_quality/__manifest__.py
@@ -16,7 +16,7 @@
     'depends': ['quality_control'],
     'data': [
         'security/ir.model.access.csv',
-        # 'views/view.xml'
+        'views/view.xml'
     ],
 
     'assets': {
diff --git a/sf_quality/views/view.xml b/sf_quality/views/view.xml
index ab4208ed..fcbfe71c 100644
--- a/sf_quality/views/view.xml
+++ b/sf_quality/views/view.xml
@@ -6,6 +6,8 @@
         <field name="model">quality.alert</field>
         <field name="arch" type="xml">
             <tree sample="1">
+                <field name="name" decoration-bf="1"/>
+                <field name="name" decoration-bf="1"/>
                 <field name="name" decoration-bf="1"/>
                 <field name="product_tmpl_id" optional="show"/>
                 <field name="product_id" optional="hide"/>
@@ -44,6 +46,26 @@
                         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>
+            <xpath expr="//sheet//group//group//field[@name='picking_type_ids']" position="attributes">
+                <attribute name="class">custom_required</attribute>
+            </xpath>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="sf_quality_point_view_form_inherit_quality_control">
+        <field name="name">sf.quality.point.form.inherit.sf</field>
+        <field name="model">quality.point</field>
+        <field name="inherit_id" ref="quality_control.quality_point_view_form_inherit_quality_control"/>
+        <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>
+            </xpath>
         </field>
     </record>
 

From b7be5251b8a27d952823b5fcb7b31378566ecb5c Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 4 Mar 2024 09:45:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8C=89=E9=92=AE=E5=B1=95=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/security/ir.model.access.csv |  2 ++
 sf_sale/views/purchase_order_view.xml         | 30 ++++++++++++-------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/sf_manufacturing/security/ir.model.access.csv b/sf_manufacturing/security/ir.model.access.csv
index c3fceb02..632b6030 100644
--- a/sf_manufacturing/security/ir.model.access.csv
+++ b/sf_manufacturing/security/ir.model.access.csv
@@ -126,3 +126,5 @@ access_sf_cmm_program_group_plan_dispatch,sf_cmm_program_group_plan_dispatch,mod
 
 access_mrp_workcenter_productivity,mrp.workcenter.productivity,mrp.model_mrp_workcenter_productivity,sf_base.group_plan_dispatch,1,0,0,0
 access_maintenance_equipment_tool_group_plan_dispatch,maintenance.equipment.tool,sf_manufacturing.model_maintenance_equipment_tool,sf_base.group_plan_dispatch,1,0,0,0
+
+access_sf_workpiece_delivery_group_plan_dispatch,sf.workpiece.delivery,sf_manufacturing.model_sf_workpiece_delivery,sf_base.group_plan_dispatch,1,0,0,0
\ No newline at end of file
diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index 844d9c92..30883841 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -23,21 +23,24 @@
                 </xpath>
                 <xpath expr="//form/header/button[@name='button_confirm'][2]" position="replace">
                     <button name="button_confirm" type="object" context="{'validate_analytic': True}"
-                            string="确认订单" id="draft_confirm"
+                            string="确认订单" id="draft_confirm" groups="sf_base.group_purchase,sf_base.group_purchase_director"
                             attrs="{'invisible': ['|','&amp;','&amp;', ('state', 'in', ['purchase','draft']), ('check_status', 'in', ['approved']), ('date_approve', '!=', False),'&amp;', '&amp;',('state', 'in', ['purchase', 'draft']),('check_status', 'in', [False, 'pending', 'fail']),('date_approve', '=', False)]}"
                     />
                     <button name="button_confirming" type="object"
-                            string="确认订单"
+                            string="确认订单" groups="sf_base.group_purchase,sf_base.group_purchase_director"
                             attrs="{'invisible': ['&amp;',('check_status','!=', False),('state', 'not in', ['draft','send'])]}"
                     />
                 </xpath>
+                <xpath expr="//form/header/button[@name='action_rfq_send'][1]" position="replace">
+                    <button name="action_rfq_send" states="draft" string="通过Email发送采购单" type="object" context="{'send_rfq':True}" class="oe_highlight" data-hotkey="g" groups="sf_base.group_purchase,sf_base.group_purchase_director"/>
+                </xpath>
+                <xpath expr="//form/header/button[@name='action_rfq_send'][2]" position="replace">
+                    <button name="action_rfq_send" states="sent" string="通过Email重新发送采购单" type="object" context="{'send_rfq':True}" data-hotkey="g" groups="sf_base.group_purchase,sf_base.group_purchase_director"/>
+                </xpath>
+                <xpath expr="//form/header/button[@name='action_rfq_send'][3]" position="replace">
+                    <button name="action_rfq_send" states="purchase" string="通过Email发送订单" type="object" context="{'send_rfq':False}" data-hotkey="g" groups="sf_base.group_purchase,sf_base.group_purchase_director"/>
+                </xpath>
 
-                <!--                <xpath expr="//form/header/button[@name='action_rfq_send[1]']" position="attributes">-->
-                <!--                    <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>-->
-                <!--                </xpath>-->
-                <!--                <xpath expr="//form/header/button[@name='action_rfq_send[2]']" position="attributes">-->
-                <!--                    <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>-->
-                <!--                </xpath>-->
                 <!--                <xpath expr="//form/header/button[@name='print_quotation[1]']" position="attributes">-->
                 <!--                    <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>-->
                 <!--                </xpath>-->
@@ -48,9 +51,14 @@
                     <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>
                 </xpath>
 
-                <!--                <xpath expr="//form/header/button[@name='action_create_invoice[1]']" position="attributes">-->
-                <!--                    <attribute name="groups">sf_base.group_purchase,sf_base.group_purchase_director</attribute>-->
-                <!--                </xpath>-->
+               <xpath expr="//form/header/button[@name='action_create_invoice']" 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>
+               <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>
                 <!--                <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>-->