Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xavier Thompson
erp5
Commits
5d9a9afd
Commit
5d9a9afd
authored
Aug 11, 2020
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_corporate_identity: display correctly address
parent
3f2a7ede
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Letter_createLetterContent.zpt
...ns/erp5_corporate_identity/Letter_createLetterContent.zpt
+3
-1
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Letter_createLetterFooter.zpt
...ins/erp5_corporate_identity/Letter_createLetterFooter.zpt
+3
-1
No files found.
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Letter_createLetterContent.zpt
View file @
5d9a9afd
...
@@ -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>
...
...
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Letter_createLetterFooter.zpt
View file @
5d9a9afd
...
@@ -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"
>
</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"
>
</span><span
tal:content=
"address"
></span>
</tal:block>
<span
class=
"ci-letter-footer-title"
>
</span><span
tal:content=
"python: ''.join([letter_source_postal_code, ' ', letter_source_city])"
></span>
<span
class=
"ci-letter-footer-title"
>
</span><span
tal:content=
"python: ''.join([letter_source_postal_code, ' ', letter_source_city])"
></span>
<span
class=
"ci-letter-footer-title"
>
</span><span
tal:content=
"letter_source_country"
></span>
<span
class=
"ci-letter-footer-title"
>
</span><span
tal:content=
"letter_source_country"
></span>
</div>
</div>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment