Merge lp:~therp-nl/therp-addons/7.0-report_aeroo_ooo_plugin_save_addressee into lp:~therp-nl/therp-addons/7.0

[Holger Brunn (Therp)]

[Stefan Rijnhart (Opener) (stefan-opener)]

Tnx!

review: Approve

=== modified file 'report_aeroo_ooo_plugin/model/instant_aeroo.py'
--- report_aeroo_ooo_plugin/model/instant_aeroo.py	2014-07-28 15:37:05 +0000
+++ report_aeroo_ooo_plugin/model/instant_aeroo.py	2014-07-28 15:37:05 +0000
@@ -36,7 +36,7 @@
 import base64
 from openerp.osv import osv
 from openerp.tools.translate import _
-from openerp.tools.safe_eval import const_eval
+from openerp.tools.safe_eval import safe_eval
 from openerp.report.report_sxw import rml_parse
 from openerp.addons.report_aeroo.report_aeroo import Aeroo_report
 from openerp.addons.report_aeroo.report_aeroo import AerooPrint
@@ -91,8 +91,8 @@
                                                       context=context)
         ids = self.pool[saved_filter.model_id].search(
             cr, uid,
-            const_eval(saved_filter.domain),
-            context=const_eval(saved_filter.context))
+            safe_eval(saved_filter.domain),
+            context=safe_eval(saved_filter.context))
 
         if not ids:
             return (False, _("User's selection does not contain any items."))

