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

Merge branch '11.0' into pr_onboard_service_line

Browse Source
This commit is contained in:
Darío Lodeiros
2018-12-18 19:42:26 +01:00
committed by GitHub
parent 2529a7ee88 21b96c8a9a
commit fc221ee07f
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hotel/models/hotel_service.py
View File

@@ -229,8 +229,6 @@ class HotelService(models.Model):
fiscal_position=False fiscal_position=False
) )
return self.env['account.tax']._fix_tax_included_price_company(self._get_display_price(product), product.taxes_id, self.tax_ids, folio.company_id) return self.env['account.tax']._fix_tax_included_price_company(self._get_display_price(product), product.taxes_id, self.tax_ids, folio.company_id)
@api.model @api.model
def prepare_service_lines(self, **kwargs): def prepare_service_lines(self, **kwargs):
@@ -270,6 +268,7 @@ class HotelService(models.Model):
product = record.product_id product = record.product_id
price = record.price_unit * (1 - (record.discount or 0.0) * 0.01) price = record.price_unit * (1 - (record.discount or 0.0) * 0.01)
taxes = record.tax_ids.compute_all(price, currency, record.product_qty, product=product) taxes = record.tax_ids.compute_all(price, currency, record.product_qty, product=product)
record.update({ record.update({
'price_tax': sum(t.get('amount', 0.0) for t in taxes.get('taxes', [])), 'price_tax': sum(t.get('amount', 0.0) for t in taxes.get('taxes', [])),
'price_total': taxes['total_included'], 'price_total': taxes['total_included'],