!9793 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang

Merge pull request !9793 from 李鹏宇/dev_wang

yuthon_property/models/property_bank_statements.py

@@ -194,7 +194,9 @@ class ReceivableModifyLine(models.Model):
     _description = '修改应收账单明细'
 
     bank_id = fields.Many2one('property.bank.statements', string='关联银行对账单')
+    original_amount = fields.Float(related='bank_id.original_amount', string='交易金额', store=False)
     receivable_id = fields.Many2one('property.accounts.receivable', string='应收账单')
+    management_type_id = fields.Many2one('yuthon.management.type', related='receivable_id.management_type_id', string='应收类型', store=False)
     is_write = fields.Boolean()
 
     reconciliation_date = fields.Date(string='对账日期')

yuthon_property/views/property_bank_statements_views.xml

@@ -62,6 +62,7 @@
                                     <field name="reconciliation_date"/>
                                     <field name="is_penalty"/>
                                     <field name="receivable_id"/>
+                                    <field name="management_type_id"/>
                                     <field name="not_collected"/>
                                     <field name="amount"/>
                                 </tree>
@@ -109,6 +110,31 @@
          <field name="view_ids" eval="[(5, 0, 0),
          (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_property.view_property_bank_statements_tree1')})]"/>
     </record>
+    <record id="view_receivable_modify_line_tree" model="ir.ui.view">
+        <field name="name">receivable.modify.line.tree</field>
+        <field name="model">receivable.modify.line</field>
+        <field name="arch" type="xml">
+            <tree string="应收流水中间表">
+                <field name="bank_id"/>
+                <field name="original_amount"/>
+                <field name="receivable_id"/>
+                <field name="management_type_id"/>
+                <field name="reconciliation_date"/>
+                <field name="is_penalty"/>
+                <field name="not_collected"/>
+                <field name="amount"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="action_receivable_modify_line" model="ir.actions.act_window">
+        <field name="name">应收流水中间表</field>
+        <field name="res_model">receivable.modify.line</field>
+        <field name="view_mode">tree</field>
+        <field name="view_ids" eval="[(5, 0, 0),
+        (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_property.view_receivable_modify_line_tree')})]"/>
+    </record>
+
     <record id="all_update_company_id" model="ir.actions.server">
         <field name="name">更新公司</field>
         <field name="model_id" ref="yuthon_property.model_property_bank_statements"/>

yuthon_report/models/month_receivable_report.py

@@ -47,7 +47,11 @@ class MonthReceivableReport(models.Model):
                 } if rec.contract_id and rec.contract_id.lease_ids and rec.contract_id.lease_ids[0].address_id else rec.property_name or '',
                 '承租方名称': rec.lessee_id.name if rec.lessee_id else '',
                 '金额': amount,
-                '管理员': rec.admin_id.name if rec.admin_id else '',
+                "管理员": {
+                    'model': 'res.users',
+                    'id': rec.admin_id.id,
+                    'display_name': rec.admin_id.name,
+                } if rec.admin_id else "",
             })
 
         stats = [{'name': '合计', 'amount': round(total_amount, 2)}]

yuthon_work_brand/views/hr_menus.xml

@@ -954,6 +954,12 @@
               parent="yuthon_financial_management_menu"
               action="yuthon_property.view_property_bank_statements_action1"/>
 
+    <menuitem id="yuthon_receivable_modify_line_menu"
+              sequence="24"
+              name="应收流水中间表"
+              parent="yuthon_financial_management_menu"
+              action="yuthon_property.action_receivable_modify_line"/>
+
     <menuitem id="human_pay_slips_root_setting"
               name="配置"
               parent="finance_root_board"