=== added directory 'report_aeroo_ooo_plugin_save_addressee'
=== added file 'report_aeroo_ooo_plugin_save_addressee/__init__.py'
--- report_aeroo_ooo_plugin_save_addressee/__init__.py	1970-01-01 00:00:00 +0000
+++ report_aeroo_ooo_plugin_save_addressee/__init__.py	2014-07-28 15:37:05 +0000
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2014 Therp BV (<http://therp.nl>).
+#
+#    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 . import model

=== added file 'report_aeroo_ooo_plugin_save_addressee/__openerp__.py'
--- report_aeroo_ooo_plugin_save_addressee/__openerp__.py	1970-01-01 00:00:00 +0000
+++ report_aeroo_ooo_plugin_save_addressee/__openerp__.py	2014-07-28 15:37:05 +0000
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2014 Therp BV (<http://therp.nl>).
+#
+#    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": "Save mail merges' addressees",
+    "version": "1.0",
+    "author": "Therp BV",
+    "license": "AGPL-3",
+    "complexity": "normal",
+    "description": """
+This addons saves the partners used in a mail merge. A byproduct of this is
+that mail merges (against res.partner) end up in your database.
+    """,
+    "category": "Generic Modules/Aeroo Reporting",
+    "depends": [
+        'report_aeroo_ooo_plugin',
+    ],
+    "data": [
+        "view/res_partner.xml",
+        "view/aeroo_mailmerge.xml",
+        "view/menu.xml",
+        'security/ir.model.access.csv',
+    ],
+    "js": [
+    ],
+    "css": [
+    ],
+    "qweb": [
+    ],
+    "test": [
+    ],
+    "auto_install": False,
+    "installable": True,
+    "application": False,
+    "external_dependencies": {
+        'python': [],
+    },
+}

=== added directory 'report_aeroo_ooo_plugin_save_addressee/model'
=== added file 'report_aeroo_ooo_plugin_save_addressee/model/__init__.py'
--- report_aeroo_ooo_plugin_save_addressee/model/__init__.py	1970-01-01 00:00:00 +0000
+++ report_aeroo_ooo_plugin_save_addressee/model/__init__.py	2014-07-28 15:37:05 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2014 Therp BV (<http://therp.nl>).
+#
+#    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 . import instant_aeroo
+from . import aeroo_mailmerge
+from . import res_partner

=== added file 'report_aeroo_ooo_plugin_save_addressee/model/aeroo_mailmerge.py'
--- report_aeroo_ooo_plugin_save_addressee/model/aeroo_mailmerge.py	1970-01-01 00:00:00 +0000
+++ report_aeroo_ooo_plugin_save_addressee/model/aeroo_mailmerge.py	2014-07-28 15:37:05 +0000
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2014 Therp BV (<http://therp.nl>).
+#
+#    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 datetime
+from openerp.osv.orm import Model
+from openerp.osv import fields
+from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
+
+
+class AerooMailmerge(Model):
+    _name = 'aeroo.mailmerge'
+    _description = 'Mailmerge'
+    _order = 'create_date desc, filter_id'
+
+    _columns = {
+        'filter_id': fields.many2one('ir.filters', 'Filter', required=True),
+        'create_date': fields.datetime('Created', required=True),
+        'create_uid': fields.many2one('res.users', 'User', required=True),
+        'template': fields.binary('Template', required=True),
+        'partner_ids': fields.many2many(
+            'res.partner', 'aeroo_mailmerge_partner_rel', 'mailmerge_id',
+            'partner_id', string='Partners'),
+    }
+
+    def name_get(self, cr, uid, ids, context=None):
+        user = self.pool['res.users'].browse(cr, uid, uid, context=context)
+        res_lang = self.pool['res.lang']
+        lang = res_lang.browse(
+            cr, uid,
+            res_lang.search(
+                cr, uid, [('code', '=', user.partner_id.lang)],
+                context=context)[0],
+            context=context)
+        return dict([
+            (this.id, '%s [%s]' % (
+                this.filter_id.name,
+                datetime.datetime.strptime(
+                    this.create_date, DEFAULT_SERVER_DATETIME_FORMAT).strftime(
+                    lang.date_format)))
+            for this in self.browse(cr, uid, ids, context=context)
+        ])

=== added file 'report_aeroo_ooo_plugin_save_addressee/model/instant_aeroo.py'
--- report_aeroo_ooo_plugin_save_addressee/model/instant_aeroo.py	1970-01-01 00:00:00 +0000
+++ report_aeroo_ooo_plugin_save_addressee/model/instant_aeroo.py	2014-07-28 15:37:05 +0000
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2014 Therp BV (<http://therp.nl>).
+#
+#    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.orm import TransientModel
+from openerp.tools.safe_eval import safe_eval
+
+
+class InstantAeroo(TransientModel):
+    _inherit = 'instant.aeroo'
+
+    def create_report(self, cr, uid, file_data, filter_id, context=None):
+        saved_filter = self.pool['ir.filters'].browse(
+            cr, uid, filter_id, context=context)
+        partner_ids = []
+        if saved_filter.model_id == 'res.partner':
+            partner_ids = self.pool[saved_filter.model_id].search(
+                cr, uid,
+                safe_eval(saved_filter.domain),
+                context=safe_eval(saved_filter.context))
+
+        self.pool['aeroo.mailmerge'].create(
+            cr, uid,
+            {
+                'filter_id': filter_id,
+                'template': file_data,
+                'partner_ids': [(6, 0, partner_ids)],
+            },
+            context=context)
+        return super(InstantAeroo, self).create_report(
+            cr, uid, file_data, filter_id, context=context)

=== added file 'report_aeroo_ooo_plugin_save_addressee/model/res_partner.py'
--- report_aeroo_ooo_plugin_save_addressee/model/res_partner.py	1970-01-01 00:00:00 +0000
+++ report_aeroo_ooo_plugin_save_addressee/model/res_partner.py	2014-07-28 15:37:05 +0000
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2014 Therp BV (<http://therp.nl>).
+#
+#    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.orm import Model
+from openerp.tools.translate import _
+
+
+class ResPartner(Model):
+    _inherit = 'res.partner'
+
+    def button_show_mailmerges(self, cr, uid, ids, context=None):
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Mail merges'),
+            'view_type': 'form',
+            'views': [(False, 'tree'), (False, 'form')],
+            'res_model': 'aeroo.mailmerge',
+            'domain': [('partner_ids', 'in', ids)],
+        }

=== added directory 'report_aeroo_ooo_plugin_save_addressee/security'
=== added file 'report_aeroo_ooo_plugin_save_addressee/security/ir.model.access.csv'
--- report_aeroo_ooo_plugin_save_addressee/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ report_aeroo_ooo_plugin_save_addressee/security/ir.model.access.csv	2014-07-28 15:37:05 +0000
@@ -0,0 +1,2 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"cr_aeroo_mailmerge","Create and read aeroo mail merges","model_aeroo_mailmerge","base.group_user",1,0,1,0

=== added directory 'report_aeroo_ooo_plugin_save_addressee/static'
=== added directory 'report_aeroo_ooo_plugin_save_addressee/static/src'
=== added directory 'report_aeroo_ooo_plugin_save_addressee/static/src/img'
=== added file 'report_aeroo_ooo_plugin_save_addressee/static/src/img/icon.png'
Binary files report_aeroo_ooo_plugin_save_addressee/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and report_aeroo_ooo_plugin_save_addressee/static/src/img/icon.png	2014-07-28 15:37:05 +0000 differ
=== added directory 'report_aeroo_ooo_plugin_save_addressee/view'
=== added file 'report_aeroo_ooo_plugin_save_addressee/view/aeroo_mailmerge.xml'
--- report_aeroo_ooo_plugin_save_addressee/view/aeroo_mailmerge.xml	1970-01-01 00:00:00 +0000
+++ report_aeroo_ooo_plugin_save_addressee/view/aeroo_mailmerge.xml	2014-07-28 15:37:05 +0000
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record id="form_aeroo_mailmerge" model="ir.ui.view">
+            <field name="model">aeroo.mailmerge</field>
+            <field name="arch" type="xml">
+                <form string="Mail merges" version="7.0" create="0">
+                    <sheet>
+                        <group>
+                            <field name="create_date" />
+                            <field name="create_uid" />
+                            <field name="filter_id" />
+                            <field name="template" />
+                        </group>
+                        <group attrs="{'invisible': [('partner_ids', '=', [(6, False, [])])]}">
+                            <field name="partner_ids" nolabel="1" />
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+        <record id="search_aeroo_mailmerge" model="ir.ui.view">
+            <field name="model">aeroo.mailmerge</field>
+            <field name="arch" type="xml">
+                <search>
+                    <filter name="own" string="My mail merges" domain="[('create_uid', '=', uid)]" />
+                    <field name="create_uid" />
+                    <field name="filter_id" />
+                    <field name="create_date" />
+                </search>
+            </field>
+        </record>
+         <record id="tree_aeroo_mailmerge" model="ir.ui.view">
+            <field name="model">aeroo.mailmerge</field>
+            <field name="arch" type="xml">
+                <tree string="Mail merges" create="0" delete="0">
+                    <field name="create_date" />
+                    <field name="create_uid" />
+                    <field name="filter_id" />
+                </tree>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added file 'report_aeroo_ooo_plugin_save_addressee/view/menu.xml'
--- report_aeroo_ooo_plugin_save_addressee/view/menu.xml	1970-01-01 00:00:00 +0000
+++ report_aeroo_ooo_plugin_save_addressee/view/menu.xml	2014-07-28 15:37:05 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <menuitem id="menu_aeroo_mailmerge"
+            parent="base.menu_base_partner"
+            name="Mail merges" />
+        <act_window id="action_aeroo_mailmerge"
+            name="All mail merges"
+            context="{'search_default_own': 1}"
+            res_model="aeroo.mailmerge" />
+        <menuitem id="menu_aeroo_mailmerge_tree"
+            parent="menu_aeroo_mailmerge"
+            action="action_aeroo_mailmerge" />
+    </data>
+</openerp>

=== added file 'report_aeroo_ooo_plugin_save_addressee/view/res_partner.xml'
--- report_aeroo_ooo_plugin_save_addressee/view/res_partner.xml	1970-01-01 00:00:00 +0000
+++ report_aeroo_ooo_plugin_save_addressee/view/res_partner.xml	2014-07-28 15:37:05 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record id="view_partner_form" model="ir.ui.view">
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form" />
+            <field name="arch" type="xml">
+                <div name="buttons" position="inside">
+                    <button type="object" name="button_show_mailmerges" string="Mail merges" />
+                </div>
+            </field>
+        </record>
+    </data>
+</openerp>