Accept Merge Request #2206: (feature/删除客户交期字段 -> develop)
Merge Request: 删除客户交期字段 Created By: @禹翔辉 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @禹翔辉 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2206
This commit is contained in:
@@ -158,8 +158,7 @@ class ReSaleOrder(models.Model):
|
|||||||
'is_incoming_material': True if item.get('embryo_redundancy_id') else False,
|
'is_incoming_material': True if item.get('embryo_redundancy_id') else False,
|
||||||
'manual_quotation': item.get('manual_quotation'),
|
'manual_quotation': item.get('manual_quotation'),
|
||||||
'model_id': item['model_id'],
|
'model_id': item['model_id'],
|
||||||
'delivery_end_date': item['delivery_end_date'],
|
'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)
|
return self.env['sale.order.line'].with_context(skip_procurement=True).create(vals)
|
||||||
|
|
||||||
@@ -294,7 +293,6 @@ class ResaleOrderLine(models.Model):
|
|||||||
model_url = fields.Char('模型文件地址')
|
model_url = fields.Char('模型文件地址')
|
||||||
model_id = fields.Char('模型ID')
|
model_id = fields.Char('模型ID')
|
||||||
delivery_end_date = fields.Date('交货截止日期')
|
delivery_end_date = fields.Date('交货截止日期')
|
||||||
customer_delivery_date = fields.Date('客户交期')
|
|
||||||
|
|
||||||
@api.depends('embryo_redundancy_id')
|
@api.depends('embryo_redundancy_id')
|
||||||
def _compute_is_incoming_material(self):
|
def _compute_is_incoming_material(self):
|
||||||
|
|||||||
Reference in New Issue
Block a user