diff --git a/hotel/models/__init__.py b/hotel/models/__init__.py
index 84c6f0088..29689f309 100644
--- a/hotel/models/__init__.py
+++ b/hotel/models/__init__.py
@@ -3,6 +3,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import inherited_payment_return
+from . import hotel_board_service_room_type
 from . import hotel_floor
 from . import hotel_folio
 from . import hotel_reservation
diff --git a/hotel/models/hotel_board_service_room_type.py b/hotel/models/hotel_board_service_room_type.py
new file mode 100644
index 000000000..983b4c055
--- /dev/null
+++ b/hotel/models/hotel_board_service_room_type.py
@@ -0,0 +1,56 @@
+# Copyright 2017  Dario Lodeiros
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import api, fields, models, _
+from odoo.addons import decimal_precision as dp
+from odoo.exceptions import UserError
+
+
+class HotelBoardServiceRoomType(models.Model):
+    _name = 'hotel.board.service.room.type'
+    _table = 'hotel_board_service_room_type_rel'
+    _rec_name = 'hotel_board_service_id'
+    _log_access = False
+    _description = 'Board Service included in Room'
+
+    hotel_board_service_id = fields.Many2one(
+        'hotel.board.service', 'Board Service', index=True, ondelete='cascade', required=True)
+    hotel_room_type_id = fields.Many2one(
+        'hotel.room.type', 'Room Type', index=True, ondelete='cascade', required=True)
+    pricelist_id = fields.Many2one(
+        'product.pricelist', 'Pricelist', required=False)
+    price_type = fields.Selection([
+        ('fixed','Fixed'),
+        ('percent','Percent')], string='Type')
+    amount = fields.Float('Amount', digits=dp.get_precision('Product Price'), default=0.0)
+    
+    @api.model_cr
+    def init(self):
+        self._cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = %s', ('hotel_board_service_id_hotel_room_type_id_pricelist_id',))
+        if not self._cr.fetchone():
+            self._cr.execute('CREATE INDEX hotel_board_service_id_hotel_room_type_id_pricelist_id ON hotel_board_service_room_type_rel (hotel_board_service_id, hotel_room_type_id, pricelist_id)')
+
+    @api.constrains('pricelist_id')
+    def constrains_pricelist_id(self):
+        for record in self:
+            if self.pricelist_id:
+                board_pricelist = self.env['hotel.board.service.room.type'].search([
+                    ('pricelist_id','=', record.pricelist_id.id),
+                    ('hotel_room_type_id','=', record.hotel_room_type_id.id),
+                    ('hotel_board_service_id','=',record.hotel_board_service_id.id),
+                    ('id','!=',record.id)
+                ])
+                if board_pricelist:
+                    raise UserError(
+                        _("This Board Service in this Room can't repeat pricelist"))
+            else:
+                board_pricelist = self.env['hotel.board.service.room.type'].search([
+                    ('pricelist_id','=', False),
+                    ('hotel_room_type_id','=', record.hotel_room_type_id.id),
+                    ('hotel_board_service_id','=',record.hotel_board_service_id.id),
+                    ('id','!=',record.id)
+                ])
+                if board_pricelist:
+                    raise UserError(
+                        _("This Board Service in this Room can't repeat without pricelist"))
+                
+                    
diff --git a/hotel/models/hotel_room_type.py b/hotel/models/hotel_room_type.py
index 606b0e1c9..f2f369c28 100644
--- a/hotel/models/hotel_room_type.py
+++ b/hotel/models/hotel_room_type.py
@@ -19,6 +19,8 @@ class HotelRoomType(models.Model):
                                  ondelete='cascade')
     room_ids = fields.One2many('hotel.room', 'room_type_id', 'Rooms')
     class_id = fields.Many2one('hotel.room.type.class', 'Hotel Type Class')
+    board_service_room_type_ids = fields.One2many(
+        'hotel.board.service.room.type', 'hotel_room_type_id', string='Board Services')
     room_amenity_ids = fields.Many2many('hotel.amenity',
                                       'hotel_room_type_aminity_rel',
                                       'room_type_ids', 'amenity_ids',
diff --git a/hotel/views/hotel_room_type_views.xml b/hotel/views/hotel_room_type_views.xml
index b31b0be9d..7816a72a8 100644
--- a/hotel/views/hotel_room_type_views.xml
+++ b/hotel/views/hotel_room_type_views.xml
@@ -36,6 +36,19 @@
                             <separator string=" Room Amenities" />
                             <field name="room_amenity_ids" colspan="4" nolabel="1" />
                         </page>
+                        <page string="Board Services">
+                            <separator string="Board Services" />
+                            <field name="board_service_room_type_ids" colspan="4" nolabel="1"
+                                    context="{'default_hotel_room_type_id':id}">
+                                <tree editable="bottom">
+                                    <field name="hotel_room_type_id" />
+                                    <field name="hotel_board_service_id" />
+                                    <field name="price_type" />
+                                    <field name="amount" />
+                                    <field name="pricelist_id" />
+                                </tree>
+                            </field>
+                        </page>
                     </notebook>
                 </sheet>
             </form>