Rename zip into postal code (issue9853)
This commit is contained in:
parent
f7713767c4
commit
bdd7912e28
|
@ -281,7 +281,7 @@ class Invoice(metaclass=PoolMeta):
|
||||||
|
|
||||||
if (not self.company.party.addresses
|
if (not self.company.party.addresses
|
||||||
or not self.company.party.addresses[0].street
|
or not self.company.party.addresses[0].street
|
||||||
or not self.company.party.addresses[0].zip
|
or not self.company.party.addresses[0].postal_code
|
||||||
or not self.company.party.addresses[0].city
|
or not self.company.party.addresses[0].city
|
||||||
or not self.company.party.addresses[0].subdivision
|
or not self.company.party.addresses[0].subdivision
|
||||||
or not self.company.party.addresses[0].country):
|
or not self.company.party.addresses[0].country):
|
||||||
|
@ -303,7 +303,7 @@ class Invoice(metaclass=PoolMeta):
|
||||||
party=self.party.rec_name,
|
party=self.party.rec_name,
|
||||||
invoice=self.rec_name))
|
invoice=self.rec_name))
|
||||||
if (not self.invoice_address.street
|
if (not self.invoice_address.street
|
||||||
or not self.invoice_address.zip
|
or not self.invoice_address.postal_code
|
||||||
or not self.invoice_address.city
|
or not self.invoice_address.city
|
||||||
or not self.invoice_address.subdivision
|
or not self.invoice_address.subdivision
|
||||||
or not self.invoice_address.country):
|
or not self.invoice_address.country):
|
||||||
|
|
|
@ -84,7 +84,7 @@ msgstr "Genera Factura-e"
|
||||||
|
|
||||||
msgctxt "model:ir.message,text:company_address_fields"
|
msgctxt "model:ir.message,text:company_address_fields"
|
||||||
msgid ""
|
msgid ""
|
||||||
"Missing Street, Zip, City, Subdivision or Country in default address of "
|
"Missing Street, Postal Code, City, Subdivision or Country in default address of "
|
||||||
"company\\'s Party \"%(party)s\"."
|
"company\\'s Party \"%(party)s\"."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Falta el carrer, codi postal, ciutat, província o país de la direcció per "
|
"Falta el carrer, codi postal, ciutat, província o país de la direcció per "
|
||||||
|
@ -124,7 +124,7 @@ msgstr ""
|
||||||
|
|
||||||
msgctxt "model:ir.message,text:invoice_address_fields"
|
msgctxt "model:ir.message,text:invoice_address_fields"
|
||||||
msgid ""
|
msgid ""
|
||||||
"Missing Street, Zip, City, Subdivision or Country in Invoice Address of "
|
"Missing Street, Postal Code, City, Subdivision or Country in Invoice Address of "
|
||||||
"invoice \"%(invoice)s\"."
|
"invoice \"%(invoice)s\"."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Falta el carrer, codi postal, ciutat, subdivisió o país a l'adreça de la "
|
"Falta el carrer, codi postal, ciutat, subdivisió o país a l'adreça de la "
|
||||||
|
|
|
@ -85,7 +85,7 @@ msgstr "Generar Factura-e"
|
||||||
|
|
||||||
msgctxt "model:ir.message,text:company_address_fields"
|
msgctxt "model:ir.message,text:company_address_fields"
|
||||||
msgid ""
|
msgid ""
|
||||||
"Missing Street, Zip, City, Subdivision or Country in default address of "
|
"Missing Street, Postal Code, City, Subdivision or Country in default address of "
|
||||||
"company\\'s Party \"%(party)s\"."
|
"company\\'s Party \"%(party)s\"."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Falta la calle, código postal, ciudad, provincia o país de la dirección por "
|
"Falta la calle, código postal, ciudad, provincia o país de la dirección por "
|
||||||
|
@ -125,7 +125,7 @@ msgstr ""
|
||||||
|
|
||||||
msgctxt "model:ir.message,text:invoice_address_fields"
|
msgctxt "model:ir.message,text:invoice_address_fields"
|
||||||
msgid ""
|
msgid ""
|
||||||
"Missing Street, Zip, City, Subdivision or Country in Invoice Address of "
|
"Missing Street, Postal Code, City, Subdivision or Country in Invoice Address of "
|
||||||
"invoice \"%(invoice)s\"."
|
"invoice \"%(invoice)s\"."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Falta la calle, código postal, ciudad, província o país de la dirección de "
|
"Falta la calle, código postal, ciudad, província o país de la dirección de "
|
||||||
|
|
|
@ -10,7 +10,7 @@ this repository contains the full copyright notices and license terms. -->
|
||||||
<field name="text">Missing VAT Identifier in company\'s Party "%(party)s", or its length is not between 3 and 30.</field>
|
<field name="text">Missing VAT Identifier in company\'s Party "%(party)s", or its length is not between 3 and 30.</field>
|
||||||
</record>
|
</record>
|
||||||
<record model="ir.message" id="company_address_fields">
|
<record model="ir.message" id="company_address_fields">
|
||||||
<field name="text">Missing Street, Zip, City, Subdivision or Country in default address of company\'s Party "%(party)s".</field>
|
<field name="text">Missing Street, Postal Code, City, Subdivision or Country in default address of company\'s Party "%(party)s".</field>
|
||||||
</record>
|
</record>
|
||||||
<record model="ir.message" id="party_facturae_fields">
|
<record model="ir.message" id="party_facturae_fields">
|
||||||
<field name="text">Missing some Factura-e fields in party "%(party)s" of invoice "%(invoice)s": "%(field)s"</field>
|
<field name="text">Missing some Factura-e fields in party "%(party)s" of invoice "%(invoice)s": "%(field)s"</field>
|
||||||
|
@ -23,7 +23,7 @@ this repository contains the full copyright notices and license terms. -->
|
||||||
They must to be separated by one space: Name Surname.</field>
|
They must to be separated by one space: Name Surname.</field>
|
||||||
</record>
|
</record>
|
||||||
<record model="ir.message" id="invoice_address_fields">
|
<record model="ir.message" id="invoice_address_fields">
|
||||||
<field name="text">Missing Street, Zip, City, Subdivision or Country in Invoice Address of invoice "%(invoice)s".</field>
|
<field name="text">Missing Street, Postal Code, City, Subdivision or Country in Invoice Address of invoice "%(invoice)s".</field>
|
||||||
</record>
|
</record>
|
||||||
<record model="ir.message" id="no_rate">
|
<record model="ir.message" id="no_rate">
|
||||||
<field name="text">No rate found for currency "%(currency)s" on "%(date)s"</field>
|
<field name="text">No rate found for currency "%(currency)s" on "%(date)s"</field>
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
{% if address.country and address.country.code == 'ES' %}
|
{% if address.country and address.country.code == 'ES' %}
|
||||||
<AddressInSpain>
|
<AddressInSpain>
|
||||||
<Address>{{ address.street[:80] }}</Address>
|
<Address>{{ address.street[:80] }}</Address>
|
||||||
<PostCode>{{ address.zip[:5] }}</PostCode>
|
<PostCode>{{ address.postal_code[:5] }}</PostCode>
|
||||||
<Town>{{ address.city[:50] }}</Town>
|
<Town>{{ address.city[:50] }}</Town>
|
||||||
<Province>{{ address.subdivision.name[:20] }}</Province>
|
<Province>{{ address.subdivision.name[:20] }}</Province>
|
||||||
<CountryCode>{{ address.country.code3 }}</CountryCode>
|
<CountryCode>{{ address.country.code3 }}</CountryCode>
|
||||||
|
@ -29,7 +29,7 @@
|
||||||
{% else %}
|
{% else %}
|
||||||
<OverseasAddress>
|
<OverseasAddress>
|
||||||
<Address>{{ address.street[:80] }}</Address>
|
<Address>{{ address.street[:80] }}</Address>
|
||||||
<PostCodeAndTown>{{ (', '.join([address.zip, address.city]))[:50] }}</PostCodeAndTown>
|
<PostCodeAndTown>{{ (', '.join([address.postal_code, address.city]))[:50] }}</PostCodeAndTown>
|
||||||
<Province>{{ address.subdivision.name[:20] }}</Province>
|
<Province>{{ address.subdivision.name[:20] }}</Province>
|
||||||
<CountryCode>{{ address.country.code3 }}</CountryCode>
|
<CountryCode>{{ address.country.code3 }}</CountryCode>
|
||||||
</OverseasAddress>
|
</OverseasAddress>
|
||||||
|
|
|
@ -122,7 +122,7 @@ class TestAccountInvoiceFacturaeCase(ModuleTestCase):
|
||||||
|
|
||||||
company_address, = company.party.addresses
|
company_address, = company.party.addresses
|
||||||
company_address.street = 'street'
|
company_address.street = 'street'
|
||||||
company_address.zip = '08201'
|
company_address.postal_code = '08201'
|
||||||
company_address.city = 'City'
|
company_address.city = 'City'
|
||||||
company_address.subdivision = subdivision
|
company_address.subdivision = subdivision
|
||||||
company_address.country = country
|
company_address.country = country
|
||||||
|
@ -140,7 +140,7 @@ class TestAccountInvoiceFacturaeCase(ModuleTestCase):
|
||||||
'party': party.id,
|
'party': party.id,
|
||||||
'street': 'St sample, 15',
|
'street': 'St sample, 15',
|
||||||
'city': 'City',
|
'city': 'City',
|
||||||
'zip': '08201',
|
'postal_code': '08201',
|
||||||
'subdivision': subdivision.id,
|
'subdivision': subdivision.id,
|
||||||
'country': country.id,
|
'country': country.id,
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue