[REF]Global modularisation refactoring, end

This commit is contained in:
Fabien BOURGEOIS 2017-11-15 16:00:24 +01:00
parent 6601bed446
commit e99374796b
14 changed files with 67 additions and 55 deletions

View File

@ -1,3 +1 @@
# -*- coding: utf-8 -*-
from . import models

View File

@ -16,16 +16,15 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
{
'name': 'Coworking',
'name': 'Coworking whole Application',
'summary': 'yaltik coworking module simplify your coworking gerance',
'description': """ yaltik coworking module simplify your coworking gerance """,
'version': '10.0.0.0.1',
'category': 'Useless',
'category': 'Coworking',
'author': 'Yaltik',
'license': 'AGPL-3',
'application': False,
'application': True,
'installable': True,
'data': ['views/coworking_menu.xml', 'views/coworker_views.xml',
'security/ir.model.access.csv', 'views/event_menu.xml', 'views/event_views.xml'],
'depends': ['base']
'data': [],
'depends': ['coworking_coworker', 'coworking_event']
}

View File

@ -1,3 +1 @@
# -*- coding: utf-8 -*-
from . import models

View File

@ -16,16 +16,14 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
{
'name': 'Coworking',
'name': 'Coworking base',
'summary': 'yaltik coworking module simplify your coworking gerance',
'description': """ yaltik coworking module simplify your coworking gerance """,
'version': '10.0.0.0.1',
'category': 'Useless',
'category': 'Coworking',
'author': 'Yaltik',
'license': 'AGPL-3',
'application': False,
'installable': True,
'data': ['views/coworking_menu.xml', 'views/coworker_views.xml',
'security/ir.model.access.csv', 'views/event_menu.xml', 'views/event_views.xml'],
'depends': ['base']
}

View File

@ -16,16 +16,17 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
{
'name': 'Coworking',
'name': 'Coworking coworker',
'summary': 'yaltik coworking module simplify your coworking gerance',
'description': """ yaltik coworking module simplify your coworking gerance """,
'version': '10.0.0.0.1',
'category': 'Useless',
'category': 'Coworking',
'author': 'Yaltik',
'license': 'AGPL-3',
'application': False,
'installable': True,
'data': ['views/coworking_menu.xml', 'views/coworker_views.xml',
'security/ir.model.access.csv', 'views/event_menu.xml', 'views/event_views.xml'],
'depends': ['base']
'data': ['security/ir.model.access.csv',
'views/coworking_menu.xml',
'views/coworker_views.xml'],
'depends': ['coworking_base']
}

View File

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

View File

@ -42,22 +42,6 @@ class Coworker(models.Model):
is_done = fields.Boolean('Done?')
is_active = fields.Boolean('Active?', default=True)
# Event fields
manager_event_ids = fields.One2many('coworking.event', 'manager_id',
string='Events managed')
event_ids = fields.Many2many('coworking.event', string='Events visited')
events_coworker_count = fields.Integer('Number of event have participe',
compute='_compute_events_coworker_count')
@api.depends('event_ids')
def _compute_events_coworker_count(self):
""" Computes number of event coworker """
for event in self:
event.events_coworker_count = len(event.event_ids)
@api.depends('name', 'firstname')
def _compute_full_name(self):
"""Concaténation du nom et du prénom"""

View File

@ -1,4 +1,3 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
acess_coworker_group_user,Access COWORKER Member User,model_coworking_coworker,base.group_user,1,1,1,0
acess_coworker_group_manager,Access COWORKER Member Manager,model_coworking_coworker,base.group_partner_manager,1,1,1,1
acess_coworker_group_user,Access COWORKER Member User,model_coworking_event,base.group_user,1,1,1,1

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 acess_coworker_group_user Access COWORKER Member User model_coworking_coworker base.group_user 1 1 1 0
3 acess_coworker_group_manager Access COWORKER Member Manager model_coworking_coworker base.group_partner_manager 1 1 1 1
acess_coworker_group_user Access COWORKER Member User model_coworking_event base.group_user 1 1 1 1

View File

@ -37,14 +37,6 @@
<page string="Note" name="note">
<field name="note" />
</page>
<page string="Events" name="Events">
<group name="events">
<field name="manager_event_ids"
context="{'default_manager_id': active_id}" />
<field name="event_ids" />
<field name="events_coworker_count" />
</group>
</page>
</notebook>
</groupe>
</sheet>

View File

@ -16,16 +16,18 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
{
'name': 'Coworking',
'name': 'Coworking event',
'summary': 'yaltik coworking module simplify your coworking gerance',
'description': """ yaltik coworking module simplify your coworking gerance """,
'version': '10.0.0.0.1',
'category': 'Useless',
'category': 'Coworking',
'author': 'Yaltik',
'license': 'AGPL-3',
'application': False,
'installable': True,
'data': ['views/coworking_menu.xml', 'views/coworker_views.xml',
'security/ir.model.access.csv', 'views/event_menu.xml', 'views/event_views.xml'],
'depends': ['base']
'data': ['security/ir.model.access.csv',
'views/event_menu.xml',
'views/event_views.xml',
'views/coworker_views.xml'],
'depends': ['coworking_coworker']
}

View File

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

View File

@ -0,0 +1,22 @@
# -*- coding: utf-8 -*-
""" Coworker adaptations """
from odoo import models, fields, api
class Coworker(models.Model):
""" Coworker adaptations """
_inherit = 'coworking.coworker'
manager_event_ids = fields.One2many('coworking.event', 'manager_id',
string='Events managed')
event_ids = fields.Many2many('coworking.event', string='Events visited')
events_coworker_count = fields.Integer('Number of event have participe',
compute='_compute_events_coworker_count')
@api.depends('event_ids')
def _compute_events_coworker_count(self):
""" Computes number of event coworker """
for event in self:
event.events_coworker_count = len(event.event_ids)

View File

@ -1,4 +1,2 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
acess_coworker_group_user,Access COWORKER Member User,model_coworking_coworker,base.group_user,1,1,1,0
acess_coworker_group_manager,Access COWORKER Member Manager,model_coworking_coworker,base.group_partner_manager,1,1,1,1
acess_coworker_group_user,Access COWORKER Member User,model_coworking_event,base.group_user,1,1,1,1

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
acess_coworker_group_user Access COWORKER Member User model_coworking_coworker base.group_user 1 1 1 0
acess_coworker_group_manager Access COWORKER Member Manager model_coworking_coworker base.group_partner_manager 1 1 1 1
2 acess_coworker_group_user Access COWORKER Member User model_coworking_event base.group_user 1 1 1 1

View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<!-- Form -->
<record id="view_form_coworker" model="ir.ui.view">
<field name="name">Coworker Form adaptations</field>
<field name="model">coworking.coworker</field>
<field name="inherit_id" ref ="coworking_coworker.view_form_coworker" />
<field name="arch" type="xml">
<notebook position="inside">
<page string="Events" name="Events">
<group name="events">
<field name="manager_event_ids"
context="{'default_manager_id': active_id}" />
<field name="event_ids" />
<field name="events_coworker_count" />
</group>
</page>
</notebook>
</field>
</record>
</odoo>