From 3243407440309b3ef057f01e0b0361d6f68afad4 Mon Sep 17 00:00:00 2001
From: Dario Lodeiros <dario@aloxa.eu>
Date: Wed, 12 Dec 2018 18:01:36 +0100
Subject: [PATCH 1/7] [ADD] Onboard service line basic workflow

---
 hotel/__manifest__.py                         |  1 +
 hotel/models/__init__.py                      |  1 +
 hotel/models/hotel_board_service_room_type.py | 52 ++++++++++++++++++-
 .../hotel_board_service_room_type_line.py     | 21 ++++++++
 hotel/views/hotel_board_service_room_type.xml | 30 +++++++++++
 hotel/views/hotel_room_type_views.xml         |  3 ++
 6 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 hotel/models/hotel_board_service_room_type_line.py
 create mode 100644 hotel/views/hotel_board_service_room_type.xml

diff --git a/hotel/__manifest__.py b/hotel/__manifest__.py
index 98c2551c5..13fb04ca2 100644
--- a/hotel/__manifest__.py
+++ b/hotel/__manifest__.py
@@ -50,6 +50,7 @@
         'views/hotel_board_service_views.xml',
         'views/hotel_checkin_partner_views.xml',
         'views/hotel_room_type_availability_views.xml',
+        'views/hotel_board_service_room_type.xml',
         'data/cron_jobs.xml',
         'data/records.xml',
         'data/email_template_cancel.xml',
diff --git a/hotel/models/__init__.py b/hotel/models/__init__.py
index 29689f309..3c9619694 100644
--- a/hotel/models/__init__.py
+++ b/hotel/models/__init__.py
@@ -29,3 +29,4 @@ from . import hotel_room_type_class
 from . import hotel_room_closure_reason
 from . import hotel_service_line
 from . import hotel_board_service
+from . import hotel_board_service_room_type_line
diff --git a/hotel/models/hotel_board_service_room_type.py b/hotel/models/hotel_board_service_room_type.py
index ec9111d22..9b6ef772e 100644
--- a/hotel/models/hotel_board_service_room_type.py
+++ b/hotel/models/hotel_board_service_room_type.py
@@ -21,7 +21,11 @@ class HotelBoardServiceRoomType(models.Model):
     price_type = fields.Selection([
         ('fixed','Fixed'),
         ('percent','Percent')], string='Type', default='fixed', required=True)
-    amount = fields.Float('Amount', digits=dp.get_precision('Product Price'), default=0.0)
+    amount = fields.Float('Amount',
+                          digits=dp.get_precision('Product Price'),
+                          compute='_compute_board_amount',
+                          store=True)
+    board_service_line_ids = fields.One2many('hotel.board.service.room.type.line', 'hotel_board_service_room_type_id')
     
     @api.model_cr
     def init(self):
@@ -29,6 +33,52 @@ class HotelBoardServiceRoomType(models.Model):
         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.model
+    def create(self, vals):
+        if 'hotel_board_service_id' in vals:
+            vals.update(
+                    self.prepare_board_service_room_lines(vals['hotel_board_service_id'])
+                )
+        return super(HotelBoardServiceRoomType, self).create(vals)
+
+    @api.multi
+    def write(self, vals):
+        if 'hotel_board_service_id' in vals:
+            vals.update(
+                    self.prepare_board_service_room_lines(vals['hotel_board_service_id'])
+                )
+        return super(HotelBoardServiceRoomType, self).write(vals)
+
+    @api.multi
+    def open_board_lines_form(self):
+        action = self.env.ref('hotel.action_hotel_board_service_room_type_view').read()[0]
+        action['views'] = [(self.env.ref('hotel.hotel_board_service_room_type_form').id, 'form')]
+        action['res_id'] = self.id
+        return action
+
+    @api.depends('board_service_line_ids.amount')
+    def _compute_board_amount(self):
+        for record in self:
+            total = 0
+            for service in record.board_service_line_ids:
+                total += service.amount
+            record.update({'amount': total})
+
+    @api.model
+    def prepare_board_service_room_lines(self, board_service_id):
+        """
+        Prepare line to price products config
+        """
+        cmds=[(5,0,0)]
+        board_service = self.env['hotel.board.service'].browse(board_service_id)
+        today = fields.Date.today()
+        for product in board_service.service_ids:
+                cmds.append((0, False, {
+                    'service_id': product.id,
+                    'amount': product.list_price #TODO: default amomunt?¿
+                }))
+        return {'board_service_line_ids': cmds}
+
     @api.constrains('pricelist_id')
     def constrains_pricelist_id(self):
         for record in self:
diff --git a/hotel/models/hotel_board_service_room_type_line.py b/hotel/models/hotel_board_service_room_type_line.py
new file mode 100644
index 000000000..62e42ee75
--- /dev/null
+++ b/hotel/models/hotel_board_service_room_type_line.py
@@ -0,0 +1,21 @@
+# 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 HotelBoardServiceRoomTypeLine(models.Model):
+    _name = 'hotel.board.service.room.type.line'
+    _description = 'Services on Board Service included in Room'
+
+    #TODO def default_amount "amount of service"
+
+    hotel_board_service_room_type_id = fields.Many2one(
+        'hotel.board.service.room.type', 'Board Service Room', ondelete='cascade', required=True)
+    service_id = fields.Many2one(
+        'product.product', 'Product', required=True, readonly=True)
+    amount = fields.Float('Amount', digits=dp.get_precision('Product Price'), default=0.0)
+    
+                
+                    
diff --git a/hotel/views/hotel_board_service_room_type.xml b/hotel/views/hotel_board_service_room_type.xml
new file mode 100644
index 000000000..d709080ef
--- /dev/null
+++ b/hotel/views/hotel_board_service_room_type.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record model="ir.ui.view" id="hotel_board_service_room_type_form">
+        <field name="name">hotel.board.service.room.type.form</field>
+        <field name="model">hotel.board.service.room.type</field>
+        <field name="arch" type="xml">
+            <form string="Board Service Line">
+                <group>
+                    <field name="amount"/>
+                    <field name="board_service_line_ids">
+                        <tree editable="bottom">
+                            <field name="hotel_board_service_room_type_id" invisible="1"/>
+                            <field name="service_id"/>
+                            <field name="amount" />
+                        </tree>
+                    </field>
+                </group>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_hotel_board_service_room_type_view">
+        <field name="name">Hotel Board Service</field>
+        <field name="res_model">hotel.board.service.room.type</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+    </record>
+
+</odoo>
diff --git a/hotel/views/hotel_room_type_views.xml b/hotel/views/hotel_room_type_views.xml
index 7816a72a8..61294b3b5 100644
--- a/hotel/views/hotel_room_type_views.xml
+++ b/hotel/views/hotel_room_type_views.xml
@@ -46,6 +46,9 @@
                                     <field name="price_type" />
                                     <field name="amount" />
                                     <field name="pricelist_id" />
+                                    <button type="object" class="oe_stat_button"
+                                        id="go_board_lines" icon="fa fa-2x fa-bars"
+                                        name="open_board_lines_form"/>
                                 </tree>
                             </field>
                         </page>

From 1f99c16d00317ee50cfa01170e3a02549e899c3a Mon Sep 17 00:00:00 2001
From: Dario Lodeiros <dario@aloxa.eu>
Date: Wed, 12 Dec 2018 18:29:08 +0100
Subject: [PATCH 2/7] [ADD] Compute service board amount on reservation

---
 hotel/models/hotel_service.py | 47 +++++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git a/hotel/models/hotel_service.py b/hotel/models/hotel_service.py
index 459dcded3..da84c9f73 100644
--- a/hotel/models/hotel_service.py
+++ b/hotel/models/hotel_service.py
@@ -202,20 +202,41 @@ class HotelService(models.Model):
 
     @api.multi
     def _compute_price_unit(self):
-        """
-        Compute tax and price unit
-        """
+        self.ensure_one()
         folio = self.folio_id or self.env.context.get('default_folio_id')
-        product = self.product_id.with_context(
-                lang=folio.partner_id.lang,
-                partner=folio.partner_id.id,
-                quantity=self.product_qty,
-                date=folio.date_order,
-                pricelist=folio.pricelist_id.id,
-                uom=self.product_id.uom_id.id,
-                fiscal_position=False
-            )
-        return self.env['account.tax']._fix_tax_included_price_company(self._get_display_price(product), product.taxes_id, self.tax_ids, folio.company_id)
+        reservation = self.ser_room_line or self.env.context.get('ser_room_line')
+        if self.is_board_service:
+            board_room_type = self.env['hotel.board.service.room.type'].search([
+                ('hotel_board_service_id', '=', reservation.board_service_id.id),
+                ('hotel_room_type_id', '=', reservation.room_type_id.id),
+                ('pricelist_id', '=', folio.pricelist_id.id)
+            ])
+            if not board_room_type:
+                board_room_type = self.env['hotel.board.service.room.type'].search([
+                ('hotel_board_service_id', '=', reservation.board_service_id.id),
+                ('hotel_room_type_id', '=', reservation.room_type_id.id)
+            ])
+            if board_room_type.price_type = 'fixed':
+                return self.env['hotel.board.service.room.type.line'].search([
+                    ('hotel_board_service_room_type_id', '=', board_room_type.id),
+                    ('service_id','=',self.product_id.id)]).amount
+            else:
+                return (reservation.price_total * self.env['hotel.board.service.room.type.line'].search([
+                    ('hotel_board_service_room_type_id', '=', board_room_type.id),
+                    ('service_id','=',self.product_id.id)]).amount) / 100
+        else:
+            folio = self.folio_id or self.env.context.get('default_folio_id')
+            product = self.product_id.with_context(
+                    lang=folio.partner_id.lang,
+                    partner=folio.partner_id.id,
+                    quantity=self.product_qty,
+                    date=folio.date_order,
+                    pricelist=folio.pricelist_id.id,
+                    uom=self.product_id.uom_id.id,
+                    fiscal_position=False
+                )
+            return self.env['account.tax']._fix_tax_included_price_company(self._get_display_price(product), product.taxes_id, self.tax_ids, folio.company_id)
+            
          
 
     @api.model

From a6d37bd0d9dcc603925db62838b682caebd9556b Mon Sep 17 00:00:00 2001
From: Dario Lodeiros <dario@aloxa.eu>
Date: Sun, 16 Dec 2018 12:55:03 +0100
Subject: [PATCH 3/7] [WIP] Change board_service by board_service_room in
 reservation, refact code board_services model

---
 hotel/models/hotel_board_service.py           |  3 ++
 hotel/models/hotel_board_service_room_type.py | 13 +++++-
 .../hotel_board_service_room_type_line.py     |  2 +-
 hotel/models/hotel_reservation.py             | 30 ++++++++------
 hotel/models/hotel_service.py                 | 40 ++++++++-----------
 hotel/security/ir.model.access.csv            |  1 +
 hotel/views/hotel_board_service_room_type.xml |  2 +-
 hotel/views/hotel_folio_views.xml             |  4 +-
 hotel/views/hotel_reservation_views.xml       |  7 +++-
 9 files changed, 60 insertions(+), 42 deletions(-)

diff --git a/hotel/models/hotel_board_service.py b/hotel/models/hotel_board_service.py
index 4fcff0aa4..4c2a94447 100644
--- a/hotel/models/hotel_board_service.py
+++ b/hotel/models/hotel_board_service.py
@@ -13,3 +13,6 @@ class HotelBoardService(models.Model):
                                    column1='board_id',
                                    column2='service_id')
     sequence = fields.Integer('Sequence')
+    hotel_board_service_room_type_ids = fields.One2many(
+        'hotel.board.service.room.type', 'hotel_board_service_id')
+    
diff --git a/hotel/models/hotel_board_service_room_type.py b/hotel/models/hotel_board_service_room_type.py
index 9b6ef772e..bc80c8318 100644
--- a/hotel/models/hotel_board_service_room_type.py
+++ b/hotel/models/hotel_board_service_room_type.py
@@ -12,6 +12,17 @@ class HotelBoardServiceRoomType(models.Model):
     _log_access = False
     _description = 'Board Service included in Room'
 
+    @api.multi
+    def name_get(self):
+        result = []
+        for res in self:
+            if res.pricelist_id:
+                name = u'%s (%s)' % (res.hotel_board_service_id.name, res.pricelist_id.name)
+            else:
+                name = u'%s (%s)' % (res.hotel_board_service_id.name, _('Generic'))
+            result.append((res.id, name))
+        return result
+
     hotel_board_service_id = fields.Many2one(
         'hotel.board.service', 'Board Service', index=True, ondelete='cascade', required=True)
     hotel_room_type_id = fields.Many2one(
@@ -74,7 +85,7 @@ class HotelBoardServiceRoomType(models.Model):
         today = fields.Date.today()
         for product in board_service.service_ids:
                 cmds.append((0, False, {
-                    'service_id': product.id,
+                    'product_id': product.id,
                     'amount': product.list_price #TODO: default amomunt?¿
                 }))
         return {'board_service_line_ids': cmds}
diff --git a/hotel/models/hotel_board_service_room_type_line.py b/hotel/models/hotel_board_service_room_type_line.py
index 62e42ee75..8896c0644 100644
--- a/hotel/models/hotel_board_service_room_type_line.py
+++ b/hotel/models/hotel_board_service_room_type_line.py
@@ -13,7 +13,7 @@ class HotelBoardServiceRoomTypeLine(models.Model):
 
     hotel_board_service_room_type_id = fields.Many2one(
         'hotel.board.service.room.type', 'Board Service Room', ondelete='cascade', required=True)
-    service_id = fields.Many2one(
+    product_id = fields.Many2one(
         'product.product', 'Product', required=True, readonly=True)
     amount = fields.Float('Amount', digits=dp.get_precision('Product Price'), default=0.0)
     
diff --git a/hotel/models/hotel_reservation.py b/hotel/models/hotel_reservation.py
index be1bcf201..5b28e221e 100644
--- a/hotel/models/hotel_reservation.py
+++ b/hotel/models/hotel_reservation.py
@@ -4,6 +4,7 @@
 import logging
 import time
 from datetime import timedelta
+from lxml import etree
 from odoo.exceptions import UserError, ValidationError
 from odoo.tools import (
     misc,
@@ -133,7 +134,8 @@ class HotelReservation(models.Model):
                              track_visibility='onchange')
     reservation_type = fields.Selection(related='folio_id.reservation_type',
                                         default=lambda *a: 'normal')
-    board_service_id = fields.Many2one('hotel.board.service', string='Board Service')
+    board_service_room_id = fields.Many2one('hotel.board.service.room.type',
+                                            string='Board Service')
     cancelled_reason = fields.Selection([
         ('late', 'Late'),
         ('intime', 'In time'),
@@ -290,12 +292,12 @@ class HotelReservation(models.Model):
         vals.update({
             'last_updated_res': fields.Datetime.now(),
         })
-        if 'board_service_id' in vals:
+        if 'board_service_room_id' in vals:
                 board_services = []
-                board = self.env['hotel.board.service'].browse(vals['board_service_id'])
-                for product in board.service_ids:
+                board = self.env['hotel.board.service.room.type'].browse(vals['board_service_room_id'])
+                for line in board.board_service_line_ids:
                     board_services.append((0, False, {
-                        'product_id': product.id,
+                        'product_id': line.product_id.id,
                         'is_board_service': True,
                         'folio_id': vals.get('folio_id'),
                         }))
@@ -330,10 +332,10 @@ class HotelReservation(models.Model):
             if self.compute_board_services(vals):
                 record.service_ids.filtered(lambda r: r.is_board_service == True).unlink()
                 board_services = []
-                board = self.env['hotel.board.service'].browse(vals['board_service_id'])
+                board = self.env['hotel.board.service.room.type'].browse(vals['board_service_room_id'])
                 for product in board.service_ids:
                     board_services.append((0, False, {
-                        'product_id': product.id,
+                        'product_id': line.product_id.id,
                         'is_board_service': True,
                         'folio_id': record.folio_id.id or vals.get('folio_id')
                         }))
@@ -369,10 +371,10 @@ class HotelReservation(models.Model):
     @api.multi
     def compute_board_services(self, vals):
         """
-        We must compute service_ids when we hace a board_service_id without
+        We must compute service_ids when we have a board_service_id without
         service_ids associated to reservation
         """
-        if 'board_service_id' in vals:
+        if 'board_service_room_id' in vals:
             if 'service_ids' in vals:
                 for service in vals['service_ids']:
                     if 'is_board_service' in service[2] and \
@@ -402,7 +404,7 @@ class HotelReservation(models.Model):
         """ Deduce missing required fields from the onchange """
         res = {}
         onchange_fields = ['room_id', 'reservation_type',
-            'currency_id', 'name', 'board_service_id']
+            'currency_id', 'name', 'board_service_room_id']
         if values.get('room_type_id'):
             line = self.new(values)
             if any(f not in values for f in onchange_fields):
@@ -610,11 +612,13 @@ class HotelReservation(models.Model):
             ]
             return {'domain': {'room_id': domain_rooms}}
 
-    @api.onchange('board_service_id')
+    @api.onchange('board_service_room_id')
     def onchange_board_service(self):
-        if self.board_service_id:
+        if self.board_service_room_id:
+            import wdb; wdb.set_trace()
             board_services = []
-            for product in self.board_service_id.service_ids:
+            for line in self.board_service_room_id.board_service_line_ids:
+                product = line.product_id
                 if product.per_day:
                     vals = {
                         'product_id': product.id,
diff --git a/hotel/models/hotel_service.py b/hotel/models/hotel_service.py
index da84c9f73..8e2cf25e1 100644
--- a/hotel/models/hotel_service.py
+++ b/hotel/models/hotel_service.py
@@ -153,7 +153,7 @@ class HotelService(models.Model):
     def _compute_tax_ids(self):
         for record in self:
             # If company_id is set, always filter taxes by the company
-            folio = self.folio_id or self.env.context.get('default_folio_id')
+            folio = record.folio_id or self.env.context.get('default_folio_id')
             record.tax_id = record.product_id.taxes_id.filtered(lambda r: not record.company_id or r.company_id == folio.company_id)
 
     @api.multi
@@ -184,12 +184,12 @@ class HotelService(models.Model):
             if record.per_day and record.ser_room_line:
                 product = record.product_id
                 reservation = record.ser_room_line
-                vals.update(self.prepare_service_lines(
+                vals.update(record.prepare_service_lines(
                         dfrom=reservation.checkin,
                         days=reservation.nights,
                         per_person=product.per_person,
                         persons=reservation.adults,
-                        old_line_days=self.service_line_ids))
+                        old_line_days=record.service_line_ids))
                 if record.product_id.daily_limit > 0:
                     for day in record.service_line_ids:
                         day.no_free_resources()
@@ -205,33 +205,25 @@ class HotelService(models.Model):
         self.ensure_one()
         folio = self.folio_id or self.env.context.get('default_folio_id')
         reservation = self.ser_room_line or self.env.context.get('ser_room_line')
-        if self.is_board_service:
-            board_room_type = self.env['hotel.board.service.room.type'].search([
-                ('hotel_board_service_id', '=', reservation.board_service_id.id),
-                ('hotel_room_type_id', '=', reservation.room_type_id.id),
-                ('pricelist_id', '=', folio.pricelist_id.id)
-            ])
-            if not board_room_type:
-                board_room_type = self.env['hotel.board.service.room.type'].search([
-                ('hotel_board_service_id', '=', reservation.board_service_id.id),
-                ('hotel_room_type_id', '=', reservation.room_type_id.id)
-            ])
-            if board_room_type.price_type = 'fixed':
+        partner = folio.partner_id if folio else reservation.partner_id
+        pricelist = folio.pricelist_id if folio else reservation.pricelist_id
+        if reservation and self.is_board_service:
+            board_room_type = reservation.board_service_room_id
+            if board_room_type.price_type == 'fixed':
                 return self.env['hotel.board.service.room.type.line'].search([
                     ('hotel_board_service_room_type_id', '=', board_room_type.id),
-                    ('service_id','=',self.product_id.id)]).amount
+                    ('product_id','=',self.product_id.id)]).amount
             else:
                 return (reservation.price_total * self.env['hotel.board.service.room.type.line'].search([
                     ('hotel_board_service_room_type_id', '=', board_room_type.id),
-                    ('service_id','=',self.product_id.id)]).amount) / 100
+                    ('product_id','=',self.product_id.id)]).amount) / 100
         else:
-            folio = self.folio_id or self.env.context.get('default_folio_id')
             product = self.product_id.with_context(
-                    lang=folio.partner_id.lang,
-                    partner=folio.partner_id.id,
+                    lang=partner.lang,
+                    partner=partner.id,
                     quantity=self.product_qty,
-                    date=folio.date_order,
-                    pricelist=folio.pricelist_id.id,
+                    date=folio.date_order or fields.Date.today(),
+                    pricelist=pricelist.id,
                     uom=self.product_id.uom_id.id,
                     fiscal_position=False
                 )
@@ -272,9 +264,11 @@ class HotelService(models.Model):
         """
         for record in self:
             folio = record.folio_id or self.env.context.get('default_folio_id')
+            reservation = record.ser_room_line or self.env.context.get('ser_room_line')
+            currency = folio.currency_id if folio else reservation.currency_id
             product = record.product_id
             price = record.price_unit * (1 - (record.discount or 0.0) * 0.01)
-            taxes = record.tax_ids.compute_all(price, folio.currency_id, record.product_qty, product=product)
+            taxes = record.tax_ids.compute_all(price, currency, record.product_qty, product=product)
             record.update({
                 'price_tax': sum(t.get('amount', 0.0) for t in taxes.get('taxes', [])),
                 'price_total': taxes['total_included'],
diff --git a/hotel/security/ir.model.access.csv b/hotel/security/ir.model.access.csv
index 7484025a9..582f9f9d9 100644
--- a/hotel/security/ir.model.access.csv
+++ b/hotel/security/ir.model.access.csv
@@ -17,3 +17,4 @@ access_hotel_reservation,access_hotel_reservation,model_hotel_reservation,base.g
 access_hotel_folio,access_hotel_folio,model_hotel_folio,base.group_user,1,0,0,0
 access_hotel_room_type,access_hotel_room_type,model_hotel_room_type,base.group_user,1,0,0,0
 access_hotel_board_service_room_type,access_hotel_board_service_room_type,model_hotel_board_service_room_type,base.group_user,1,0,0,0
+access_hotel_board_service_room_type_line,access_hotel_board_service_room_type_line,model_hotel_board_service_room_type_line,base.group_user,1,0,0,0
diff --git a/hotel/views/hotel_board_service_room_type.xml b/hotel/views/hotel_board_service_room_type.xml
index d709080ef..b260b933e 100644
--- a/hotel/views/hotel_board_service_room_type.xml
+++ b/hotel/views/hotel_board_service_room_type.xml
@@ -11,7 +11,7 @@
                     <field name="board_service_line_ids">
                         <tree editable="bottom">
                             <field name="hotel_board_service_room_type_id" invisible="1"/>
-                            <field name="service_id"/>
+                            <field name="product_id"/>
                             <field name="amount" />
                         </tree>
                     </field>
diff --git a/hotel/views/hotel_folio_views.xml b/hotel/views/hotel_folio_views.xml
index 91de623b4..71d5cdc71 100644
--- a/hotel/views/hotel_folio_views.xml
+++ b/hotel/views/hotel_folio_views.xml
@@ -298,7 +298,9 @@
                                                 <field name="arrival_hour"/>
                                                 <field name="departure_hour"/>
                                                 <field name="nights" invisible="1"/>
-                                                <field name="board_service_id" />
+                                                <field name="board_service_room_id" domain="[
+                                                    ('hotel_room_type_id', '=', room_type_id),
+                                                    ('pricelist_id', 'in', [pricelist_id, False])]" />
                                                 <field name="name"/>
                                                 <field name="adults"/>
                                                 <field name="children"/>
diff --git a/hotel/views/hotel_reservation_views.xml b/hotel/views/hotel_reservation_views.xml
index 4791dcbe9..a84e40547 100644
--- a/hotel/views/hotel_reservation_views.xml
+++ b/hotel/views/hotel_reservation_views.xml
@@ -191,7 +191,10 @@
                             <field name="arrival_hour"/>
                             <field name="departure_hour"/>
                             <field name="nights" invisible="1"/>
-                            <field name="board_service_id" />
+                            <!-- TODO: How to filter to avoid show False (generic) pricelist board when exist a specific pricelist board¿? -->
+                            <field name="board_service_room_id" domain="[
+                                    ('hotel_room_type_id', '=', room_type_id),
+                                    ('pricelist_id', 'in', [pricelist_id, False])]" />
                             <field name="name"/>
                             <field name="adults"/>
                             <field name="children"/>
@@ -237,7 +240,7 @@
                     </group>
                     <notebook>
                         <page name="days" string="Service and Days">
-                                <group string="Reservation Services" name="reservation_services" attrs="{'invisible': [('folio_id','=',False)]}">
+                                <group string="Reservation Services" name="reservation_services">
                                     <field name="service_ids"
                                         context="{'default_ser_room_line': active_id, 'default_folio_id': folio_id}"
                                         nolabel="1">

From 8c1863e1965f2268d26677614fa2b7c3946cffee Mon Sep 17 00:00:00 2001
From: Dario Lodeiros <dario@aloxa.eu>
Date: Sun, 16 Dec 2018 13:36:21 +0100
Subject: [PATCH 4/7] [ADD] Base template produtc/prices to Board Services

---
 hotel/__manifest__.py                         |  2 +-
 hotel/models/__init__.py                      |  1 +
 hotel/models/hotel_board_service.py           | 22 ++++++++++----
 hotel/models/hotel_board_service_line.py      | 29 +++++++++++++++++++
 hotel/models/hotel_board_service_room_type.py |  7 ++---
 hotel/security/ir.model.access.csv            |  1 +
 ...> hotel_board_service_room_type_views.xml} |  0
 hotel/views/hotel_board_service_views.xml     | 24 +++++++--------
 8 files changed, 63 insertions(+), 23 deletions(-)
 create mode 100644 hotel/models/hotel_board_service_line.py
 rename hotel/views/{hotel_board_service_room_type.xml => hotel_board_service_room_type_views.xml} (100%)

diff --git a/hotel/__manifest__.py b/hotel/__manifest__.py
index 13fb04ca2..ba6a25e45 100644
--- a/hotel/__manifest__.py
+++ b/hotel/__manifest__.py
@@ -50,7 +50,7 @@
         'views/hotel_board_service_views.xml',
         'views/hotel_checkin_partner_views.xml',
         'views/hotel_room_type_availability_views.xml',
-        'views/hotel_board_service_room_type.xml',
+        'views/hotel_board_service_room_type_views.xml',
         'data/cron_jobs.xml',
         'data/records.xml',
         'data/email_template_cancel.xml',
diff --git a/hotel/models/__init__.py b/hotel/models/__init__.py
index 3c9619694..c68f79c5b 100644
--- a/hotel/models/__init__.py
+++ b/hotel/models/__init__.py
@@ -30,3 +30,4 @@ from . import hotel_room_closure_reason
 from . import hotel_service_line
 from . import hotel_board_service
 from . import hotel_board_service_room_type_line
+from . import hotel_board_service_line
diff --git a/hotel/models/hotel_board_service.py b/hotel/models/hotel_board_service.py
index 4c2a94447..0a28fa80f 100644
--- a/hotel/models/hotel_board_service.py
+++ b/hotel/models/hotel_board_service.py
@@ -1,6 +1,7 @@
 # Copyright 2017  Dario Lodeiros
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from odoo import models, fields
+from odoo import api, models, fields
+from odoo.addons import decimal_precision as dp
 
 
 class HotelBoardService(models.Model):
@@ -8,11 +9,20 @@ class HotelBoardService(models.Model):
     _description = "Board Services"
 
     name = fields.Char('Board Name', size=64, required=True, index=True)
-    service_ids = fields.Many2many(comodel_name='product.product',
-                                   relation='hotel_board_services_reservation',
-                                   column1='board_id',
-                                   column2='service_id')
-    sequence = fields.Integer('Sequence')
+    board_service_line_ids = fields.One2many('hotel.board.service.line',
+                                             'hotel_board_service_id')
     hotel_board_service_room_type_ids = fields.One2many(
         'hotel.board.service.room.type', 'hotel_board_service_id')
+    amount = fields.Float('Amount',
+                          digits=dp.get_precision('Product Price'),
+                          compute='_compute_board_amount',
+                          store=True)
+
+    @api.depends('board_service_line_ids.amount')
+    def _compute_board_amount(self):
+        for record in self:
+            total = 0
+            for service in record.board_service_line_ids:
+                total += service.amount
+            record.update({'amount': total})
     
diff --git a/hotel/models/hotel_board_service_line.py b/hotel/models/hotel_board_service_line.py
new file mode 100644
index 000000000..8475f57cc
--- /dev/null
+++ b/hotel/models/hotel_board_service_line.py
@@ -0,0 +1,29 @@
+# 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 HotelBoardServiceLine(models.Model):
+    _name = 'hotel.board.service.line'
+    _description = 'Services on Board Service included'
+
+    def _get_default_price(self):
+        if self.product_id:
+            return self.product_id.list_price
+            
+    hotel_board_service_id = fields.Many2one(
+        'hotel.board.service', 'Board Service', ondelete='cascade', required=True)
+    product_id = fields.Many2one(
+        'product.product', 'Product', required=True)
+    amount = fields.Float('Amount',
+        digits=dp.get_precision('Product Price'), default=_get_default_price)
+
+    @api.onchange('product_id')
+    def onchange_product_id(self):
+        if self.product_id:
+            self.update({'amount': self.product_id.list_price})
+    
+                
+                    
diff --git a/hotel/models/hotel_board_service_room_type.py b/hotel/models/hotel_board_service_room_type.py
index bc80c8318..ba10dd8a7 100644
--- a/hotel/models/hotel_board_service_room_type.py
+++ b/hotel/models/hotel_board_service_room_type.py
@@ -82,11 +82,10 @@ class HotelBoardServiceRoomType(models.Model):
         """
         cmds=[(5,0,0)]
         board_service = self.env['hotel.board.service'].browse(board_service_id)
