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 PR #151 into 14.0

Browse Source 
Signed-off-by DarioLodeiros
This commit is contained in:
OCA-git-bot
2022-07-23 08:05:55 +00:00
parent 27fdc2a650 f9e0f9f3a6
commit ad179dcd2e
2 changed files with 137 additions and 195 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) third_date = datetime.date(2021, 2, 3)
end_date = datetime.date(2021, 2, 4) 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 = { expected_result = {
self.country_russia.code: { self.country_russia.code: {
start_date: { start_date: {
"arrivals": 2, "arrivals": 1,
"pernoctations": 2, "pernoctations": 1,
}, },
second_date: { second_date: {
"arrivals": 2, "arrivals": 2,
"pernoctations": 2, "pernoctations": 2,
"departures": 2, "departures": 1,
}, },
third_date: { third_date: {
"pernoctations": 2, "pernoctations": 2,
@@ -861,17 +859,6 @@ class TestWizardINE(TestPms):
"departures": 2, "departures": 2,
}, },
}, },
country_spain.code: {
state_madrid.ine_code: {
second_date: {
"arrivals": 2,
"pernoctations": 2,
},
third_date: {
"departures": 2,
},
},
},
} }
# ACT # ACT
nationalities = self.env["pms.ine.wizard"].ine_nationalities( nationalities = self.env["pms.ine.wizard"].ine_nationalities(

313
pms_l10n_es/wizards/wizard_ine.py
View File

@@ -74,9 +74,21 @@ class WizardIne(models.TransientModel):
("room_id.in_ine", "=", True), ("room_id.in_ine", "=", True),
("date", "=", p_date), ("date", "=", p_date),
("room_id.capacity", "=", 2), ("room_id.capacity", "=", 2),
("reservation_id.adults", "=", 1), (
"reservation_id.state",
"in",
["confirmed", "onboard", "done"],
),
] ]
) )
.filtered(
lambda l: len(
l.reservation_id.checkin_partner_ids.filtered(
lambda c: c.state not in ["draft", "cancel"]
)
)
== 1
)
.mapped("room_id") .mapped("room_id")
) )
@@ -91,9 +103,21 @@ class WizardIne(models.TransientModel):
("room_id.in_ine", "=", True), ("room_id.in_ine", "=", True),
("date", "=", p_date), ("date", "=", p_date),
("room_id.capacity", "=", 2), ("room_id.capacity", "=", 2),
("reservation_id.adults", "=", 2), (
"reservation_id.state",
"in",
["confirmed", "onboard", "done"],
),
] ]
) )
.filtered(
lambda l: len(
l.reservation_id.checkin_partner_ids.filtered(
lambda c: c.state not in ["draft", "cancel"]
)
)
== 2
)
.mapped("room_id") .mapped("room_id")
) )
@@ -103,6 +127,7 @@ class WizardIne(models.TransientModel):
("pms_property_id", "=", pms_property_id.id), ("pms_property_id", "=", pms_property_id.id),
("product_id.is_extra_bed", "=", True), ("product_id.is_extra_bed", "=", True),
("reservation_id.reservation_type", "=", "normal"), ("reservation_id.reservation_type", "=", "normal"),
("reservation_id.state", "in", ["confirmed", "onboard", "done"]),
("date", "=", p_date), ("date", "=", p_date),
] ]
) )
@@ -133,8 +158,21 @@ class WizardIne(models.TransientModel):
("reservation_id.reservation_type", "=", "normal"), ("reservation_id.reservation_type", "=", "normal"),
("room_id.in_ine", "=", True), ("room_id.in_ine", "=", True),
("pms_property_id", "=", pms_property_id.id), ("pms_property_id", "=", pms_property_id.id),
(
"reservation_id.state",
"in",
["confirmed", "onboard", "done"],
),
] ]
) )
.filtered(
lambda l: len(
l.reservation_id.checkin_partner_ids.filtered(
lambda c: c.state not in ["draft", "cancel"]
)
)
> 0
)
.mapped("room_id") .mapped("room_id")
) )
@@ -260,6 +298,13 @@ class WizardIne(models.TransientModel):
) # .ine_code ) # .ine_code
ine_code = residence_state_id.ine_code ine_code = residence_state_id.ine_code
if not ine_code:
raise ValidationError(
_(
"%s does not have the INE Code configured"
% residence_state_id.name
)
)
# get count of each result # get count of each result
num_spain = entry_from_spain["__count"] num_spain = entry_from_spain["__count"]
@@ -272,7 +317,6 @@ class WizardIne(models.TransientModel):
if not nationalities[CODE_SPAIN][ine_code].get(date): if not nationalities[CODE_SPAIN][ine_code].get(date):
nationalities[CODE_SPAIN][ine_code][date] = dict() nationalities[CODE_SPAIN][ine_code][date] = dict()
nationalities[CODE_SPAIN][ine_code][date][ nationalities[CODE_SPAIN][ine_code][date][
type_of_entry type_of_entry
] = num_spain ] = num_spain
@@ -280,13 +324,6 @@ class WizardIne(models.TransientModel):
# result object # result object
nationalities = dict() nationalities = dict()
# fake partners to remove when process finished
fake_partners_ids = list()
# default country and state
country_spain = self.env["res.country"].search([("code", "=", "ES")])
state_madrid = self.env["res.country.state"].search([("name", "=", "Madrid")])
# iterate days between start_date and end_date # iterate days between start_date and end_date
for p_date in [ for p_date in [
start_date + datetime.timedelta(days=x) start_date + datetime.timedelta(days=x)
@@ -298,54 +335,14 @@ class WizardIne(models.TransientModel):
("pms_property_id", "=", pms_property_id), ("pms_property_id", "=", pms_property_id),
("checkin", "<=", p_date), ("checkin", "<=", p_date),
("checkout", ">=", p_date), ("checkout", ">=", p_date),
("reservation_id.state", "!=", "cancel"),
("reservation_id.reservation_type", "=", "normal"), ("reservation_id.reservation_type", "=", "normal"),
("state", "not in", ["dummy", "draft", "cancel"]),
] ]
) )
for host in hosts:
# host without checkin
if host.state not in ["onboard", "done"]:
# search other host same reservation with checkin
chk_part_same_reserv_with_checkin = (
hosts.reservation_id.checkin_partner_ids.filtered(
lambda x: x.partner_id
and x.id != host.id
and x.state in ["onboard", "done"]
and x.reservation_id.id == host.reservation_id.id
)
)
# if there are some checkin partners in the same reservation
if chk_part_same_reserv_with_checkin:
# create partner with same country & state
country_other = chk_part_same_reserv_with_checkin[
0
].partner_id.nationality_id.id
state_other = chk_part_same_reserv_with_checkin[
0
].partner_id.residence_state_id.id
dummy_partner = self.env["res.partner"].create(
{
"name": "partner1",
"country_id": country_other,
"nationality_id": country_other,
"residence_state_id": state_other,
}
)
else:
# create partner from madrid
dummy_partner = self.env["res.partner"].create(
{
"name": "partner1",
"country_id": country_spain.id,
"nationality_id": country_spain.id,
"residence_state_id": state_madrid.id,
}
)
fake_partners_ids.append(dummy_partner.id)
host.partner_id = dummy_partner
hosts = hosts.filtered( hosts = hosts.filtered(
lambda x: x.reservation_id.reservation_line_ids.mapped("room_id").in_ine lambda x: all(
x.reservation_id.reservation_line_ids.mapped("room_id.in_ine")
)
) )
# arrivals # arrivals
@@ -393,19 +390,6 @@ class WizardIne(models.TransientModel):
p_date, "pernoctations", read_by_pernoctations p_date, "pernoctations", read_by_pernoctations
) )
checkin_partners_to_unlink = self.env["pms.checkin.partner"].search(
[
("partner_id", "in", fake_partners_ids),
]
)
checkin_partners_to_unlink.partner_id = False
partners_to_unlink = self.env["res.partner"].search(
[
("id", "in", fake_partners_ids),
]
)
partners_to_unlink.unlink()
return nationalities return nationalities
def ine_calculate_adr(self, start_date, end_date, domain=False): def ine_calculate_adr(self, start_date, end_date, domain=False):
@@ -683,139 +667,110 @@ class WizardIne(models.TransientModel):
) )
) )
# TODO: total_groups_domains = {
# Evaluate how to get occupation & ADR for: "tour_operator_offline": [
# -traditional/online tour-operator ("reservation_id.agency_id.sale_channel_id.name", "ilike", "Operator"),
# -traditional/online agency ("reservation_id.agency_id.sale_channel_id.is_on_line", "=", True),
# -companys ],
"tour_operator_online": [
("reservation_id.agency_id.sale_channel_id.name", "ilike", "Operator"),
("reservation_id.agency_id.sale_channel_id.is_on_line", "=", False),
],
"companies": [
("reservation_id.partner_id", "!=", False),
("reservation_id.partner_id.is_company", "=", True),
],
"agencies": [
("reservation_id.agency_id", "!=", False),
("reservation_id.agency_id.sale_channel_id.is_on_line", "=", False),
],
"otas": [
("reservation_id.agency_id", "!=", False),
("reservation_id.agency_id.sale_channel_id.is_on_line", "=", True),
],
"persons": [
"|",
("reservation_id.partner_id", "=", False),
("reservation_id.partner_id.is_company", "=", False),
],
"groups": [("reservation_id.folio_id.number_of_rooms", ">=", 4)],
"internet": [("reservation_id.channel_type_id.is_on_line", "=", True)],
"others": [
"|",
("reservation_id.channel_type_id.is_on_line", "!=", True),
("reservation_id.channel_type_id", "=", False),
],
}
ET.SubElement(prices_tag, "ADR_TOUROPERADOR_TRADICIONAL").text = "0" percents = {}
adrs = {}
for group, domain in total_groups_domains.items():
percents[group] = self.ine_calculate_occupancy(
self.start_date,
self.end_date,
domain,
)
adrs[group] = self.ine_calculate_adr(
self.start_date,
self.end_date,
domain,
)
# In this point, the groups adrs and percents are well calculated.... but,
# our statist friends want the total of the percentage groupings to add up = 100%,
# without conceiving that the groupings overlap, so they cannot receive real data
# and force us to pervert the original data so that it fits in their grid notebook.
# The purpose of the following lines of code is only to show the inefficiency
# of the state statistics,
# so at least I will feel that the effort made some sense :)
total_percent = sum([val for val in percents.values()])
for group in total_groups_domains.keys():
percents[group] = round(percents[group] * 100 / total_percent, 2)
ET.SubElement(prices_tag, "ADR_TOUROPERADOR_TRADICIONAL").text = str(
adrs["tour_operator_offline"]
)
ET.SubElement( ET.SubElement(
prices_tag, "PCTN_HABITACIONES_OCUPADAS_TOUROPERADOR_TRADICIONAL" prices_tag, "PCTN_HABITACIONES_OCUPADAS_TOUROPERADOR_TRADICIONAL"
).text = "0" ).text = str(percents["tour_operator_offline"])
ET.SubElement(prices_tag, "ADR_TOUROPERADOR_ONLINE").text = "0" ET.SubElement(prices_tag, "ADR_TOUROPERADOR_ONLINE").text = str(
adrs["tour_operator_online"]
)
ET.SubElement( ET.SubElement(
prices_tag, "PCTN_HABITACIONES_OCUPADAS_TOUROPERADOR_ONLINE" prices_tag, "PCTN_HABITACIONES_OCUPADAS_TOUROPERADOR_ONLINE"
).text = "0" ).text = str(percents["tour_operator_online"])
ET.SubElement(prices_tag, "ADR_EMPRESAS").text = str( ET.SubElement(prices_tag, "ADR_EMPRESAS").text = str(adrs["companies"])
self.ine_calculate_adr(
self.start_date,
self.end_date,
[
("reservation_id.partner_id", "!=", False),
("reservation_id.partner_id.is_company", "=", True),
],
)
)
ET.SubElement(prices_tag, "PCTN_HABITACIONES_OCUPADAS_EMPRESAS").text = str( ET.SubElement(prices_tag, "PCTN_HABITACIONES_OCUPADAS_EMPRESAS").text = str(
self.ine_calculate_occupancy( percents["companies"]
self.start_date,
self.end_date,
[
("reservation_id.partner_id", "!=", False),
("reservation_id.partner_id.is_company", "=", True),
],
)
) )
ET.SubElement(prices_tag, "ADR_AGENCIA_DE_VIAJE_TRADICIONAL").text = str( ET.SubElement(prices_tag, "ADR_AGENCIA_DE_VIAJE_TRADICIONAL").text = str(
self.ine_calculate_adr( adrs["agencies"]
self.start_date,
self.end_date,
[
("reservation_id.agency_id", "!=", False),
("reservation_id.agency_id.sale_channel_id.is_on_line", "=", False),
],
)
) )
ET.SubElement( ET.SubElement(
prices_tag, "PCTN_HABITACIONES_OCUPADAS_AGENCIA_TRADICIONAL" prices_tag, "PCTN_HABITACIONES_OCUPADAS_AGENCIA_TRADICIONAL"
).text = str( ).text = str(percents["agencies"])
self.ine_calculate_occupancy(
self.start_date,
self.end_date,
[
("reservation_id.agency_id", "!=", False),
("reservation_id.agency_id.sale_channel_id.is_on_line", "=", False),
],
)
)
ET.SubElement(prices_tag, "ADR_AGENCIA_DE_VIAJE_ONLINE").text = str( ET.SubElement(prices_tag, "ADR_AGENCIA_DE_VIAJE_ONLINE").text = str(
self.ine_calculate_adr( adrs["otas"]
self.start_date,
self.end_date,
[
("reservation_id.agency_id", "!=", False),
("reservation_id.agency_id.sale_channel_id.is_on_line", "=", True),
],
)
) )
ET.SubElement( ET.SubElement(
prices_tag, "PCTN_HABITACIONES_OCUPADAS_AGENCIA_ONLINE" prices_tag, "PCTN_HABITACIONES_OCUPADAS_AGENCIA_ONLINE"
).text = str( ).text = str(percents["otas"])
self.ine_calculate_occupancy( ET.SubElement(prices_tag, "ADR_PARTICULARES").text = str(adrs["persons"])
self.start_date,
self.end_date,
[
("reservation_id.agency_id", "!=", False),
("reservation_id.agency_id.sale_channel_id.is_on_line", "=", True),
],
)
)
ET.SubElement(prices_tag, "ADR_PARTICULARES").text = str(
self.ine_calculate_adr(
self.start_date,
self.end_date,
[
"|",
("reservation_id.partner_id", "=", False),
("reservation_id.partner_id.is_company", "!=", False),
],
)
)
ET.SubElement(prices_tag, "PCTN_HABITACIONES_OCUPADAS_PARTICULARES").text = str( ET.SubElement(prices_tag, "PCTN_HABITACIONES_OCUPADAS_PARTICULARES").text = str(
self.ine_calculate_occupancy( percents["persons"]
self.start_date,
self.end_date,
[
"|",
("reservation_id.partner_id", "=", False),
("reservation_id.partner_id.is_company", "=", False),
],
)
) )
ET.SubElement(prices_tag, "ADR_GRUPOS").text = "0" ET.SubElement(prices_tag, "ADR_GRUPOS").text = str(adrs["groups"])
ET.SubElement(prices_tag, "PCTN_HABITACIONES_OCUPADAS_GRUPOS").text = "0" ET.SubElement(prices_tag, "PCTN_HABITACIONES_OCUPADAS_GRUPOS").text = str(
ET.SubElement(prices_tag, "ADR_INTERNET").text = str( percents["groups"]
self.ine_calculate_adr(
self.start_date,
self.end_date,
[("reservation_id.channel_type_id.is_on_line", "=", True)],
)
) )
ET.SubElement(prices_tag, "ADR_INTERNET").text = str(adrs["internet"])
ET.SubElement(prices_tag, "PCTN_HABITACIONES_OCUPADAS_INTERNET").text = str( ET.SubElement(prices_tag, "PCTN_HABITACIONES_OCUPADAS_INTERNET").text = str(
self.ine_calculate_occupancy( percents["internet"]
self.start_date,
self.end_date,
[("reservation_id.channel_type_id.is_on_line", "=", True)],
)
)
ET.SubElement(prices_tag, "ADR_OTROS").text = str(
self.ine_calculate_adr(
self.start_date,
self.end_date,
[("reservation_id.channel_type_id.is_on_line", "!=", True)],
)
) )
ET.SubElement(prices_tag, "ADR_OTROS").text = str(adrs["others"])
ET.SubElement(prices_tag, "PCTN_HABITACIONES_OCUPADAS_OTROS").text = str( ET.SubElement(prices_tag, "PCTN_HABITACIONES_OCUPADAS_OTROS").text = str(
self.ine_calculate_occupancy( percents["others"]
self.start_date,
self.end_date,
[
"|",
("reservation_id.channel_type_id.is_on_line", "!=", True),
("reservation_id.channel_type_id", "=", False),
],
)
) )
staff_tag = ET.SubElement(survey_tag, "PERSONAL_OCUPADO") staff_tag = ET.SubElement(survey_tag, "PERSONAL_OCUPADO")