Merge lp:~openbias/openobject-addons/6.1_email_template_attachments into lp:~openbias/openobject-addons/6.1_produccion

[OpenBias]

Add different attachment posibilities

[OpenBias (openbias)]

review: Approve

=== modified file 'email_template/__init__.py'
--- email_template/__init__.py	2011-10-05 11:38:46 +0000
+++ email_template/__init__.py	2012-05-24 00:05:21 +0000
@@ -22,5 +22,6 @@
 import email_template
 import wizard
 import res_partner
+import email_template_attach
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'email_template/__openerp__.py'
--- email_template/__openerp__.py	2012-01-31 13:36:57 +0000
+++ email_template/__openerp__.py	2012-05-24 00:05:21 +0000
@@ -61,6 +61,7 @@
     "data": [
         'wizard/email_template_preview_view.xml',
         'email_template_view.xml',
+        'email_template_attach_view.xml',
         'res_partner_view.xml',
         'wizard/email_compose_message_view.xml',
         'security/ir.model.access.csv'
 
=== added file 'email_template/email_template_attach.py'
--- email_template/email_template_attach.py	1970-01-01 00:00:00 +0000
+++ email_template/email_template_attach.py	2012-05-24 00:05:21 +0000
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2009 Sharoon Thomas
+#    Copyright (C) 2010-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+class email_template(osv.osv):
+    "Templates for sending Email"
+
+    _inherit = "email.template"
+
+    _columns = {
+        'ext': fields.char('Extension', size=128, help="Extensions of attachments that you want add to mail"),
+    }
+
+email_template()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'email_template/email_template_attach_view.xml'
--- email_template/email_template_attach_view.xml	1970-01-01 00:00:00 +0000
+++ email_template/email_template_attach_view.xml	2012-05-24 00:05:21 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+	<data>
+    
+        	<!--EMail add other attachments to Form view  -->
+		<record id="email_template_inherit_form" model="ir.ui.view">
+			<field name="name">email.template.inherit.form</field>
+			<field name="model">email.template</field>
+			<field name="type">form</field>
+			<field name="inherit_id" ref="email_template.email_template_form"/>
+			<field name="arch" type="xml">
+				<xpath expr="/form/notebook/page[@string='Advanced']/group[2]//notebook/page[@string='Attach existing files']" position="after">
+					<page string="Extension of Attachments">
+						<separator string="Example: xml, txt, ... (or all for all attachments)" colspan="4"/>
+						<field name="ext"/>
+					</page>
+				</xpath>
+			</field>
+		</record>
+
+	</data>
+</openerp>
+
+
+
+
+
 
=== modified file 'email_template/wizard/mail_compose_message.py'
--- email_template/wizard/mail_compose_message.py	2012-05-11 01:28:23 +0000
+++ email_template/wizard/mail_compose_message.py	2012-05-24 00:05:21 +0000
@@ -77,6 +77,30 @@
         'template_id' : lambda self, cr, uid, context={} : context.get('mail.compose.template_id', False)          
     }
 
+    def _get_attachment(self, cr, uid, template_id, att_ids, context):
+        #############################################################################################################################
+        #                                                                                                                           #
+        #   This code are added by BIAS.                                                                                            #
+        #   Check "Extension" field (ext) of "Email Template" (email.template), if so, search for the object's attachments with     #
+        #   the comma separated extensions defined in "Extension" field and add it to mail as attachment.                           #
+        #                                                                                                                           #
+        if template_id:                                                                                                             #
+            att_obj = self.pool.get('ir.attachment')                                                                                #
+            ctx = [('res_model','=',context.get('active_model')),('res_id','=',context.get('active_id'))]                           #
+            all_attach = att_obj.search(cr, uid, ctx)                                                                               #
+            if context.get('mail.compose.template_id'):                                                                             #
+                template = self.pool.get('email.template').browse(cr, uid, context['mail.compose.template_id'])                     #
+                for attachment_id in all_attach:                                                                                    #
+                    if template.ext:                                                                                                #
+                        if template.ext == 'all':                                                                                   #
+                            att_ids.append(attachment_id)                                                                           #
+                        else:                                                                                                       #
+                            for ext in template.ext.split(','):                                                                     #
+                                if ext.strip().lower() == att_obj.browse(cr, uid, attachment_id).datas_fname[-3:].lower():          #
+                                    att_ids.append(attachment_id)                                                                   #
+        #############################################################################################################################
+        return att_ids
+
     def on_change_template(self, cr, uid, ids, use_template, template_id, email_from=None, email_to=None, context=None):
         if context is None:
             context = {}
@@ -87,10 +111,12 @@
                 # use the original template values - to be rendered when actually sent
                 # by super.send_mail()
                 values = self.pool.get('email.template').read(cr, uid, template_id, self.fields_get_keys(cr, uid), context)
+                values['attachment_ids'] = self._get_attachment(cr, uid, template_id, values['attachment_ids'], context)
             else:
                 # render the mail as one-shot
                 values = self.pool.get('email.template').generate_email(cr, uid, template_id, res_id, context=context)
                 # retrofit generated attachments in the expected field format
+                values['attachment_ids'] = self._get_attachment(cr, uid, template_id, values['attachment_ids'], context)
                 if values['attachments']:
                     attachment = values.pop('attachments')
                     attachment_obj = self.pool.get('ir.attachment')