michel
/
Coworking
2
0
Fork 1
Code Pull Requests Releases Activity

whaouu

This commit is contained in:
michel 2017-11-24 17:16:20 +01:00
parent ebb8b20e14
commit 44042e87a8
11 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coworking_app/__manifest__.py
View File

@ -26,5 +26,5 @@
'application': True, 'application': True,
'installable': True, 'installable': True,
'data': [], 'data': [],
'depends': ['coworking_coworker'] #'coworking_event'] 'depends': ['coworking_coworker', 'coworking_event']
} }

1
coworking_coworker/models/res_partner.py
View File

@ -16,6 +16,7 @@ class ResPartner(models.Model):
inverse_name="parent_id", inverse_name="parent_id",
) )
url = fields.Char('URL')
contact_date = fields.Date(default=fields.Date.context_today) contact_date = fields.Date(default=fields.Date.context_today)

16
coworking_coworker/views/res_partner_views.xml
View File

@ -11,16 +11,14 @@
<field name="contact_date" /> <field name="contact_date" />
<field name="coworker_type" /> <field name="coworker_type" />
<field name="url" /> <field name="url" />
</group> </group>
<notebook position="inside">
<notebook position="inside"> <page string="Events" name="Events">
<page string="Events" name="Events"> <group name="events">
<group name="events">
<field name="job" /> </group>
</group> </page>
</page> </notebook>
</notebook>
</field> </field>
</record> </record>

2
coworking_event/__manifest__.py
View File

@ -28,7 +28,7 @@
'data': ['security/ir.model.access.csv', 'data': ['security/ir.model.access.csv',
'views/event_menu.xml', 'views/event_menu.xml',
'views/event_views.xml', 'views/event_views.xml',
'views/coworker_views.xml', 'views/res_partner_views.xml',
'wizard/coworking_event_weekly_views.xml'], 'wizard/coworking_event_weekly_views.xml'],
'depends': ['coworking_coworker'] 'depends': ['coworking_coworker']
} }

2
coworking_event/models/__init__.py
View File

@ -1,3 +1,3 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
"""dd""" """dd"""
from . import event, coworker from . import event, res_partner

4
coworking_event/models/coworker.py → coworking_event/models/res_partner.py
View File

@ -4,9 +4,9 @@
from odoo import models, fields, api from odoo import models, fields, api
class Coworker(models.Model): class ResPartner(models.Model):
""" Coworker adaptations """ """ Coworker adaptations """
_inherit = 'coworking.coworker' _inherit = 'res.partner'
manager_event_ids = fields.One2many('coworking.event', 'manager_id', manager_event_ids = fields.One2many('coworking.event', 'manager_id',
string='Events managed') string='Events managed')

8
coworking_event/views/coworker_views.xml → coworking_event/views/res_partner_views.xml
View File

@ -2,10 +2,10 @@
<odoo> <odoo>
<!-- Form --> <!-- Form -->
<record id="view_form_coworker" model="ir.ui.view"> <record id="view_form_res_partner" model="ir.ui.view">
<field name="name">Coworker Form adaptations</field> <field name="name">Res_partner Form</field>
<field name="model">coworking.coworker</field> <field name="model">res.partner</field>
<field name="inherit_id" ref ="coworking_coworker.view_form_coworker" /> <field name="inherit_id" ref ="base.view_partner_form" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<notebook position="inside"> <notebook position="inside">
<page string="Events" name="Events"> <page string="Events" name="Events">

4
coworking_relation/__manifest__.py
View File

@ -26,8 +26,8 @@
'application': False, 'application': False,
'installable': True, 'installable': True,
'data': ['security/ir.model.access.csv', 'data': ['security/ir.model.access.csv',
'views/relation_menu.xml', # 'views/relation_menu.xml',
'views/relation_views.xml', 'views/relation_views.xml',
'views/coworker_views.xml'], 'views/res_partner_views.xml'],
'depends': ['coworking_coworker'] 'depends': ['coworking_coworker']
} }

2
coworking_relation/models/__init__.py
View File

@ -1,3 +1,3 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
"""dd""" """dd"""
from . import relation, coworker from . import relation, res_partner

4
coworking_relation/models/coworker.py → coworking_relation/models/res_partner.py
View File

@ -6,9 +6,9 @@ import logging
from odoo import models, fields, api from odoo import models, fields, api
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
class Coworker(models.Model): class ResPartner(models.Model):
""" Coworker adaptations """ """ Coworker adaptations """
_inherit = 'coworking.coworker' _inherit = 'res.partner'
manager_event_ids = fields.One2many('coworking.event', 'manager_id', manager_event_ids = fields.One2many('coworking.event', 'manager_id',
string='Events managed') string='Events managed')

8
coworking_relation/views/coworker_views.xml → coworking_relation/views/res_partner_views.xml
View File

@ -3,10 +3,10 @@
<odoo> <odoo>
<!-- Form --> <!-- Form -->
<record id="view_form_coworker" model="ir.ui.view"> <record id="view_form_res_partner" model="ir.ui.view">
<field name="name">Coworker Form adaptations</field> <field name="name">Res_partner Form adaptations</field>
<field name="model">coworking.coworker</field> <field name="model">res.partner</field>
<field name="inherit_id" ref ="coworking_coworker.view_form_coworker" /> <field name="inherit_id" ref ="base.view_partner_form" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<notebook position="inside"> <notebook position="inside">
<page string="Relation" name="Relation"> <page string="Relation" name="Relation">