From 6cdd23e551e353912da9cd82c9c74ff24eb3ea46 Mon Sep 17 00:00:00 2001 From: houssine Date: Tue, 26 May 2020 17:56:33 +0200 Subject: [PATCH 1/4] [FIX] fix xml view due to Odoo xml parsing glitch --- easy_my_coop/views/account_invoice_view.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/easy_my_coop/views/account_invoice_view.xml b/easy_my_coop/views/account_invoice_view.xml index d248b8d..8398480 100644 --- a/easy_my_coop/views/account_invoice_view.xml +++ b/easy_my_coop/views/account_invoice_view.xml @@ -14,8 +14,7 @@ Cooperator Invoices account.invoice form - tree,kanban,form,calendar,pivot,graph,activity - + tree,kanban,form,calendar,pivot,graph,activity [('type','in',('out_invoice', 'out_refund')),('release_capital_request','=',True)] @@ -53,8 +52,7 @@ Customer Invoices account.invoice form - tree,kanban,form,calendar,pivot,graph,activity - + tree,kanban,form,calendar,pivot,graph,activity [('type','in',('out_invoice', 'out_refund')),('release_capital_request','=',False)] From 55ecd8340315e5ec095583577a7f5910928daa4b Mon Sep 17 00:00:00 2001 From: houssine Date: Tue, 26 May 2020 18:00:46 +0200 Subject: [PATCH 2/4] [IMP] do not return partner if company register number is None or empty --- easy_my_coop/models/partner.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/easy_my_coop/models/partner.py b/easy_my_coop/models/partner.py index f579766..b4b1752 100644 --- a/easy_my_coop/models/partner.py +++ b/easy_my_coop/models/partner.py @@ -211,9 +211,14 @@ class ResPartner(models.Model): ) def get_cooperator_from_crn(self, company_register_number): - return self.env["res.partner"].search( - [ - ("cooperator", "=", True), - ("company_register_number", "=", company_register_number), - ] - ) + company_register_number = company_register_number.strip() + if company_register_number: + partner = self.env["res.partner"].search( + [ + ("cooperator", "=", True), + ("company_register_number", "=", company_register_number), + ] + ) + else: + partner = None + return partner From e8114dbc96da98e48956fdf2d30df46c13da1070 Mon Sep 17 00:00:00 2001 From: houssine Date: Tue, 26 May 2020 18:13:05 +0200 Subject: [PATCH 3/4] [FIX] fix typo --- easy_my_coop_website/controllers/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easy_my_coop_website/controllers/main.py b/easy_my_coop_website/controllers/main.py index 60bff75..1fde5bb 100644 --- a/easy_my_coop_website/controllers/main.py +++ b/easy_my_coop_website/controllers/main.py @@ -333,7 +333,7 @@ class WebsiteSubscription(http.Controller): if not valid: values = self.fill_values(values, is_company, logged) - values["error_msg"] = _("You iban account number" "is not valid") + values["error_msg"] = _("You iban account number is not valid") return request.render(redirect, values) # check the subscription's amount From 9452970ec529109fd0b65bb6c62a3061245b4b52 Mon Sep 17 00:00:00 2001 From: houssine Date: Tue, 26 May 2020 18:20:28 +0200 Subject: [PATCH 4/4] [FIX] fix swiss localization for iban not required. IBAN number not required so it should not be checked if not provided. --- easy_my_coop_website/controllers/main.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/easy_my_coop_website/controllers/main.py b/easy_my_coop_website/controllers/main.py index 1fde5bb..ce8ff2e 100644 --- a/easy_my_coop_website/controllers/main.py +++ b/easy_my_coop_website/controllers/main.py @@ -329,12 +329,13 @@ class WebsiteSubscription(http.Controller): return request.render(redirect, values) iban = kwargs.get("iban") - valid = sub_req_obj.check_iban(iban) + if iban.strip(): + valid = sub_req_obj.check_iban(iban) - if not valid: - values = self.fill_values(values, is_company, logged) - values["error_msg"] = _("You iban account number is not valid") - return request.render(redirect, values) + if not valid: + values = self.fill_values(values, is_company, logged) + values["error_msg"] = _("You iban account number is not valid") + return request.render(redirect, values) # check the subscription's amount max_amount = company.subscription_maximum_amount