[FIX] filters "Main Address" et "Main Email" have to be combined with…

… AND operator, not OR refs #16637
acsone · Sep 30, 2015 · c9086d4 · c9086d4
1 parent cd49e3f
commit c9086d4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/mozaik_communication/i18n/fr.po b/mozaik_communication/i18n/fr.po
@@ -1014,15 +1014,15 @@ msgstr "Courriels"
 
 #. module: mozaik_communication
 #: view:virtual.partner.instance:mozaik_communication.virtual_partner_instance_search_view
-#: field:virtual.partner.instance,main_email:0
-msgid "Main Email"
-msgstr "Adresse électronique principale"
+#: field:virtual.partner.instance,main_postal:0
+msgid "Main Address"
+msgstr "Adresse principale"
 
 #. module: mozaik_communication
 #: view:virtual.partner.instance:mozaik_communication.virtual_partner_instance_search_view
-#: field:virtual.partner.instance,main_postal:0
-msgid "Main Postal"
-msgstr "Adresse principale"
+#: field:virtual.partner.instance,main_email:0
+msgid "Main Email"
+msgstr "Adresse électronique principale"
 
 #. module: mozaik_communication
 #: view:virtual.partner.candidature:mozaik_communication.virtual_partner_candidature_search_view

diff --git a/mozaik_communication/virtual_models.py b/mozaik_communication/virtual_models.py
@@ -326,7 +326,7 @@ class virtual_partner_instance(orm.Model):
         'employee': fields.boolean('Employee'),
 
         'postal_vip': fields.boolean('VIP Address'),
-        'main_postal': fields.boolean('Main Postal'),
+        'main_postal': fields.boolean('Main Address'),
         'postal_unauthorized': fields.boolean('Unauthorized Address'),
         'postal_category_id': fields.many2one('coordinate.category',
                                               'Postal Coordinate Category'),

diff --git a/mozaik_communication/virtual_models_view.xml b/mozaik_communication/virtual_models_view.xml
@@ -294,8 +294,9 @@
                     <field name="email_category_id" />
                     <field name="postal_category_id" />
 
-                    <filter string="Main Postal" name="main_postal"
+                    <filter string="Main Address" name="main_postal"
                         domain="[('main_postal','=',1)]" />
+                    <separator />
                     <filter string="Main Email" name="main_email"
                         domain="[('main_email','=',1)]" />
                     <separator />