mirror of
https://bitbucket.org/presik/trytonpsk-hotel.git
synced 2023-12-14 07:52:52 +01:00
Fix
This commit is contained in:
parent
ae45d28f88
commit
0e2ecf6852
|
@ -1,4 +1,4 @@
|
|||
Copyright (C) 2013-2022 Oscar Andrés Álvarez Montero
|
||||
Copyright (C) 2013-2023 Oscar Andrés Álvarez Montero
|
||||
Copyright (C) 2013 Humberto José Yances Cárdenas
|
||||
|
||||
|
||||
|
|
|
@ -134,5 +134,4 @@ def register():
|
|||
sale.InvoiceIncomeDaily,
|
||||
party.CreateGuest,
|
||||
operation.NightAuditWizard,
|
||||
# booking.AddOccupancy,
|
||||
module='hotel', type_='wizard')
|
||||
|
|
|
@ -433,7 +433,6 @@ class Booking(Workflow, ModelSQL, ModelView):
|
|||
self.price_list = None
|
||||
self.collection_mode = None
|
||||
|
||||
|
||||
@classmethod
|
||||
@ModelView.button_action('hotel.wizard_select_rooms')
|
||||
def select_rooms(cls, records):
|
||||
|
|
|
@ -8,16 +8,3 @@ class Commission(metaclass=PoolMeta):
|
|||
__name__ = 'commission'
|
||||
offset_move_line = fields.Many2One('account.move.line', 'Offset Move Line',
|
||||
states={'readonly': True})
|
||||
|
||||
# @classmethod
|
||||
# @ModelView.button
|
||||
# def invoice(cls, commissions):
|
||||
# super().invoice(commissions)
|
||||
# Invoice = Pool().get('account.invoice')
|
||||
# for comm in commissions:
|
||||
# if not comm.invoice_line or not comm.offset_move_line:
|
||||
# return
|
||||
# invoice = comm.invoice_line.invoice
|
||||
# Invoice.write([invoice], {'payment_lines': [
|
||||
# ('add', [comm.offset_move_line.id])
|
||||
# ]})
|
||||
|
|
7
folio.py
7
folio.py
|
@ -256,7 +256,7 @@ class Folio(ModelSQL, ModelView):
|
|||
def get_pending_to_pay(self, name=None):
|
||||
res = 0
|
||||
if name == 'pending_accommodation':
|
||||
if self.payment_status != 'paid':
|
||||
# if self.payment_status != 'paid':
|
||||
res = self.get_total_accommodation()
|
||||
if name == 'pending_charges':
|
||||
total_charges = self.get_total_products()
|
||||
|
@ -358,8 +358,9 @@ class Folio(ModelSQL, ModelView):
|
|||
bk = self.booking
|
||||
|
||||
def _check_accommodation(folio):
|
||||
if folio.payment_status != 'paid':
|
||||
raise UserError(gettext('hotel.msg_accommodation_not_paid'))
|
||||
for charge in folio.charges:
|
||||
if charge.status != 'paid':
|
||||
raise UserError(gettext('hotel.msg_accommodation_not_paid'))
|
||||
|
||||
def _check_charges(folio):
|
||||
for charge in folio.charges:
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
[tryton]
|
||||
version=6.0.57
|
||||
version=6.0.60
|
||||
depends:
|
||||
party
|
||||
company
|
||||
|
|
Loading…
Reference in a new issue