-        today = fields.Date.today()
-        for product in board_service.service_ids:
+        for line in board_service.board_service_line_ids:
                 cmds.append((0, False, {
-                    'product_id': product.id,
-                    'amount': product.list_price #TODO: default amomunt?¿
+                    'product_id': line.product_id.id,
+                    'amount': line.amount
                 }))
         return {'board_service_line_ids': cmds}
 
diff --git a/hotel/security/ir.model.access.csv b/hotel/security/ir.model.access.csv
index 582f9f9d9..3d41900d3 100644
--- a/hotel/security/ir.model.access.csv
+++ b/hotel/security/ir.model.access.csv
@@ -18,3 +18,4 @@ access_hotel_folio,access_hotel_folio,model_hotel_folio,base.group_user,1,0,0,0
 access_hotel_room_type,access_hotel_room_type,model_hotel_room_type,base.group_user,1,0,0,0
 access_hotel_board_service_room_type,access_hotel_board_service_room_type,model_hotel_board_service_room_type,base.group_user,1,0,0,0
 access_hotel_board_service_room_type_line,access_hotel_board_service_room_type_line,model_hotel_board_service_room_type_line,base.group_user,1,0,0,0
+access_hotel_board_service_line,access_hotel_board_service_line,model_hotel_board_service_line,base.group_user,1,0,0,0
diff --git a/hotel/views/hotel_board_service_room_type.xml b/hotel/views/hotel_board_service_room_type_views.xml
similarity index 100%
rename from hotel/views/hotel_board_service_room_type.xml
rename to hotel/views/hotel_board_service_room_type_views.xml
diff --git a/hotel/views/hotel_board_service_views.xml b/hotel/views/hotel_board_service_views.xml
index 0dbc15fba..35faeee72 100644
--- a/hotel/views/hotel_board_service_views.xml
+++ b/hotel/views/hotel_board_service_views.xml
@@ -3,20 +3,20 @@
 
     <!--==================================================== Board Services ==================================================== -->
     <!-- Form view of hotel board service -->
