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..011205dd 100644 --- a/g2p_entitlement_voucher/views/entitlement_manager_view.xml +++ b/g2p_entitlement_voucher/views/entitlement_manager_view.xml @@ -40,7 +40,7 @@ type="object" icon="fa-external-link" class="oe_stat_button" - titile="open voucher config form" + title="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_programs/views/registrant_view.xml b/g2p_programs/views/registrant_view.xml index 35cccb9e..7a5b8754 100644 --- a/g2p_programs/views/registrant_view.xml +++ b/g2p_programs/views/registrant_view.xml @@ -19,8 +19,8 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details.