diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py index 285d43f0..3233e674 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_quality/security/ir.model.access.csv b/sf_quality/security/ir.model.access.csv index 0ed30ac1..d59ff730 100644 --- a/sf_quality/security/ir.model.access.csv +++ b/sf_quality/security/ir.model.access.csv @@ -53,8 +53,13 @@ access_product_template_group_equipment_manager,product_template_group_equipment access_quality_alert_stage_group_quality,quality_alert_stage_group_quality,quality.model_quality_alert_stage,sf_base.group_quality,1,0,0,0 access_quality_alert_stage_group_quality_director,quality_alert_stage_group_quality_director,quality.model_quality_alert_stage,sf_base.group_quality_director,1,0,0,0 +access_quality_point_test_type_group_quality,quality_point_test_type_group_quality,quality.model_quality_point_test_type,sf_base.group_quality,1,0,0,0 +access_quality_point_test_type_group_quality_director,quality_point_test_type_group_quality_director,quality.model_quality_point_test_type,sf_base.group_quality_director,1,0,0,0 + +access_quality_point_test_type_group_quality,quality_point_test_type_group_quality,quality.model_quality_point_test_type,sf_base.group_quality,1,0,0,0 +access_quality_point_test_type_group_quality_director,quality_point_test_type_group_quality_director,quality.model_quality_point_test_type,sf_base.group_quality_director,1,0,0,0 + -access_quality_alert_stage,quality.alert.stage,quality.model_quality_alert_stage,sf_base.group_plan_dispatch,1,0,0,0 diff --git a/sf_sale/__manifest__.py b/sf_sale/__manifest__.py index f30bb014..6c65a7d5 100644 --- a/sf_sale/__manifest__.py +++ b/sf_sale/__manifest__.py @@ -17,6 +17,7 @@ 'wizard/sale_order_wizard_views.xml', 'views/sale_team.xml', 'views/sale_order_view.xml', + 'views/res_partner_view.xml', 'views/purchase_order_view.xml', 'views/quick_easy_order_view.xml' ], diff --git a/sf_sale/models/auto_quatotion_common.py b/sf_sale/models/auto_quatotion_common.py index 09ea3f0f..10b83aed 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..7419cc9a 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/models/sale_order.py b/sf_sale/models/sale_order.py index 93bf5c10..aad75979 100644 --- a/sf_sale/models/sale_order.py +++ b/sf_sale/models/sale_order.py @@ -1,7 +1,7 @@ import datetime import base64 from odoo import models, fields, api -from odoo.osv import expression +from odoo.exceptions import UserError class ReSaleOrder(models.Model): @@ -86,6 +86,24 @@ class RePurchaseOrder(models.Model): class ResPartnerToSale(models.Model): _inherit = 'res.partner' + @api.constrains('name') + def _check_name(self): + obj = self.sudo().search([('name', '=', self.name), ('id', '!=', self.id)]) + if obj: + raise UserError('该名称已存在,请重新输入') + + @api.constrains('vat') + def _check_vat(self): + obj = self.sudo().search([('vat', '=', self.vat), ('id', '!=', self.id)]) + if obj: + raise UserError('该税ID已存在,请重新输入') + + @api.constrains('email') + def _check_email(self): + obj = self.sudo().search([('email', '=', self.email), ('id', '!=', self.id)]) + if obj: + raise UserError('该邮箱已存在,请重新输入') + @api.model def _name_search(self, name, args=None, operator='ilike', limit=100, name_get_uid=None): if self._context.get('is_customer'): @@ -95,3 +113,21 @@ class ResPartnerToSale(models.Model): domain = [('user_id', '=', self.env.user.id)] return self._search(domain, limit=limit, access_rights_uid=name_get_uid) return super()._name_search(name, args, operator, limit, name_get_uid) + + @api.onchange('user_id') + def _get_salesman(self): + self.user_id = self.env.user.id + + +class ResUserToSale(models.Model): + _inherit = 'res.users' + + @api.model + def _name_search(self, name, args=None, operator='ilike', limit=100, name_get_uid=None): + if self._context.get('is_sale'): + if self.env.user.has_group('sf_base.group_sale_director'): + domain = [] + elif self.env.user.has_group('sf_base.group_sale_salemanager'): + domain = [('id', '=', self.env.user.id)] + return self._search(domain, limit=limit, access_rights_uid=name_get_uid) + return super()._name_search(name, args, operator, limit, name_get_uid) diff --git a/sf_sale/security/group_security.xml b/sf_sale/security/group_security.xml index 5afd8196..1c5b1659 100644 --- a/sf_sale/security/group_security.xml +++ b/sf_sale/security/group_security.xml @@ -23,7 +23,7 @@ 销售总监查看所有客户 - [(1,'=',1),('customer_rank','=',1)] + [(1,'=',1),('customer_rank','>',0)] @@ -32,7 +32,8 @@ 销售经理查看自己的客户 - ['|',('user_id','=',user.id),('create_uid', '=',user.id)] + [('user_id','=',user.id),('customer_rank','>',0)] + @@ -73,7 +74,7 @@ 采购总监查看所有供应商 - [(1,'=',1)] + [(1,'=',1),('supplier_rank','>', 0)] @@ -82,7 +83,7 @@ 采购岗查看自己的供应商 - ['|',('user_id','=',user.id),('create_uid', '=',user.id)] + [('user_id','=',user.id),('supplier_rank','>', 0)] diff --git a/sf_sale/security/ir.model.access.csv b/sf_sale/security/ir.model.access.csv index 7e697a8f..92b4359b 100644 --- a/sf_sale/security/ir.model.access.csv +++ b/sf_sale/security/ir.model.access.csv @@ -38,13 +38,20 @@ access_uom_category_group_purchase_director,uom_category_group_purchase_director access_sale_order_check_wizard_group_sale_salemanager,sale_order_check_wizard_group_sale_salemanager,model_sale_order_check_wizard,sf_base.group_sale_salemanager,1,1,1,0 access_sale_order_check_wizard_group_sale_director,sale_order_check_wizard_group_sale_director,model_sale_order_check_wizard,sf_base.group_sale_director,1,1,1,0 +access_account_move_line_group_purchase,account_move_line_group_purchase,account.model_account_move_line,sf_base.group_purchase,1,1,1,0 +access_account_move_line_group_purchase_director,account_move_line_group_purchase_director,account.model_account_move_line,sf_base.group_purchase_director,1,1,1,0 + +access_res_users_group_purchase,res_user_group_purchase,model_res_users,sf_base.group_purchase,1,1,1,0 +access_res_users_group_purchase_director,res_user_group_purchase_director,model_res_users,sf_base.group_purchase_director,1,1,1,0 +access_res_users_sale_salemanager,res_user_group_sale_salemanager,model_res_users,sf_base.group_sale_salemanager,1,0,0,0 +access_res_users_group_sale_director,res_user_group_sale_director,model_res_users,sf_base.group_sale_director,1,1,1,0 + + + + + + - - - - - -access_sale_order,sale_order,model_sale_order,sf_base.group_plan_dispatch,1,0,0,0 diff --git a/sf_sale/views/res_partner_view.xml b/sf_sale/views/res_partner_view.xml new file mode 100644 index 00000000..9902db34 --- /dev/null +++ b/sf_sale/views/res_partner_view.xml @@ -0,0 +1,35 @@ + + + + + res.partner.form.inherit.sf + res.partner + + + + + + + + + + {'required': [('phone', '=', False),('company_type','=', 'company')]} + + + + {'required': [('mobile', '=', False),('company_type','=', 'company')]} + + + + + + + {'required': [('company_type', '=', 'company')]} + + + + + + + \ No newline at end of file