[REF] pms_l10n_es: refactor rename nationalities var to countries @ ine

This commit is contained in:
miguelpadin
2024-06-10 11:16:18 +01:00
parent d9247e5df7
commit 1fe96b5c2e
3 changed files with 61 additions and 20 deletions

View File

@@ -15,7 +15,6 @@
<field
name="nextcall"
eval="(datetime.now(pytz.timezone('UTC')) + timedelta(days=1)).strftime('%Y-%m-%d 00:05:00')"
/>
<field name="code">model.send_file_institution_async()</field>
</record>

View File

@@ -0,0 +1,44 @@
-----BEGIN CERTIFICATE-----
MIIH0zCCBrugAwIBAgIQajkADBY6ZK1iD4oFQUbYdzANBgkqhkiG9w0BAQsFADBH
MQswCQYDVQQGEwJFUzERMA8GA1UECgwIRk5NVC1SQ00xJTAjBgNVBAsMHEFDIENv
bXBvbmVudGVzIEluZm9ybcOhdGljb3MwHhcNMjIwMjE4MTE1OTAxWhcNMjUwMjE4
MTE1OTAwWjCB9zELMAkGA1UEBhMCRVMxDzANBgNVBAcMBk1BRFJJRDFDMEEGA1UE
Cgw6TUlOSVNURVJJTyBJTlRFUklPUiAtIFNFQ1JFVEFSSUEgRVNUQURPIFNFR1VS
SURBRCAtIFNHU0lDUzFEMEIGA1UECww7U1VCLkdFTkVSQUwgU0lTVEVNQVMgSU5G
T1JNQUNJT04gWSBDT01VTklDQUNJT05FUyBTRUdVUklEQUQxEjAQBgNVBAUTCVMy
ODAwMTA5RzEYMBYGA1UEYQwPVkFURVMtUzI4MDAxMDlHMR4wHAYDVQQDDBVQUkUt
U0dTSUNTLlNFUy5NSVIuRVMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
AQCa8OJf1tPWpwnboeomX27292iTcsNONHnZZTnjuV8CUv9t+crTXmv7kA9L6l/1
bcSpkVuWcCnnHjVsn2FnTA1pl82dR/BWlbOx1A8A3d2auUJAIH1uJ68xlGTo1jqp
SZn6z4Ply3zz7Tb09FfkZdWnalp0ozD5y//Rgc91CboNn62lAMe3OLrUI1DWwrVA
gVV7YB7Sx4Tl+wSPu/Qr36f0KmoDW78IqGWjZ6pfJXSZZ9YmIlMBv9IS4GLb1Rh/
JiMLZMRSKdqu1kA7g+dUhy6ueUKlHPzxik2JZIIHydxTHss4kGIFVaZ2LOE8GyuV
AIjYDyl+yJdJm6ROrk5r1kwLAgMBAAGjggQIMIIEBDAMBgNVHRMBAf8EAjAAMIGB
BggrBgEFBQcBAQR1MHMwOwYIKwYBBQUHMAGGL2h0dHA6Ly9vY3NwY29tcC5jZXJ0
LmZubXQuZXMvb2NzcC9PY3NwUmVzcG9uZGVyMDQGCCsGAQUFBzAChihodHRwOi8v
d3d3LmNlcnQuZm5tdC5lcy9jZXJ0cy9BQ0NPTVAuY3J0MIIBNAYDVR0gBIIBKzCC
AScwggEYBgorBgEEAaxmAwkTMIIBCDApBggrBgEFBQcCARYdaHR0cDovL3d3dy5j
ZXJ0LmZubXQuZXMvZHBjcy8wgdoGCCsGAQUFBwICMIHNDIHKQ2VydGlmaWNhZG8g
Y3VhbGlmaWNhZG8gZGUgc2VsbG8gZWxlY3Ryw7NuaWNvIHNlZ8O6biByZWdsYW1l
bnRvIGV1cm9wZW8gZUlEQVMuIFN1amV0byBhIGxhcyBjb25kaWNpb25lcyBkZSB1
c28gZXhwdWVzdGFzIGVuIGxhIERQQyBkZSBGTk1ULVJDTSBjb24gTklGOiBRMjgy
NjAwNC1KIChDL0pvcmdlIEp1YW4gMTA2LTI4MDA5LU1hZHJpZC1Fc3Bhw7FhKTAJ
BgcEAIvsQAEBMDMGA1UdEQQsMCqkKDAmMSQwIgYJKwYBBAGsZgEIDBVQUkUtU0dT
SUNTLlNFUy5NSVIuRVMwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMA4G
A1UdDwEB/wQEAwIF4DAdBgNVHQ4EFgQURXqQD9HjmqRh4SuG9Zf8Mh8YUukwgbAG
CCsGAQUFBwEDBIGjMIGgMAgGBgQAjkYBATALBgYEAI5GAQMCAQ8wEwYGBACORgEG
MAkGBwQAjkYBBgIwcgYGBACORgEFMGgwMhYsaHR0cHM6Ly93d3cuY2VydC5mbm10
LmVzL3Bkcy9QRFNfQ09NUF9lcy5wZGYTAmVzMDIWLGh0dHBzOi8vd3d3LmNlcnQu
Zm5tdC5lcy9wZHMvUERTX0NPTVBfZW4ucGRmEwJlbjAfBgNVHSMEGDAWgBQZ+Fgv
FNamzJsEmAgNTNerAKeDZTCB4AYDVR0fBIHYMIHVMIHSoIHPoIHMhoGebGRhcDov
L2xkYXBjb21wLmNlcnQuZm5tdC5lcy9DTj1DUkwxLE9VPUFDJTIwQ29tcG9uZW50
ZXMlMjBJbmZvcm1hdGljb3MsTz1GTk1ULVJDTSxDPUVTP2NlcnRpZmljYXRlUmV2
b2NhdGlvbkxpc3Q7YmluYXJ5P2Jhc2U/b2JqZWN0Y2xhc3M9Y1JMRGlzdHJpYnV0
aW9uUG9pbnSGKWh0dHA6Ly93d3cuY2VydC5mbm10LmVzL2NybHNjb21wL0NSTDEu
Y3JsMA0GCSqGSIb3DQEBCwUAA4IBAQAsgDOnmLs0lyBc29ABc6aCUIdxDLxbSodp
0rBMxKl3G6fGakUXJYCD9GBKRNMmCD8NXuYtNU6KmSWeXXUvz9ixGB234wKVdKx3
en6j0mmiJWwTmMP6KNZ77/B/6GXmV1Wum+iyqKBG4NEy42OSF57sCChD2toLfcWP
7to3i30GUzaWgeISFSC1Lq7iqbKLZzMjlh82AqD8F9Xvo+N9YadxQ51bPPt+4WNW
r4oj6PM8w6nhVEGW7+h5hpTFgt7O0H9G6U5D8N+utHe9dKssGvJLKpATzJvMjPxS
pU3eaujFO6D0qhmInyV+PtjSIhL8hzeTQcAXR6oBqNtOrplcTahz
-----END CERTIFICATE-----

