Merge pull request #51 from Antiun/pr-mass_mailing_partner_filter

[IMP] Mailing list filter added
OCA · Sep 30, 2015 · 17be632 · 17be632
2 parents cf54db0 + bbc9d7c
commit 17be632
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/mass_mailing_partner/i18n/es.po b/mass_mailing_partner/i18n/es.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-03 09:06+0000\n"
-"PO-Revision-Date: 2015-09-03 09:06+0000\n"
+"POT-Creation-Date: 2015-09-30 07:46+0000\n"
+"PO-Revision-Date: 2015-09-30 07:46+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,7 @@ msgstr ""
 
 #. module: mass_mailing_partner
 #: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: view:res.partner:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr "Lista de correo"
 
@@ -58,13 +59,14 @@ msgid "Partner Tag"
 msgstr "Etiqueta de empresa"
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:33
+#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:15
+#: sql_constraint:mail.mass_mailing.contact:0
 #, python-format
 msgid "Partner already exists in this mailing list."
 msgstr "La empresa ya existe en esta lista de correo."
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:23
 #, python-format
 msgid "This partner '%s' is subscribed to one or more mailing lists. Email must be assigned."
 msgstr "Esta empresa '%s' está suscrita a una o más listas de correo. El email debe estar asignado."

diff --git a/mass_mailing_partner/i18n/mass_mailing_partner.pot b/mass_mailing_partner/i18n/mass_mailing_partner.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-03 09:06+0000\n"
-"PO-Revision-Date: 2015-09-03 09:06+0000\n"
+"POT-Creation-Date: 2015-09-30 07:46+0000\n"
+"PO-Revision-Date: 2015-09-30 07:46+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,7 @@ msgstr ""
 
 #. module: mass_mailing_partner
 #: model:ir.model,name:mass_mailing_partner.model_mail_mass_mailing_list
+#: view:res.partner:mass_mailing_partner.view_res_partner_filter
 msgid "Mailing List"
 msgstr ""
 
@@ -58,13 +59,14 @@ msgid "Partner Tag"
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:33
+#: code:addons/mass_mailing_partner/models/mail_mass_mailing_contact.py:15
+#: sql_constraint:mail.mass_mailing.contact:0
 #, python-format
 msgid "Partner already exists in this mailing list."
 msgstr ""
 
 #. module: mass_mailing_partner
-#: code:addons/mass_mailing_partner/models/res_partner.py:36
+#: code:addons/mass_mailing_partner/models/res_partner.py:23
 #, python-format
 msgid "This partner '%s' is subscribed to one or more mailing lists. Email must be assigned."
 msgstr ""

diff --git a/mass_mailing_partner/views/res_partner_view.xml b/mass_mailing_partner/views/res_partner_view.xml
@@ -22,5 +22,18 @@
     </field>
 </record>
 
+<record id="view_res_partner_filter" model="ir.ui.view">
+    <field name="name">Partner Search with mailing contacts</field>
+    <field name="model">res.partner</field>
+    <field name="inherit_id" ref="base.view_res_partner_filter"/>
+    <field name="priority">20</field>
+    <field name="arch" type="xml">
+        <field name="category_id" position="after">
+            <field name="mass_mailing_contacts" string="Mailing List"
+                filter_domain="[('mass_mailing_contacts.list_id','ilike', self)]"/>
+        </field>
+    </field>
+</record>
+
 </data>
 </openerp>