Accept Merge Request #1495: (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/1495
This commit is contained in:
@@ -208,7 +208,8 @@ class RePurchaseOrder(models.Model):
|
||||
compute='_compute_user_id',
|
||||
store=True)
|
||||
|
||||
purchase_type = fields.Selection([('standard', '标准采购'), ('consignment', '委外加工')], string='采购类型', default='standard')
|
||||
purchase_type = fields.Selection([('standard', '标准采购'), ('consignment', '委外加工')], string='采购类型',
|
||||
default='standard')
|
||||
|
||||
@api.depends('partner_id')
|
||||
def _compute_user_id(self):
|
||||
@@ -273,6 +274,7 @@ class RePurchaseOrder(models.Model):
|
||||
'partner_id': server_template.seller_ids.partner_id.id,
|
||||
'origin': ','.join(production_process),
|
||||
'state': 'draft',
|
||||
'purchase_type': 'consignment',
|
||||
'order_line': server_product_process})
|
||||
# self.env.cr.commit()
|
||||
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
<!-- <field name="process_id"/>-->
|
||||
<field name="parameter_ids" widget="many2many_tags" string="表面工艺参数"
|
||||
options="{'no_create': True}"/>
|
||||
<field name="machining_precision" required="1"/>
|
||||
<!-- <field name="machining_precision" required="1"/>-->
|
||||
<field name="processing_time"/>
|
||||
<field name="quantity" options="{'format': false}"/>
|
||||
<field name="unit_price"/>
|
||||
|
||||
Reference in New Issue
Block a user