From c7fc3711ecfa6451fdb05c4762f7d3918560f4ed Mon Sep 17 00:00:00 2001
From: AjmalCybro <ajmal@cybrosys.in>
Date: Fri, 19 Jul 2024 11:14:07 +0530
Subject: [PATCH] Jul 18 [UPDT] Updated 'advanced_loan_management'

---
 advanced_loan_management/models/loan_request.py |  9 ++++-----
 advanced_loan_management/models/loan_type.py    |  1 -
 .../models/repayment_lines.py                   | 10 ++++++----
 .../security/loan_management_groups.xml         |  1 -
 .../security/loan_management_security.xml       | 17 ++++++++++++++++-
 .../views/loan_request_views.xml                | 12 ++++++------
 .../views/loan_type_views.xml                   |  1 -
 .../views/repayment_lines_views.xml             |  2 +-
 .../views/res_config_settings_views.xml         |  2 +-
 9 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/advanced_loan_management/models/loan_request.py b/advanced_loan_management/models/loan_request.py
index 9498f93c1..7e79485ae 100644
--- a/advanced_loan_management/models/loan_request.py
+++ b/advanced_loan_management/models/loan_request.py
@@ -89,10 +89,9 @@ class LoanRequest(models.Model):
                                                       "rejected reason")
     request = fields.Boolean(string="Request",
                              help="For monitoring the record")
-    state = fields.Selection(
-        string='State',
-        selection=[('draft', 'Draft'), ('confirmed', 'Confirmed'),
-                   ('waiting for approval', 'Waiting For Approval'),
+    state = fields.Selection(string='State',
+selection=[('draft', 'Draft'), ('confirmed', 'Confirmed'),
+                   ('waiting', 'Waiting For Approval'),
                    ('approved', 'Approved'), ('disbursed', 'Disbursed'),
                    ('rejected', 'Rejected'), ('closed', 'Closed')],
         copy=False, tracking=True, default='draft', help="Loan request states")
@@ -148,7 +147,7 @@ class LoanRequest(models.Model):
     def action_request_for_loan(self):
         """Change the state to waiting for approval"""
         if self.request:
-            self.write({'state': "waiting for approval"})
+            self.write({'state': "waiting"})
         else:
             message_id = self.env['message.popup'].create(
                 {'message': _("Compute the repayments before requesting")})
diff --git a/advanced_loan_management/models/loan_type.py b/advanced_loan_management/models/loan_type.py
index 66e74f2e5..0cc7436bb 100644
--- a/advanced_loan_management/models/loan_type.py
+++ b/advanced_loan_management/models/loan_type.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 ################################################################################
 #
 #    Cybrosys Technologies Pvt. Ltd.
diff --git a/advanced_loan_management/models/repayment_lines.py b/advanced_loan_management/models/repayment_lines.py
index ac69e0c82..87572904c 100644
--- a/advanced_loan_management/models/repayment_lines.py
+++ b/advanced_loan_management/models/repayment_lines.py
@@ -122,9 +122,9 @@ class RepaymentLine(models.Model):
             ],
         })
         if invoice:
