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

[ADD] Property listprice rules in services

Browse Source
This commit is contained in:
Darío Lodeiros
2020-10-23 17:30:19 +02:00
parent 9ddfac3641
commit 9c0d1f445c
2 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pms/models/pms_service.py
View File

@@ -295,12 +295,17 @@ class PmsService(models.Model):
@api.depends("service_line_ids", "service_line_ids.day_qty") @api.depends("service_line_ids", "service_line_ids.day_qty")
def _compute_product_qty(self): def _compute_product_qty(self):
self.product_qty = 0 self.product_qty = 0
_logger.info("B")
for service in self.filtered("service_line_ids"): for service in self.filtered("service_line_ids"):
qty = sum(service.service_line_ids.mapped("day_qty")) qty = sum(service.service_line_ids.mapped("day_qty"))
service.product_qty = qty service.product_qty = qty
@api.depends("product_id", "service_line_ids", "reservation_id.pricelist_id") @api.depends(
"product_id",
"service_line_ids",
"reservation_id.pricelist_id",
"reservation_id.pms_property_id",
"pms_property_id",
)
def _compute_price_unit(self): def _compute_price_unit(self):
for service in self: for service in self:
folio = service.folio_id folio = service.folio_id
@@ -352,6 +357,7 @@ class PmsService(models.Model):
pricelist=pricelist.id, pricelist=pricelist.id,
uom=service.product_id.uom_id.id, uom=service.product_id.uom_id.id,
fiscal_position=False, fiscal_position=False,
property=service.pms_property_id.id,
) )
service.price_unit = self.env[ service.price_unit = self.env[
"account.tax" "account.tax"
@@ -378,7 +384,11 @@ class PmsService(models.Model):
folio_new = self.folio_id folio_new = self.folio_id
reservation_new = self.reservation_id reservation_new = self.reservation_id
new = reservation_new if reservation_new else folio_new new = reservation_new if reservation_new else folio_new
price_fields = ["pricelist_id", "reservation_type"] price_fields = [
"pricelist_id",
"reservation_type",
"pms_property_id",
]
if ( if (
any(origin[field] != new[field] for field in price_fields) any(origin[field] != new[field] for field in price_fields)
or self._origin.price_unit == 0 or self._origin.price_unit == 0

26
pms/models/product_product.py
View File

@@ -1,26 +0,0 @@
# Copyright 2017 Alexandre Díaz
# Copyright 2017 Dario Lodeiros
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import fields, models
class ProductTemplate(models.Model):
_inherit = "product.template"
pms_property_ids = fields.Many2many(
"pms.property", string="Properties", required=False, ondelete="restrict"
)
per_day = fields.Boolean("Unit increment per day")
per_person = fields.Boolean("Unit increment per person")
consumed_on = fields.Selection(
[("before", "Before night"), ("after", "After night")],
"Consumed",
default="before",
)
daily_limit = fields.Integer("Daily limit")
is_extra_bed = fields.Boolean("Is extra bed", default=False)
show_in_calendar = fields.Boolean(
"Show in Calendar",
default=False,
help="Specifies if the product is shown in the calendar information.",
)