叮咚

yuthon_report/models/receivable_flow_report.py

@@ -72,18 +72,6 @@ class ReceivableFlowReport(models.Model):
         all_wizards = self.env['penalty.line.wizard'].sudo().search([
             ('receivable_id', 'in', rec_ids),
         ])
-        
-        # 3. 批量查违约金类型的应收账单记录（sudo跳过多公司权限）
-        penalty_type = self.env['yuthon.management.type'].sudo().search([('name', 'ilike', '违约金')], limit=1)
-        all_penalty_receivables = self.env['property.accounts.receivable'].sudo().search([
-            ('management_type_id', '=', penalty_type.id),
-            ('rent_id', 'in', [r.rent_id for r in receivables if r.rent_id]),
-        ])
-        # 按 rent_id 分组
-        penalty_receivable_map = {}  # {rent_id: [receivables]}
-        for pr in all_penalty_receivables:
-            if pr.rent_id:
-                penalty_receivable_map.setdefault(pr.rent_id, []).append(pr)
         # 按 receivable_id 分组，并预取 pay_line_ids
         wizard_map = {}  # {receivable_id: [wizards]}
         for wz in all_wizards:
@@ -158,7 +146,6 @@ class ReceivableFlowReport(models.Model):
                 "收款日期": "",
                 "收款金额": "",
                 "收款备注": "",
-                "违约金计算时间": "",
                 "违约金明细": "",
                 "违约金收款时间": "",
                 "违约金收款金额": "",
@@ -187,15 +174,6 @@ class ReceivableFlowReport(models.Model):
                 )
                 penalty_payment_date = latest_penalty_payment[0].date if latest_penalty_payment else None
 
-                # 获取违约金计算时间
-                penalty_dates = []
-                if rec.rent_id:
-                    penalty_recs = penalty_receivable_map.get(rec.rent_id, [])
-                    for penalty_rec in penalty_recs:
-                        if hasattr(penalty_rec, 'charging_range') and penalty_rec.charging_range:
-                            penalty_dates.append(penalty_rec.charging_range)
-                penalty_date_str = "\n".join(penalty_dates) if penalty_dates else ""
-                
                 # ==== 应收租金行 ====
                 rows.append({
                     "row_type": "主",
@@ -222,7 +200,6 @@ class ReceivableFlowReport(models.Model):
                     "收款日期": "",
                     "收款金额": "",
                     "收款备注": "",
-                    "违约金计算时间": penalty_date_str,
                     "违约金明细": {
                         'model': 'property.accounts.receivable',
                         'display_name': '违约金明细',
@@ -250,7 +227,6 @@ class ReceivableFlowReport(models.Model):
                         "收款日期": ml.reconciliation_date.strftime("%Y-%m-%d") if ml.reconciliation_date else "",
                         "收款金额": round(ml.amount, 2),
                         "收款备注": ml.bank_id.remake if ml.bank_id else "",
-                        "违约金计算时间": "",
                         "违约金明细": "",
                         "违约金收款时间": "",
                         "违约金收款金额": "",

yuthon_report/views/receivable_flow_report.xml

@@ -24,7 +24,6 @@
                         {"headerName": "收款日期", "field": "收款日期", "flex": 1},
                         {"headerName": "收款金额", "field": "收款金额", "flex": 1, "type": "number"},
                         {"headerName": "收款备注", "field": "收款备注", "flex": 2, "wrapText": true},
-                        {"headerName": "违约金计算时间", "field": "违约金计算时间", "flex": 2, "wrapText": true},
                         {"headerName": "违约金明细", "field": "违约金明细", "flex": 1, "cellRenderer": "linkRender"},
                         {"headerName": "违约金收款时间", "field": "违约金收款时间", "flex": 1},
                         {"headerName": "违约金收款金额", "field": "违约金收款金额", "flex": 1, "type": "number"}