From c0ba6590280a42cf779cbfcbea20d2ccf4e84781 Mon Sep 17 00:00:00 2001
From: Dario Lodeiros <dario@aloxa.eu>
Date: Mon, 8 Apr 2019 20:58:44 +0200
Subject: [PATCH] [IMP] Wizard Reservation names and fields

---
 hotel/models/hotel_service.py              | 10 ++++++----
 hotel/wizard/folio_make_invoice_advance.py | 18 +++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/hotel/models/hotel_service.py b/hotel/models/hotel_service.py
index cd71ff1ed..0a44bf2ff 100644
--- a/hotel/models/hotel_service.py
+++ b/hotel/models/hotel_service.py
@@ -33,12 +33,14 @@ class HotelService(models.Model):
     @api.multi
     def name_get(self):
         result = []
-        for res in self:
-            name = u'%s (%s)' % (res.name, res.ser_room_line.name)
-            result.append((res.id, name))
+        for rec in self:
+            name = []
+            name.append('%(name)s' % {'name': rec.name})
+            if rec.ser_room_line.name:
+                name.append('%(name)s' % {'name': rec.ser_room_line.name})
+            result.append((rec.id, ", ".join(name)))
         return result
 
-
     @api.model
     def _default_ser_room_line(self):
         if self.env.context.get('room_lines'):
diff --git a/hotel/wizard/folio_make_invoice_advance.py b/hotel/wizard/folio_make_invoice_advance.py
index 6fe4cb900..8066a5a09 100644
--- a/hotel/wizard/folio_make_invoice_advance.py
+++ b/hotel/wizard/folio_make_invoice_advance.py
@@ -298,15 +298,15 @@ class FolioAdvancePaymentInv(models.TransientModel):
                     lambda x: x.is_board_service == False and \
                     x.qty_to_invoice != 0 and \
                     (x.ser_room_line.id in self.reservation_ids.ids or \
-                    x.ser_room_line.id  == False)):
+                    not x.ser_room_line.id)):
                 invoice_lines[service.id] = {
-                        'description' : service.name,
-                        'product_id': service.product_id.id,
-                        'qty': service.qty_to_invoice,
-                        'discount': service.discount,
-                        'price_unit': service.price_unit,
-                        'service_id': service.id,
-                        }
+                    'description' : service.name,
+                    'product_id': service.product_id.id,
+                    'qty': service.qty_to_invoice,
+                    'discount': service.discount,
+                    'price_unit': service.price_unit,
+                    'service_id': service.id,
+                    }
             for reservation in folio.room_lines.filtered(
                     lambda x: x.id in self.reservation_ids.ids and
                     x.invoice_status == 'to invoice'):
@@ -432,7 +432,7 @@ class LineAdvancePaymentInv(models.TransientModel):
         for record in self:
             origin = record.reservation_id if record.reservation_id.id else record.service_id
             amount_line = record.price_unit * record.qty
-            if amount_line > 0:
+            if amount_line != 0:
                 product = record.product_id
                 price = amount_line * (1 - (record.discount or 0.0) * 0.01)
                 taxes = origin.tax_ids.compute_all(price, origin.currency_id, 1, product=product)