From 404e10b84521e112b045bb13f7a39877c79b0bdf Mon Sep 17 00:00:00 2001 From: mdietrichc2c Date: Tue, 13 Jun 2017 16:07:48 +0200 Subject: [PATCH] Add CC email address for Toolstream exports --- .../server_environment_files/prod/company.conf | 1 + .../server_environment_files/test/company.conf | 1 + .../server_environment_files/test/magento.conf | 2 +- specific-parts/specific-addons/specific_fct/company.py | 5 +++++ .../specific-addons/toolstream_purchase_edi/purchase.py | 9 +++++---- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/specific-parts/specific-addons/server_environment_files/prod/company.conf b/specific-parts/specific-addons/server_environment_files/prod/company.conf index b24917f20..c6916196c 100644 --- a/specific-parts/specific-addons/server_environment_files/prod/company.conf +++ b/specific-parts/specific-addons/server_environment_files/prod/company.conf @@ -14,3 +14,4 @@ edifact_purchase_error_path = ERREUR edifact_regex_ref = (\w*?)\.edi edifact_regex_errors = ERREUR: ([^<>]*) toolstream_email_address = orbis@toolstream.com +toolstream_email_cc_address = john.ellery@toolstream.com diff --git a/specific-parts/specific-addons/server_environment_files/test/company.conf b/specific-parts/specific-addons/server_environment_files/test/company.conf index f55c346aa..517dd11ed 100644 --- a/specific-parts/specific-addons/server_environment_files/test/company.conf +++ b/specific-parts/specific-addons/server_environment_files/test/company.conf @@ -15,3 +15,4 @@ edifact_purchase_error_path = ERREUR edifact_regex_ref = (\w*?)\.edi edifact_regex_errors = ERREUR: ([^<>]*) toolstream_email_address = fscalese@descours-cabaud.com +toolstream_email_cc_address = diff --git a/specific-parts/specific-addons/server_environment_files/test/magento.conf b/specific-parts/specific-addons/server_environment_files/test/magento.conf index 202307dfa..25d9d542f 100644 --- a/specific-parts/specific-addons/server_environment_files/test/magento.conf +++ b/specific-parts/specific-addons/server_environment_files/test/magento.conf @@ -1,5 +1,5 @@ [magento_backend.debonix] -location = http://recette.debonix.fr +location = https://recette.debonix.fr username = openerp_connect password = dohSh(eo+m/oa1Zo diff --git a/specific-parts/specific-addons/specific_fct/company.py b/specific-parts/specific-addons/specific_fct/company.py index be22361b7..68c042080 100644 --- a/specific-parts/specific-addons/specific_fct/company.py +++ b/specific-parts/specific-addons/specific_fct/company.py @@ -134,5 +134,10 @@ def _get_environment_config_by_id(self, cr, uid, ids, field_names, _get_environment_config_by_id, string="Toolstream email address", type='char', + multi='server_env'), + 'toolstream_email_cc_address': fields.function( + _get_environment_config_by_id, + string="Toolstream email CC address", + type='char', multi='server_env') } diff --git a/specific-parts/specific-addons/toolstream_purchase_edi/purchase.py b/specific-parts/specific-addons/toolstream_purchase_edi/purchase.py index 559948201..d07ba2916 100644 --- a/specific-parts/specific-addons/toolstream_purchase_edi/purchase.py +++ b/specific-parts/specific-addons/toolstream_purchase_edi/purchase.py @@ -96,9 +96,10 @@ def _send_toolstream_email(self, cr, uid, purchase, context=None): 'name': filename, 'datas_fname': filename}, context=context) - message_id = mail_obj.create( - cr, uid, {'subject': toolstream_account_id, + mail_values = {'subject': toolstream_account_id, 'email_to': company.toolstream_email_address, - 'attachment_ids': [(6, 0, [attachment_id])]}, - context=context) + 'attachment_ids': [(6, 0, [attachment_id])]} + if company.toolstream_email_cc_address: + mail_values['email_cc'] = company.toolstream_email_cc_address + message_id = mail_obj.create(cr, uid, mail_values, context=context) mail_obj.send(cr, uid, [message_id], context=context)