1、内部下单:行明细增加交期等; 2、处理 bfm平台下单-填写了合同相关字段,未上传合同,合同的相关字段未传到sf销售订单 问题
This commit is contained in:
@@ -63,6 +63,7 @@ class ReSaleOrder(models.Model):
|
||||
|
||||
model_display_version = fields.Char('模型展示版本', default="v1")
|
||||
|
||||
customer_name = fields.Char('终端客户')
|
||||
contract_code = fields.Char('合同编号')
|
||||
contract_date = fields.Date('合同日期')
|
||||
contract_document_id = fields.Many2one('documents.document', string='合同文件')
|
||||
@@ -158,6 +159,7 @@ class ReSaleOrder(models.Model):
|
||||
'manual_quotation': item.get('manual_quotation'),
|
||||
'model_id': item['model_id'],
|
||||
'delivery_end_date': item['delivery_end_date'],
|
||||
'customer_delivery_date': item.get('customer_delivery_date'),
|
||||
}
|
||||
return self.env['sale.order.line'].with_context(skip_procurement=True).create(vals)
|
||||
|
||||
@@ -291,8 +293,8 @@ class ResaleOrderLine(models.Model):
|
||||
manual_quotation = fields.Boolean('人工编程', default=False)
|
||||
model_url = fields.Char('模型文件地址')
|
||||
model_id = fields.Char('模型ID')
|
||||
|
||||
delivery_end_date = fields.Date('交货截止日期')
|
||||
customer_delivery_date = fields.Date('客户交期')
|
||||
|
||||
@api.depends('embryo_redundancy_id')
|
||||
def _compute_is_incoming_material(self):
|
||||
|
||||
@@ -90,6 +90,9 @@
|
||||
<field name="partner_id" position="replace">
|
||||
<field name="partner_id" widget="res_partner_many2one" context="{'is_customer': True }"
|
||||
options='{"always_reload": True,"no_create": True}'/>
|
||||
<field name="customer_name" readonly="1"/>
|
||||
<field name="contract_code" readonly="1"/>
|
||||
<field name="contract_date" readonly="1"/>
|
||||
</field>
|
||||
<field name="payment_term_id" position="attributes">
|
||||
<attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
|
||||
@@ -124,6 +127,7 @@
|
||||
<xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="replace">
|
||||
<field name="name" widget="section_and_note_text" optional="show"
|
||||
string="参数说明(长/宽/高/体积/精度/材质)"/>
|
||||
<field name="customer_delivery_date" readonly="1"/>
|
||||
<field name="manual_quotation" readonly="1"/>
|
||||
<field name="is_incoming_material" readonly="1"/>
|
||||
</xpath>
|
||||
|
||||
Reference in New Issue
Block a user