diff --git a/sf_dlm/data/product_data.xml b/sf_dlm/data/product_data.xml index 3cc92912..9b562fbb 100644 --- a/sf_dlm/data/product_data.xml +++ b/sf_dlm/data/product_data.xml @@ -35,6 +35,11 @@ 功能刀具 + + 业务平台 + + + 功能刀具 diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py index f425813a..c2c85895 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 @@ -819,9 +819,9 @@ class ResProductMo(models.Model): # 将attach的datas内容转为glb文件 def transition_glb_file(self, report_path, code): - # shapes = read_step_file(report_path) + shapes = read_step_file(report_path) output_file = os.path.join('/tmp', str(code) + '.stl') - # write_stl_file(shapes, output_file, 'binary', 0.03, 0.5) + write_stl_file(shapes, output_file, 'binary', 0.03, 0.5) # 转化为glb output_glb_file = os.path.join('/tmp', str(code) + '.glb') util_path = get_resource_path('sf_base', 'static/util') diff --git a/sf_sale/__manifest__.py b/sf_sale/__manifest__.py index ea891245..64d9c41a 100644 --- a/sf_sale/__manifest__.py +++ b/sf_sale/__manifest__.py @@ -10,7 +10,7 @@ """, 'category': 'sf', 'website': 'https://www.sf.jikimo.com', - 'depends': ['sale', 'sale_management', 'web_widget_model_viewer', 'sf_base','sales_team'], + 'depends': ['sale', 'sale_management', 'web_widget_model_viewer', 'sf_base'], 'data': [ 'security/group_security.xml', 'security/ir.model.access.csv', diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py index 6308d01d..1e5f274c 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 @@ -93,9 +93,9 @@ class QuickEasyOrder(models.Model): # 将attach的datas内容转为glb文件 def transition_glb_file(self, report_path, model_code): - # shapes = read_step_file(report_path) + shapes = read_step_file(report_path) output_file = os.path.join('/tmp', str(model_code) + '.stl') - # write_stl_file(shapes, output_file, 'binary', 0.03, 0.5) + write_stl_file(shapes, output_file, 'binary', 0.03, 0.5) # 转化为glb output_glb_file = os.path.join('/tmp', str(model_code) + '.glb') util_path = get_resource_path('sf_base', 'static/util') diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py index e32b9360..c699a9d0 100644 --- a/sf_sale/models/sale_order.py +++ b/sf_sale/models/sale_order.py @@ -12,6 +12,8 @@ class ReSaleOrder(models.Model): address_of_delivery = fields.Char('交货人地址') payments_way = fields.Selection([('现结', '现结'), ('月结', '月结')], '结算方式', default='现结', tracking=True) pay_way = fields.Selection([('转账', '转账'), ('微信', '微信'), ('支付宝', '支付宝')], '支付方式') + check_status = fields.Selection([('unchecked', '未审核'), ('checked', '已审核')], '审核状态', default='unchecked') + payment_term_id = fields.Many2one( comodel_name='account.payment.term', @@ -40,6 +42,10 @@ class ReSaleOrder(models.Model): }) return order_id + # 审核 + def action_check(self): + self.check_status = 'checked' + def get_customer(self): customer = self.env['res.partner'].search([('name', '=', '业务平台')]) if customer: diff --git a/sf_sale/security/group_security.xml b/sf_sale/security/group_security.xml index 79fb2ef9..33890d49 100644 --- a/sf_sale/security/group_security.xml +++ b/sf_sale/security/group_security.xml @@ -3,7 +3,7 @@ 销售经理只可以查看本人所在的团队 - [(crm_team_member_ids.user_id,'=',user.id)] + [('crm_team_member_ids.user_id','=',user.id)] @@ -12,12 +12,31 @@ 销售总监 - + [(1,'=',1)] + + + 销售总监查看所有的订单 + + [(1,'=',1)] + + + + + + + 销售经理查看自己的订单 + + ['|',('partner_id','=',user.partner_id.id),('create_uid', '=',user.id)] + + + + + \ No newline at end of file diff --git a/sf_sale/security/ir.model.access.csv b/sf_sale/security/ir.model.access.csv index b90db9d6..171a6d4d 100644 --- a/sf_sale/security/ir.model.access.csv +++ b/sf_sale/security/ir.model.access.csv @@ -1,12 +1,12 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_quick_easy_order,quick_easy_order,model_quick_easy_order,base.group_system,1,1,1,1 access_sf_auto_quatotion_common,sf_auto_quatotion_common,model_sf_auto_quatotion_common,base.group_system,1,1,1,1 -access_sale_order,sale_order,model_sale_order,sf_base.group_sale_salemanager,1,1,1,0 -access_sale_order,sale_order,model_sale_order,sf_base.group_sale_director,1,1,1,0 -access_sale_order_line,sale_order_line,model_sale_order_line,sf_base.group_sale_salemanager,1,1,1,0 -access_sale_order_line,sale_order_line,model_sale_order_line,sf_base.group_sale_director,1,1,1,0 -access_crm_team,crm_team,sales_team.model_crm_team,sf_base.group_sale_director,1,1,1,0 -access_crm_team_member,crm_team_member,sales_team.model_crm_team_member,sf_base.group_sale_director,1,1,1,0 +access_sale_order_manager,sale_order_manager,model_sale_order,sf_base.group_sale_salemanager,1,1,1,0 +access_sale_order_director,sale_order_director,model_sale_order,sf_base.group_sale_director,1,1,1,0 +access_sale_order_line_manager,sale_order_line_manager,model_sale_order_line,sf_base.group_sale_salemanager,1,1,1,0 +access_sale_order_line_director,sale_order_line_director,model_sale_order_line,sf_base.group_sale_director,1,1,1,0 +access_crm_team_member_manager,crm_team_manager,sales_team.model_crm_team,sf_base.group_sale_director,1,1,1,0 +access_crm_team_member_director,crm_team_member_director,sales_team.model_crm_team_member,sf_base.group_sale_director,1,1,1,0 access_res_users,res_users,base.model_res_users,sf_base.group_sale_director,1,1,1,0 diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml index ba32f029..a02a8adc 100644 --- a/sf_sale/views/sale_order_view.xml +++ b/sf_sale/views/sale_order_view.xml @@ -7,6 +7,25 @@ sale.order + + +