From 6c664223df59be52377533b23dd3f5580b08fff5 Mon Sep 17 00:00:00 2001 From: Dibik Date: Mon, 5 Feb 2024 19:42:07 +0530 Subject: [PATCH 1/3] G2P-1830,G2P-1818,G2P-1803: Setting opening issue, Import registrant issue, Added name to external link --- .../views/entitlement_manager_view.xml | 45 +++++++++---------- .../views/entitlement_manager_view.xml | 3 +- g2p_payment_phee/__manifest__.py | 2 +- .../views/res_config_settings_view.xml | 45 +++++++++++++------ .../wizard/create_entitlement_wizard.py | 4 +- .../wizard/create_entitlement_wizard.xml | 8 +--- .../static/src/js/preview_document.js | 17 ++++--- .../views/program_membership_view.xml | 2 +- .../models/program_membership.py | 17 +++---- .../views/program_membership.xml | 1 + .../views/program_registrant_info.xml | 2 + g2p_programs/views/cycle_membership_view.xml | 1 + g2p_programs/views/duplicate_view.xml | 1 + .../views/program_membership_view.xml | 1 + g2p_programs/views/programs_view.xml | 8 ++++ g2p_programs/views/registrant_view.xml | 4 ++ 16 files changed, 94 insertions(+), 67 deletions(-) diff --git a/g2p_entitlement_differential/views/entitlement_manager_view.xml b/g2p_entitlement_differential/views/entitlement_manager_view.xml index 9ad4bd6e..214cc5a9 100644 --- a/g2p_entitlement_differential/views/entitlement_manager_view.xml +++ b/g2p_entitlement_differential/views/entitlement_manager_view.xml @@ -4,32 +4,29 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. --> - - view_entitlement_manager_cash_form_diff_inherit - g2p.program.entitlement.manager.cash - - 100 - - -
- -
- + + view_entitlement_manager_cash_form_diff_inherit + g2p.program.entitlement.manager.cash + + 100 + + +
+ +
+ - - + - - - - - - - + + + + + + + diff --git a/g2p_entitlement_voucher/views/entitlement_manager_view.xml b/g2p_entitlement_voucher/views/entitlement_manager_view.xml index 10204585..60e5d03b 100644 --- a/g2p_entitlement_voucher/views/entitlement_manager_view.xml +++ b/g2p_entitlement_voucher/views/entitlement_manager_view.xml @@ -40,7 +40,8 @@ type="object" icon="fa-external-link" class="oe_stat_button" - titile="open voucher config form" + string="Open voucher config form" + titile="Open voucher config form" /> diff --git a/g2p_payment_phee/__manifest__.py b/g2p_payment_phee/__manifest__.py index 651addde..937d44cc 100644 --- a/g2p_payment_phee/__manifest__.py +++ b/g2p_payment_phee/__manifest__.py @@ -15,8 +15,8 @@ ], "data": [ "security/ir.model.access.csv", - "views/res_config_settings_view.xml", "views/payment_manager_view.xml", + "views/res_config_settings_view.xml", ], "assets": {}, "demo": [], diff --git a/g2p_payment_phee/views/res_config_settings_view.xml b/g2p_payment_phee/views/res_config_settings_view.xml index c9d24dfd..8fa8955b 100644 --- a/g2p_payment_phee/views/res_config_settings_view.xml +++ b/g2p_payment_phee/views/res_config_settings_view.xml @@ -12,27 +12,46 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. - - - - + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + diff --git a/g2p_program_assessment/wizard/create_entitlement_wizard.py b/g2p_program_assessment/wizard/create_entitlement_wizard.py index b64d712d..6e8aafe3 100644 --- a/g2p_program_assessment/wizard/create_entitlement_wizard.py +++ b/g2p_program_assessment/wizard/create_entitlement_wizard.py @@ -82,9 +82,7 @@ def open_entitlement_form_wizard(self, beneficiary): def create_entitlement(self): if not self.initial_amount or self.initial_amount <= 0: - raise ValidationError( - _("Amount cannot be zero or empty or negative.") - ) + raise ValidationError(_("Amount cannot be zero or empty or negative.")) existing_entitlements_count = self.env["g2p.entitlement"].search_count( [ diff --git a/g2p_program_assessment/wizard/create_entitlement_wizard.xml b/g2p_program_assessment/wizard/create_entitlement_wizard.xml index cb55e33e..3fcfbea1 100644 --- a/g2p_program_assessment/wizard/create_entitlement_wizard.xml +++ b/g2p_program_assessment/wizard/create_entitlement_wizard.xml @@ -25,13 +25,7 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. diff --git a/g2p_program_documents/static/src/js/preview_document.js b/g2p_program_documents/static/src/js/preview_document.js index 4dd2e9ce..27c76a2b 100644 --- a/g2p_program_documents/static/src/js/preview_document.js +++ b/g2p_program_documents/static/src/js/preview_document.js @@ -1,22 +1,21 @@ /** @odoo-module **/ -import { useFileViewer } from "@web/core/file_viewer/file_viewer_hook"; -import { Component, xml } from "@odoo/owl"; -import { registry } from "@web/core/registry"; -import { useService } from "@web/core/utils/hooks"; +import {useFileViewer} from "@web/core/file_viewer/file_viewer_hook"; +import {Component, xml} from "@odoo/owl"; +import {registry} from "@web/core/registry"; +import {useService} from "@web/core/utils/hooks"; class Widgetpreview extends Component { - static template = xml``; - setup(){ + setup() { super.setup(); this.fileViewer = useFileViewer(); this.store = useService("mail.store"); this.rpc = useService("rpc"); } - clickPreview(ev){ - const currentRow = ev.target.closest('.o_data_row'); + clickPreview(ev) { + const currentRow = ev.target.closest(".o_data_row"); if (currentRow) { const slugElement = currentRow.querySelector('.o_data_cell[name="slug"]'); if (slugElement) { @@ -39,7 +38,7 @@ class Widgetpreview extends Component { } async _onPreviewButtonClick(recordID) { - const result = await this.rpc("/web/dataset/call_kw/storage.file/get_binary",{ + const result = await this.rpc("/web/dataset/call_kw/storage.file/get_binary", { model: "storage.file", method: "get_binary", args: [[recordID]], diff --git a/g2p_program_documents/views/program_membership_view.xml b/g2p_program_documents/views/program_membership_view.xml index 2cbe476d..3c42914f 100644 --- a/g2p_program_documents/views/program_membership_view.xml +++ b/g2p_program_documents/views/program_membership_view.xml @@ -13,7 +13,7 @@ - + diff --git a/g2p_program_registrant_info/models/program_membership.py b/g2p_program_registrant_info/models/program_membership.py index dec3a3e4..bd3d8eb5 100644 --- a/g2p_program_registrant_info/models/program_membership.py +++ b/g2p_program_registrant_info/models/program_membership.py @@ -27,14 +27,15 @@ def _compute_latest_registrant_info(self): @api.constrains("partner_id", "program_id") def _onchange_program_registrant_info(self): - old_prog_reg_infos = self.env["g2p.program.registrant_info"].search( - [ - ("registrant_id", "=", self.partner_id.id), - ("program_id", "=", self.program_id.id), - ("program_membership_id", "!=", self.id), - ] - ) - old_prog_reg_infos.write({"program_membership_id": self.id}) + for rec in self: + old_prog_reg_infos = self.env["g2p.program.registrant_info"].search( + [ + ("registrant_id", "=", rec.partner_id.id), + ("program_id", "=", rec.program_id.id), + ("program_membership_id", "!=", rec.id), + ] + ) + old_prog_reg_infos.write({"program_membership_id": rec.id}) def create_program_registrant_info(self): self.ensure_one() diff --git a/g2p_program_registrant_info/views/program_membership.xml b/g2p_program_registrant_info/views/program_membership.xml index 8c30dbf7..47a5a814 100644 --- a/g2p_program_registrant_info/views/program_membership.xml +++ b/g2p_program_registrant_info/views/program_membership.xml @@ -25,6 +25,7 @@ type="object" icon="fa-external-link" class="btn-success" + string="Open new tab" title="Open new tab" /> diff --git a/g2p_program_registrant_info/views/program_registrant_info.xml b/g2p_program_registrant_info/views/program_registrant_info.xml index 06c6169e..43789771 100644 --- a/g2p_program_registrant_info/views/program_registrant_info.xml +++ b/g2p_program_registrant_info/views/program_registrant_info.xml @@ -22,6 +22,7 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. type="object" icon="fa-external-link" title="Open registrant form" + string="Open registrant form" class="btn-success" /> @@ -53,6 +54,7 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. type="object" icon="fa-external-link" title="Open registrant form" + string="Open registrant form" class="btn-success" /> diff --git a/g2p_programs/views/cycle_membership_view.xml b/g2p_programs/views/cycle_membership_view.xml index 6d7f4bc7..10a23d56 100644 --- a/g2p_programs/views/cycle_membership_view.xml +++ b/g2p_programs/views/cycle_membership_view.xml @@ -15,6 +15,7 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. icon="fa-external-link" title="Open registrant form" class="btn-success" + string="Open registrant form" /> diff --git a/g2p_programs/views/duplicate_view.xml b/g2p_programs/views/duplicate_view.xml index 1a894e70..ca4fd6ba 100644 --- a/g2p_programs/views/duplicate_view.xml +++ b/g2p_programs/views/duplicate_view.xml @@ -54,6 +54,7 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. type="object" icon="fa-external-link" title="Open registrant form" + string="Open registrant form" class="btn-success" /> diff --git a/g2p_programs/views/program_membership_view.xml b/g2p_programs/views/program_membership_view.xml index 3240a0f0..bbdb9c3a 100644 --- a/g2p_programs/views/program_membership_view.xml +++ b/g2p_programs/views/program_membership_view.xml @@ -15,6 +15,7 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. type="object" title="Open registrant form" icon="fa-external-link" + string="Open registrant form" class="btn-success" /> diff --git a/g2p_programs/views/programs_view.xml b/g2p_programs/views/programs_view.xml index 35d1c9fd..2a3a1468 100644 --- a/g2p_programs/views/programs_view.xml +++ b/g2p_programs/views/programs_view.xml @@ -226,6 +226,7 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. type="object" title="Open cycle form" icon="fa-external-link" + string="Open cycle form" class="btn-success" /> @@ -520,6 +521,7 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. title="Open manager form" type="object" icon="fa-external-link" + string="Open eligibility manager form" class="btn-success" invisible="not manager_ref_id" context="{'default_program_id':id, 'create': False}" @@ -559,6 +561,7 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. title="Open manager form" type="object" icon="fa-external-link" + string="Open deduplication manager form" class="btn-success" invisible="not manager_ref_id" context="{'default_program_id':id, 'create': False}" @@ -598,6 +601,7 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. title="Open manager form" type="object" icon="fa-external-link" + string="Open notification manager form" class="btn-success" invisible="not manager_ref_id" context="{'default_program_id':id, 'create': False}" @@ -647,6 +651,7 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. title="Open manager form" type="object" icon="fa-external-link" + string="Open program manager form" class="btn-success" invisible="not manager_ref_id" context="{'default_program_id':id, 'create': False}" @@ -693,6 +698,7 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. title="Open manager form" type="object" icon="fa-external-link" + string="Open cycle manager form" class="btn-success" invisible="not manager_ref_id" context="{'default_program_id':id, 'create': False}" @@ -739,6 +745,7 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. title="Open manager form" type="object" icon="fa-external-link" + string="Open Entitlement manager form" class="btn-success" invisible="not manager_ref_id" context="{'default_program_id':id, 'create': False}" @@ -786,6 +793,7 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. title="Open manager form" type="object" icon="fa-external-link" + string="Open payment manager form" class="btn-success" invisible="not manager_ref_id" context="{'default_program_id':id, 'create': False}" diff --git a/g2p_programs/views/registrant_view.xml b/g2p_programs/views/registrant_view.xml index 35cccb9e..3dabd1e2 100644 --- a/g2p_programs/views/registrant_view.xml +++ b/g2p_programs/views/registrant_view.xml @@ -21,6 +21,7 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. type="object" title="Open beneficiaries form" icon="fa-external-link" + string="Open beneficiaries form" class="btn-success" /> @@ -52,6 +53,7 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. title="Open entitlement form" type="object" icon="fa-external-link" + string="Open entitlement form" class="btn-success" /> @@ -87,6 +89,7 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. title="Open beneficiaries form" type="object" icon="fa-external-link" + string="Open beneficiaries form" class="btn-success" /> @@ -118,6 +121,7 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. title="Open entitlement form" type="object" icon="fa-external-link" + string="Open entitlement form" class="btn-success" /> From ec44676c5e3418182293bf24453815bab38a1973 Mon Sep 17 00:00:00 2001 From: Dibik Date: Mon, 5 Feb 2024 19:48:27 +0530 Subject: [PATCH 2/3] Text changes --- g2p_entitlement_voucher/views/entitlement_manager_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/g2p_entitlement_voucher/views/entitlement_manager_view.xml b/g2p_entitlement_voucher/views/entitlement_manager_view.xml index 60e5d03b..d6d0d51a 100644 --- a/g2p_entitlement_voucher/views/entitlement_manager_view.xml +++ b/g2p_entitlement_voucher/views/entitlement_manager_view.xml @@ -41,7 +41,7 @@ icon="fa-external-link" class="oe_stat_button" string="Open voucher config form" - titile="Open voucher config form" + title="Open voucher config form" /> From 2a101facd254234d4d8b4f9e2c2fff9ae811f29b Mon Sep 17 00:00:00 2001 From: Dibik Date: Wed, 7 Feb 2024 01:48:43 +0530 Subject: [PATCH 3/3] G2P-1830: Removed string from the external button --- .../views/entitlement_manager_view.xml | 1 - .../views/program_membership.xml | 1 - .../views/program_registrant_info.xml | 2 -- g2p_programs/views/cycle_membership_view.xml | 1 - g2p_programs/views/duplicate_view.xml | 1 - g2p_programs/views/program_membership_view.xml | 1 - g2p_programs/views/programs_view.xml | 8 -------- g2p_programs/views/registrant_view.xml | 10 +++------- 8 files changed, 3 insertions(+), 22 deletions(-) diff --git a/g2p_entitlement_voucher/views/entitlement_manager_view.xml b/g2p_entitlement_voucher/views/entitlement_manager_view.xml index d6d0d51a..011205dd 100644 --- a/g2p_entitlement_voucher/views/entitlement_manager_view.xml +++ b/g2p_entitlement_voucher/views/entitlement_manager_view.xml @@ -40,7 +40,6 @@ type="object" icon="fa-external-link" class="oe_stat_button" - string="Open voucher config form" title="Open voucher config form" /> diff --git a/g2p_program_registrant_info/views/program_membership.xml b/g2p_program_registrant_info/views/program_membership.xml index 47a5a814..8c30dbf7 100644 --- a/g2p_program_registrant_info/views/program_membership.xml +++ b/g2p_program_registrant_info/views/program_membership.xml @@ -25,7 +25,6 @@ type="object" icon="fa-external-link" class="btn-success" - string="Open new tab" title="Open new tab" /> diff --git a/g2p_program_registrant_info/views/program_registrant_info.xml b/g2p_program_registrant_info/views/program_registrant_info.xml index 43789771..06c6169e 100644 --- a/g2p_program_registrant_info/views/program_registrant_info.xml +++ b/g2p_program_registrant_info/views/program_registrant_info.xml @@ -22,7 +22,6 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. type="object" icon="fa-external-link" title="Open registrant form" - string="Open registrant form" class="btn-success" /> @@ -54,7 +53,6 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. type="object" icon="fa-external-link" title="Open registrant form" - string="Open registrant form" class="btn-success" /> diff --git a/g2p_programs/views/cycle_membership_view.xml b/g2p_programs/views/cycle_membership_view.xml index 10a23d56..6d7f4bc7 100644 --- a/g2p_programs/views/cycle_membership_view.xml +++ b/g2p_programs/views/cycle_membership_view.xml @@ -15,7 +15,6 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. icon="fa-external-link" title="Open registrant form" class="btn-success" - string="Open registrant form" /> diff --git a/g2p_programs/views/duplicate_view.xml b/g2p_programs/views/duplicate_view.xml index ca4fd6ba..1a894e70 100644 --- a/g2p_programs/views/duplicate_view.xml +++ b/g2p_programs/views/duplicate_view.xml @@ -54,7 +54,6 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. type="object" icon="fa-external-link" title="Open registrant form" - string="Open registrant form" class="btn-success" /> diff --git a/g2p_programs/views/program_membership_view.xml b/g2p_programs/views/program_membership_view.xml index bbdb9c3a..3240a0f0 100644 --- a/g2p_programs/views/program_membership_view.xml +++ b/g2p_programs/views/program_membership_view.xml @@ -15,7 +15,6 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. type="object" title="Open registrant form" icon="fa-external-link" - string="Open registrant form" class="btn-success" /> diff --git a/g2p_programs/views/programs_view.xml b/g2p_programs/views/programs_view.xml index 2a3a1468..35d1c9fd 100644 --- a/g2p_programs/views/programs_view.xml +++ b/g2p_programs/views/programs_view.xml @@ -226,7 +226,6 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. type="object" title="Open cycle form" icon="fa-external-link" - string="Open cycle form" class="btn-success" /> @@ -521,7 +520,6 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. title="Open manager form" type="object" icon="fa-external-link" - string="Open eligibility manager form" class="btn-success" invisible="not manager_ref_id" context="{'default_program_id':id, 'create': False}" @@ -561,7 +559,6 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. title="Open manager form" type="object" icon="fa-external-link" - string="Open deduplication manager form" class="btn-success" invisible="not manager_ref_id" context="{'default_program_id':id, 'create': False}" @@ -601,7 +598,6 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. title="Open manager form" type="object" icon="fa-external-link" - string="Open notification manager form" class="btn-success" invisible="not manager_ref_id" context="{'default_program_id':id, 'create': False}" @@ -651,7 +647,6 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. title="Open manager form" type="object" icon="fa-external-link" - string="Open program manager form" class="btn-success" invisible="not manager_ref_id" context="{'default_program_id':id, 'create': False}" @@ -698,7 +693,6 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. title="Open manager form" type="object" icon="fa-external-link" - string="Open cycle manager form" class="btn-success" invisible="not manager_ref_id" context="{'default_program_id':id, 'create': False}" @@ -745,7 +739,6 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. title="Open manager form" type="object" icon="fa-external-link" - string="Open Entitlement manager form" class="btn-success" invisible="not manager_ref_id" context="{'default_program_id':id, 'create': False}" @@ -793,7 +786,6 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details. title="Open manager form" type="object" icon="fa-external-link" - string="Open payment manager form" class="btn-success" invisible="not manager_ref_id" context="{'default_program_id':id, 'create': False}" diff --git a/g2p_programs/views/registrant_view.xml b/g2p_programs/views/registrant_view.xml index 3dabd1e2..7a5b8754 100644 --- a/g2p_programs/views/registrant_view.xml +++ b/g2p_programs/views/registrant_view.xml @@ -19,9 +19,8 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details.