Skip to content

erp5
erp5
Commit 716b8171 authored by Xiaowu Zhang's avatar Xiaowu Zhang
Browse files
Options

erp5_corporate_identity: let user to define position against to left

parent a235b1b5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 290 additions and 11 deletions
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) ...@@ -50,6 +50,7 @@ override_batch_mode = kw.get('batch_mode', None)
destination_position_in_letter = kw.get('destination_position_in_letter', 'right') destination_position_in_letter = kw.get('destination_position_in_letter', 'right')
display_sender_company_above_recipient = kw.get('display_sender_company_above_recipient', 0) 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 ------------------------------ # -------------------------- Document Parameters ------------------------------
letter_portal_type = letter.getPortalType() letter_portal_type = letter.getPortalType()
letter_relative_url = letter.getRelativeUrl() letter_relative_url = letter.getRelativeUrl()
...@@ -140,6 +141,7 @@ if letter_format == "html": ...@@ -140,6 +141,7 @@ if letter_format == "html":
letter_destination_city=letter_destination.get("city", blank), letter_destination_city=letter_destination.get("city", blank),
letter_destination_country=letter_destination.get("country", blank), letter_destination_country=letter_destination.get("country", blank),
letter_destination_position = destination_position_in_letter, 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=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_corporate_name=letter_source.get("corporate_name", blank),
letter_source_company_capital=letter_source.get("social_capital", blank), letter_source_company_capital=letter_source.get("social_capital", blank),
...@@ -211,6 +213,7 @@ if letter_format == "pdf": ...@@ -211,6 +213,7 @@ if letter_format == "pdf":
letter_destination_city=letter_destination.get("city", blank), letter_destination_city=letter_destination.get("city", blank),
letter_destination_country=letter_destination.get("country", blank), letter_destination_country=letter_destination.get("country", blank),
letter_destination_position = destination_position_in_letter, 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=letter_source.get("corporate_name", letter_source.get("organisation_title", blank)),
letter_source_address=letter_source.get("address", blank), letter_source_address=letter_source.get("address", blank),
letter_source_postal_code=letter_source.get("postal_code", 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 ...@@ -35,6 +35,7 @@ Generates the complete letter
letter_destination_city python: options.get('letter_destination_city'); letter_destination_city python: options.get('letter_destination_city');
letter_destination_country python: options.get('letter_destination_country'); letter_destination_country python: options.get('letter_destination_country');
letter_destination_position python: options.get('letter_destination_position'); 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_content python: options.get('letter_content');
letter_display_source_address python: options.get('letter_display_source_address'); 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 ...@@ -30,6 +30,7 @@ Generates the letter Content
letter_display_source_address python: options.get('letter_display_source_address'); 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_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 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_content python: options.get('letter_content');">
<!DOCTYPE html> <!DOCTYPE html>
<html tal:attributes="class python: ''.join(['ci-', letter_theme, ' ci-', letter_language])"> <html tal:attributes="class python: ''.join(['ci-', letter_theme, ' ci-', letter_language])">
...@@ -51,7 +52,7 @@ Generates the letter Content ...@@ -51,7 +52,7 @@ Generates the letter Content
<tal:block tal:condition="python: False"> <tal:block tal:condition="python: False">
<tal:block metal:define-macro="letter_destination"> <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: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_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_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( ...@@ -39,5 +39,6 @@ return context.Base_viewAsLetter(
batch_mode=batch_mode, batch_mode=batch_mode,
destination_position_in_letter = destination_position_in_letter, destination_position_in_letter = destination_position_in_letter,
display_sender_company_above_recipient=display_sender_company_above_recipient, display_sender_company_above_recipient=display_sender_company_above_recipient,
destination_position_padding_left = destination_position_padding_left,
**kw **kw
) )
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Letter_viewAsLetter.xml
View file @ 716b8171
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <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>
<item> <item>
<key> <string>id</string> </key> <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( ...@@ -40,5 +40,6 @@ return context.WebPage_viewAsLetter(
batch_mode=batch_mode, batch_mode=batch_mode,
destination_position_in_letter = destination_position_in_letter, destination_position_in_letter = destination_position_in_letter,
display_sender_company_above_recipient= display_sender_company_above_recipient, display_sender_company_above_recipient= display_sender_company_above_recipient,
destination_position_padding_left = destination_position_padding_left,
**kw **kw
) )
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_exportAsLetter.xml
View file @ 716b8171
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <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>
<item> <item>
<key> <string>id</string> </key> <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 ...@@ -26,7 +26,6 @@ Update the letter dialog with parameters manually entered
# override_destination_organisation_title: override event recipient subordinate # override_destination_organisation_title: override event recipient subordinate
# override_destination_person_title: overide event recipient # override_destination_person_title: overide event recipient
# override_date to use instead of current date # override_date to use instead of current date
from Products.ERP5Type.Message import translateString from Products.ERP5Type.Message import translateString
if dialog_id is not None: if dialog_id is not None:
return context.Base_redirect( return context.Base_redirect(
...@@ -48,6 +47,7 @@ if dialog_id is not None: ...@@ -48,6 +47,7 @@ if dialog_id is not None:
document_save=document_save, document_save=document_save,
destination_position_in_letter = destination_position_in_letter, destination_position_in_letter = destination_position_in_letter,
display_sender_company_above_recipient=display_sender_company_above_recipient, display_sender_company_above_recipient=display_sender_company_above_recipient,
destination_position_padding_left = destination_position_padding_left,
**kw **kw
) )
) )
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_updateLetterDialog.xml
View file @ 716b8171
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <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>
<item> <item>
<key> <string>id</string> </key> <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( ...@@ -39,5 +39,6 @@ return context.Base_viewAsLetter(
batch_mode=batch_mode, batch_mode=batch_mode,
destination_position_in_letter = destination_position_in_letter, destination_position_in_letter = destination_position_in_letter,
display_sender_company_above_recipient=display_sender_company_above_recipient, display_sender_company_above_recipient=display_sender_company_above_recipient,
destination_position_padding_left = destination_position_padding_left,
**kw **kw
) )
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_viewAsLetter.xml
View file @ 716b8171
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <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>
<item> <item>
<key> <string>id</string> </key> <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 @@ ...@@ -93,6 +93,7 @@
<string>override_destination_organisation_title</string> <string>override_destination_organisation_title</string>
<string>override_destination_person_title</string> <string>override_destination_person_title</string>
<string>destination_position_in_letter</string> <string>destination_position_in_letter</string>
<string>destination_position_padding_left</string>
<string>override_date</string> <string>override_date</string>
</list> </list>
</value> </value>
......
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_viewExportAsLetterDialog/content.xml
View file @ 716b8171
...@@ -301,7 +301,7 @@ ...@@ -301,7 +301,7 @@
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[ <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&amp;override_source_person_title=%s&amp;override_source_organisation_title=%s&amp;override_destination_person_title=%s&amp;override_destination_organisation_title=%s&amp;display_head=%s&amp;override_date=%s&amp;display_source_address=%s&amp;display_svg=%s&amp;destination_position_in_letter=%s&amp;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&amp;override_source_person_title=%s&amp;override_source_organisation_title=%s&amp;override_destination_person_title=%s&amp;override_destination_organisation_title=%s&amp;display_head=%s&amp;override_date=%s&amp;display_source_address=%s&amp;display_svg=%s&amp;destination_position_in_letter=%s&amp;display_sender_company_above_recipient=%s&amp;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> ]]></string> </value>
</item> </item>
......
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/template_css/letter.css.css
View file @ 716b8171
...@@ -135,7 +135,6 @@ html{ ...@@ -135,7 +135,6 @@ html{
width: 50%; width: 50%;
} }
.ci-letter .ci-letter-head-right table tr td:nth-child(2) { .ci-letter .ci-letter-head-right table tr td:nth-child(2) {
padding-left:100px;
width: 48%; width: 48%;
} }
.ci-letter .ci-letter-head-right table tr td:nth-child(3) { .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 { ...@@ -143,7 +143,6 @@ html {
width: 43%; width: 43%;
} }
.ci-letter .ci-letter-head-right table tr td:nth-child(2) { .ci-letter .ci-letter-head-right table tr td:nth-child(2) {
padding-left:100px;
width: 55%; width: 55%;
} }
.ci-letter .ci-letter-head-right table tr td:nth-child(3) { .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 ...@@ -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_organisation_title: use this organisation as recipient
# override_destination_person_title: use this person as recipient # override_destination_person_title: use this person as recipient
# override_date: use this date as letter date (required field) # override_date: use this date as letter date (required field)
return context.Letter_viewAsLetter( return context.Letter_viewAsLetter(
format=format, format=format,
display_head=display_head, display_head=display_head,
...@@ -41,5 +40,6 @@ return context.Letter_viewAsLetter( ...@@ -41,5 +40,6 @@ return context.Letter_viewAsLetter(
batch_mode=batch_mode, batch_mode=batch_mode,
destination_position_in_letter = destination_position_in_letter, destination_position_in_letter = destination_position_in_letter,
display_sender_company_above_recipient = display_sender_company_above_recipient, display_sender_company_above_recipient = display_sender_company_above_recipient,
destination_position_padding_left = destination_position_padding_left,
**kw **kw
) )
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_letter/WebPage_viewAsWeb.xml
View file @ 716b8171
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <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>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7