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]pms_l10n_es: Fix compute INE checkins data

Browse Source
This commit is contained in:
Darío Lodeiros
2022-07-23 10:03:51 +02:00
parent 218fcecd26
commit f9e0f9f3a6
2 changed files with 26 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pms_l10n_es/tests/test_wizard_ine.py
View File

@@ -841,18 +841,16 @@ class TestWizardINE(TestPms):
third_date = datetime.date(2021, 2, 3)
end_date = datetime.date(2021, 2, 4)
country_spain = self.env["res.country"].search([("code", "=", "ES")])
state_madrid = self.env["res.country.state"].search([("name", "=", "Madrid")])
expected_result = {
self.country_russia.code: {
start_date: {
"arrivals": 2,
"pernoctations": 2,
"arrivals": 1,
"pernoctations": 1,
},
second_date: {
"arrivals": 2,
"pernoctations": 2,
"departures": 2,
"departures": 1,
},
third_date: {
"pernoctations": 2,
@@ -861,17 +859,6 @@ class TestWizardINE(TestPms):
"departures": 2,
},
},
country_spain.code: {
state_madrid.ine_code: {
second_date: {
"arrivals": 2,
"pernoctations": 2,
},
third_date: {
"departures": 2,
},
},
},
}
# ACT
nationalities = self.env["pms.ine.wizard"].ine_nationalities(

44
pms_l10n_es/wizards/wizard_ine.py
View File

@@ -74,7 +74,11 @@ class WizardIne(models.TransientModel):
("room_id.in_ine", "=", True),
("date", "=", p_date),
("room_id.capacity", "=", 2),
("reservation_id.state", "in", ["confirmed", "done"]),
(
"reservation_id.state",
"in",
["confirmed", "onboard", "done"],
),
]
)
.filtered(
@@ -99,7 +103,11 @@ class WizardIne(models.TransientModel):
("room_id.in_ine", "=", True),
("date", "=", p_date),
("room_id.capacity", "=", 2),
("reservation_id.state", "in", ["confirmed", "done"]),
(
"reservation_id.state",
"in",
["confirmed", "onboard", "done"],
),
]
)
.filtered(
@@ -114,24 +122,14 @@ class WizardIne(models.TransientModel):
)
# service lines with extra beds
extra_bed_service_lines = (
self.env["pms.service.line"]
.search(
[
("pms_property_id", "=", pms_property_id.id),
("product_id.is_extra_bed", "=", True),
("reservation_id.reservation_type", "=", "normal"),
("date", "=", p_date),
]
)
.filtered(
lambda s: len(
s.reservation_id.checkin_partner_ids.filtered(
lambda c: c.state not in ["draft", "cancel"]
)
)
> s.reservation_id.adults
)
extra_bed_service_lines = self.env["pms.service.line"].search(
[
("pms_property_id", "=", pms_property_id.id),
("product_id.is_extra_bed", "=", True),
("reservation_id.reservation_type", "=", "normal"),
("reservation_id.state", "in", ["confirmed", "onboard", "done"]),
("date", "=", p_date),
]
)
extra_beds = 0
@@ -160,7 +158,11 @@ class WizardIne(models.TransientModel):
("reservation_id.reservation_type", "=", "normal"),
("room_id.in_ine", "=", True),
("pms_property_id", "=", pms_property_id.id),
("reservation_id.state", "in", ["confirmed", "done"]),
(
"reservation_id.state",
"in",
["confirmed", "onboard", "done"],
),
]
)
.filtered(