!5922 添加功能

Merge pull request !5922 from 李鹏宇/dev_zhou

yuthon_property_approval/views/inherit_yuthon_property_views.xml

@@ -635,7 +635,7 @@
                 <field name="property_name" string="物业信息"/>
                 <field name="admin_id"/>
             </xpath>
-            <xpath expr="//field[@name='bank_state']" position="after">
+            <xpath expr="//field[@name='name_account']" position="after">
                  <button name="button_reconciliation" type="object" string="对账" class="btn btn-primary" invisible="bank_state == 'reconciled'"/>
                  <button name="binding_information" type="object" string="绑定信息" class="btn btn-primary"/>
             </xpath>

yuthon_property_approval/wizard/property_reconciliation_wizard.py

@@ -15,8 +15,8 @@ class PropertyReconciliationWizard(models.Model):
     bank_branch = fields.Char('银行名称')
 
     bank_id = fields.Many2one('property.bank.statements', string='银行流水')
-    lessee_ids = fields.Many2many(related='bank_id.lessee_ids', string='承租方')
-    name_account = fields.Char(related='bank_id.name_account', string='对方户名')
+    lessee_ids = fields.Many2many('property.tenant.information', string='承租方')
+    name_account = fields.Char( string='对方户名')
     account = fields.Char(string='账号')
     amount_been_reconciled = fields.Float(string='已对金额', store=True)
     amount_reconciled = fields.Float(string='未核销', store=True)
@@ -25,9 +25,17 @@ class PropertyReconciliationWizard(models.Model):
     initial_total = fields.Float(string='初始金额', default=0.0)
     rent = fields.Float(string='未收总租金', compute="_compute_rent_total")
     penalty = fields.Float(string='未收总违约金',  compute="_compute_penalty_total")
-    remake = fields.Text(related='bank_id.remake', string='摘要')
+    remake = fields.Text(string='摘要')
     reconciliation_line_ids = fields.One2many('property.reconciliation.line', 'reconciliation_id', string='对账明细')
 
+    @api.onchange('bank_id')
+    def _onchange_bank_id(self):
+        for rec in self:
+            rec.lessee_ids = rec.bank_id.lessee_ids.ids
+            rec.name_account = rec.bank_id.name_account
+            rec.remake = rec.bank_id.remake
+
+
     @api.onchange('reconciliation_line_ids', 'actual_total')
     def _onchange_amount_reconciled(self):
         for rec in self:

yuthon_property_approval/wizard/property_reconciliation_wizard_views.xml

@@ -13,8 +13,9 @@
                         </h1>
                     </div>
                     <group>
-                        <field name="lessee_ids"  widget="many2many_tags"/>
-                        <field name="name_account"/>
+                        <field name="bank_id" invisible="1"/>
+                        <field name="lessee_ids"  widget="many2many_tags" readonly="1"/>
+                        <field name="name_account" readonly="1"/>
                         <field name="bank_branch" invisible="1"/>
                         <field name="account" invisible="1"/>
                     </group>