[IMP]GOLEM Member : better filters for partners and members

golem_member/__manifest__.py

@@ -20,7 +20,7 @@
     'name': 'GOLEM non-profit members',
     'summary': 'Extends Odoo contacts for MJC',
     'description': 'Extends Odoo contacts for MJC',
-    'version': '10.0.2.2.0',
+    'version': '10.0.2.2.1',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois, Michel Dessenne',
     'license': 'AGPL-3',

golem_member/i18n/fr.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-20 14:15+0000\n"
+"POT-Creation-Date: 2018-07-20 14:43+0000\n"
-"PO-Revision-Date: 2018-07-20 16:16+0200\n"
+"PO-Revision-Date: 2018-07-20 16:44+0200\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -493,7 +493,7 @@ msgid "Group By"
 msgstr "Grouper par"
 
 #. module: golem_member
-#: model:ir.ui.view,arch_db:golem_member.golem_member_search
+#: model:ir.ui.view,arch_db:golem_member.res_partner_search_inherit_golem_member
 msgid "Has contributed"
 msgstr "A payé une adhésion"
 
@@ -550,9 +550,30 @@ msgid "Invoices"
 msgstr "Factures"
 
 #. module: golem_member
-#: model:ir.ui.view,arch_db:golem_member.golem_member_search
+#: model:ir.ui.view,arch_db:golem_member.res_partner_search_inherit_golem_member
 msgid "Is Free Member"
-msgstr "Membre libre"
+msgstr "Adhérent libre"
+
+#. module: golem_member
+#: model:ir.ui.view,arch_db:golem_member.res_partner_search_inherit_golem_member
+msgid "Is Old Member"
+msgstr "Ancien adhérent"
+
+#. module: golem_member
+#: model:ir.ui.view,arch_db:golem_member.res_partner_search_inherit_golem_member
+msgid "Is Service User"
+msgstr "Usager"
+
+#. module: golem_member
+#: model:ir.ui.view,arch_db:golem_member.golem_member_search
+msgid "Is Service User Only"
+msgstr "Usager non adhérent"
+
+#. module: golem_member
+#: model:ir.ui.view,arch_db:golem_member.golem_member_search
+#: model:ir.ui.view,arch_db:golem_member.res_partner_search_inherit_golem_member
+msgid "Is Subscriber"
+msgstr "Adhérent"
 
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_is_company

golem_member/i18n/golem_member.pot

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-20 14:15+0000\n"
+"POT-Creation-Date: 2018-07-20 14:43+0000\n"
-"PO-Revision-Date: 2018-07-20 14:15+0000\n"
+"PO-Revision-Date: 2018-07-20 14:43+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -493,7 +493,7 @@ msgid "Group By"
 msgstr ""
 
 #. module: golem_member
-#: model:ir.ui.view,arch_db:golem_member.golem_member_search
+#: model:ir.ui.view,arch_db:golem_member.res_partner_search_inherit_golem_member
 msgid "Has contributed"
 msgstr ""
 
@@ -550,10 +550,31 @@ msgid "Invoices"
 msgstr ""
 
 #. module: golem_member
-#: model:ir.ui.view,arch_db:golem_member.golem_member_search
+#: model:ir.ui.view,arch_db:golem_member.res_partner_search_inherit_golem_member
 msgid "Is Free Member"
 msgstr ""
 
+#. module: golem_member
+#: model:ir.ui.view,arch_db:golem_member.res_partner_search_inherit_golem_member
+msgid "Is Old Member"
+msgstr ""
+
+#. module: golem_member
+#: model:ir.ui.view,arch_db:golem_member.res_partner_search_inherit_golem_member
+msgid "Is Service User"
+msgstr ""
+
+#. module: golem_member
+#: model:ir.ui.view,arch_db:golem_member.golem_member_search
+msgid "Is Service User Only"
+msgstr ""
+
+#. module: golem_member
+#: model:ir.ui.view,arch_db:golem_member.golem_member_search
+#: model:ir.ui.view,arch_db:golem_member.res_partner_search_inherit_golem_member
+msgid "Is Subscriber"
+msgstr ""
+
 #. module: golem_member
 #: model:ir.model.fields,field_description:golem_member.field_golem_member_is_company
 msgid "Is a Company"

golem_member/views/golem_member_views.xml

@@ -283,10 +283,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
           <filter name="season_default" string="Default season"
            domain="[('is_default', '=', True)]" />
           <separator />
-          <filter name="has_contributed" string="Has contributed"
+          <filter name="is_subscriber" string="Is Subscriber"
-            domain="[('membership_state','in',['invoiced', 'paid'])]" />
+            domain="[('membership_state', '!=', 'none')]" />
-          <filter name="is_free_member" string="Is Free Member"
+          <filter name="is_service_user_only" string="Is Service User Only"
-            domain="[('free_member', '=', True)]" />
+            domain="[('membership_state', '=', 'none')]" />
           <group string="Group By">
             <filter name="group_age" string="By age"
               context="{'group_by': 'is_minor'}"/>

golem_member/views/res_partner_views.xml

@@ -86,6 +86,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         <field name="name" position="after">
           <field name="member_number" />
         </field>
+        <filter name="filter_my_partners" position="before">
+          <filter name="is_subscriber" string="Is Subscriber"
+            domain="[('membership_state', '!=', 'none')]" />
+          <filter name="has_contributed" string="Has contributed"
+            domain="[('membership_state', 'in', ['invoiced', 'paid'])]" />
+          <filter name="old_member" string="Is Old Member"
+            domain="[('membership_state', 'in', ['old', 'cancel'])]" />
+          <filter name="is_free_member" string="Is Free Member"
+            domain="[('free_member', '=', True)]" />
+          <separator />
+          <filter name="is_service_user" string="Is Service User"
+            domain="[('member_id', '!=', False)]" />
+          <separator />
+        </filter>
       </field>
     </record>