From 94c0b00c2dba81edc427d1908a452aa344e69333 Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Mon, 4 Dec 2023 17:28:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=BA=8A=E6=B3=A8=E5=86=8C=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=A0=B9=E6=8D=AE=E6=9D=83=E9=99=90=E7=BB=84=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_maintenance/security/group_security.xml  | 43 ++++++++++++-
 sf_maintenance/views/maintenance_views.xml  |  4 +-
 sf_manufacturing/models/product_template.py |  4 +-
 sf_sale/models/auto_quatotion_common.py     |  2 +-
 sf_sale/models/quick_easy_order.py          |  4 +-
 sf_sale/security/group_security.xml         | 70 ++++++++++-----------
 6 files changed, 84 insertions(+), 43 deletions(-)

diff --git a/sf_maintenance/security/group_security.xml b/sf_maintenance/security/group_security.xml
index e5a90368..4966ef8a 100644
--- a/sf_maintenance/security/group_security.xml
+++ b/sf_maintenance/security/group_security.xml
@@ -1,5 +1,7 @@
 <odoo>
-    <record id="sf_group_equipment_user" model="res.groups">
+
+    <data noupdate="1">
+            <record id="sf_group_equipment_user" model="res.groups">
         <field name="name">维保岗</field>
         <field name="category_id" ref="base.module_category_manufacturing_maintenance"/>
         <field name="implied_ids" eval="[(4, ref('maintenance.group_equipment_manager'))]"/>
@@ -11,7 +13,44 @@
             <field name="category_id" ref="base.module_category_manufacturing_maintenance"/>
         </record>
 
-    <data noupdate="1">
+        <!--        <record model="ir.rule" id="crm_team_rule_salemanager">-->
+<!--            <field name="name">销售经理只可以查看本人所在的团队</field>-->
+<!--            <field name="model_id" ref="model_crm_team"/>-->
+<!--            <field name="domain_force">[('crm_team_member_ids.user_id','=',user.id)]</field>-->
+<!--            <field name="groups" eval="[(4, ref('sf_base.group_sale_salemanager'))]"/>-->
+<!--            <field name="perm_read" eval="1"/>-->
+<!--            <field name="perm_write" eval="0"/>-->
+<!--            <field name="perm_create" eval="0"/>-->
+<!--        </record>-->
+
+<!--        <record model="ir.rule" id="crm_team_rule_director">-->
+<!--            <field name="name">销售总监</field>-->
+<!--            <field name="model_id" ref="model_crm_team"/>-->
+<!--            <field name="domain_force">[(1,'=',1)]</field>-->
+<!--            <field name="groups" eval="[(4, ref('sf_base.group_sale_director'))]"/>-->
+<!--            <field name="perm_read" eval="1"/>-->
+<!--            <field name="perm_write" eval="1"/>-->
+<!--            <field name="perm_create" eval="1"/>-->
+<!--        </record>-->
+
+<!--        <record model="ir.rule" id="sale_order_rule_director">-->
+<!--            <field name="name">销售总监查看所有的订单</field>-->
+<!--            <field name="model_id" ref="model_sale_order"/>-->
+<!--            <field name="domain_force">[(1,'=',1)]</field>-->
+<!--            <field name="groups" eval="[(4, ref('sf_base.group_sale_director'))]"/>-->
+<!--            <field name="perm_read" eval="1"/>-->
+<!--            <field name="perm_write" eval="1"/>-->
+<!--        </record>-->
+
+<!--        <record model="ir.rule" id="sale_order_rule_salemanager">-->
+<!--            <field name="name">销售经理查看自己的订单</field>-->
+<!--            <field name="model_id" ref="model_sale_order"/>-->
+<!--            <field name="domain_force">['|',('partner_id','=',user.partner_id.id),('create_uid', '=',user.id)]</field>-->
+<!--            <field name="groups" eval="[(4, ref('sf_base.group_sale_salemanager'))]"/>-->
+<!--            <field name="perm_read" eval="1"/>-->
+<!--            <field name="perm_write" eval="1"/>-->
+<!--            <field name="perm_create" eval="1"/>-->
+<!--        </record>-->
 
     </data>
 </odoo>
\ No newline at end of file
diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml
index ff0b6e73..b7cb707e 100644
--- a/sf_maintenance/views/maintenance_views.xml
+++ b/sf_maintenance/views/maintenance_views.xml
@@ -50,7 +50,9 @@
                     <label for="enroll_machine_tool"/>
                     <div class="col-12 col-lg-6 o_setting_box" style="white-space: nowrap">
                         <button type="object" class="oe_highlight" name='enroll_machine_tool' string="机床注册"
-                                attrs="{'invisible': [('equipment_type', '!=', '机床'), ('brand_id','!=',False),('type_id','!=',False),('control_system_id','!=',False)]}"/>
+                                attrs="{'invisible': [('equipment_type', '!=', '机床'), ('brand_id','!=',False),
+                                ('type_id','!=',False),('control_system_id','!=',False),('code','!=', False)]}"
+                                groups="sf_maintenance.sf_group_equipment_manager"/>
                     </div>
                 </xpath>
                   <xpath expr="//field[@name='category_id']" position="before">
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 5a079abe..29aa7c67 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -6,8 +6,8 @@ import os
 from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError
 from odoo.modules import get_resource_path
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+#from OCC.Extend.DataExchange import read_step_file
+#from OCC.Extend.DataExchange import write_stl_file
 
 
 class ResProductMo(models.Model):
diff --git a/sf_sale/models/auto_quatotion_common.py b/sf_sale/models/auto_quatotion_common.py
index 09ea3f0f..1b29c6d2 100644
--- a/sf_sale/models/auto_quatotion_common.py
+++ b/sf_sale/models/auto_quatotion_common.py
@@ -2,7 +2,7 @@
 import logging
 from odoo.modules import get_resource_path
 from odoo import fields, models, api
