| commit | 9e32f587f5ab35142c4945ace04ba48718a32335 | [log] [tgz] |
|---|---|---|
| author | Raffael Meyer <raffael@alyf.de> | Tue Dec 10 17:11:05 2019 +0100 |
| committer | Nabin Hait <nabinhait@gmail.com> | Tue Dec 10 21:41:05 2019 +0530 |
| tree | 0a58fe2d642a227ff30fc351e693427c108c7dd4 | |
| parent | 5380a4c3db67cf8e69fce0c7c06661c893a4fee4 [diff] [blame] |
fix: remove contact info, use international format (#19828) - for international letters, city and country should be upper case: https://www.deutschepost.de/content/dam/dpag/images/B_b/Briefe_ins_Ausland/downloads/dp-brief-international-handlingbroschuere-072019.pdf#page=15 - it is not customary, to use contact information such as phone number in the address
diff --git a/erpnext/regional/germany/address_template.html b/erpnext/regional/germany/address_template.html index 0df7867..7fa4c32 100644 --- a/erpnext/regional/germany/address_template.html +++ b/erpnext/regional/germany/address_template.html
@@ -1,8 +1,8 @@ {{ address_line1 }}<br> {% if address_line2 %}{{ address_line2 }}<br>{% endif -%} -{{ pincode }} {{ city }}<br> -{% if country %}{{ country }}<br>{% endif -%} -<br> -{% if phone %}Tel: {{ phone }}<br>{% endif -%} -{% if fax %}Fax: {{ fax }}<br>{% endif -%} -{% if email_id %}E-Mail: {{ email_id }}<br>{% endif -%} +{% if country in ["Germany", "Deutschland"] %} + {{ pincode }} {{ city }} +{% else %} + {{ pincode }} {{ city | upper }}<br> + {{ country | upper }} +{% endif %}