diff --git a/yuthon_property_approval/wizard/property_bills_wizard.py b/yuthon_property_approval/wizard/property_bills_wizard.py index 14ec7bdc0..38b4f4b93 100644 --- a/yuthon_property_approval/wizard/property_bills_wizard.py +++ b/yuthon_property_approval/wizard/property_bills_wizard.py @@ -27,7 +27,10 @@ class PropertyBillsWizard(models.TransientModel): ('management_type_id', '=', self.bills_list_i.management_type_id.id) ]) if receivable: - receivable.write({'has_date': self.actual_date}) + receivable.write({'has_date': self.actual_date, + 'deposit_state': 'yes' + }) + self.bills_list_id.contract_id.contact_state = 'settle' self.bills_list_id.contract_id.compute_is_has() diff --git a/yuthon_property_approval/wizard/property_reconciliation_wizard.py b/yuthon_property_approval/wizard/property_reconciliation_wizard.py index f8603a309..6cd8cda66 100644 --- a/yuthon_property_approval/wizard/property_reconciliation_wizard.py +++ b/yuthon_property_approval/wizard/property_reconciliation_wizard.py @@ -482,6 +482,16 @@ class PropertyReconciliationWizard(models.Model): deposit_state = 'paid' else: deposit_state = 'no_paid' + + deposit_id = self.env['property.accounts.receivable'].search( + [('contract_id', '=', receivable_id.contract_id.id), + ('workflow_record_id', '!=', False), + ('management_type_id.name', '=', '押金'), + ] + ) + if deposit_id: + deposit_id.deposit_state = 'yes' + receivable_id.write({ 'delivered1': receivable_id.delivered1 + line.amount, 'due_date': extract_end_date or line.due_date,