Merge pull request OCA#114 from mdietrichc2c/toolstream-email-cc

Add CC email address for Toolstream exports
camptocamp · Jun 13, 2017 · 5715028 · 5715028
2 parents eb7f34a + 404e10b
commit 5715028
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)