-            self.invoice = True
-            self.write({'state': 'invoiced'})
-
+            invoice.action_post()
+            self.invoice=True
+            self.write({'state':'invoiced'})
         return {
             'name': 'Invoice',
             'res_model': 'account.move',
@@ -136,8 +136,10 @@ class RepaymentLine(models.Model):
     def action_view_invoice(self):
         """To view the invoices"""
         invoice = self.env['account.move'].search([
-            ('payment_reference', '=', self.name,)
+            ('payment_reference', '=', self.name)
         ])
+        self.invoice = True
+
         return {
             'name': 'Invoice',
             'res_model': 'account.move',
diff --git a/advanced_loan_management/security/loan_management_groups.xml b/advanced_loan_management/security/loan_management_groups.xml
index a192e8536..19ba7eec9 100644
--- a/advanced_loan_management/security/loan_management_groups.xml
+++ b/advanced_loan_management/security/loan_management_groups.xml
@@ -19,6 +19,5 @@
             <field name="implied_ids" eval="[(4, ref('advanced_loan_management.loan_management_group_user'))]"/>
             <field name="category_id" ref="loan_management_groups"/>
         </record>
-
     </data>
 </odoo>
\ No newline at end of file
diff --git a/advanced_loan_management/security/loan_management_security.xml b/advanced_loan_management/security/loan_management_security.xml
index f78e01452..e0a389112 100644
--- a/advanced_loan_management/security/loan_management_security.xml
+++ b/advanced_loan_management/security/loan_management_security.xml
@@ -29,7 +29,22 @@
         <field name="global" eval="True"/>
         <field name="domain_force">[('company_id', 'in', company_ids)]</field>
     </record>
-<!--       User Group Access Rule-->
+
+    <!--       Manager Group Access Rule-->
+    <record id="loan_request_manager_rule" model="ir.rule">
+        <field name="name">Access All Loan Request Created</field>
+        <field ref="model_loan_request" name="model_id"/>
+        <field name="domain_force">[(1, '=', 1)]</field>
+        <field name="groups"
+               eval="[(4, ref('advanced_loan_management.loan_management_group_manager'))]"/>
+        <field name="perm_read" eval="True"/>
+        <field name="perm_write" eval="True"/>
+        <field name="perm_create" eval="True"/>
+        <field name="perm_unlink" eval="True"/>
+        <field name="active" eval="True"/>
+    </record>
+
+    <!--       User Group Access Rule-->
     <record id="loan_request_user_rule" model="ir.rule">
         <field name="name">Access Only Loan Request Created By User</field>
         <field ref="model_loan_request" name="model_id"/>
diff --git a/advanced_loan_management/views/loan_request_views.xml b/advanced_loan_management/views/loan_request_views.xml
index f94c2f913..0df294983 100644
--- a/advanced_loan_management/views/loan_request_views.xml
+++ b/advanced_loan_management/views/loan_request_views.xml
@@ -35,7 +35,7 @@
                     <header>
                         <div class="alert alert-info" role="alert"
                              style="height: 40px; margin-bottom:0px;"
-                             invisible="[('state', 'not in', 'waiting for approval')]"
+                                invisible="state != 'waiting'"
                              groups="advanced_loan_management.loan_management_group_user">
                             Waiting for approval from the manager
                         </div>
@@ -55,11 +55,11 @@
                                 string="Request"
                                 type="object"/>
                         <button name="action_loan_approved" class="oe_highlight"
-                                invisible="state != 'waiting for approval'"
+                                invisible="state != 'waiting'"
                                 string="Approve" type="object"
                                 groups="advanced_loan_management.loan_management_group_manager"/>
                         <button name="action_loan_rejected" class="oe_highlight"
-                                invisible="state != 'waiting for approval'"
+                                invisible="state != 'waiting'"
                                 string="Reject" type="object"
                                 groups="advanced_loan_management.loan_management_group_manager"/>
                         <button name="action_disburse_loan" class="oe_highlight"
@@ -115,13 +115,13 @@
                                                decoration-danger="state == 'unpaid'"
                                                decoration-warning="state == 'invoiced'"
                                                decoration-success="state == 'paid'"/>
-                                        <field name="invoice" invisible="1"/>
+                                        <field name="invoice" column_invisible="1"/>
                                         <button invisible="(invoice == True) or (state != 'unpaid') or (parent.state != 'disbursed')"
                                                 name="action_pay_emi"
                                                 class="oe_highlight"
                                                 string="Pay"
                                                 type="object"/>
-                                        <button invisible="(invoice == False) or (parent.state != 'disbursed')"
+                                        <button invisible="(invoice == False) or (parent.state != 'disbursed') or (state == 'paid')"
                                                 name="action_view_invoice"
                                                 class="oe_highlight"
                                                 string="View"
@@ -138,7 +138,7 @@
                                 </group>
                             </page>
                             <page string="Loan rejection"
-                                  invisible="state == 'rejected'">
+                                  invisible="state != 'rejected'">
                                 <field name="reject_reason" readonly="1"/>
                             </page>
                             <page string="Accounting"
diff --git a/advanced_loan_management/views/loan_type_views.xml b/advanced_loan_management/views/loan_type_views.xml
index 9fa0accd0..4999e41df 100644
--- a/advanced_loan_management/views/loan_type_views.xml
+++ b/advanced_loan_management/views/loan_type_views.xml
@@ -81,7 +81,6 @@
                             <field name="documents_ids"
                                    widget="many2many_tags"/>
                         </group>
-
                         <group>
                             <field name="processing_fee"/>
                             <field name="interest_rate" widget="percentage"/>
diff --git a/advanced_loan_management/views/repayment_lines_views.xml b/advanced_loan_management/views/repayment_lines_views.xml
index 1f478d27f..0934986b7 100644
--- a/advanced_loan_management/views/repayment_lines_views.xml
+++ b/advanced_loan_management/views/repayment_lines_views.xml
@@ -71,7 +71,7 @@
                             <field name="amount"/>
                             <field name="interest_amount"/>
                             <field name="total_amount"/>
-                            <field name="invoice" invisible="1"/>
+                            <field name="invoice" column_invisible="1"/>
                         </group>
                         <group>
                             <field name="company_id"/>
diff --git a/advanced_loan_management/views/res_config_settings_views.xml b/advanced_loan_management/views/res_config_settings_views.xml
index 013713788..e47fd26c4 100644
--- a/advanced_loan_management/views/res_config_settings_views.xml
+++ b/advanced_loan_management/views/res_config_settings_views.xml
@@ -23,7 +23,7 @@
             <xpath expr="//form"
                    position="inside">
                     <app data-string="Loan Management" string="Loan" name="advanced_loan_management">
-                        <field name="interest_product_id" invisible="1"/>
+                        <field name="interest_product_id" column_invisible="1"/>
                         <field name="interest_product_id" invisible="1"/>
                         <block title="Loan Interest" name="fiscal_localization_setting_container" >
                             <setting string="Loan Interest Details" company_dependent="1" help="Interest product and repayment details.">