!10061 !10060 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyuse…

Merge pull request !10061 from 李鹏宇/dev
2026-03-23 01:51:22 +00:00
parent 2bfb1edfb7 75ca5e090a
commit 02bdeaa6a5
1 changed files with 3 additions and 4 deletions
@@ -238,11 +238,10 @@ class ReceivableFlowReport(models.Model):
                "违约金计算时间": billing_period,
                "违约天数": days_diff,
                "违约金金额": {
-                    'model': 'property.accounts.receivable',
+                    'model': 'penalty.line.wizard',
                    'display_name': str(round(penalty_amount, 2)),
-                    'view_mode': 'tree',
-                    'domain': [('id', '=', rec.id)],
-                },
+                    'id': wz_list[0].id if wz_list else None,
+                } if wz_list else str(round(penalty_amount, 2)),
                "违约金收款时间": penalty_payment_date.strftime("%Y-%m-%d") if penalty_payment_date else "",
                "违约金收款金额": round(total_penalty_collected, 2),
                "合同编号": {