diff --git a/golem_precreation_member/__manifest__.py b/golem_precreation_member/__manifest__.py
index 19944c7..66d2eed 100644
--- a/golem_precreation_member/__manifest__.py
+++ b/golem_precreation_member/__manifest__.py
@@ -19,15 +19,14 @@
{
'name': 'GOLEM Pre-creation search member',
'summary': 'Pre-creation search member',
- 'version': '10.0.0.0.0',
+ 'version': '10.0.0.1.0',
'category': 'GOLEM',
'author': 'Fabien Bourgeois, Youssef El ouahby',
'license': 'AGPL-3',
- 'application': True,
+ 'application': False,
'installable': True,
- 'depends': ['golem_member', 'golem_family'],
- 'data': ['views/golem_member_views.xml',
- 'views/partner_views.xml',
+ 'depends': ['golem_member'],
+ 'data': ['views/golem_precreation_partner_menu.xml',
'wizard/golem_precreation_member_request_wizard_views.xml',
'wizard/golem_precreation_member_result_wizard_views.xml']
}
diff --git a/golem_precreation_member/models/__init__.py b/golem_precreation_member/models/__init__.py
index 008167b..70d4d12 100644
--- a/golem_precreation_member/models/__init__.py
+++ b/golem_precreation_member/models/__init__.py
@@ -16,4 +16,4 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see .
-from . import golem_member, res_partner
+from . import res_partner
diff --git a/golem_precreation_member/models/golem_member.py b/golem_precreation_member/models/golem_member.py
deleted file mode 100644
index 872320e..0000000
--- a/golem_precreation_member/models/golem_member.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright 2018 Youssef El Ouahby
-# Copyright 2018 Fabien Bourgeois
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-
-""" GOLEM Members """
-
-
-from odoo import models, api, _
-
-
-
-class GolemMember(models.Model):
- """ GOLEM Member model """
- _inherit = 'golem.member'
-
- @api.multi
- def precreation_search(self):
- """ Precreation member search """
- self.ensure_one()
- return {
- 'name' : _('Please enter member searched'),
- 'type' : 'ir.actions.act_window',
- 'res_model' : 'golem.precreation.member.request.wizard',
- 'context' : {'default_is_member' : True},
- 'view_mode': 'form',
- 'target': 'new'
- }
- @api.multi
- def open_line(self):
- """ open member form """
- self.ensure_one()
- return {
- 'type': 'ir.actions.act_window',
- 'name': 'Member',
- 'view_type': 'form',
- 'view_mode': 'form',
- 'res_model': self._name,
- 'res_id': self.id,
- 'flags': {'initial_mode': 'edit'},
- 'target': 'current',
- }
diff --git a/golem_precreation_member/models/res_partner.py b/golem_precreation_member/models/res_partner.py
index 22f4cb9..852c03d 100644
--- a/golem_precreation_member/models/res_partner.py
+++ b/golem_precreation_member/models/res_partner.py
@@ -18,11 +18,9 @@
""" GOLEM Contact """
-
from odoo import models, api, _
-
-class GolemMember(models.Model):
+class ResPartner(models.Model):
""" Res Partner extention """
_inherit = 'res.partner'
@@ -37,9 +35,10 @@ class GolemMember(models.Model):
'view_mode': 'form',
'target': 'new'
}
+
@api.multi
- def open_line(self):
- """ open contact form """
+ def navigate_to_contact(self):
+ """ Navigates to contact form, in edit mode """
self.ensure_one()
return {
'type': 'ir.actions.act_window',
@@ -47,7 +46,7 @@ class GolemMember(models.Model):
'view_type': 'form',
'view_mode': 'form',
'res_model': self._name,
- 'res_id': self.id,
+ 'res_id': self[0].id,
'flags': {'initial_mode': 'edit'},
- 'target': 'current',
+ 'target': 'current'
}
diff --git a/golem_precreation_member/views/golem_member_views.xml b/golem_precreation_member/views/golem_member_views.xml
deleted file mode 100644
index ce3b6e3..0000000
--- a/golem_precreation_member/views/golem_member_views.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
- GOLEM Member Precreation extention Form
- golem.member
-
-
-
-
-
-
-
-
-
-
-
diff --git a/golem_precreation_member/views/partner_views.xml b/golem_precreation_member/views/golem_precreation_partner_menu.xml
similarity index 59%
rename from golem_precreation_member/views/partner_views.xml
rename to golem_precreation_member/views/golem_precreation_partner_menu.xml
index cdf1032..c991059 100644
--- a/golem_precreation_member/views/partner_views.xml
+++ b/golem_precreation_member/views/golem_precreation_partner_menu.xml
@@ -19,18 +19,19 @@ along with this program. If not, see .
-
-
- Res Partner Precreation extention Form
- res.partner
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/golem_precreation_member/wizard/golem_precreation_member_result_wizard_views.xml b/golem_precreation_member/wizard/golem_precreation_member_result_wizard_views.xml
index c1e7795..ffbe4ef 100644
--- a/golem_precreation_member/wizard/golem_precreation_member_result_wizard_views.xml
+++ b/golem_precreation_member/wizard/golem_precreation_member_result_wizard_views.xml
@@ -32,7 +32,7 @@ along with this program. If not, see .
-
+
.
-
+