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
Léo-Paul Géneau
erp5
Commits
572a0c3d
Commit
572a0c3d
authored
Aug 20, 2020
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_corporate_identity: display correcly sender company address
parent
81324c5e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Letter_createLetterContent.zpt
...ns/erp5_corporate_identity/Letter_createLetterContent.zpt
+3
-4
No files found.
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Letter_createLetterContent.zpt
View file @
572a0c3d
...
...
@@ -56,10 +56,9 @@ Generates the letter Content
<tal:block
tal:condition=
"python: int(letter_display_sender_company_above_recipient)"
tal:define=
'address python:[]'
>
<tal:block
tal:define=
"dummy python: address.append(letter_source_company) if letter_source_company else ''"
></tal:block>
<tal:block
tal:define=
"dummy python: address.append(letter_source_address) if letter_source_address else ''"
></tal:block>
<tal:block
tal:define=
"dummy python: address.append(letter_source_country_code) if letter_source_country_code else ''"
></tal:block>
<tal:block
tal:define=
"dummy python: address.append(letter_source_postal_code) if letter_source_postal_code else ''"
></tal:block>
<tal:block
tal:define=
"dummy python: address.append(letter_source_city) if letter_source_city else ''"
></tal:block>
<div
class=
'ci-letter-sender-company-above-recipient'
tal:content=
"python: ','.join(address)"
></div>
<div
class=
'ci-letter-sender-company-above-recipient'
tal:content=
"python: ','.join(address)+ ',%s%s%s'% (letter_source_postal_code, ' ' if letter_source_postal_code else '', letter_source_city)
if (letter_source_postal_code or letter_source_city) else ','.join(address) "
>
</div>
</tal:block>
<span
tal:content=
"python: letter_destination_company or ' '"
></span>
<span
tal:content=
"python: letter_destination_person or ' '"
></span>
...
...
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