pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加功能

Browse Source
This commit is contained in:
李鹏宇
2025-12-02 17:19:40 +08:00
parent 18f5cff4cb
commit f61147fdf8
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_property/wizard/initialize_wizard.py
+2 -2
View File
@@ -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,
yuthon_property/wizard/task_push_wizard.py
+4 -4
View File
@@ -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,
yuthon_property_approval/models/inherit_yuthon_property.py
+2 -2
View File
@@ -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,
yuthon_property_approval/wizard/property_reconciliation_wizard.py
+4 -3
View File
@@ -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,