View File

@@ -200,7 +200,7 @@ class WizardIne(models.TransientModel):
return rooms
@api.model
def ine_nationalities(self, start_date, end_date, pms_property_id):
def ine_countries(self, start_date, end_date, pms_property_id):
"""
Returns a dictionary:
{
@@ -266,11 +266,11 @@ class WizardIne(models.TransientModel):
num = entry["__count"]
# update/create dicts for countries & dates and set num. arrivals
if not nationalities.get(residence_country_id_code):
nationalities[residence_country_id_code] = dict()
if not nationalities[residence_country_id_code].get(date):
nationalities[residence_country_id_code][date] = dict()
nationalities[residence_country_id_code][date][type_of_entry] = num
if not countries.get(residence_country_id_code):
countries[residence_country_id_code] = dict()
if not countries[residence_country_id_code].get(date):
countries[residence_country_id_code][date] = dict()
countries[residence_country_id_code][date][type_of_entry] = num
else:
# arrivals grouped by state_id (Spain "provincias")
read_by_arrivals_spain = self.env["pms.checkin.partner"].read_group(
@@ -312,20 +312,18 @@ class WizardIne(models.TransientModel):
num_spain = entry_from_spain["__count"]
# update/create dicts for states & dates and set num. arrivals
if not nationalities.get(CODE_SPAIN):
nationalities[CODE_SPAIN] = dict()
if not countries.get(CODE_SPAIN):
countries[CODE_SPAIN] = dict()
if not nationalities[CODE_SPAIN].get(ine_code):
nationalities[CODE_SPAIN][ine_code] = dict()
if not countries[CODE_SPAIN].get(ine_code):
countries[CODE_SPAIN][ine_code] = dict()
if not nationalities[CODE_SPAIN][ine_code].get(date):
nationalities[CODE_SPAIN][ine_code][date] = dict()
nationalities[CODE_SPAIN][ine_code][date][
type_of_entry
] = num_spain
if not countries[CODE_SPAIN][ine_code].get(date):
countries[CODE_SPAIN][ine_code][date] = dict()
countries[CODE_SPAIN][ine_code][date][type_of_entry] = num_spain
# result object
nationalities = dict()
countries = dict()
# iterate days between start_date and end_date
for p_date in [
@@ -393,7 +391,7 @@ class WizardIne(models.TransientModel):
p_date, "pernoctations", read_by_pernoctations
)
return nationalities
return countries
def ine_calculate_adr(self, start_date, end_date, domain=False):
"""
@@ -575,10 +573,10 @@ class WizardIne(models.TransientModel):
# INE XML -> GUESTS
accommodation_tag = ET.SubElement(survey_tag, "ALOJAMIENTO")
nationalities = self.ine_nationalities(
countries = self.ine_countries(
self.start_date, self.end_date, self.pms_property_id.id
)
for key_country, value_country in nationalities.items():
for key_country, value_country in countries.items():
country = self.env["res.country"].search([("code", "=", key_country)])