This commit is contained in:
oscar alvarez 2023-08-28 14:52:25 -05:00
parent 958b8fc4f0
commit f2245ad289
1 changed files with 7 additions and 7 deletions

View File

@ -1153,14 +1153,15 @@ class Booking(Workflow, ModelSQL, ModelView):
def get_untaxed_amount(self, name):
res = []
charges_ids = []
for folio in self.lines:
for occ in folio.occupancy:
if not occ.charge:
res.append(occ.unit_price)
if folio.occupancy:
for occ in folio.occupancy:
if not occ.charge:
res.append(occ.unit_price)
else:
res.append(folio.room_amount)
for charge in folio.charges:
if charge.id not in charges_ids:
res.append(charge.amount)
res.append(charge.amount)
return self.currency.round(sum(res))
def get_channel_commission(self, name):
@ -1276,7 +1277,6 @@ class SelectRoomsAsk(ModelView):
unit_price = rate_plan.price_list.compute(
booking.party, product, unit_price,
quantity, product.default_uom)
print("= = = = >", booking.party, product, unit_price, quantity, product.default_uom)
unit_price = booking.currency.round(unit_price)
return unit_price