Commit 5d9a9afd authored by Xiaowu Zhang's avatar Xiaowu Zhang

erp5_corporate_identity: display correctly address

parent 3f2a7ede
...@@ -77,7 +77,9 @@ Generates the letter Content ...@@ -77,7 +77,9 @@ Generates the letter Content
<td class="ci-letter-destination"> <td class="ci-letter-destination">
<span tal:content="python: letter_destination_company or ' '"></span> <span tal:content="python: letter_destination_company or ' '"></span>
<span tal:content="python: letter_destination_person or ' '"></span> <span tal:content="python: letter_destination_person or ' '"></span>
<span tal:content="python: letter_destination_address or ' '"></span> <tal:block tal:repeat="address python: letter_destination_address.split('\n')">
<span tal:content="python: address"></span>
</tal:block>
<span tal:content="python: ''.join([letter_destination_postal_code, ' ', letter_destination_city])"></span> <span tal:content="python: ''.join([letter_destination_postal_code, ' ', letter_destination_city])"></span>
<span tal:content="python: letter_destination_country or ' '"></span> <span tal:content="python: letter_destination_country or ' '"></span>
</td> </td>
......
...@@ -99,7 +99,9 @@ Creates the Letter footer section. ...@@ -99,7 +99,9 @@ Creates the Letter footer section.
<td> <td>
<div> <div>
<span class="ci-letter-footer-title" i18n:translate="" i18n:domain="erp5_ui">Address</span><span tal:content="letter_source_company"></span> <span class="ci-letter-footer-title" i18n:translate="" i18n:domain="erp5_ui">Address</span><span tal:content="letter_source_company"></span>
<span class="ci-letter-footer-title">&nbsp;</span><span tal:content="letter_source_address"></span> <tal:block tal:repeat="address python: letter_source_address.split('\n')">
<span class="ci-letter-footer-title">&nbsp;</span><span tal:content="address"></span>
</tal:block>
<span class="ci-letter-footer-title">&nbsp;</span><span tal:content="python: ''.join([letter_source_postal_code, ' ', letter_source_city])"></span> <span class="ci-letter-footer-title">&nbsp;</span><span tal:content="python: ''.join([letter_source_postal_code, ' ', letter_source_city])"></span>
<span class="ci-letter-footer-title">&nbsp;</span><span tal:content="letter_source_country"></span> <span class="ci-letter-footer-title">&nbsp;</span><span tal:content="letter_source_country"></span>
</div> </div>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment