!4362 !4361 添加功能

Merge pull request !4362 from 李鹏宇/dev

yuthon_property_approval/models/inherit_yuthon_property.py

@@ -65,7 +65,7 @@ class PropertyBankStatements(models.Model):
                 ])
                 rec.bank_state = 'not_reconciled'
                 rec.registered = 0
-                rec.no_amount = rec.yes_amount
+                rec.no_amount = 0
                 rec.yes_amount = 0
                 if accounts:
                     for account in accounts:

yuthon_property_approval/wizard/property_reconciliation_wizard.py

@@ -177,7 +177,7 @@ class PropertyReconciliationWizard(models.Model):
                         domain.append(('contract_id', '=', line.contract_id.id))
                     receivable_ids = self.env['property.accounts.receivable'].search(domain)
                     for receivable in receivable_ids:
-                        if not rec.amount_reconciled:
+                        if line.rent == line.amount:
                             is_reconciliation = True
                         else:
                             is_reconciliation = False