diff --git a/coworking_app/__manifest__.py b/coworking_app/__manifest__.py index 811b791..3a363af 100644 --- a/coworking_app/__manifest__.py +++ b/coworking_app/__manifest__.py @@ -26,5 +26,5 @@ 'application': True, 'installable': True, 'data': [], - 'depends': ['coworking_coworker'] #'coworking_event'] + 'depends': ['coworking_coworker', 'coworking_event'] } diff --git a/coworking_coworker/models/res_partner.py b/coworking_coworker/models/res_partner.py index 966a235..1ba950a 100644 --- a/coworking_coworker/models/res_partner.py +++ b/coworking_coworker/models/res_partner.py @@ -16,6 +16,7 @@ class ResPartner(models.Model): inverse_name="parent_id", ) + url = fields.Char('URL') contact_date = fields.Date(default=fields.Date.context_today) diff --git a/coworking_coworker/views/res_partner_views.xml b/coworking_coworker/views/res_partner_views.xml index 47cd627..10d82a4 100644 --- a/coworking_coworker/views/res_partner_views.xml +++ b/coworking_coworker/views/res_partner_views.xml @@ -11,16 +11,14 @@ - - - - - - - - - + + + + + + + diff --git a/coworking_event/__manifest__.py b/coworking_event/__manifest__.py index 1f5c134..31efe0d 100644 --- a/coworking_event/__manifest__.py +++ b/coworking_event/__manifest__.py @@ -28,7 +28,7 @@ 'data': ['security/ir.model.access.csv', 'views/event_menu.xml', 'views/event_views.xml', - 'views/coworker_views.xml', + 'views/res_partner_views.xml', 'wizard/coworking_event_weekly_views.xml'], 'depends': ['coworking_coworker'] } diff --git a/coworking_event/models/__init__.py b/coworking_event/models/__init__.py index e57763e..0e7be92 100644 --- a/coworking_event/models/__init__.py +++ b/coworking_event/models/__init__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """dd""" -from . import event, coworker +from . import event, res_partner diff --git a/coworking_event/models/coworker.py b/coworking_event/models/res_partner.py similarity index 91% rename from coworking_event/models/coworker.py rename to coworking_event/models/res_partner.py index f556f3d..6bfb00e 100644 --- a/coworking_event/models/coworker.py +++ b/coworking_event/models/res_partner.py @@ -4,9 +4,9 @@ from odoo import models, fields, api -class Coworker(models.Model): +class ResPartner(models.Model): """ Coworker adaptations """ - _inherit = 'coworking.coworker' + _inherit = 'res.partner' manager_event_ids = fields.One2many('coworking.event', 'manager_id', string='Events managed') diff --git a/coworking_event/views/coworker_views.xml b/coworking_event/views/res_partner_views.xml similarity index 67% rename from coworking_event/views/coworker_views.xml rename to coworking_event/views/res_partner_views.xml index 70ed982..9893b97 100644 --- a/coworking_event/views/coworker_views.xml +++ b/coworking_event/views/res_partner_views.xml @@ -2,10 +2,10 @@ - - Coworker Form adaptations - coworking.coworker - + + Res_partner Form + res.partner + diff --git a/coworking_relation/__manifest__.py b/coworking_relation/__manifest__.py index a181477..82daa2a 100644 --- a/coworking_relation/__manifest__.py +++ b/coworking_relation/__manifest__.py @@ -26,8 +26,8 @@ 'application': False, 'installable': True, 'data': ['security/ir.model.access.csv', - 'views/relation_menu.xml', + # 'views/relation_menu.xml', 'views/relation_views.xml', - 'views/coworker_views.xml'], + 'views/res_partner_views.xml'], 'depends': ['coworking_coworker'] } diff --git a/coworking_relation/models/__init__.py b/coworking_relation/models/__init__.py index 101cb73..65fa7a1 100644 --- a/coworking_relation/models/__init__.py +++ b/coworking_relation/models/__init__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """dd""" -from . import relation, coworker +from . import relation, res_partner diff --git a/coworking_relation/models/coworker.py b/coworking_relation/models/res_partner.py similarity index 95% rename from coworking_relation/models/coworker.py rename to coworking_relation/models/res_partner.py index 399958c..7680b81 100644 --- a/coworking_relation/models/coworker.py +++ b/coworking_relation/models/res_partner.py @@ -6,9 +6,9 @@ import logging from odoo import models, fields, api _LOGGER = logging.getLogger(__name__) -class Coworker(models.Model): +class ResPartner(models.Model): """ Coworker adaptations """ - _inherit = 'coworking.coworker' + _inherit = 'res.partner' manager_event_ids = fields.One2many('coworking.event', 'manager_id', string='Events managed') diff --git a/coworking_relation/views/coworker_views.xml b/coworking_relation/views/res_partner_views.xml similarity index 59% rename from coworking_relation/views/coworker_views.xml rename to coworking_relation/views/res_partner_views.xml index c25a1e1..e59ecd8 100644 --- a/coworking_relation/views/coworker_views.xml +++ b/coworking_relation/views/res_partner_views.xml @@ -3,10 +3,10 @@ - - Coworker Form adaptations - coworking.coworker - + + Res_partner Form adaptations + res.partner +