audrius/pms
1
0
Fork 1
mirror of https://github.com/OCA/pms.git synced 2025-01-29 00:17:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] var on service _get_display_price

Browse Source
This commit is contained in:
Dario Lodeiros
2019-02-11 11:42:46 +01:00
parent 1fe0225cf1
commit 6dff8baea3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hotel/models/hotel_service.py
View File

@@ -169,7 +169,7 @@ class HotelService(models.Model):
if self.compute_lines_out_vals(vals): if self.compute_lines_out_vals(vals):
reservation = self.env['hotel.reservation'].browse(vals['ser_room_line']) reservation = self.env['hotel.reservation'].browse(vals['ser_room_line'])
product = self.env['product.product'].browse(vals['product_id']) product = self.env['product.product'].browse(vals['product_id'])
vals.update(self.prepare_service_lines( vals.update(self.prepare_service_lines(
dfrom=reservation.checkin, dfrom=reservation.checkin,
days=reservation.nights, days=reservation.nights,
@@ -251,7 +251,7 @@ class HotelService(models.Model):
return product.with_context(pricelist=origin.pricelist_id.id).price return product.with_context(pricelist=origin.pricelist_id.id).price
product_context = dict(self.env.context, partner_id=origin.partner_id.id, date=folio.date_order if folio else fields.Date.today(), uom=self.product_id.uom_id.id) product_context = dict(self.env.context, partner_id=origin.partner_id.id, date=folio.date_order if folio else fields.Date.today(), uom=self.product_id.uom_id.id)
final_price, rule_id = origin.pricelist_id.with_context(product_context).get_product_price_rule(self.product_id, self.product_qty or 1.0, origin.partner_id) final_price, rule_id = origin.pricelist_id.with_context(product_context).get_product_price_rule(self.product_id, self.product_qty or 1.0, origin.partner_id)
base_price, currency_id = self.with_context(product_context)._get_real_price_currency(product, rule_id, self.product_qty, product_id.uom_id, origin.pricelist_id.id) base_price, currency_id = self.with_context(product_context)._get_real_price_currency(product, rule_id, self.product_qty, self.product_id.uom_id, origin.pricelist_id.id)
if currency_id != origin.pricelist_id.currency_id.id: if currency_id != origin.pricelist_id.currency_id.id:
base_price = self.env['res.currency'].browse(currency_id).with_context(product_context).compute(base_price, origin.pricelist_id.currency_id) base_price = self.env['res.currency'].browse(currency_id).with_context(product_context).compute(base_price, origin.pricelist_id.currency_id)
# negative discounts (= surcharge) are included in the display price # negative discounts (= surcharge) are included in the display price
@@ -326,11 +326,11 @@ class HotelService(models.Model):
if board_room_type.price_type == 'fixed': if board_room_type.price_type == 'fixed':
return self.env['hotel.board.service.room.type.line'].search([ return self.env['hotel.board.service.room.type.line'].search([
('hotel_board_service_room_type_id', '=', board_room_type.id), ('hotel_board_service_room_type_id', '=', board_room_type.id),
('product_id','=',self.product_id.id)]).amount ('product_id', '=', self.product_id.id)]).amount
else: else:
return (reservation.price_total * self.env['hotel.board.service.room.type.line'].search([ return (reservation.price_total * self.env['hotel.board.service.room.type.line'].search([
('hotel_board_service_room_type_id', '=', board_room_type.id), ('hotel_board_service_room_type_id', '=', board_room_type.id),
('product_id','=',self.product_id.id)]).amount) / 100 ('product_id', '=', self.product_id.id)]).amount) / 100
else: else:
product = self.product_id.with_context( product = self.product_id.with_context(
lang=partner.lang, lang=partner.lang,
@@ -408,7 +408,7 @@ class HotelService(models.Model):
action['res_id'] = self.id action['res_id'] = self.id
action['target'] = 'new' action['target'] = 'new'
return action return action
#~ @api.constrains('product_qty') #~ @api.constrains('product_qty')
#~ def constrains_qty_per_day(self): #~ def constrains_qty_per_day(self):
#~ for record in self: #~ for record in self: