Merge lp:~vauxoo/addons-vauxoo/7.0-addons-vauxoo-email_template_comment-dev-julio into lp:addons-vauxoo/7.0

[Julio Serna-http://www.vauxoo.com]

Added field in email_template to generated wizard of mail.compose.message like composition_mode = comment

[lp:~vauxoo/addons-vauxoo/7.0-addons-vauxoo-email_template_comment-dev-julio]

1112. By Julio Serna-http://www.vauxoo.com on 2014-08-14

[REF] changed label of fields composition_mode_comment in email_template

1113. By Julio Serna-http://www.vauxoo.com on 2014-08-14

[MERGE]

=== added directory 'email_template_comment'
=== added file 'email_template_comment/__init__.py'
--- email_template_comment/__init__.py	1970-01-01 00:00:00 +0000
+++ email_template_comment/__init__.py	2014-08-14 16:01:11 +0000
@@ -0,0 +1,24 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Vauxoo (<http://vauxoo.com>).
+#    All Rights Reserved
+###############Credits######################################################
+#    Coded by: vauxoo consultores ([e-mail])
+#############################################################################
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+import model

=== added file 'email_template_comment/__openerp__.py'
--- email_template_comment/__openerp__.py	1970-01-01 00:00:00 +0000
+++ email_template_comment/__openerp__.py	2014-08-14 16:01:11 +0000
@@ -0,0 +1,43 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Vauxoo (<http://vauxoo.com>).
+#    All Rights Reserved
+###############Credits######################################################
+#    Coded by: vauxoo consultores ([e-mail])
+#############################################################################
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+{
+    'name' : 'Email template Comment',
+    'version' : '1.1',
+    "website": "http://vauxoo.com",
+    "category": "Addons Vauxoo",
+    'author' : 'Vauxoo',
+    'description' : """
+Composition mode in email_template
+==================================
+This module Allow to create mail.composse.message from email_template like composition_model=comment
+""",
+    'depends' : ['mail','email_template'],
+    'data': [
+        'view/email_template_view.xml'
+        ],
+    "active": False,
+    "installable": True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+ 

=== added directory 'email_template_comment/model'
=== added file 'email_template_comment/model/__init__.py'
--- email_template_comment/model/__init__.py	1970-01-01 00:00:00 +0000
+++ email_template_comment/model/__init__.py	2014-08-14 16:01:11 +0000
@@ -0,0 +1,25 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Vauxoo (<http://vauxoo.com>).
+#    All Rights Reserved
+###############Credits######################################################
+#    Coded by: vauxoo consultores ([e-mail])
+#############################################################################
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+import email_template
+import mail_compose_message

=== added file 'email_template_comment/model/email_template.py'
--- email_template_comment/model/email_template.py	1970-01-01 00:00:00 +0000
+++ email_template_comment/model/email_template.py	2014-08-14 16:01:11 +0000
@@ -0,0 +1,35 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Vauxoo (<http://vauxoo.com>).
+#    All Rights Reserved
+###############Credits######################################################
+#    Coded by: vauxoo consultores ([e-mail])
+#############################################################################
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+
+from openerp.osv import osv, fields
+from openerp import tools, SUPERUSER_ID
+
+class email_template(osv.Model):
+    
+    _inherit = 'email.template'
+    
+    _columns = {
+        'composition_mode_comment': fields.boolean('Composition Mode',
+            help='Create Composition mode like comment'),
+    }

=== added file 'email_template_comment/model/mail_compose_message.py'
--- email_template_comment/model/mail_compose_message.py	1970-01-01 00:00:00 +0000
+++ email_template_comment/model/mail_compose_message.py	2014-08-14 16:01:11 +0000
@@ -0,0 +1,45 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Vauxoo (<http://vauxoo.com>).
+#    All Rights Reserved
+###############Credits######################################################
+#    Coded by: vauxoo consultores ([e-mail])
+#############################################################################
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+
+from openerp.osv import osv, fields
+from openerp import tools, SUPERUSER_ID
+
+class mail_compose_message(osv.TransientModel):
+    
+    _inherit = 'mail.compose.message'
+    
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
+            
+        email_template_obj = self.pool.get('email.template')
+        result = super(mail_compose_message, self).default_get(cr, uid, fields, context=context)
+        
+        template_id = context.get('default_template_id', False)
+        
+        if template_id and\
+            email_template_obj.browse(cr, uid, template_id,
+                        context=context).composition_mode_comment:
+            result['composition_mode'] = 'comment'
+        return result

=== added directory 'email_template_comment/view'
=== added file 'email_template_comment/view/email_template_view.xml'
--- email_template_comment/view/email_template_view.xml	1970-01-01 00:00:00 +0000
+++ email_template_comment/view/email_template_view.xml	2014-08-14 16:01:11 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+        <record model="ir.ui.view" id="composition_comment_template_form">
+            <field name="name">composition.comment.email.template</field>
+            <field name="model">email.template</field>
+            <field name="inherit_id" ref="email_template.email_template_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='lang']" position="after">
+                    <field name="composition_mode_comment"/>
+                </xpath>
+            </field>
+        </record>
+        
+    </data>
+</openerp>