diff --git a/sf_bf_connect/controllers/controllers.py b/sf_bf_connect/controllers/controllers.py index d79e7137..7f46765d 100644 --- a/sf_bf_connect/controllers/controllers.py +++ b/sf_bf_connect/controllers/controllers.py @@ -29,7 +29,7 @@ class Sf_Bf_Connect(http.Controller): bfm_process_order_list = json.loads(kw['bfm_process_order_list']) order_id = request.env['sale.order'].with_user(request.env.ref("base.user_admin")).sale_order_create( company_id, kw['delivery_name'], kw['delivery_telephone'], kw['delivery_address'], - kw['delivery_end_date'], kw['payments_way'], kw['pay_way']) + kw['delivery_end_date'], kw['payments_way'], kw['pay_way'], model_display_version=kw.get('model_display_version')) i = 1 # 给sale_order的default_code字段赋值 aa = request.env['sale.order'].sudo().search([('name', '=', order_id.name)]) diff --git a/sf_manufacturing/controllers/main.py b/sf_manufacturing/controllers/main.py index 839b87fe..2e23eb72 100644 --- a/sf_manufacturing/controllers/main.py +++ b/sf_manufacturing/controllers/main.py @@ -27,7 +27,8 @@ class JikimoSaleRoutePicking(Sf_Bf_Connect): bfm_process_order_list = json.loads(kw['bfm_process_order_list']) order_id = request.env['sale.order'].with_user(request.env.ref("base.user_admin")).sale_order_create( company_id, kw['delivery_name'], kw['delivery_telephone'], kw['delivery_address'], - kw['delivery_end_date'], kw['payments_way'], kw['pay_way'], kw['order_number'], state='draft') + kw['delivery_end_date'], kw['payments_way'], kw['pay_way'], kw['order_number'], state='draft', + model_display_version=kw.get('model_display_version')) i = 1 # 给sale_order的default_code字段赋值 # aa = request.env['sale.order'].sudo().search([('name', '=', order_id.name)]) diff --git a/sf_manufacturing/models/quick_easy_order.py b/sf_manufacturing/models/quick_easy_order.py index 89d3a6d8..5a02be8f 100644 --- a/sf_manufacturing/models/quick_easy_order.py +++ b/sf_manufacturing/models/quick_easy_order.py @@ -59,7 +59,7 @@ class QuickEasyOrder(models.Model): product_id = self.env.ref('jikimo_sale_multiple_supply_methods.product_template_default').sudo().with_context(active_test=False).product_variant_id # user_id = request.env.ref('base.user_admin').sudo() order_id = self.env['sale.order'].sale_order_create(company_id, 'XXXXX', 'XXXXX', 'XXXXX', - str(datetime.now()), '现结', '支付宝', state='draft') + str(datetime.now()), '现结', '支付宝', state='draft', model_display_version='v2') order_id.default_code = obj.name i = 1 for item in res['bfm_process_order_list']: diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py index 081807a4..d164d8cc 100644 --- a/sf_sale/models/quick_easy_order.py +++ b/sf_sale/models/quick_easy_order.py @@ -314,7 +314,7 @@ class QuickEasyOrder(models.Model): company_id = self.env.ref('base.main_company').sudo() # user_id = request.env.ref('base.user_admin').sudo() order_id = self.env['sale.order'].sale_order_create(company_id, 'XXXXX', 'XXXXX', 'XXXXX', - str(datetime.now()), '现结', '支付宝') + str(datetime.now()), '现结', '支付宝', 'v2') i = 1 # 给sale_order的default_code字段赋值 aa = self.env['sale.order'].sudo().search([('name', '=', order_id.name)]) diff --git a/sf_sale/models/quick_easy_order_old.py b/sf_sale/models/quick_easy_order_old.py index 87848e3a..cbf0f8f1 100644 --- a/sf_sale/models/quick_easy_order_old.py +++ b/sf_sale/models/quick_easy_order_old.py @@ -237,7 +237,7 @@ class QuickEasyOrder(models.Model): company_id = self.env.ref('base.main_company').sudo() # user_id = request.env.ref('base.user_admin').sudo() order_id = self.env['sale.order'].sale_order_create(company_id, 'XXXXX', 'XXXXX', 'XXXXX', - str(datetime.now()), '现结', '支付宝') + str(datetime.now()), '现结', '支付宝', 'v2') i = 1 # 给sale_order的default_code字段赋值 aa = self.env['sale.order'].sudo().search([('name', '=', order_id.name)]) diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py index 934dc11a..eb09fdc1 100644 --- a/sf_sale/models/sale_order.py +++ b/sf_sale/models/sale_order.py @@ -61,9 +61,12 @@ class ReSaleOrder(models.Model): order_code = fields.Char('平台订单号', readonly=True) + model_display_version = fields.Char('模型展示版本', default="v1") + # 业务平台分配工厂后在智能工厂先创建销售订单 def sale_order_create(self, company_id, delivery_name, delivery_telephone, delivery_address, - deadline_of_delivery, payments_way, pay_way, order_number, state='sale'): + deadline_of_delivery, payments_way, pay_way, order_number, state='sale', + model_display_version='v1'): now_time = datetime.datetime.now() partner = self.get_customer() data = { @@ -80,6 +83,7 @@ class ReSaleOrder(models.Model): 'payments_way': payments_way, 'pay_way': pay_way, 'order_code': order_number, + 'model_display_version': model_display_version, } if deadline_of_delivery: # deadline_of_delivery字段存在为false字符串情况 diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml index 0a6b6123..6a5f839b 100644 --- a/sf_sale/views/sale_order_view.xml +++ b/sf_sale/views/sale_order_view.xml @@ -98,13 +98,14 @@ + + string="模型文件" readonly="1" attrs="{'column_invisible': [('parent.model_display_version', '!=', 'v1')]}"/> + string="模型文件" readonly="1" attrs="{'column_invisible': [('parent.model_display_version', '!=', 'v2')]}"/>