From 41f990bc86e323e633fa72e8303de35adf8798f0 Mon Sep 17 00:00:00 2001 From: oscar alvarez Date: Tue, 14 Jun 2022 21:23:38 -0500 Subject: [PATCH] Fix --- folio.py | 4 ++-- invoice.py | 1 + service.py | 10 +++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/folio.py b/folio.py index 2a59150..b3b4fae 100644 --- a/folio.py +++ b/folio.py @@ -173,8 +173,8 @@ class Folio(ModelSQL, ModelView): return sum(res) def get_rec_name(self, name=None): - if self.registration_card: - name = f'{self.registration_card}:' + if self.room: + name = f'{self.room.code}:' if self.main_guest: name = name + self.main_guest.name return name diff --git a/invoice.py b/invoice.py index 80d9910..19e30cc 100644 --- a/invoice.py +++ b/invoice.py @@ -27,6 +27,7 @@ class Invoice(metaclass=PoolMeta): for voucher in booking.vouchers: if invoice.party.id == voucher.party.id: vouchers.append(voucher) + # FIXME must pass lines of move if vouchers: invoice.create_move_advance(set(vouchers)) diff --git a/service.py b/service.py index e5e697f..c972731 100644 --- a/service.py +++ b/service.py @@ -230,9 +230,14 @@ class ServiceLine(Workflow, ModelSQL, ModelView): def add_product_to_room(self): FolioCharge = Pool().get('hotel.folio.charge') + Folio = Pool().get('hotel.folio') if self.folio_line: return + folios = Folio.search([ + ('room', '=', self.room.id), + ('registration_state', '=', 'check_in'), + ]) # if not folios: # raise UserError( # gettext('hotel.msg_room_not_occupied', s=self.room.name) @@ -242,7 +247,10 @@ class ServiceLine(Workflow, ModelSQL, ModelView): # gettext('hotel.msg_multiple_rooms_active', s=self.room.name) # ) - # folio = folios[0] + if not folios: + return + + folio = folios[0] new_line = { 'folio': self.folio.id, 'date_service': self.service.service_date,