diff --git a/yuthon_hr_attendance/views/go_approval.xml b/yuthon_hr_attendance/views/go_approval.xml index 8f2629574..ba490ee9e 100644 --- a/yuthon_hr_attendance/views/go_approval.xml +++ b/yuthon_hr_attendance/views/go_approval.xml @@ -34,9 +34,6 @@ - - - @@ -88,6 +85,7 @@ + diff --git a/yuthon_purchase/models/inherit_purchase_order.py b/yuthon_purchase/models/inherit_purchase_order.py index b296bee3b..018bbcae7 100644 --- a/yuthon_purchase/models/inherit_purchase_order.py +++ b/yuthon_purchase/models/inherit_purchase_order.py @@ -9,6 +9,7 @@ class InheritPurchaseOrder(models.Model): _name = 'purchase.order' _inherit = ['purchase.order', 'soong.workflow.mixin'] + json_display = fields.Char( string="物品详情", compute='_compute_json_display', @@ -30,6 +31,7 @@ class InheritPurchaseOrder(models.Model): string="采购类型", default='fixed') pay_way = fields.Selection([('onetime', '一次性'), ('installment', '分期')], string="付款方式", default='onetime') reason_text = fields.Text(string="申请事由") + pay_line_ids = fields.One2many('purchase.order.pay.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 2a6380fcb..a7fa99873 100644 --- a/yuthon_purchase/models/purchase_workflow.py +++ b/yuthon_purchase/models/purchase_workflow.py @@ -114,6 +114,7 @@ class PurchaseOrderPayLine(models.Model): _description = "付款详情" purchase_id = fields.Many2one('purchase.workflow', string="关联采购工作流") + order_id = fields.Many2one('purchase.order', string="关联采购工作流") payment_stage = fields.Char(string="付款阶段") amount = fields.Char(string="比例/金额") payment_date = fields.Date(string="付款日期") diff --git a/yuthon_purchase/views/inherit_purchase_order_views.xml b/yuthon_purchase/views/inherit_purchase_order_views.xml index 93a022f7c..7538e776c 100644 --- a/yuthon_purchase/views/inherit_purchase_order_views.xml +++ b/yuthon_purchase/views/inherit_purchase_order_views.xml @@ -8,6 +8,15 @@ 1 + + 事项 + + + + + + 1 + 1 @@ -36,6 +45,12 @@ 1 + + 0 + + + 0 + @@ -52,6 +67,24 @@ [('is_employee', '=', False)] + + + + + + + + + + + + + + + True + + + @@ -68,6 +101,6 @@ - +