diff --git a/yuthon_property/wizard/task_push_wizard.py b/yuthon_property/wizard/task_push_wizard.py index f572a3afc..505001519 100644 --- a/yuthon_property/wizard/task_push_wizard.py +++ b/yuthon_property/wizard/task_push_wizard.py @@ -28,7 +28,7 @@ class TaskPushWizard(models.TransientModel): if meter.is_acc: remark = '新合同,暂无需抄表' else: - remark = self.format_date(start_date) + '-' + self.format_date(end_date) + remark = str(start_date) + '-' + str(end_date) self.env['property.accounts.receivable'].create({ 'contract_id': meter.contract_id.id, @@ -52,7 +52,7 @@ class TaskPushWizard(models.TransientModel): if water.is_acc: remark = '新合同,暂无需抄表' else: - remark = self.format_date(start_date) + '-' + self.format_date(end_date) + remark = str(start_date) + '-' + str(end_date) self.env['property.accounts.receivable'].create({ 'contract_id': water.contract_id.id, diff --git a/yuthon_property_approval/wizard/property_reconciliation_wizard.py b/yuthon_property_approval/wizard/property_reconciliation_wizard.py index 1bd27103e..b44ef692d 100644 --- a/yuthon_property_approval/wizard/property_reconciliation_wizard.py +++ b/yuthon_property_approval/wizard/property_reconciliation_wizard.py @@ -37,10 +37,10 @@ class PropertyReconciliationWizard(models.Model): if line.due_date.month != rec.actual_date.month and line.collection_type == 'rent': if line.rent_month == line.amount: due_date_str = fields.Date.to_date(line.due_date).strftime('%Y-%m') - line.remake = str(rec.actual_date) + '补' + str(due_date_str) + '欠0' + line.remake = str(rec.actual_date) + '补' + str(due_date_str) + ',欠0' elif line.rent > line.amount: due_date_str = fields.Date.to_date(line.due_date).strftime('%Y-%m') - line.remake = str(rec.actual_date) + '补' + str(due_date_str) + '欠' + str(line.rent - line.amount) + line.remake = str(rec.actual_date) + '补' + str(due_date_str) + ',欠' + str(line.rent - line.amount) @api.depends('reconciliation_line_ids') def _compute_receivable_total(self):