diff --git a/yuthon_property/wizard/initialize_wizard.py b/yuthon_property/wizard/initialize_wizard.py index 0df9eeaf1..8cddd4003 100644 --- a/yuthon_property/wizard/initialize_wizard.py +++ b/yuthon_property/wizard/initialize_wizard.py @@ -103,8 +103,8 @@ class InitializeWizard(models.TransientModel): self.env['property.accounts.receivable'].create({ 'contract_id': contract_id.id, 'lessee_id': lessee_id.id, - 'due_date': due_date_end, - 'due_date_end': None, + 'due_date': due_date, + 'due_date_end': due_date_end, 'original_amount': original_amount, 'submitted': submitted, 'management_type_id': management_type_id.id, diff --git a/yuthon_property/wizard/task_push_wizard.py b/yuthon_property/wizard/task_push_wizard.py index 7b38833ea..740cdf276 100644 --- a/yuthon_property/wizard/task_push_wizard.py +++ b/yuthon_property/wizard/task_push_wizard.py @@ -58,8 +58,8 @@ class TaskPushWizard(models.TransientModel): 'contract_id': meter.contract_id.id, 'lessee_id': meter.lessee_id.id if meter.lessee_id else None, 'original_amount': original_amount, - 'due_date': due_date_end, - 'due_date_end': None, + 'due_date': due_date, + 'due_date_end': due_date_end, 'charging_range': f"{start_date.strftime('%Y-%m-%d')} 到 {(end_date).strftime('%Y-%m-%d')}", 'create_time': datetime.now(), 'remark': remark, @@ -83,8 +83,8 @@ class TaskPushWizard(models.TransientModel): 'contract_id': water.contract_id.id, 'lessee_id': water.lessee_id.id if water.lessee_id else None, 'original_amount': water.water_id.fixed_receivables if water.water_id.fixed_receivables else water.receivables, - 'due_date': due_date_end, - 'due_date_end': None, + 'due_date': due_date, + 'due_date_end': due_date_end, 'charging_range': f"{start_date.strftime('%Y-%m-%d')} 到 {(end_date).strftime('%Y-%m-%d')}", 'create_time': datetime.now(), 'remark': remark, diff --git a/yuthon_property_approval/models/inherit_yuthon_property.py b/yuthon_property_approval/models/inherit_yuthon_property.py index 8e2fc6c30..a9199a6bf 100644 --- a/yuthon_property_approval/models/inherit_yuthon_property.py +++ b/yuthon_property_approval/models/inherit_yuthon_property.py @@ -1252,8 +1252,8 @@ class PropertyManagementList(models.Model): 'contract_id': rec.contract_id.id, 'lessee_id': rec.contract_id.lessee_id.id if rec.contract_id.lessee_id else None, 'original_amount': rec.original_amount, - 'due_date': due_date_end, - 'due_date_end': None, + 'due_date': rec.due_date, + 'due_date_end': due_date_end, 'charging_range': f"{due_date} 到 {due_date_end}", 'create_time': datetime.now(), 'management_type_id': management_type_id.id, diff --git a/yuthon_property_approval/wizard/property_reconciliation_wizard.py b/yuthon_property_approval/wizard/property_reconciliation_wizard.py index b02db874c..5b9a6a81d 100644 --- a/yuthon_property_approval/wizard/property_reconciliation_wizard.py +++ b/yuthon_property_approval/wizard/property_reconciliation_wizard.py @@ -560,8 +560,8 @@ class PropertyReconciliationWizard(models.Model): reconciliation_id = self.env['property.reconciliation.line'].search(domain2, limit=1) receivable_id = self.env['property.accounts.receivable'].create({ 'is_reconciliation': is_reconciliation, - 'due_date': extract_start_date, - 'due_date_end': extract_end_date, + 'due_date': extract_end_date, + 'due_date_end': None, 'penalty': reconciliation_id.rent, 'management_type_id': management_type_id.id, 'contract_id': line.contract_id.id, @@ -576,7 +576,8 @@ class PropertyReconciliationWizard(models.Model): if line.amount: existing_record.write({ 'delivered1': existing_record.delivered1 + line.amount, - 'due_date_end': extract_end_date, + 'due_date': extract_end_date, + 'due_date_end': None, 'is_reconciliation': is_reconciliation, 'payout_date': rec.actual_date if (line.rent == line.amount and line.rent != 0) else None, 'remark': line.remake,