diff --git a/models/partner_dashboard_dlg.py b/models/partner_dashboard_dlg.py index 021c61b084a5987348171b835329c9dfb61ba0a9..1e0261a9a1e8aa3e84e605ca10dd8daa65020e26 100644 --- a/models/partner_dashboard_dlg.py +++ b/models/partner_dashboard_dlg.py @@ -60,7 +60,6 @@ class ScopPartnerDashboardDlg(models.Model): graph_values = fields.Text(compute="_compute_graph_values") - # ------------------------------------------------------ # Construction de la requete # ------------------------------------------------------ @@ -77,7 +76,6 @@ class ScopPartnerDashboardDlg(models.Model): return qy - # ------------------------------------------------------ # Dashboard projets # ------------------------------------------------------ @@ -187,7 +185,6 @@ class ScopPartnerDashboardDlg(models.Model): return query - # ------------------------------------------------------ # Dashboard revision # ------------------------------------------------------ @@ -374,14 +371,12 @@ class ScopPartnerDashboardDlg(models.Model): """ return query - def init(self): tools.drop_view_if_exists(self.env.cr, self._table) self.env.cr.execute("""CREATE or REPLACE VIEW %s as ( %s )""" % (self._table, self._select())) - # ------------------------------------------------------ # Calcule les données du graphique # ------------------------------------------------------ @@ -472,7 +467,7 @@ class ScopPartnerDashboardDlg(models.Model): 'type': 'ir.actions.act_window', 'res_model': 'res.partner', 'view_type': 'form', - 'view_mode': 'kanban,tree,form', + 'view_mode': 'kanban,tree,form,activity', 'views': [ (self.env.ref('cgscop_partner.view_partner_cooperative_kanban').id, 'kanban'), (self.env.ref('cgscop_partner.view_partner_prospect_tree').id, 'tree'), @@ -482,6 +477,12 @@ class ScopPartnerDashboardDlg(models.Model): ('is_cooperative', '=', True), ('project_status','in',('1_information','2_pre-diagnostic','3_accompagnement','4_adhesion','5_cg','7_abandonne')), ('creation_delegate_id', '=', self.env.user.id)], + 'context': { + 'default_is_company': True, + 'default_is_cooperative': True, + 'default_company_type': 'company', + 'default_project_status': '1_information' + }, } # ------------------------------------------------------ @@ -494,7 +495,7 @@ class ScopPartnerDashboardDlg(models.Model): 'res_model': 'res.partner', 'search_view_id' : self.env.ref('cgscop_partner.scop_partner_view_search').id, 'view_type': 'form', - 'view_mode': 'tree,form', + 'view_mode': 'tree,form,activity', 'views': [ (self.env.ref('cgscop_partner.view_partner_cooperative_tree').id, 'tree'), (self.env.ref('cgscop_partner.scop_contact_view_form').id, 'form')], @@ -503,6 +504,12 @@ class ScopPartnerDashboardDlg(models.Model): ('is_cooperative', '=', True), ('membership_status', '=', 'member'), ('followup_delegate_id', '=', self.env.user.id)], + 'context': { + 'default_is_company': True, + 'default_is_cooperative': True, + 'default_company_type': 'company', + 'create': False, + }, } # ------------------------------------------------------ @@ -517,7 +524,7 @@ class ScopPartnerDashboardDlg(models.Model): 'type': 'ir.actions.act_window', 'res_model': 'res.partner', 'view_type': 'form', - 'view_mode': 'tree', + 'view_mode': 'tree,form,activity', 'views': [ (self.env.ref('cgscop_partner.view_partner_cooperative_tree').id, 'tree'), (self.env.ref('cgscop_partner.scop_contact_view_form').id, 'form')], @@ -528,6 +535,12 @@ class ScopPartnerDashboardDlg(models.Model): ('revision_person_id', '=', self.env.user.id), ('revision_next_year', '=', wyear) ], + 'context': { + 'default_is_company': True, + 'default_is_cooperative': True, + 'default_company_type': 'company', + 'create': False, + }, } # ------------------------------------------------------ @@ -535,15 +548,13 @@ class ScopPartnerDashboardDlg(models.Model): # ------------------------------------------------------ def show_acc(self): - wyear = datetime.datetime.today().year - return { 'name': "Coopérative à suivre" , 'type': 'ir.actions.act_window', 'res_model': 'res.partner', 'search_view_id': (self.env.ref('cgscop_partner.scop_partner_view_search').id,), 'view_type': 'form', - 'view_mode': 'tree', + 'view_mode': 'tree,form,activity', 'views': [ (self.env.ref('cgscop_partner_crm.scop_partner_crm_view_tree').id, 'tree'), (self.env.ref('cgscop_partner.scop_contact_view_form').id, 'form')], @@ -552,4 +563,10 @@ class ScopPartnerDashboardDlg(models.Model): ('is_cooperative', '=', True), ('membership_status', '=', 'member'), ('followup_delegate_id', '=', self.env.user.id)], + 'context': { + 'default_is_company': True, + 'default_is_cooperative': True, + 'default_company_type': 'company', + 'create': False, + }, } \ No newline at end of file