From 2bcc5615aa797b7c0934fd00308a9f55e8bd38b8 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: Wed, 24 Sep 2025 10:50:51 +0800 Subject: [PATCH 1/2] =?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/models/property_meter_archives.py | 4 ++-- yuthon_property/models/property_meter_water.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/yuthon_property/models/property_meter_archives.py b/yuthon_property/models/property_meter_archives.py index 83ec56ea5..746c34b92 100644 --- a/yuthon_property/models/property_meter_archives.py +++ b/yuthon_property/models/property_meter_archives.py @@ -191,10 +191,10 @@ class MeterArchivesLine(models.Model): insurances_ids = self.env["meter.archives.line"].browse( self._context.get('active_ids', self._context.get('active_id'))) for line in insurances_ids: - line._compute_meter_values() + line.compute_meter_values() @api.depends('current_read', 'last_read', 'meter_date', 'maximum_count', 'archives_id') - def _compute_meter_values(self): + def compute_meter_values(self): """合并计算当前用量和上次用量""" for line in self: # 计算当前用量 (原 _compute_current_meter 逻辑) diff --git a/yuthon_property/models/property_meter_water.py b/yuthon_property/models/property_meter_water.py index 6fec88f32..eb991bc26 100644 --- a/yuthon_property/models/property_meter_water.py +++ b/yuthon_property/models/property_meter_water.py @@ -155,10 +155,10 @@ class MeterWaterLine(models.Model): insurances_ids = self.env["meter.water.line"].browse( self._context.get('active_ids', self._context.get('active_id'))) for line in insurances_ids: - line._compute_meter_values() + line.compute_meter_values() @api.depends('current_read', 'last_read', 'meter_date', 'maximum_count', 'water_id') - def _compute_meter_values(self): + def compute_meter_values(self): """合并计算当前用量和上次用量""" for line in self: # 计算当前用量 (原 _compute_current_meter 逻辑) From dc3f6d92408818f741c145a22656c68d1bbb7c1f 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: Wed, 24 Sep 2025 10:52:24 +0800 Subject: [PATCH 2/2] =?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_report/models/ledger_report.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/yuthon_report/models/ledger_report.py b/yuthon_report/models/ledger_report.py index 8592d5191..1c5bb43f8 100644 --- a/yuthon_report/models/ledger_report.py +++ b/yuthon_report/models/ledger_report.py @@ -31,7 +31,6 @@ class YuthonProperty(models.Model): # 查询数据，限制100条 properties = self.search(domain, limit=100) state_selection = dict(self._fields['property_state']._description_selection(self.env)) - rental_method_selection = dict(self._fields['rental_method']._description_selection(self.env)) return [ { @@ -49,7 +48,6 @@ class YuthonProperty(models.Model): "联系人": p.contact or "", "出租用途": p.rental_purposes.name or "" if p.rental_purposes else "", "审批情况": p.approval_status or "", - "出租方式": rental_method_selection.get(p.rental_method, ""), "租赁合同号": p.contract_id.name or "" if p.contract_id else "", "出租面积": p.rental_area or 0.0, "评估价（元/m² •月）": p.appraisal_price or 0.0,