Merge PR #285 into 14.0

Signed-off-by DarioLodeiros
This commit is contained in:
OCA-git-bot
2024-09-10 10:50:31 +00:00

View File

@@ -24,35 +24,13 @@ class ProductProduct(models.Model):
@api.depends_context("consumption_date", "board_service_line_id")
def _compute_board_price(self):
pms_property_id = (
self.env.context.get("property")
or self.env.user.get_active_property_ids()[0]
)
for record in self:
if self._context.get("board_service"):
if self._context.get("board_service_line_id"):
record.board_price = (
self.env["pms.board.service.room.type.line"]
.browse(self._context.get("board_service_line_id"))
.amount
)
else:
record.board_price = (
self.env["pms.board.service.room.type.line"]
.search(
[
(
"pms_board_service_room_type_id",
"=",
self._context.get("board_service"),
),
("product_id", "=", record.id),
("pms_property_id", "=", pms_property_id),
],
limit=1,
)
.amount
)
if self._context.get("board_service_line_id"):
record.board_price = (
self.env["pms.board.service.room.type.line"]
.browse(self._context.get("board_service_line_id"))
.amount
)
else:
record.board_price = False
@@ -73,7 +51,7 @@ class ProductProduct(models.Model):
rec.room_type_id = False
def price_compute(self, price_type, uom=False, currency=False, company=None):
if self._context.get("board_service"):
if self._context.get("board_service_line_id"):
price_type = "board_price"
return super(ProductProduct, self).price_compute(
price_type, uom, currency, company