-from quatotion import readSql, feature_recognize, auto_quatotion
+#from quatotion import readSql, feature_recognize, auto_quatotion
 
 __author__ = 'jinling.yang'
 _logger = logging.getLogger(__name__)
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index 1e5f274c..5ec1fd52 100644
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -5,8 +5,8 @@ import os
 import json
 from datetime import datetime
 import requests
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+#from OCC.Extend.DataExchange import read_step_file
+#from OCC.Extend.DataExchange import write_stl_file
 from odoo import models, fields, api
 from odoo.modules import get_resource_path
 from odoo.exceptions import ValidationError, UserError
diff --git a/sf_sale/security/group_security.xml b/sf_sale/security/group_security.xml
index 33890d49..b94c67c3 100644
--- a/sf_sale/security/group_security.xml
+++ b/sf_sale/security/group_security.xml
@@ -1,42 +1,42 @@
 <odoo>
     <data noupdate="1">
-        <record model="ir.rule" id="crm_team_rule_salemanager">
-            <field name="name">销售经理只可以查看本人所在的团队</field>
-            <field name="model_id" ref="model_crm_team"/>
-            <field name="domain_force">[('crm_team_member_ids.user_id','=',user.id)]</field>
-            <field name="groups" eval="[(4, ref('sf_base.group_sale_salemanager'))]"/>
-            <field name="perm_read" eval="1"/>
-            <field name="perm_write" eval="0"/>
-            <field name="perm_create" eval="0"/>
-        </record>
+<!--        <record model="ir.rule" id="crm_team_rule_salemanager">-->
+<!--            <field name="name">销售经理只可以查看本人所在的团队</field>-->
+<!--            <field name="model_id" ref="model_crm_team"/>-->
+<!--            <field name="domain_force">[('crm_team_member_ids.user_id','=',user.id)]</field>-->
+<!--            <field name="groups" eval="[(4, ref('sf_base.group_sale_salemanager'))]"/>-->
+<!--            <field name="perm_read" eval="1"/>-->
+<!--            <field name="perm_write" eval="0"/>-->
+<!--            <field name="perm_create" eval="0"/>-->
+<!--        </record>-->
 
-        <record model="ir.rule" id="crm_team_rule_director">
-            <field name="name">销售总监</field>
-            <field name="model_id" ref="model_crm_team"/>
-            <field name="domain_force">[(1,'=',1)]</field>
-            <field name="groups" eval="[(4, ref('sf_base.group_sale_director'))]"/>
-            <field name="perm_read" eval="1"/>
-            <field name="perm_write" eval="1"/>
-            <field name="perm_create" eval="1"/>
-        </record>
+<!--        <record model="ir.rule" id="crm_team_rule_director">-->
+<!--            <field name="name">销售总监</field>-->
+<!--            <field name="model_id" ref="model_crm_team"/>-->
+<!--            <field name="domain_force">[(1,'=',1)]</field>-->
+<!--            <field name="groups" eval="[(4, ref('sf_base.group_sale_director'))]"/>-->
+<!--            <field name="perm_read" eval="1"/>-->
+<!--            <field name="perm_write" eval="1"/>-->
+<!--            <field name="perm_create" eval="1"/>-->
+<!--        </record>-->
 
-        <record model="ir.rule" id="sale_order_rule_director">
-            <field name="name">销售总监查看所有的订单</field>
-            <field name="model_id" ref="model_sale_order"/>
-            <field name="domain_force">[(1,'=',1)]</field>
-            <field name="groups" eval="[(4, ref('sf_base.group_sale_director'))]"/>
-            <field name="perm_read" eval="1"/>
-            <field name="perm_write" eval="1"/>
-        </record>
+<!--        <record model="ir.rule" id="sale_order_rule_director">-->
+<!--            <field name="name">销售总监查看所有的订单</field>-->
+<!--            <field name="model_id" ref="model_sale_order"/>-->
+<!--            <field name="domain_force">[(1,'=',1)]</field>-->
+<!--            <field name="groups" eval="[(4, ref('sf_base.group_sale_director'))]"/>-->
+<!--            <field name="perm_read" eval="1"/>-->
+<!--            <field name="perm_write" eval="1"/>-->
+<!--        </record>-->
 
-        <record model="ir.rule" id="sale_order_rule_salemanager">
-            <field name="name">销售经理查看自己的订单</field>
-            <field name="model_id" ref="model_sale_order"/>
-            <field name="domain_force">['|',('partner_id','=',user.partner_id.id),('create_uid', '=',user.id)]</field>
-            <field name="groups" eval="[(4, ref('sf_base.group_sale_salemanager'))]"/>
-            <field name="perm_read" eval="1"/>
-            <field name="perm_write" eval="1"/>
-            <field name="perm_create" eval="1"/>
-        </record>
+<!--        <record model="ir.rule" id="sale_order_rule_salemanager">-->
+<!--            <field name="name">销售经理查看自己的订单</field>-->
+<!--            <field name="model_id" ref="model_sale_order"/>-->
+<!--            <field name="domain_force">['|',('partner_id','=',user.partner_id.id),('create_uid', '=',user.id)]</field>-->
+<!--            <field name="groups" eval="[(4, ref('sf_base.group_sale_salemanager'))]"/>-->
+<!--            <field name="perm_read" eval="1"/>-->
+<!--            <field name="perm_write" eval="1"/>-->
+<!--            <field name="perm_create" eval="1"/>-->
+<!--        </record>-->
     </data>
 </odoo>
\ No newline at end of file