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
Labels
Merge Requests
137
Merge Requests
137
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
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
716b8171
Commit
716b8171
authored
Aug 19, 2020
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_corporate_identity: let user to define position against to left
parent
a235b1b5
Changes
18
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
290 additions
and
11 deletions
+290
-11
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Base_viewAsLetter.py
...portal_skins/erp5_corporate_identity/Base_viewAsLetter.py
+3
-0
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Letter_createLetter.zpt
...tal_skins/erp5_corporate_identity/Letter_createLetter.zpt
+1
-0
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Letter_createLetterContent.zpt
...ns/erp5_corporate_identity/Letter_createLetterContent.zpt
+2
-1
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Letter_viewAsLetter.py
...rtal_skins/erp5_corporate_identity/Letter_viewAsLetter.py
+1
-0
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Letter_viewAsLetter.xml
...tal_skins/erp5_corporate_identity/Letter_viewAsLetter.xml
+1
-1
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_exportAsLetter.py
...l_skins/erp5_corporate_identity/WebPage_exportAsLetter.py
+1
-0
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_exportAsLetter.xml
..._skins/erp5_corporate_identity/WebPage_exportAsLetter.xml
+1
-1
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_updateLetterDialog.py
...ins/erp5_corporate_identity/WebPage_updateLetterDialog.py
+1
-1
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_updateLetterDialog.xml
...ns/erp5_corporate_identity/WebPage_updateLetterDialog.xml
+1
-1
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_viewAsLetter.py
...tal_skins/erp5_corporate_identity/WebPage_viewAsLetter.py
+1
-0
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_viewAsLetter.xml
...al_skins/erp5_corporate_identity/WebPage_viewAsLetter.xml
+1
-1
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_viewExportAsLetterDialog.xml
...5_corporate_identity/WebPage_viewExportAsLetterDialog.xml
+1
-0
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_viewExportAsLetterDialog/content.xml
...ate_identity/WebPage_viewExportAsLetterDialog/content.xml
+1
-1
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_viewExportAsLetterDialog/destination_position_padding_left.xml
...xportAsLetterDialog/destination_position_padding_left.xml
+272
-0
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/template_css/letter.css.css
...skins/erp5_corporate_identity/template_css/letter.css.css
+0
-1
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/template_css/letter.pdf.css.css
...s/erp5_corporate_identity/template_css/letter.pdf.css.css
+0
-1
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_letter/WebPage_viewAsWeb.py
...skins/erp5_corporate_identity_letter/WebPage_viewAsWeb.py
+1
-1
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_letter/WebPage_viewAsWeb.xml
...kins/erp5_corporate_identity_letter/WebPage_viewAsWeb.xml
+1
-1
No files found.
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Base_viewAsLetter.py
View file @
716b8171
...
...
@@ -50,6 +50,7 @@ override_batch_mode = kw.get('batch_mode', None)
destination_position_in_letter
=
kw
.
get
(
'destination_position_in_letter'
,
'right'
)
display_sender_company_above_recipient
=
kw
.
get
(
'display_sender_company_above_recipient'
,
0
)
destination_position_padding_left
=
kw
.
get
(
'destination_position_padding_left'
,
'100px'
)
# -------------------------- Document Parameters ------------------------------
letter_portal_type
=
letter
.
getPortalType
()
letter_relative_url
=
letter
.
getRelativeUrl
()
...
...
@@ -140,6 +141,7 @@ if letter_format == "html":
letter_destination_city
=
letter_destination
.
get
(
"city"
,
blank
),
letter_destination_country
=
letter_destination
.
get
(
"country"
,
blank
),
letter_destination_position
=
destination_position_in_letter
,
letter_destination_position_padding_left
=
destination_position_padding_left
,
letter_source_company
=
letter_source
.
get
(
"corporate_name"
,
letter_source
.
get
(
"organisation_title"
,
blank
)),
letter_source_company_corporate_name
=
letter_source
.
get
(
"corporate_name"
,
blank
),
letter_source_company_capital
=
letter_source
.
get
(
"social_capital"
,
blank
),
...
...
@@ -211,6 +213,7 @@ if letter_format == "pdf":
letter_destination_city
=
letter_destination
.
get
(
"city"
,
blank
),
letter_destination_country
=
letter_destination
.
get
(
"country"
,
blank
),
letter_destination_position
=
destination_position_in_letter
,
letter_destination_position_padding_left
=
destination_position_padding_left
,
letter_source_company
=
letter_source
.
get
(
"corporate_name"
,
letter_source
.
get
(
"organisation_title"
,
blank
)),
letter_source_address
=
letter_source
.
get
(
"address"
,
blank
),
letter_source_postal_code
=
letter_source
.
get
(
"postal_code"
,
blank
),
...
...
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Letter_createLetter.zpt
View file @
716b8171
...
...
@@ -35,6 +35,7 @@ Generates the complete letter
letter_destination_city python: options.get('letter_destination_city');
letter_destination_country python: options.get('letter_destination_country');
letter_destination_position python: options.get('letter_destination_position');
letter_destination_position_padding_left python: options.get('letter_destination_position_padding_left');
letter_content python: options.get('letter_content');
letter_display_source_address python: options.get('letter_display_source_address');
...
...
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Letter_createLetterContent.zpt
View file @
716b8171
...
...
@@ -30,6 +30,7 @@ Generates the letter Content
letter_display_source_address python: options.get('letter_display_source_address');
letter_display_sender_company_above_recipient python: options.get('letter_display_sender_company_above_recipient');
letter_destination_position python: options.get('letter_destination_position');
letter_destination_position_padding_left python: options.get('letter_destination_position_padding_left');
letter_content python: options.get('letter_content');"
>
<!DOCTYPE html>
<html
tal:attributes=
"class python: ''.join(['ci-', letter_theme, ' ci-', letter_language])"
>
...
...
@@ -51,7 +52,7 @@ Generates the letter Content
<tal:block
tal:condition=
"python: False"
>
<tal:block
metal:define-macro=
"letter_destination"
>
<td
class=
"ci-letter-destination"
>
<td
class=
"ci-letter-destination"
tal:attributes=
"style python: 'padding-left: %s' % letter_destination_position_padding_left "
>
<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>
...
...
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Letter_viewAsLetter.py
View file @
716b8171
...
...
@@ -39,5 +39,6 @@ return context.Base_viewAsLetter(
batch_mode
=
batch_mode
,
destination_position_in_letter
=
destination_position_in_letter
,
display_sender_company_above_recipient
=
display_sender_company_above_recipient
,
destination_position_padding_left
=
destination_position_padding_left
,
**
kw
)
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Letter_viewAsLetter.xml
View file @
716b8171
...
...
@@ -50,7 +50,7 @@
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
format=None, display_source_address=None, display_head=None, display_svg=None, batch_mode=False, document_download=None, document_save=None, override_source_organisation_title=None,override_source_person_title=None,override_destination_organisation_title=None,override_destination_person_title=None,override_date=None,destination_position_in_letter=\'right\', display_sender_company_above_recipient=0,**kw
</string>
</value>
<value>
<string>
format=None, display_source_address=None, display_head=None, display_svg=None, batch_mode=False, document_download=None, document_save=None, override_source_organisation_title=None,override_source_person_title=None,override_destination_organisation_title=None,override_destination_person_title=None,override_date=None,destination_position_in_letter=\'right\', display_sender_company_above_recipient=0,
destination_position_padding_left=\'100px\',
**kw
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
...
...
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_exportAsLetter.py
View file @
716b8171
...
...
@@ -40,5 +40,6 @@ return context.WebPage_viewAsLetter(
batch_mode
=
batch_mode
,
destination_position_in_letter
=
destination_position_in_letter
,
display_sender_company_above_recipient
=
display_sender_company_above_recipient
,
destination_position_padding_left
=
destination_position_padding_left
,
**
kw
)
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_exportAsLetter.xml
View file @
716b8171
...
...
@@ -50,7 +50,7 @@
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
format="html", display_source_address=None, display_head=1, display_svg=None, batch_mode=False, document_download=None, document_save=None, override_source_organisation_title=None,override_source_person_title=None,override_destination_organisation_title=None,override_destination_person_title=None,override_date=None, destination_position_in_letter = \'right\', display_sender_company_above_recipient=0, **kw
</string>
</value>
<value>
<string>
format="html", display_source_address=None, display_head=1, display_svg=None, batch_mode=False, document_download=None, document_save=None, override_source_organisation_title=None,override_source_person_title=None,override_destination_organisation_title=None,override_destination_person_title=None,override_date=None, destination_position_in_letter = \'right\', display_sender_company_above_recipient=0,
destination_position_padding_left=\'100px\',
**kw
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
...
...
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_updateLetterDialog.py
View file @
716b8171
...
...
@@ -26,7 +26,6 @@ Update the letter dialog with parameters manually entered
# override_destination_organisation_title: override event recipient subordinate
# override_destination_person_title: overide event recipient
# override_date to use instead of current date
from
Products.ERP5Type.Message
import
translateString
if
dialog_id
is
not
None
:
return
context
.
Base_redirect
(
...
...
@@ -48,6 +47,7 @@ if dialog_id is not None:
document_save
=
document_save
,
destination_position_in_letter
=
destination_position_in_letter
,
display_sender_company_above_recipient
=
display_sender_company_above_recipient
,
destination_position_padding_left
=
destination_position_padding_left
,
**
kw
)
)
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_updateLetterDialog.xml
View file @
716b8171
...
...
@@ -50,7 +50,7 @@
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
override_source_organisation_title=None, display_source_address=None, display_svg=None,document_download=None, document_save=None, dialog_id=None, cancel_url=None, portal_skin=None,display_head=None, format=None, override_date=None, override_destination_person_title=None, override_source_person_title=None,override_destination_organisation_title=None, destination_position_in_letter = \'right\', display_sender_company_above_recipient=None,*args,**kw
</string>
</value>
<value>
<string>
override_source_organisation_title=None, display_source_address=None, display_svg=None,document_download=None, document_save=None, dialog_id=None, cancel_url=None, portal_skin=None,display_head=None, format=None, override_date=None, override_destination_person_title=None, override_source_person_title=None,override_destination_organisation_title=None, destination_position_in_letter = \'right\', display_sender_company_above_recipient=None,
destination_position_padding_left=\'100px\',
*args,**kw
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
...
...
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_viewAsLetter.py
View file @
716b8171
...
...
@@ -39,5 +39,6 @@ return context.Base_viewAsLetter(
batch_mode
=
batch_mode
,
destination_position_in_letter
=
destination_position_in_letter
,
display_sender_company_above_recipient
=
display_sender_company_above_recipient
,
destination_position_padding_left
=
destination_position_padding_left
,
**
kw
)
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_viewAsLetter.xml
View file @
716b8171
...
...
@@ -50,7 +50,7 @@
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
format=None, display_source_address=None, display_head=None, display_svg=None, batch_mode=False, document_download=None, document_save=None, override_source_organisation_title=None,override_source_person_title=None,override_destination_organisation_title=None,override_destination_person_title=None,override_date=None,destination_position_in_letter = \'right\',display_sender_company_above_recipient=0,**kw
</string>
</value>
<value>
<string>
format=None, display_source_address=None, display_head=None, display_svg=None, batch_mode=False, document_download=None, document_save=None, override_source_organisation_title=None,override_source_person_title=None,override_destination_organisation_title=None,override_destination_person_title=None,override_date=None,destination_position_in_letter = \'right\',display_sender_company_above_recipient=0,
destination_position_padding_left=\'100px\',
**kw
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
...
...
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_viewExportAsLetterDialog.xml
View file @
716b8171
...
...
@@ -93,6 +93,7 @@
<string>
override_destination_organisation_title
</string>
<string>
override_destination_person_title
</string>
<string>
destination_position_in_letter
</string>
<string>
destination_position_padding_left
</string>
<string>
override_date
</string>
</list>
</value>
...
...
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_viewExportAsLetterDialog/content.xml
View file @
716b8171
...
...
@@ -301,7 +301,7 @@
<key>
<string>
_text
</string>
</key>
<value>
<string
encoding=
"cdata"
>
<![CDATA[
python: \'<iframe width="100%%" height="500" style="background-color:#FFFFFF;box-sizing:border-box;-wekbit-box-sizing:border-box;" src="%s/WebPage_viewAsWeb?portal_skin=Letter&override_source_person_title=%s&override_source_organisation_title=%s&override_destination_person_title=%s&override_destination_organisation_title=%s&display_head=%s&override_date=%s&display_source_address=%s&display_svg=%s&destination_position_in_letter=%s&display_sender_company_above_recipient=%s
" name="default_version">
</iframe>
\' % (context.absolute_url(), context.REQUEST.get("override_source_person_title", ""), context.REQUEST.get("override_source_organisation_title", ""), context.REQUEST.get("override_destination_person_title", ""), context.REQUEST.get("override_destination_organisation_title", ""), context.REQUEST.get("display_head", 1), context.REQUEST.get("override_date", ""), context.REQUEST.get("display_source_address", 0), context.REQUEST.get("display_svg", "png"), context.REQUEST.get("destination_position_in_letter", "right"), context.REQUEST.get("display_sender_company_above_recipient", 0
))
python: \'<iframe width="100%%" height="500" style="background-color:#FFFFFF;box-sizing:border-box;-wekbit-box-sizing:border-box;" src="%s/WebPage_viewAsWeb?portal_skin=Letter&override_source_person_title=%s&override_source_organisation_title=%s&override_destination_person_title=%s&override_destination_organisation_title=%s&display_head=%s&override_date=%s&display_source_address=%s&display_svg=%s&destination_position_in_letter=%s&display_sender_company_above_recipient=%s
&destination_position_padding_left=%s" name="default_version">
</iframe>
\' % (context.absolute_url(), context.REQUEST.get("override_source_person_title", ""), context.REQUEST.get("override_source_organisation_title", ""), context.REQUEST.get("override_destination_person_title", ""), context.REQUEST.get("override_destination_organisation_title", ""), context.REQUEST.get("display_head", 1), context.REQUEST.get("override_date", ""), context.REQUEST.get("display_source_address", 0), context.REQUEST.get("display_svg", "png"), context.REQUEST.get("destination_position_in_letter", "right"), context.REQUEST.get("display_sender_company_above_recipient", 0), context.REQUEST.get(\'destination_position_padding_left\', \'100px\'
))
]]>
</string>
</value>
</item>
...
...
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_viewExportAsLetterDialog/destination_position_padding_left.xml
0 → 100644
View file @
716b8171
This diff is collapsed.
Click to expand it.
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/template_css/letter.css.css
View file @
716b8171
...
...
@@ -135,7 +135,6 @@ html{
width
:
50%
;
}
.ci-letter
.ci-letter-head-right
table
tr
td
:nth-child
(
2
)
{
padding-left
:
100px
;
width
:
48%
;
}
.ci-letter
.ci-letter-head-right
table
tr
td
:nth-child
(
3
)
{
...
...
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/template_css/letter.pdf.css.css
View file @
716b8171
...
...
@@ -143,7 +143,6 @@ html {
width
:
43%
;
}
.ci-letter
.ci-letter-head-right
table
tr
td
:nth-child
(
2
)
{
padding-left
:
100px
;
width
:
55%
;
}
.ci-letter
.ci-letter-head-right
table
tr
td
:nth-child
(
3
)
{
...
...
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_letter/WebPage_viewAsWeb.py
View file @
716b8171
...
...
@@ -25,7 +25,6 @@ Allow to render letters through the URL?portal_skin=Letter
# override_destination_organisation_title: use this organisation as recipient
# override_destination_person_title: use this person as recipient
# override_date: use this date as letter date (required field)
return
context
.
Letter_viewAsLetter
(
format
=
format
,
display_head
=
display_head
,
...
...
@@ -41,5 +40,6 @@ return context.Letter_viewAsLetter(
batch_mode
=
batch_mode
,
destination_position_in_letter
=
destination_position_in_letter
,
display_sender_company_above_recipient
=
display_sender_company_above_recipient
,
destination_position_padding_left
=
destination_position_padding_left
,
**
kw
)
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_letter/WebPage_viewAsWeb.xml
View file @
716b8171
...
...
@@ -50,7 +50,7 @@
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
format="html", display_source_address=None, display_svg=None,document_download=None, batch_mode=False, display_head=None,document_save=None, override_source_organisation_title=None,override_source_person_title=None,override_destination_organisation_title=None,override_destination_person_title=None,override_date=None,destination_position_in_letter=\'right\',display_sender_company_above_recipient=0,**kw
</string>
</value>
<value>
<string>
format="html", display_source_address=None, display_svg=None,document_download=None, batch_mode=False, display_head=None,document_save=None, override_source_organisation_title=None,override_source_person_title=None,override_destination_organisation_title=None,override_destination_person_title=None,override_date=None,destination_position_in_letter=\'right\',display_sender_company_above_recipient=0,
destination_position_padding_left=\'100px\',
**kw
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
...
...
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