-    <record model="ir.ui.view" id="hotel_board_service_view_form">
+    <record model="ir.ui.view" id="hotel_board_service_form">
         <field name="name">hotel.board.service.form</field>
         <field name="model">hotel.board.service</field>
         <field name="arch" type="xml">
-            <form string="Hotel Board Service">
-                <sheet>
-                    <group>
-                        <field name="name" select="1" />
-                        <field name="sequence" />
-                    </group>
-                    <group>
-                        <field name="service_ids" />
-                    </group>
-                </sheet>
+            <form string="Board Service Line">
+                <group>
+                    <field name="amount"/>
+                    <field name="board_service_line_ids">
+                        <tree editable="bottom">
+                            <field name="product_id"/>
+                            <field name="amount" />
+                        </tree>
+                    </field>
+                </group>
             </form>
         </field>
     </record>
@@ -28,7 +28,7 @@
         <field name="arch" type="xml">
             <tree string="Hotel Board Services">
                 <field name="name" />
-                <field name="sequence" />
+                <field name="amount" />
             </tree>
         </field>
     </record>

From ee7ddc70b962bc4171e0ee152d22c8fd08183217 Mon Sep 17 00:00:00 2001
From: Dario Lodeiros <dario@aloxa.eu>
Date: Sun, 16 Dec 2018 14:05:09 +0100
Subject: [PATCH 5/7] [WIP] Board services in reservation

---
 hotel/models/hotel_reservation.py       | 3 +--
 hotel/views/hotel_reservation_views.xml | 7 ++++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/hotel/models/hotel_reservation.py b/hotel/models/hotel_reservation.py
index 5b28e221e..d00a04909 100644
--- a/hotel/models/hotel_reservation.py
+++ b/hotel/models/hotel_reservation.py
@@ -333,7 +333,7 @@ class HotelReservation(models.Model):
                 record.service_ids.filtered(lambda r: r.is_board_service == True).unlink()
                 board_services = []
                 board = self.env['hotel.board.service.room.type'].browse(vals['board_service_room_id'])
-                for product in board.service_ids:
+                for line in board.board_service_line_ids:
                     board_services.append((0, False, {
                         'product_id': line.product_id.id,
                         'is_board_service': True,
@@ -615,7 +615,6 @@ class HotelReservation(models.Model):
     @api.onchange('board_service_room_id')
     def onchange_board_service(self):
         if self.board_service_room_id:
-            import wdb; wdb.set_trace()
             board_services = []
             for line in self.board_service_room_id.board_service_line_ids:
                 product = line.product_id
diff --git a/hotel/views/hotel_reservation_views.xml b/hotel/views/hotel_reservation_views.xml
index a84e40547..e8990fd1e 100644
--- a/hotel/views/hotel_reservation_views.xml
+++ b/hotel/views/hotel_reservation_views.xml
@@ -244,7 +244,12 @@
                                     <field name="service_ids"
                                         context="{'default_ser_room_line': active_id, 'default_folio_id': folio_id}"
                                         nolabel="1">
-                                        <tree string="Services" editable="bottom">
+                                        <tree string="Services" editable="bottom"
+                                        decoration-success="is_board_service == True">
+                                            <button type="object" class="oe_stat_button"
+                                                id="included_in_room" icon="fa fa-1x fa-bed"                                                                                              
+                                                name="open_service_lines"
+                                                attrs="{'invisible':[('is_board_service','=', False)]}" />
                                             <!-- <field name="sequence" widget="handle"/> -->
                                             <field name="per_day" invisible="1"/>
                                             <field name="is_board_service" invisible="1" />

From f598f65f45871162252a7f79472220e262526c1d Mon Sep 17 00:00:00 2001
From: Dario Lodeiros <dario@aloxa.eu>
Date: Mon, 17 Dec 2018 11:18:01 +0100
Subject: [PATCH 6/7] [ADD] Price type on board service template

---
 hotel/models/hotel_board_service.py           |  3 ++
 hotel/models/hotel_board_service_room_type.py |  1 +
 hotel/models/hotel_service.py                 | 45 ++++++++++---------
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/hotel/models/hotel_board_service.py b/hotel/models/hotel_board_service.py
index 0a28fa80f..e9fa26b15 100644
--- a/hotel/models/hotel_board_service.py
+++ b/hotel/models/hotel_board_service.py
@@ -11,6 +11,9 @@ class HotelBoardService(models.Model):
     name = fields.Char('Board Name', size=64, required=True, index=True)
     board_service_line_ids = fields.One2many('hotel.board.service.line',
                                              'hotel_board_service_id')
+    price_type = fields.Selection([
+        ('fixed','Fixed'),
+        ('percent','Percent')], string='Type', default='fixed', required=True)
     hotel_board_service_room_type_ids = fields.One2many(
         'hotel.board.service.room.type', 'hotel_board_service_id')
     amount = fields.Float('Amount',
diff --git a/hotel/models/hotel_board_service_room_type.py b/hotel/models/hotel_board_service_room_type.py
index ba10dd8a7..ae09426dc 100644
--- a/hotel/models/hotel_board_service_room_type.py
+++ b/hotel/models/hotel_board_service_room_type.py
@@ -65,6 +65,7 @@ class HotelBoardServiceRoomType(models.Model):
         action = self.env.ref('hotel.action_hotel_board_service_room_type_view').read()[0]
         action['views'] = [(self.env.ref('hotel.hotel_board_service_room_type_form').id, 'form')]
         action['res_id'] = self.id
+        action['target'] = 'new'
         return action
 
     @api.depends('board_service_line_ids.amount')
diff --git a/hotel/models/hotel_service.py b/hotel/models/hotel_service.py
index 8e2cf25e1..9190c6a7e 100644
--- a/hotel/models/hotel_service.py
+++ b/hotel/models/hotel_service.py
@@ -205,29 +205,30 @@ class HotelService(models.Model):
         self.ensure_one()
         folio = self.folio_id or self.env.context.get('default_folio_id')
         reservation = self.ser_room_line or self.env.context.get('ser_room_line')
-        partner = folio.partner_id if folio else reservation.partner_id
-        pricelist = folio.pricelist_id if folio else reservation.pricelist_id
-        if reservation and self.is_board_service:
-            board_room_type = reservation.board_service_room_id
-            if board_room_type.price_type == 'fixed':
-                return self.env['hotel.board.service.room.type.line'].search([
-                    ('hotel_board_service_room_type_id', '=', board_room_type.id),
-                    ('product_id','=',self.product_id.id)]).amount
+        if folio or reservation:
+            partner = folio.partner_id if folio else reservation.partner_id
+            pricelist = folio.pricelist_id if folio else reservation.pricelist_id
+            if reservation and self.is_board_service:
+                board_room_type = reservation.board_service_room_id
+                if board_room_type.price_type == 'fixed':
+                    return self.env['hotel.board.service.room.type.line'].search([
+                        ('hotel_board_service_room_type_id', '=', board_room_type.id),
+                        ('product_id','=',self.product_id.id)]).amount
+                else:
+                    return (reservation.price_total * self.env['hotel.board.service.room.type.line'].search([
+                        ('hotel_board_service_room_type_id', '=', board_room_type.id),
+                        ('product_id','=',self.product_id.id)]).amount) / 100
             else:
-                return (reservation.price_total * self.env['hotel.board.service.room.type.line'].search([
-                    ('hotel_board_service_room_type_id', '=', board_room_type.id),
-                    ('product_id','=',self.product_id.id)]).amount) / 100
-        else:
-            product = self.product_id.with_context(
-                    lang=partner.lang,
-                    partner=partner.id,
-                    quantity=self.product_qty,
-                    date=folio.date_order or fields.Date.today(),
-                    pricelist=pricelist.id,
-                    uom=self.product_id.uom_id.id,
-                    fiscal_position=False
-                )
-            return self.env['account.tax']._fix_tax_included_price_company(self._get_display_price(product), product.taxes_id, self.tax_ids, folio.company_id)
+                product = self.product_id.with_context(
+                        lang=partner.lang,
+                        partner=partner.id,
+                        quantity=self.product_qty,
+                        date=folio.date_order or fields.Date.today(),
+                        pricelist=pricelist.id,
+                        uom=self.product_id.uom_id.id,
+                        fiscal_position=False
+                    )
+                return self.env['account.tax']._fix_tax_included_price_company(self._get_display_price(product), product.taxes_id, self.tax_ids, folio.company_id)
             
          
 

From 2529a7ee8873aee91454da5d274b832588d3f93b Mon Sep 17 00:00:00 2001
From: Dario Lodeiros <dario@aloxa.eu>
Date: Mon, 17 Dec 2018 11:18:23 +0100
Subject: [PATCH 7/7] [ADD] Demo date board services

---
 hotel/data/hotel_demo.xml | 91 +++++++++++++++++++++++++++++++++------
 1 file changed, 78 insertions(+), 13 deletions(-)

diff --git a/hotel/data/hotel_demo.xml b/hotel/data/hotel_demo.xml
index ee34db3c8..042b7d0b9 100644
--- a/hotel/data/hotel_demo.xml
+++ b/hotel/data/hotel_demo.xml
@@ -235,24 +235,90 @@
 
         <record id="hotel_board_service_0" model="hotel.board.service">
             <field name="name">BreakFast</field>
-            <field name="service_ids"
-                   eval="[(4, ref('hotel_service_0'))]"/>
-            <field name="sequence">0</field>
+            <field name="board_service_line_ids"
+                   eval="[(5, 0), (0, 0, {
+                    'product_id': ref('hotel_service_0'),
+                    'amount': 3})]"/>
+            <field name="price_type">fixed</field>
         </record>
 
         <record id="hotel_board_service_1" model="hotel.board.service">
             <field name="name">Half Board</field>
-            <field name="service_ids"
-                   eval="[(4, ref('hotel_service_0')), (4, ref('hotel_service_4'))]"/>
-            <field name="sequence">10</field>
+            <field name="board_service_line_ids"
+                   eval="[(5, 0), (0, 0, {
+                    'product_id': ref('hotel_service_0'),
+                    'amount': 3}),
+                    (0, 0, {'product_id': ref('hotel_service_4'),
+                    'amount': 8})
+                    ]"/>
+            <field name="price_type">fixed</field>
         </record>
 
         <record id="hotel_board_service_2" model="hotel.board.service">
             <field name="name">FullBoard</field>
-            <field name="service_ids"
-                   eval="[(4, ref('hotel_service_0')), (4, ref('hotel_service_4')),
-                   (4, ref('hotel_service_5'))]"/>
-            <field name="sequence">10</field>
+            <field name="board_service_line_ids"
+                   eval="[(5, 0), (0, 0, {
+                    'product_id': ref('hotel_service_0'),
+                    'amount': 3}),
+                    (0, 0, {'product_id': ref('hotel_service_4'),
+                    'amount': 8}),
+                    (0, 0, {'product_id': ref('hotel_service_5'),
+                    'amount': 8})
+                    ]"/>
+            <field name="price_type">fixed</field>
+        </record>
+
+    <!-- hotel.board.service.room.type -->
+
+                            <!--Room 0 Economic-->
+
+        <record id="hotel_board_service_room_0"
+                model="hotel.board.service.room.type">
+            <field name="hotel_board_service_id"
+                    ref="hotel_board_service_0"/>
+            <field name="hotel_room_type_id"
+                    ref="hotel_room_type_0"/>
+            <field name="price_type">fixed</field>
+        </record>
+
+        <record id="hotel_board_service_room_1"
+                model="hotel.board.service.room.type">
+            <field name="hotel_board_service_id"
+                    ref="hotel_board_service_1"/>
+            <field name="hotel_room_type_id"
+                    ref="hotel_room_type_0"/>
+            <field name="price_type">fixed</field>
+        </record>
+
+        <record id="hotel_board_service_room_2"
+                model="hotel.board.service.room.type">
+            <field name="hotel_board_service_id"
+                    ref="hotel_board_service_1"/>
+            <field name="hotel_room_type_id"
+                    ref="hotel_room_type_0"/>
+            <field name="pricelist_id"
+                    ref="product.list0"/>
+            <field name="price_type">fixed</field>
+        </record>
+
+                            <!--Room 3 Triple-->
+
+        <record id="hotel_board_service_room_3"
+                model="hotel.board.service.room.type">
+            <field name="hotel_board_service_id"
+                    ref="hotel_board_service_0"/>
+            <field name="hotel_room_type_id"
+                    ref="hotel_room_type_3"/>
+            <field name="price_type">fixed</field>
+        </record>
+
+        <record id="hotel_board_service_room_4"
+                model="hotel.board.service.room.type">
+            <field name="hotel_board_service_id"
+                    ref="hotel_board_service_2"/>
+            <field name="hotel_room_type_id"
+                    ref="hotel_room_type_3"/>
+            <field name="price_type">fixed</field>
         </record>
 
     <!-- room.closure.reason -->
@@ -280,7 +346,7 @@
                     'checkout': (DateTime.today() + timedelta(days=2)).strftime('%Y-%m-%d'),
                     'adults': 2,
                     'state': 'confirm',
-                    'board_service_id': ref('hotel_board_service_1'),
+                    'board_service_room_id': ref('hotel_board_service_room_1'),
                     })]"/>
         </record>
         <!-- reservation of 1 triple room for 3 people on behalf on the company -->
@@ -292,7 +358,7 @@
                     'checkin': (DateTime.today() + timedelta(days=2)).strftime('%Y-%m-%d'),
                     'checkout': (DateTime.today() + timedelta(days=4)).strftime('%Y-%m-%d'),
                     'adults': 3,
-                    'board_service_id': ref('hotel_board_service_2'),
+                    'board_service_room_id': ref('hotel_board_service_room_3'),
                     })]"/>
         </record>
         <!-- reservation of 3 single rooms for 3 people with 1 cancelled -->
@@ -329,7 +395,6 @@
                     'checkout': (DateTime.today() + timedelta(days=4)).strftime('%Y-%m-%d'),
                     'adults': 1,
                     'state': 'confirm',
-                    'board_service_id': ref('hotel_board_service_1'),
                     })]"/>
         </record>