diff --git a/report/partner_dashboard_ur.py b/report/partner_dashboard_ur.py index ef5797637449215db047370f1ff27b76ea3c680c..cd18d4011ea573131464ff8f7736f0c5115d813c 100644 --- a/report/partner_dashboard_ur.py +++ b/report/partner_dashboard_ur.py @@ -668,6 +668,12 @@ class ScopPartnerDashboardUr(models.Model): # Affichage des projets de l'ur # ------------------------------------------------------ def show_projets(self): + domain = [ + ("is_cooperative", "=", True), + ("project_status", "!=", "6_suivi"), + ] + if self.env.company.ur_id.partner_filter != "1": + domain.append(("ur_id", "=", self.env.company.ur_id.id)) return { "name": "Prospects", "type": "ir.actions.act_window", @@ -688,22 +694,7 @@ class ScopPartnerDashboardUr(models.Model): ), ], "target": "current", - "domain": [ - ("is_cooperative", "=", True), - ( - "project_status", - "in", - ( - "1_information", - "2_pre-diagnostic", - "3_accompagnement", - "4_adhesion", - "5_cg", - "7_abandonne", - ), - ), - ("current_user_ur_id", "=", "ur_id"), - ], + "domain": domain, "context": { "default_is_company": True, "default_is_cooperative": True, @@ -763,6 +754,13 @@ class ScopPartnerDashboardUr(models.Model): # Affichage des coop adh de l'ur # ------------------------------------------------------ def show_coop(self): + domain = [ + ("is_cooperative", "=", True), + ("membership_status", "=", "member"), + ] + if self.env.company.ur_id.partner_filter != "1": + domain.append(("ur_id", "=", self.env.company.ur_id.id)) + return { "name": "Coopératives adhérentes", "type": "ir.actions.act_window", @@ -782,11 +780,7 @@ class ScopPartnerDashboardUr(models.Model): ), ], "target": "current", - "domain": [ - ("is_cooperative", "=", True), - ("membership_status", "=", "member"), - ("current_user_ur_id", "=", "ur_id"), - ], + "domain": domain, "context": { "default_is_company": True, "default_is_cooperative": True, @@ -836,6 +830,13 @@ class ScopPartnerDashboardUr(models.Model): def show_rev(self): wyear = datetime.datetime.today().year + domain = [ + ("is_cooperative", "=", True), + ("membership_status", "=", "member"), + ("revision_next_year", "<=", wyear), + ] + if self.env.company.ur_id.partner_filter != "1": + domain.append(("ur_id", "=", self.env.company.ur_id.id)) return { "name": "Coopérative à réviser", @@ -853,12 +854,7 @@ class ScopPartnerDashboardUr(models.Model): ), ], "target": "current", - "domain": [ - ("is_cooperative", "=", True), - ("membership_status", "=", "member"), - ("current_user_ur_id", "=", "ur_id"), - ("revision_next_year", "<=", wyear), - ], + "domain": domain, "context": { "default_is_company": True, "default_is_cooperative": True, @@ -871,6 +867,12 @@ class ScopPartnerDashboardUr(models.Model): # Affichage des coop à suivre # ------------------------------------------------------ def show_acc(self): + domain = [ + ("is_cooperative", "=", True), + ("membership_status", "=", "member"), + ] + if self.env.company.ur_id.partner_filter != "1": + domain.append(("ur_id", "=", self.env.company.ur_id.id)) return { "name": "Coopérative à suivre", @@ -891,11 +893,7 @@ class ScopPartnerDashboardUr(models.Model): ), ], "target": "current", - "domain": [ - ("is_cooperative", "=", True), - ("membership_status", "=", "member"), - ("current_user_ur_id", "=", "ur_id"), - ], + "domain": domain, "context": { "default_is_company": True, "default_is_cooperative": True, diff --git a/views/res_partner.xml b/views/res_partner.xml index 7cde7d265dfb21dd6c22668fc3c776beb6d4a2ef..19eaa17b784f5661a133f1dcfdd66030639db147 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -13,7 +13,7 @@ id="res_partner_menu_dashboard" name="Dashboard" parent="contacts.menu_contacts" - sequence="05" + sequence="5" /> <menuitem