diff --git a/yuthon_purchase/models/inherit_purchase_order.py b/yuthon_purchase/models/inherit_purchase_order.py index 5efce9ac3..89208e48d 100644 --- a/yuthon_purchase/models/inherit_purchase_order.py +++ b/yuthon_purchase/models/inherit_purchase_order.py @@ -34,6 +34,7 @@ class InheritPurchaseOrder(models.Model): pay_line_ids = fields.One2many('purchase.order.pay.line', 'order_id', string="付款详情") low_line_ids = fields.One2many('purchase.low.line', 'order_id', string="低值易耗明细") service_line_ids = fields.One2many('purchase.service.line', 'order_id', string="服务明细") + fixed_line_ids = fields.One2many('purchase.fixed.line', 'order_id', string="日常消耗品明细") def end_approval(self): self.button_confirm() diff --git a/yuthon_purchase/models/purchase_workflow.py b/yuthon_purchase/models/purchase_workflow.py index 4cfc521c0..ca5f74c57 100644 --- a/yuthon_purchase/models/purchase_workflow.py +++ b/yuthon_purchase/models/purchase_workflow.py @@ -127,6 +127,7 @@ class PurchaseFixedLine(models.Model): purchase_id = fields.Many2one('purchase.workflow', string="关联采购工作流") product_id = fields.Many2one('product.product', string="物品名称") + order_id = fields.Many2one('purchase.order', string="关联采购") brand = fields.Char(string="品牌") specs = fields.Char(string="规格") number = fields.Integer(string="数量") diff --git a/yuthon_purchase/views/inherit_purchase_order_views.xml b/yuthon_purchase/views/inherit_purchase_order_views.xml index 57ed75fc1..3f92109cb 100644 --- a/yuthon_purchase/views/inherit_purchase_order_views.xml +++ b/yuthon_purchase/views/inherit_purchase_order_views.xml @@ -85,6 +85,23 @@ 固定资产明细 + + + + + + + + + + + + + + + + +