diff --git a/yuthon_property/models/property_meter_water.py b/yuthon_property/models/property_meter_water.py index 9b3ab4257..8c12e71dd 100644 --- a/yuthon_property/models/property_meter_water.py +++ b/yuthon_property/models/property_meter_water.py @@ -186,7 +186,7 @@ class MeterWaterLine(models.Model): current_read = fields.Float(string='本次读数', group_operator=None) unit_number = fields.Char(string='单元编号/用途') unit = fields.Float(string='当月单价', group_operator=None) - receivables = fields.Float(string="应收", compute='_compute_receivables', store=True, group_operator=None, help="应收金额=本次用量*单价*(1+线损)") + receivables = fields.Float(string="应收", store=True, group_operator=None, help="应收金额=本次用量*单价*(1+线损)") gauge_magnification = fields.Integer(string='仪表倍率', readonly=True, default=1, group_operator=None) last_reading_time = fields.Date(string="最后读数时间") type = fields.Selection([("public", "公共"), ("fees", "收费")], string="类型") @@ -198,12 +198,6 @@ class MeterWaterLine(models.Model): remarks = fields.Text(string='备注') employee_ids = fields.Many2many('hr.employee', string='抄表人') maximum_count = fields.Integer(string='最大位数') - meter_date_month = fields.Char( - string="任务日期月份", - compute="_compute_meter_date_month", - store=True, - index=True, - ) def _compute_meter_date_month(self): for rec in self: @@ -218,14 +212,14 @@ class MeterWaterLine(models.Model): for line in self.line_ids: line.name = self.name - @api.depends("line_loss", "current_meter", "unit") - def _compute_receivables(self): - for record in self: - if record.line_loss and record.current_meter and record.unit: - raw_value = record.current_meter * record.unit * (1 + record.line_loss) * record.gauge_magnification - record.receivables = round(raw_value, 1) - else: - record.receivables = 0.0 + # @api.depends("line_loss", "current_meter", "unit") + # def _compute_receivables(self): + # for record in self: + # if record.line_loss and record.current_meter and record.unit: + # raw_value = record.current_meter * record.unit * (1 + record.line_loss) * record.gauge_magnification + # record.receivables = round(raw_value, 1) + # else: + # record.receivables = 0.0 def update_meter(self): current_year = datetime.now().year