Merge branch 'develop' into feature/commercially_launched
This commit is contained in:
@@ -28,7 +28,7 @@ class PurchaseRequestLine(models.Model):
|
|||||||
origin = fields.Char(string="Source Document")
|
origin = fields.Char(string="Source Document")
|
||||||
|
|
||||||
part_number = fields.Char('零件图号', store=True, compute='_compute_part_number')
|
part_number = fields.Char('零件图号', store=True, compute='_compute_part_number')
|
||||||
part_name = fields.Char('零件名称', store=True, compute='_compute_part_name')
|
part_name = fields.Char('零件名称', store=True, compute='_compute_part_number')
|
||||||
related_product = fields.Many2one('product.product', string='关联产品',
|
related_product = fields.Many2one('product.product', string='关联产品',
|
||||||
help='经此产品工艺加工成的成品')
|
help='经此产品工艺加工成的成品')
|
||||||
|
|
||||||
|
|||||||
@@ -110,7 +110,7 @@ class PurchaseOrderLine(models.Model):
|
|||||||
_inherit = 'purchase.order.line'
|
_inherit = 'purchase.order.line'
|
||||||
|
|
||||||
part_number = fields.Char('零件图号', store=True, compute='_compute_part_number')
|
part_number = fields.Char('零件图号', store=True, compute='_compute_part_number')
|
||||||
part_name = fields.Char('零件名称', store=True, compute='_compute_part_name')
|
part_name = fields.Char('零件名称', store=True, compute='_compute_part_number')
|
||||||
related_product = fields.Many2one('product.product', string='关联产品',
|
related_product = fields.Many2one('product.product', string='关联产品',
|
||||||
help='经此产品工艺加工成的成品')
|
help='经此产品工艺加工成的成品')
|
||||||
manual_part_number = fields.Char()
|
manual_part_number = fields.Char()
|
||||||
|
|||||||
Reference in New Issue
Block a user