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
139
Merge Requests
139
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
73345fcf
Commit
73345fcf
authored
1 year ago
by
Jérome Perrin
Committed by
Arnaud Fontaine
7 months ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
*: make attachment_list of notification API correctly use bytes
parent
b54b9efb
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
23 additions
and
16 deletions
+23
-16
bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/AccountingTransactionModule_aggregateFrenchAccountingTransactionFile.py
...sactionModule_aggregateFrenchAccountingTransactionFile.py
+10
-3
bt5/erp5_base/DocumentTemplateItem/portal_components/document.erp5.Url.py
...cumentTemplateItem/portal_components/document.erp5.Url.py
+3
-3
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_createMailMessageAsString.py
.../portal_skins/erp5_base/Base_createMailMessageAsString.py
+4
-4
bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_renderSimpleView.py
...l_skins/erp5_deferred_style_core/Base_renderSimpleView.py
+1
-1
bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_report.py
...Item/portal_skins/erp5_deferred_style_core/Base_report.py
+1
-1
product/ERP5/Document/Alarm.py
product/ERP5/Document/Alarm.py
+1
-1
product/ERP5/bootstrap/erp5_core/ToolComponentTemplateItem/portal_components/tool.erp5.NotificationTool.py
...plateItem/portal_components/tool.erp5.NotificationTool.py
+3
-3
No files found.
bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/AccountingTransactionModule_aggregateFrenchAccountingTransactionFile.py
View file @
73345fcf
# coding: utf-8
import
unicodedata
from
six.moves
import
cStringIO
as
StringIO
import
six
from
io
import
BytesIO
import
zipfile
from
Products.ERP5Type.Message
import
translateString
...
...
@@ -22,7 +23,7 @@ if test_compta_demat_compatibility:
'NFKD'
,
fec_file
.
replace
(
u"€"
,
"EUR"
)
).
encode
(
'ascii'
,
'ignore'
)
zipbuffer
=
String
IO
()
zipbuffer
=
Bytes
IO
()
zipfilename
=
at_date
.
strftime
(
'FEC-%Y%m%d.zip'
)
zipfileobj
=
zipfile
.
ZipFile
(
zipbuffer
,
'w'
,
compression
=
zipfile
.
ZIP_DEFLATED
)
filename
=
'FEC.xml'
...
...
@@ -42,9 +43,15 @@ attachment_list = (
'content'
:
zipbuffer
.
getvalue
(),
'name'
:
zipfilename
,
},
)
subject
=
translateString
(
'French Accounting Transaction File'
)
if
six
.
PY2
:
subject
=
unicode
(
subject
)
else
:
subject
=
str
(
subject
)
portal
.
ERP5Site_notifyReportComplete
(
user_name
=
user_name
,
subject
=
unicode
(
translateString
(
'French Accounting Transaction File'
))
,
subject
=
subject
,
message
=
''
,
attachment_list
=
attachment_list
)
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_base/DocumentTemplateItem/portal_components/document.erp5.Url.py
View file @
73345fcf
...
...
@@ -121,9 +121,9 @@ class Url(Coordinate, UrlMixin):
This method was previously named 'SendMail' and is used to send email
* attachment_list is a list of dictionnaries with those keys:
- name : name of the attachment,
- content: data of the attachment
- mime_type: mime-type corresponding to the attachment
- name
(str)
: name of the attachment,
- content
(bytes)
: data of the attachment
- mime_type
(str)
: mime-type corresponding to the attachment
* extra_headers is a dictionnary of custom headers to add to the email.
"X-" prefix is automatically added to those headers.
"""
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_createMailMessageAsString.py
View file @
73345fcf
...
...
@@ -6,10 +6,10 @@
* body: body of the message as UTF-8 encoded string
* content_type: mime type of this message, can be text/html for
HTML message or anything else for text/plain message.
* attachment_list: a list of attach
e
ment mapping in format:
- mime_type
: mime type of thsi attache
ment
- content
: file content of the attachement, as a string
- name
: displayed name of this attachements
* attachment_list: a list of attachment mapping in format:
- mime_type
(str): mime type of thsi attach
ment
- content
(bytes): file content of the attachment
- name
(str): displayed name of this attachment
* embedded_file_list: a list of ERP5 File to use as attachments.
* extra_header_dict: additional email headers
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_renderSimpleView.py
View file @
73345fcf
...
...
@@ -30,7 +30,7 @@ with portal.Localizer.translationContext(localizer_language):
attachment_name
=
attachment_name
[:
-
1
]
attachment_list
=
(
{
'mime_type'
:
(
request
.
RESPONSE
.
getHeader
(
'content-type'
)
or
'application/octet-stream;'
).
split
(
';'
)[
0
],
'content'
:
'%s'
%
report_data
,
'content'
:
bytes
(
report_data
)
,
'name'
:
attachment_name
},)
getattr
(
portal
,
notify_report_complete_script_id
)(
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_report.py
View file @
73345fcf
...
...
@@ -51,7 +51,7 @@ with portal.Localizer.translationContext(localizer_language):
attachment_list
=
(
{
'mime_type'
:
(
request
.
RESPONSE
.
getHeader
(
'content-type'
)
or
'application/octet-stream;'
).
split
(
';'
)[
0
],
'content'
:
'%s'
%
report_data
,
'content'
:
bytes
(
report_data
)
,
'name'
:
attachment_name
},)
getattr
(
portal
,
notify_report_complete_script_id
)(
...
...
This diff is collapsed.
Click to expand it.
product/ERP5/Document/Alarm.py
View file @
73345fcf
...
...
@@ -355,7 +355,7 @@ class Alarm(XMLObject, PeriodicityMixin):
for
x
in
result_list
]
rendered_alarm_result
=
'
\
n
'
.
join
(
rendered_alarm_result_list
)
attachment_list
.
append
({
'name'
:
'alarm_result.txt'
,
'content'
:
rendered_alarm_result
,
'content'
:
rendered_alarm_result
.
encode
()
,
'mime_type'
:
'text/plain'
})
notification_tool
.
sendMessage
(
recipient
=
candidate_list
,
...
...
This diff is collapsed.
Click to expand it.
product/ERP5/bootstrap/erp5_core/ToolComponentTemplateItem/portal_components/tool.erp5.NotificationTool.py
View file @
73345fcf
...
...
@@ -109,9 +109,9 @@ def buildEmailMessage(from_url, to_url, msg=None,
sent by Zope MailHost.
* attachment_list is a list of dictionaries with those keys:
- name
: name of the attachment,
- content: data of the attachment
- mime_type: mime-type corresponding to the attachment
- name
(str): name of the attachment
- content
(bytes)
: data of the attachment
- mime_type
(str)
: mime-type corresponding to the attachment
* extra_headers is a dictionary of custom headers to add to the email.
"X-" prefix is automatically added to those headers.
* additional_headers is similar to extra_headers, but no prefix is added.
...
...
This diff is collapsed.
Click to expand it.
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