This commit is contained in:
oscar alvarez 2022-10-27 21:53:50 -05:00
parent 1d5ace5b49
commit 43b86932e3
4 changed files with 32 additions and 13 deletions

View File

@ -371,9 +371,9 @@ class Booking(Workflow, ModelSQL, ModelView):
for folio in self.lines:
if folio.invoice_line:
res.append(folio.invoice_line.invoice.id)
for charge in folio.charges:
if charge.invoice_line:
res.append(charge.invoice_line.invoice.id)
for charge in folio.charges:
if charge.invoice_line:
res.append(charge.invoice_line.invoice.id)
return list(set(res))
def get_person_num(self, name):
@ -635,7 +635,7 @@ class Booking(Workflow, ModelSQL, ModelView):
'product': cha.product,
'unit_price': bk.currency.round(cha.unit_price),
'charge': cha,
'origin': str(bk),
'origin': str(cha.folio),
'taxes': cha.folio.taxes,
'taxes_exception': bk.taxes_exception,
}
@ -892,7 +892,7 @@ class Booking(Workflow, ModelSQL, ModelView):
'quantity': folio.nights_quantity,
'unit_price': folio.unit_price,
'description': folio.room.name,
'origin': str(bk),
'origin': str(folio),
'taxes_exception': bk.taxes_exception,
}
line, = InvoiceLine.create([

View File

@ -185,12 +185,8 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_open_booking_invoices_form">
<field name="name">Invoices</field>
<field name="res_model">account.invoice</field>
<field name="domain"
eval="[('lines.origin.id', '=', Eval('active_id'), 'hotel.booking')]"
pyson="1"/>
<!-- <field name="domain"
eval="[('id', 'in', Eval('invoices'))]"
pyson="1"/> -->
<field name="domain" pyson="1"
eval="[('lines.origin.booking.id', '=', Eval('active_id'), 'hotel.folio')]"/>
</record>
<record model="ir.action.keyword" id="act_open_booking_invoices_keyword1">
<field name="keyword">form_relate</field>

View File

@ -99,8 +99,8 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.message" id="msg_cannot_check_in_future">
<field name="text">It can not check-in of future dates!</field>
</record>
<record model="ir.message" id="msg_missing_guest">
<!-- <record model="ir.message" id="msg_missing_guest">
<field name="text">It missing guest in booking "%(number)s"!</field>
</record>
</record> -->
</data>
</tryton>

View File

@ -15,3 +15,26 @@ UPDATE account_statement_line SET source=t.booking FROM (
DROP TABLE hotel_booking_statement_line_rel;
DROP TABLE hotel_folio_statement_line_rel;
|| ta.id FROM hotel_folio
WHERE account_invoice_line.origin
SELECT id, booking FROM hotel_folio
------------------------------------------------------------------
ALTER TABLE account_invoice_line ADD COLUMN origin2 VARCHAR;
UPDATE account_invoice_line SET origin2=origin;
UPDATE account_invoice_line AS ail
SET origin='hotel.folio,' || st.folio_id FROM (
SELECT fo.id AS folio_id, fo.booking, ta.line_id AS line_id
FROM hotel_folio AS fo INNER JOIN (
SELECT ail.id AS line_id, SPLIT_PART(ail.origin, ',', 2)::INTEGER AS booking_id, ail.origin
FROM account_invoice_line AS ail
WHERE origin ILIKE 'hotel.booking%') AS ta
ON ta.booking_id=fo.booking
) AS st
WHERE ail.id=st.line_id AND ail.origin ILIKE 'hotel.booking%';