Reversion of V3 commits #6

Merged
michel merged 2 commits from fabien/michel_coworking:V2 into V2 2017-11-15 16:15:53 +01:00
20 changed files with 31 additions and 153 deletions

View File

@ -16,14 +16,16 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
{ {
'name': 'Coworking base', 'name': 'Coworking',
'summary': 'yaltik coworking module simplify your coworking gerance', 'summary': 'yaltik coworking module simplify your coworking gerance',
'description': """ yaltik coworking module simplify your coworking gerance """, 'description': """ yaltik coworking module simplify your coworking gerance """,
'version': '10.0.0.0.1', 'version': '10.0.0.0.1',
'category': 'Coworking', 'category': 'Useless',
'author': 'Yaltik', 'author': 'Yaltik',
'license': 'AGPL-3', 'license': 'AGPL-3',
'application': False, 'application': False,
'installable': 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'] 'depends': ['base']
} }

View File

@ -1 +0,0 @@
# -*- coding: utf-8 -*-

View File

@ -1,30 +0,0 @@
# -*- coding: utf-8 -*-
# Copyright 2017 Firstname Lastname <firstname.lastname@company.com>
#
# 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 <http://www.gnu.org/licenses/>.
{
'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': 'Coworking',
'author': 'Yaltik',
'license': 'AGPL-3',
'application': True,
'installable': True,
'data': [],
'depends': ['coworking_coworker', 'coworking_event']
}

View File

@ -1 +0,0 @@
# -*- coding: utf-8 -*-

View File

@ -1,32 +0,0 @@
# -*- coding: utf-8 -*-
# Copyright 2017 Firstname Lastname <firstname.lastname@company.com>
#
# 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 <http://www.gnu.org/licenses/>.
{
'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': 'Coworking',
'author': 'Yaltik',
'license': 'AGPL-3',
'application': False,
'installable': True,
'data': ['security/ir.model.access.csv',
'views/coworking_menu.xml',
'views/coworker_views.xml'],
'depends': ['coworking_base']
}

View File

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

View File

@ -1,33 +0,0 @@
# -*- coding: utf-8 -*-
# Copyright 2017 Firstname Lastname <firstname.lastname@company.com>
#
# 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 <http://www.gnu.org/licenses/>.
{
'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': 'Coworking',
'author': 'Yaltik',
'license': 'AGPL-3',
'application': False,
'installable': True,
'data': ['security/ir.model.access.csv',
'views/event_menu.xml',
'views/event_views.xml',
'views/coworker_views.xml'],
'depends': ['coworking_coworker']
}

View File

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

View File

@ -1,22 +0,0 @@
# -*- 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,2 +0,0 @@
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_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_event base.group_user 1 1 1 1

View File

@ -1,24 +0,0 @@
<?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>

View File

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

View File

@ -42,6 +42,22 @@ class Coworker(models.Model):
is_done = fields.Boolean('Done?') is_done = fields.Boolean('Done?')
is_active = fields.Boolean('Active?', default=True) 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') @api.depends('name', 'firstname')
def _compute_full_name(self): def _compute_full_name(self):
"""Concaténation du nom et du prénom""" """Concaténation du nom et du prénom"""

View File

@ -1,3 +1,4 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink 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_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_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
4 acess_coworker_group_user Access COWORKER Member User model_coworking_event base.group_user 1 1 1 1

View File

@ -37,6 +37,14 @@
<page string="Note" name="note"> <page string="Note" name="note">
<field name="note" /> <field name="note" />
</page> </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> </notebook>
</groupe> </groupe>
</sheet> </sheet>