Merge PR #1737 into 16.0

Signed-off-by etobella

account_loan/__manifest__.py

@@ -19,6 +19,7 @@
         "views/account_loan_view.xml",
         "views/account_move_view.xml",
         "views/res_partner.xml",
+        "views/account_loan_lines_view.xml",
     ],
     "installable": True,
     "maintainers": ["etobella"],

account_loan/models/account_loan_line.py

@@ -25,10 +25,31 @@ class AccountLoanLine(models.Model):
         readonly=True,
         ondelete="cascade",
     )
+    company_id = fields.Many2one(
+        "res.company", readonly=True, related="loan_id.company_id"
+    )
+    partner_id = fields.Many2one(
+        "res.partner", readonly=True, related="loan_id.partner_id"
+    )
     is_leasing = fields.Boolean(
         related="loan_id.is_leasing",
         readonly=True,
     )
+    journal_id = fields.Many2one(
+        "account.journal",
+        readonly=True,
+        related="loan_id.journal_id",
+    )
+    short_term_loan_account_id = fields.Many2one(
+        "account.account",
+        readonly=True,
+        related="loan_id.short_term_loan_account_id",
+    )
+    interest_expenses_account_id = fields.Many2one(
+        "account.account",
+        readonly=True,
+        related="loan_id.interest_expenses_account_id",
+    )
     loan_type = fields.Selection(
         related="loan_id.loan_type",
         readonly=True,

account_loan/views/account_loan_lines_view.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="account_loan_lines_view" model="ir.ui.view">
+        <field name="name">account.loan.lines.view</field>
+        <field name="model">account.loan.line</field>
+        <field name="arch" type="xml">
+            <tree create="0" import="0">
+                <field name="sequence" />
+                <field name="loan_id" />
+                <field name="date" />
+                <field name="rate" />
+                <field name="pending_principal_amount" />
+                <field name="payment_amount" />
+                <field name="principal_amount" />
+                <field name="interests_amount" />
+                <field name="long_term_pending_principal_amount" />
+                <field name="long_term_principal_amount" />
+                <field name="company_id" optional="hide" />
+                <field name="partner_id" optional="hide" />
+                <field name="journal_id" optional="hide" />
+                <field name="short_term_loan_account_id" optional="hide" />
+                <field name="long_term_loan_account_id" optional="hide" />
+                <field name="interest_expenses_account_id" optional="hide" />
+                <groupby name="loan_id">
+                    <button name="edit" type="edit" icon="fa-edit" title="Edit" />
+                </groupby>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_account_loan_lines_search" model="ir.ui.view">
+        <field name="name">Loan Items</field>
+        <field name="model">account.loan.line</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="loan_id" />
+                <field name="partner_id" />
+                <group expand='0' string='Group by...'>
+                    <filter
+                        string='Loan'
+                        name="group_by_loan_id"
+                        context="{'group_by': 'loan_id'}"
+                    />
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="account_loan_lines_action" model="ir.actions.act_window">
+        <field name="name">Loan Items</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">account.loan.line</field>
+        <field name="view_mode">tree,pivot,graph</field>
+        <field name="view_id" ref="account_loan_lines_view" />
+        <field name="context">{'search_default_group_by_loan_id': 1}</field>
+    </record>
+
+    <menuitem
+        id="account_loan_lines_menu"
+        parent="loan_menu"
+        sequence="20"
+        name="Loan Items"
+        action="account_loan_lines_action"
+    />
+</odoo>

account_loan/views/account_loan_view.xml

@@ -20,10 +20,13 @@
         <field name="arch" type="xml">
             <tree>
                 <field name="name" />
+                <field name="partner_id" optional="hide" />
                 <field name="company_id" />
                 <field name="is_leasing" />
                 <field name="state" />
+                <field name="rate" optional="hide" />
                 <field name="loan_amount" optional="hide" />
+                <field name="pending_principal_amount" optional="hide" />
                 <field name="periods" optional="hide" />
                 <field name="start_date" optional="hide" />
             </tree>
@@ -252,10 +255,18 @@
         <field name="name">Loans</field>
         <field name="res_model">account.loan</field>
     </record>
+
+    <menuitem
+        id="loan_menu"
+        name="Loans"
+        parent="account.menu_finance_entries"
+        sequence="75"
+    />
+
     <menuitem
         id="account_loan_menu"
-        parent="account.menu_finance_entries"
+        parent="loan_menu"
-        sequence="80"
+        sequence="10"
         name="Loans"
         action="account_loan_action"
     />