From e68b0dc7a44429ffe477f62ef99d88b2fdfcadbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Thu, 11 Dec 2025 14:43:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_property_approval/models/inherit_yuthon_property.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/yuthon_property_approval/models/inherit_yuthon_property.py b/yuthon_property_approval/models/inherit_yuthon_property.py index ec8661c6a..8dfa24f9a 100644 --- a/yuthon_property_approval/models/inherit_yuthon_property.py +++ b/yuthon_property_approval/models/inherit_yuthon_property.py @@ -366,6 +366,7 @@ class PropertyBankStatements(models.Model): domain = base_domain + [('management_type_id.name', '=', management_type_name)] return self.env['property.accounts.receivable'].search(domain) + service_ids = _search_receivable('有偿服务收入') rent_ids = _search_receivable('租金') rename_fee_ids = _search_receivable('更名费') deposit_ids = _search_receivable('押金') @@ -443,6 +444,7 @@ class PropertyBankStatements(models.Model): return vals_list, current_sequence all_vals = [] + service_vals, next_seq = create_reconciliation_vals(service_ids, 'service', 1) rent_vals, next_seq = create_reconciliation_vals(rent_ids, 'rent', 1) deposit_vals, next_seq = create_reconciliation_vals(deposit_ids, 'deposit', 100) management_vals, next_seq = create_reconciliation_vals(management_ids, 'management_fee', 200) @@ -457,6 +459,7 @@ class PropertyBankStatements(models.Model): all_vals.extend(deposit_vals) all_vals.extend(lightbox_vals) all_vals.extend(guanzi_vals) + all_vals.extend(service_vals) all_vals.extend(management_vals) all_vals.extend(water_vals) all_vals.extend(electricity_vals) @@ -980,9 +983,10 @@ class PropertyAccountsReceivable(models.Model): } archives_ids = self.env["property.accounts.receivable"].browse( self._context.get('active_ids', self._context.get('active_id'))) + valid_management_types = list(model_type_data.keys()) for rec in archives_ids: model_type = model_type_data.get(rec.management_type_id.name) - if rec.management_type_id.name == '违约金': + if model_type not in valid_management_types: rec.unlink() continue if model_type in ('meter.archives.line', 'meter.water.line'):