From f97742f84571c832ef14679cbae5f347defb41d8 Mon Sep 17 00:00:00 2001 From: Unai Beristain Date: Tue, 15 Oct 2024 12:02:58 +0200 Subject: [PATCH] x[IMP] website_sale_cancel_not_show: Improve domain --- website_sale_cancel_not_show/__manifest__.py | 1 + website_sale_cancel_not_show/controllers/main.py | 10 ++++++++-- .../security/ir.model.access.csv | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 website_sale_cancel_not_show/security/ir.model.access.csv diff --git a/website_sale_cancel_not_show/__manifest__.py b/website_sale_cancel_not_show/__manifest__.py index 9c00c74e..dcd69b67 100644 --- a/website_sale_cancel_not_show/__manifest__.py +++ b/website_sale_cancel_not_show/__manifest__.py @@ -8,6 +8,7 @@ "license": "AGPL-3", "depends": ["website_sale", "sale", "portal"], "data": [ + "security/ir.model.access.csv", "views/website_sale_my_account_state_templates.xml", ], "installable": True, diff --git a/website_sale_cancel_not_show/controllers/main.py b/website_sale_cancel_not_show/controllers/main.py index 0cc733f7..7b15c6a5 100644 --- a/website_sale_cancel_not_show/controllers/main.py +++ b/website_sale_cancel_not_show/controllers/main.py @@ -31,15 +31,21 @@ def _prepare_home_portal_values(self, counters): def _prepare_quotations_domain(self, partner): domain = [ - ("message_partner_ids", "child_of", [partner.commercial_partner_id.id]), + "&", ("state", "in", ["sent", "draft"]), + "|", + ("message_partner_ids", "child_of", [partner.commercial_partner_id.id]), + ("partner_id", "child_of", [partner.commercial_partner_id.id]), ] return domain def _prepare_orders_domain(self, partner): domain = [ - ("message_partner_ids", "child_of", [partner.commercial_partner_id.id]), + "&", ("state", "in", ["sale"]), + "|", + ("message_partner_ids", "child_of", [partner.commercial_partner_id.id]), + ("partner_id", "child_of", [partner.commercial_partner_id.id]), ] return domain diff --git a/website_sale_cancel_not_show/security/ir.model.access.csv b/website_sale_cancel_not_show/security/ir.model.access.csv new file mode 100644 index 00000000..a925b168 --- /dev/null +++ b/website_sale_cancel_not_show/security/ir.model.access.csv @@ -0,0 +1,2 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink,domain +portal_partner_quotations_sales_orders,Portal Partner Quotations/Sales Orders,model_sale_order,base.group_portal,1,1,0,1,"[('partner_id','child_of',[user.commercial_partner_id.id])]"