解决销售订单form中,tree内显示模型的问题
This commit is contained in:
@@ -29,7 +29,7 @@ class Sf_Bf_Connect(http.Controller):
|
|||||||
bfm_process_order_list = json.loads(kw['bfm_process_order_list'])
|
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(
|
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'],
|
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
|
i = 1
|
||||||
# 给sale_order的default_code字段赋值
|
# 给sale_order的default_code字段赋值
|
||||||
aa = request.env['sale.order'].sudo().search([('name', '=', order_id.name)])
|
aa = request.env['sale.order'].sudo().search([('name', '=', order_id.name)])
|
||||||
|
|||||||
@@ -27,7 +27,8 @@ class JikimoSaleRoutePicking(Sf_Bf_Connect):
|
|||||||
bfm_process_order_list = json.loads(kw['bfm_process_order_list'])
|
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(
|
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'],
|
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
|
i = 1
|
||||||
# 给sale_order的default_code字段赋值
|
# 给sale_order的default_code字段赋值
|
||||||
# aa = request.env['sale.order'].sudo().search([('name', '=', order_id.name)])
|
# aa = request.env['sale.order'].sudo().search([('name', '=', order_id.name)])
|
||||||
|
|||||||
@@ -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
|
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()
|
# user_id = request.env.ref('base.user_admin').sudo()
|
||||||
order_id = self.env['sale.order'].sale_order_create(company_id, 'XXXXX', 'XXXXX', 'XXXXX',
|
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
|
order_id.default_code = obj.name
|
||||||
i = 1
|
i = 1
|
||||||
for item in res['bfm_process_order_list']:
|
for item in res['bfm_process_order_list']:
|
||||||
|
|||||||
@@ -314,7 +314,7 @@ class QuickEasyOrder(models.Model):
|
|||||||
company_id = self.env.ref('base.main_company').sudo()
|
company_id = self.env.ref('base.main_company').sudo()
|
||||||
# user_id = request.env.ref('base.user_admin').sudo()
|
# user_id = request.env.ref('base.user_admin').sudo()
|
||||||
order_id = self.env['sale.order'].sale_order_create(company_id, 'XXXXX', 'XXXXX', 'XXXXX',
|
order_id = self.env['sale.order'].sale_order_create(company_id, 'XXXXX', 'XXXXX', 'XXXXX',
|
||||||
str(datetime.now()), '现结', '支付宝')
|
str(datetime.now()), '现结', '支付宝', 'v2')
|
||||||
i = 1
|
i = 1
|
||||||
# 给sale_order的default_code字段赋值
|
# 给sale_order的default_code字段赋值
|
||||||
aa = self.env['sale.order'].sudo().search([('name', '=', order_id.name)])
|
aa = self.env['sale.order'].sudo().search([('name', '=', order_id.name)])
|
||||||
|
|||||||
@@ -237,7 +237,7 @@ class QuickEasyOrder(models.Model):
|
|||||||
company_id = self.env.ref('base.main_company').sudo()
|
company_id = self.env.ref('base.main_company').sudo()
|
||||||
# user_id = request.env.ref('base.user_admin').sudo()
|
# user_id = request.env.ref('base.user_admin').sudo()
|
||||||
order_id = self.env['sale.order'].sale_order_create(company_id, 'XXXXX', 'XXXXX', 'XXXXX',
|
order_id = self.env['sale.order'].sale_order_create(company_id, 'XXXXX', 'XXXXX', 'XXXXX',
|
||||||
str(datetime.now()), '现结', '支付宝')
|
str(datetime.now()), '现结', '支付宝', 'v2')
|
||||||
i = 1
|
i = 1
|
||||||
# 给sale_order的default_code字段赋值
|
# 给sale_order的default_code字段赋值
|
||||||
aa = self.env['sale.order'].sudo().search([('name', '=', order_id.name)])
|
aa = self.env['sale.order'].sudo().search([('name', '=', order_id.name)])
|
||||||
|
|||||||
@@ -61,9 +61,12 @@ class ReSaleOrder(models.Model):
|
|||||||
|
|
||||||
order_code = fields.Char('平台订单号', readonly=True)
|
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,
|
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()
|
now_time = datetime.datetime.now()
|
||||||
partner = self.get_customer()
|
partner = self.get_customer()
|
||||||
data = {
|
data = {
|
||||||
@@ -80,6 +83,7 @@ class ReSaleOrder(models.Model):
|
|||||||
'payments_way': payments_way,
|
'payments_way': payments_way,
|
||||||
'pay_way': pay_way,
|
'pay_way': pay_way,
|
||||||
'order_code': order_number,
|
'order_code': order_number,
|
||||||
|
'model_display_version': model_display_version,
|
||||||
}
|
}
|
||||||
if deadline_of_delivery:
|
if deadline_of_delivery:
|
||||||
# deadline_of_delivery字段存在为false字符串情况
|
# deadline_of_delivery字段存在为false字符串情况
|
||||||
|
|||||||
@@ -98,13 +98,14 @@
|
|||||||
<field name="deadline_of_delivery" readonly="0"/>
|
<field name="deadline_of_delivery" readonly="0"/>
|
||||||
<field name="payments_way" invisible="1"/>
|
<field name="payments_way" invisible="1"/>
|
||||||
<field name="pay_way" invisible="1"/>
|
<field name="pay_way" invisible="1"/>
|
||||||
|
<field name="model_display_version" invisible="1"/>
|
||||||
<!-- <field name="schedule_status" readonly="1"/> -->
|
<!-- <field name="schedule_status" readonly="1"/> -->
|
||||||
</field>
|
</field>
|
||||||
<xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="before">
|
<xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="before">
|
||||||
<field name="model_glb_file" widget="Viewer3D" optional="show"
|
<field name="model_glb_file" widget="Viewer3D" optional="show"
|
||||||
string="模型文件" readonly="1" attrs="{'invisible': [('model_glb_file', '=', False)]}"/>
|
string="模型文件" readonly="1" attrs="{'column_invisible': [('parent.model_display_version', '!=', 'v1')]}"/>
|
||||||
<field name="glb_url" widget="Viewer3D" optional="show"
|
<field name="glb_url" widget="Viewer3D" optional="show"
|
||||||
string="模型文件" readonly="1" attrs="{'invisible': [('glb_url', '=', False)]}"/>
|
string="模型文件" readonly="1" attrs="{'column_invisible': [('parent.model_display_version', '!=', 'v2')]}"/>
|
||||||
<field name="part_name" optional="show"/>
|
<field name="part_name" optional="show"/>
|
||||||
</xpath>
|
</xpath>
|
||||||
<xpath expr="//field[@name='order_line']/tree/field[@name='price_subtotal']" position="after">
|
<xpath expr="//field[@name='order_line']/tree/field[@name='price_subtotal']" position="after">
|
||||||
|
|||||||
Reference in New Issue
Block a user