diff --git a/golem_ressources/__init__.py b/golem_ressources/__init__.py
new file mode 100644
index 00000000..2fca3d29
--- /dev/null
+++ b/golem_ressources/__init__.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2016 Fabien Bourgeois <fabien@yaltik.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/>.
+
+from . import models
diff --git a/golem_ressources/__manifest__.py b/golem_ressources/__manifest__.py
new file mode 100644
index 00000000..f42d1e1c
--- /dev/null
+++ b/golem_ressources/__manifest__.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2016 Fabien Bourgeois <fabien@yaltik.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': 'GOLEM non-profit resources',
+    'summary': 'Extends Odoo resources for MJC',
+    'version': '10.0.1.0.0',
+    'category': 'GOLEM',
+    'author': 'Youssef El ouahby',
+    'license': 'AGPL-3',
+    'application': True,
+    'installable': True,
+    'depends': ['product',
+                ],
+    'data': ['views/golem_resources_views.xml',
+             'views/golem_reservation_views.xml',
+             'security/ir.model.access.csv',
+            ]
+}
diff --git a/golem_ressources/models/__init__.py b/golem_ressources/models/__init__.py
new file mode 100644
index 00000000..43371e7e
--- /dev/null
+++ b/golem_ressources/models/__init__.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2016 Fabien Bourgeois <fabien@yaltik.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/>.
+
+from . import golem_resources
diff --git a/golem_ressources/models/golem_resources.py b/golem_ressources/models/golem_resources.py
new file mode 100644
index 00000000..7fc6b207
--- /dev/null
+++ b/golem_ressources/models/golem_resources.py
@@ -0,0 +1,142 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2017 Fabien Bourgeois <fabien@yaltik.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/>.
+
+
+
+from odoo import models, fields, api, _, exceptions
+import logging
+
+_logger = logging.getLogger(__name__)
+#modèle de base : ressources
+class GolemResources(models.Model):
+    """ GOLEM Resources """
+    _name = 'golem.resources'
+    _description = 'GOLEM Resources'
+
+    name = fields.Char(required=True)
+    active = fields.Boolean(default=True)
+    resource_type = fields.Many2one("golem.resourcetype")
+    resource_responsible = fields.Many2one("res.partner")
+    article_link = fields.Many2one("product.template")
+
+    #Configuration de disponibilité(période, jours et horaire)
+    start_of_availability_date = fields.Date(required=True)
+    end_of_availability_date = fields.Date(required=True)
+    timetable = fields.One2many("golem.timetable", "resource_id", string="Availibility timetable")
+    reservation = fields.One2many("golem.reservation", "linked_resource")
+
+    @api.multi
+    def active_change(self):
+        self.active = not self.active
+
+
+
+#modèle gestion des reservation
+class GolemReservation(models.Model):
+    """ GOLEM Reservation """
+    _name = 'golem.reservation'
+    _description = 'GOLEM Reservation'
+
+    start_date = fields.Datetime()
+    end_date = fields.Datetime()
+    linked_resource = fields.Many2one('golem.resources', required=True)
+    user = fields.Many2one('res.users', required=True,  default=lambda self: self.env.user)
+    on_behalf_of = fields.Many2one('res.partner', required=True, default=lambda self: self.env['res.partner'])
+    #statut=fields.Char()
+    status = fields.Selection([
+        ('draft', "Draft"),
+        ('confirmed', "Confirmed"),
+        ('canceled', "Canceled"),
+    ], default='draft')
+
+    @api.multi
+    def status_draft(self):
+        self.status = 'draft'
+
+    @api.multi
+    def status_confirm(self):
+        self.status = 'confirmed'
+
+
+    @api.multi
+    def status_canceled(self):
+        self.status = 'canceled'
+
+    @api.constrains('status')
+    def _onConfirmReservation(self):
+        if self.status == 'confirmed':
+            #verifyin is the reservation is taking place out of the resource availibility period
+            if(self.start_date < self.linked_resource.start_of_availability_date or self.end_date > self.linked_resource.end_of_availability_date ):
+                raise exceptions.UserError('Not allowed, the resource is not available in this period, please choose another périod before confirming %s' % self.linked_resource.start_of_availability_date)
+            else :
+                #verifying if the reservation is taking place out the availibility timetable
+                #defining a boolean flag, which will determine if the day of the reservation is available
+                r_allowed = False
+                for day in self.linked_resource.timetable :
+                    #if the day is available, look for the time if it's inside the resource timetable availibility
+                    if day.name.id_day == fields.Datetime.from_string(self.start_date).weekday():
+                        start_hour = fields.Datetime.from_string(self.start_date).hour
+                        start_min = float(fields.Datetime.from_string(self.start_date).minute) #+(int(fields.Datetime.from_string(self.start_date).min))/100
+                        start_time_r = start_hour + start_min/100
+                        start_hour = fields.Datetime.from_string(self.end_date).hour
+                        start_min = float(fields.Datetime.from_string(self.end_date).minute) #+(int(fields.Datetime.from_string(self.start_date).min))/100
+                        end_time_r = start_hour + start_min/100
+                        #if the time is suitable, the flag state is changed
+                        if(start_time_r > day.start_time and end_time_r < day.end_time):
+                            r_allowed = True
+                #if the flag is changed no erreur is raised.
+                if(not r_allowed):
+                            raise exceptions.UserError("Not allowed, the resource is not available during this timetable, please choose another time before confirming ")
+                #verifying if the resource is already taken during this period
+                for reservation in self.linked_resource.reservation :
+                    if(self.id != reservation.id and reservation.status == 'confirmed' and not (self.end_date < reservation.start_date or self.start_date > reservation.end_date)):
+                        raise exceptions.UserError("Not allowed, the resource is taken during this period, please choose another période before confirming ")
+
+
+
+#modèle de base pour identifier le type de la ressource
+class GolemResourceType(models.Model):
+    """ GOLEM Resource Type """
+    _name = 'golem.resourcetype'
+    _description = 'GOLEM Resource Type'
+
+    name = fields.Char(string='Resource Type',required=True)
+
+#modèle de base pour stocker les jours de la semaine
+class GolemWeekDay(models.Model):
+    """ GOLEM Week Day """
+    _name = 'golem.weekday'
+    _description = 'GOLEM Week Day'
+
+    name = fields.Char(string='Week Day')
+    id_day = fields.Integer()
+
+#modèle de gestion horaire
+class GolemTimetable(models.Model):
+    """ Golem Timetable """
+    _name = "golem.timetable"
+    _description = "Golem Timetable"
+
+    resource_id = fields.Many2one("golem.resources", required=True)
+    name = fields.Many2one("golem.weekday", required=True)
+    start_time = fields.Float(required=True)
+    end_time = fields.Float(required=True)
+
+    @api.constrains('start_time', 'end_time')
+    def _check_time_consistency(self):
+        if self.end_time < self.start_time:
+            raise exceptions.ValidationError(_('End time should be higher than start time'))
diff --git a/golem_ressources/security/ir.model.access.csv b/golem_ressources/security/ir.model.access.csv
new file mode 100644
index 00000000..a269e71f
--- /dev/null
+++ b/golem_ressources/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_golem_resources_user,Access GOLEM Resources User,model_golem_resources,golem_base.group_golem_user,1,0,0,0
+access_golem_resources_manager,Access GOLEM Resources Manager,model_golem_resources,golem_base.group_golem_manager,1,1,1,1
diff --git a/golem_ressources/views/golem_reservation_views.xml b/golem_ressources/views/golem_reservation_views.xml
new file mode 100644
index 00000000..bd38ff02
--- /dev/null
+++ b/golem_ressources/views/golem_reservation_views.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2018 Fabien Bourgeois <fabien@yaltik.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/>.
+-->
+<odoo>
+  <data>
+    <!--Calendrier des reservations-->
+    <record model="ir.ui.view" id="reservation_calendar_view">
+      <field name="name">reservation.calendar</field>
+      <field name="model">golem.reservation</field>
+      <field name="arch" type="xml">
+        <calendar string="Reservation Calendar" date_start="start_date" date_stop="end_date"
+                      color="linked_resource">
+                      <field name="linked_resource"/>
+                      <field name="user"/>
+                      <field name="on_behalf_of"/>
+        </calendar>
+      </field>
+    </record>
+
+    <!--liste des réservations -->
+    <record model="ir.ui.view" id="reservation_tree_view">
+      <field name="name">reservation.tree</field>
+      <field name="model">golem.reservation</field>
+      <field name="arch" type="xml">
+        <tree string="Reservation tree">
+          <field name="start_date"/>
+          <field name="end_date"/>
+          <field name="linked_resource"/>
+          <field name="user"/>
+          <field name="on_behalf_of"/>
+          <field name="status"/>
+        </tree>
+      </field>
+    </record>
+
+    <!--Formulaire de réservation de ressource-->
+    <record model="ir.ui.view" id="reservation_form_view">
+      <field name="name">reservation.form</field>
+      <field name="model">golem.reservation</field>
+      <field name="arch" type="xml">
+        <form string="Reservation Form">
+          <header>
+            <button name="status_confirm" type="object"
+                            string="Confirm" statuss="draft"
+                            class="oe_highlight"/>
+            <button name="status_canceled" type="object"
+                            string="Cancel" statuss="confirmed"
+                            class="oe_highlight"/>
+            <field name="status" widget="statusbar"/>
+          </header>
+          <sheet>
+            <group>
+              <field name="start_date"/>
+              <field name="end_date"/>
+              <field name="linked_resource"/>
+              <field name="user"/>
+              <field name="on_behalf_of"/>
+            </group>
+            </sheet>
+        </form>
+      </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_reservation">
+      <field name="name">Reservation</field>
+      <field name="res_model">golem.reservation</field>
+      <field name="view_mode">tree,form,calendar</field>
+    </record>
+    <menuitem id="reservation_sub_menu" name="Reservation" parent="resources_menu"
+                    action="action_reservation"/>
+  </data>
+</odoo>
diff --git a/golem_ressources/views/golem_resources_views.xml b/golem_ressources/views/golem_resources_views.xml
new file mode 100644
index 00000000..48057d17
--- /dev/null
+++ b/golem_ressources/views/golem_resources_views.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2018 Fabien Bourgeois <fabien@yaltik.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/>.
+-->
+<odoo>
+  <data>
+    <!-- Remplissage du modele golem.weekday par les jours de la semaine -->
+    <record model="golem.weekday" id="6">
+
+            <field name="name">Sunday</field>
+            <field name="id_day">6</field>
+    </record>
+    <record model="golem.weekday" id="0">
+            <field name="name">Monday</field>
+            <field name="id_day">0</field>
+    </record>
+    <record model="golem.weekday" id="1">
+            <field name="name">Tuesday</field>
+            <field name="id_day">1</field>
+    </record>
+    <record model="golem.weekday" id="2">
+            <field name="name">wednesday</field>
+            <field name="id_day">2</field>
+    </record>
+    <record model="golem.weekday" id="3">
+            <field name="name">Thursday</field>
+            <field name="id_day">3</field>
+    </record>
+    <record model="golem.weekday" id="4">
+            <field name="name">Friday</field>
+            <field name="id_day">4</field>
+    </record>
+    <record model="golem.weekday" id="5">
+            <field name="name">Saturday</field>
+            <field name="id_day">5</field>
+    </record>
+
+    <!--formulaire de recherche et filtrage du modèle golem.resources-->
+
+    <record model="ir.ui.view" id="resource_search_view">
+      <field name="name">resource.search</field>
+      <field name="model">golem.resources</field>
+      <field name="arch" type="xml">
+        <search string="Resource Search">
+          <field name="name"/>
+          <field name="resource_type"/>
+          <field name="resource_responsible"/>
+          <field name="article_link"/>
+        </search>
+      </field>
+    </record>
+
+    <!--liste d'affichage du modèle golem.resources-->
+    <record model="ir.ui.view" id="resource_tree_view">
+      <field name="name">resource.tree</field>
+      <field name="model">golem.resources</field>
+      <field name="arch" type="xml">
+        <tree string="Resource Form">
+          <field name="name"/>
+          <field name="resource_type"/>
+          <field name="resource_responsible"/>
+          <field name="article_link"/>
+          <field name="start_of_availability_date"/>
+          <field name="end_of_availability_date"/>
+        </tree>
+      </field>
+    </record>
+
+    <!--formulaire du modèle golem.resources-->
+    <record model="ir.ui.view" id="resource_form_view">
+      <field name="name">resource.form</field>
+      <field name="model">golem.resources</field>
+      <field name="arch" type="xml">
+        <form string="Resource Form">
+          <sheet>
+            <div class="oe_button_box" name="button_box" groups="base.group_user">
+              <button class="oe_stat_button" icon="fa-archive" name="active_change" type="object"
+                 align="right">
+               <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
+              </button>
+            </div>
+            <group colspan="2">
+              <group colspan="4" col="4">
+                  <field name="name"/>
+                  <field name="resource_type"/>
+                  <field name="resource_responsible"/>
+                  <field name="article_link"/>
+              </group>
+              <field name="id" invisible="1"/>
+              <group colspan="3">
+                  <separator string="Availibility configuration" colspan="3"/>
+                  <field name="start_of_availability_date"/>
+                  <field name="end_of_availability_date"/>
+              </group>
+              <label string="Please save the resource before fixing the timetable availibility" attrs="{'invisible': [('id', '!=', False)]}"/>
+              <group colspan="3">
+                  <field name="timetable" context="{'default_resource_id': active_id}" attrs="{'readonly': [('id', '=', False)]}">
+                    <tree editable="bottom" >
+                       <field name="resource_id" invisible="1"/>
+                       <field name="name" />
+                       <field name="start_time" />
+                       <field name="end_time" />
+                    </tree>
+                  </field>
+              </group>
+            </group>
+          </sheet>
+        </form>
+      </field>
+    </record>
+
+    <!--action du sous menu Resources-->
+    <record model="ir.actions.act_window" id="action_resources">
+      <field name="name">Resources</field>
+      <field name="res_model">golem.resources</field>
+      <field name="view_mode">tree,form,search</field>
+    </record>
+
+
+    <!--liste d'affichage du modèle golem.resources-->
+    <record model="ir.ui.view" id="resourcetype_tree_view">
+      <field name="name">resourcetype.tree</field>
+      <field name="model">golem.resourcetype</field>
+      <field name="arch" type="xml">
+        <tree editable="bottom" string="Resource Type Form">
+          <field name="name"/>
+        </tree>
+      </field>
+    </record>
+
+    <!--action du sous menu configuration-->
+    <record model="ir.actions.act_window" id="action_configuration">
+      <field name="name">Resources Type</field>
+      <field name="res_model">golem.resourcetype</field>
+      <field name="view_mode">tree</field>
+    </record>
+    <!--menu principale et sous menu-->
+    <menuitem id="resources_menu" name="Resources" />
+    <menuitem id="resources_sub_menu" name="Resources" parent="resources_menu"
+              action="action_resources"/>
+    <menuitem id="configuration_sub_menu" name="Configuration" parent="resources_menu"
+              action="action_configuration"/>
+  </data>
+</odoo>