[IMP]Search per activity and free and paid filters.

golem_activity_registration/__manifest__.py

@@ -18,9 +18,9 @@
 {
     'name': 'GOLEM Activity Member Registrations',
     'summary': 'GOLEM Activities Member Registrations management',
-    'version': '10.0.1.0.0',
+    'version': '10.0.1.1.0',
     'category': 'GOLEM',
-    'author': 'Fabien Bourgeois',
+    'author': 'Fabien Bourgeois, Michel Dessenne',
     'license': 'AGPL-3',
     'application': False,
     'installable': True,

golem_activity_registration/i18n/golem_activity_registration.pot

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-14 23:15+0000\n"
+"POT-Creation-Date: 2018-01-09 15:14+0000\n"
-"PO-Revision-Date: 2017-06-14 23:15+0000\n"
+"PO-Revision-Date: 2018-01-09 15:14+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"

golem_activity_registration/models/golem_activity_registration.py

@@ -74,6 +74,7 @@ class GolemActivityRegistration(models.Model):
     """ GOLEM Activity Registration """
     _name = 'golem.activity.registration'
     _description = 'GOLEM Activity Registration'
+    _rec_name ='activity_id'
 
     member_id = fields.Many2one('golem.member', string='Member', required=True,
                                 ondelete='cascade', index=True)

golem_activity_registration/views/golem_member_views.xml

@@ -52,5 +52,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       </field>
     </record>
 
+    <!-- Searches -->
+    <record id="golem_member_searches_inherit_golem_activity_registration"
+      model="ir.ui.view">
+      <field name="name">Add activities registrations to member searches</field>
+      <field name="model">golem.member</field>
+      <field name="inherit_id" ref="golem_member.golem_member_search" />
+      <field name="arch" type="xml">
+          <field name="number" position="before">
+            <field name="activity_registration_all_ids" widget="many2one"/>
+          </field>
+      </field>
+    </record>
   </data>
 </odoo>

golem_membership/__manifest__.py

@@ -18,9 +18,9 @@
 {
     'name': 'GOLEM non-profit membership handling',
     'summary': 'Extends Odoo membership',
-    'version': '10.0.1.0.0',
+    'version': '10.0.1.1.0',
     'category': 'GOLEM',
-    'author': 'Fabien Bourgeois',
+    'author': 'Fabien Bourgeois, Michel Dessenne',
     'license': 'AGPL-3',
     'application': False,
     'installable': True,

golem_membership/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: 2017-06-14 07:05+0000\n"
+"POT-Creation-Date: 2018-01-09 15:07+0000\n"
-"PO-Revision-Date: 2017-06-14 07:05+0000\n"
+"PO-Revision-Date: 2018-01-09 15:07+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -56,6 +56,16 @@ msgstr "ID"
 msgid "Invoice Membership"
 msgstr "Facture d'adhésion"
 
+#. module: golem_membership
+#: model:ir.ui.view,arch_db:golem_membership.golem_member_search_inherit_golem_membership
+msgid "Is free"
+msgstr "Adhérent libre"
+
+#. module: golem_membership
+#: model:ir.ui.view,arch_db:golem_membership.golem_member_search_inherit_golem_membership
+msgid "Is paid"
+msgstr "A cotisé"
+
 #. module: golem_membership
 #: model:ir.actions.act_window,name:golem_membership.golem_membership_invoice_action
 msgid "Join Membership"
@@ -106,4 +116,3 @@ msgstr "Contact"
 #: model:ir.ui.view,arch_db:golem_membership.golem_membership_invoice_form
 msgid "or"
 msgstr "ou"
-

golem_membership/i18n/golem_membership.pot

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-14 07:04+0000\n"
+"POT-Creation-Date: 2018-01-09 15:05+0000\n"
-"PO-Revision-Date: 2017-06-14 07:04+0000\n"
+"PO-Revision-Date: 2018-01-09 15:05+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -55,6 +55,16 @@ msgstr ""
 msgid "Invoice Membership"
 msgstr ""
 
+#. module: golem_membership
+#: model:ir.ui.view,arch_db:golem_membership.golem_member_search_inherit_golem_membership
+msgid "Is free"
+msgstr ""
+
+#. module: golem_membership
+#: model:ir.ui.view,arch_db:golem_membership.golem_member_search_inherit_golem_membership
+msgid "Is paid"
+msgstr ""
+
 #. module: golem_membership
 #: model:ir.actions.act_window,name:golem_membership.golem_membership_invoice_action
 msgid "Join Membership"

golem_membership/views/golem_member_view.xml

@@ -73,6 +73,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         </page>
       </field>
     </record>
+<!-- Searches -->
+    <record model="ir.ui.view" id="golem_member_search_inherit_golem_membership">
+      <field name="name">GOLEM Member form adaptations</field>
+      <field name="model">golem.member</field>
+      <field name="inherit_id" ref="golem_member.golem_member_search" />
+      <field name="arch" type="xml">
+        <filter name="season_default" position="after">
+          <separator />
+          <filter name="is_paid" string="Is paid"
+            domain="[('membership_state','in',['invoiced', 'paid'])]" />
+          <filter name="is_free" string="Is free"
+            domain="[('free_member', '=', True)]" />
+          </filter>
+      </field>
+    </record>
 
   </data>
 </odoo>