From 3ad9263f68eede9c30beb3cfdd2c3d4289332a1f Mon Sep 17 00:00:00 2001
From: Youssef ELOUAHBY <youssef@yaltik.com>
Date: Tue, 19 May 2020 23:23:00 +0000
Subject: [PATCH 1/7] make season default filter active on activity action

---
 golem_activity/views/golem_activity_views.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/golem_activity/views/golem_activity_views.xml b/golem_activity/views/golem_activity_views.xml
index 9b2aa07..0e44032 100644
--- a/golem_activity/views/golem_activity_views.xml
+++ b/golem_activity/views/golem_activity_views.xml
@@ -187,7 +187,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     <!-- Actions -->
     <act_window id="golem_activity_action" name="GOLEM Activities"
-      res_model="golem.activity" view_mode="tree,form,calendar" />
+      res_model="golem.activity" view_mode="tree,form,calendar"   
+      context="{'search_default_season_default': 1}"/>
     <act_window id="golem_activity_type_action" name="GOLEM Activity Types"
       res_model="golem.activity.type" view_mode="tree" />
     <act_window id="golem_activity_audience_action" name="GOLEM Activity Audiences"

From c95a54bd6ce60be24e3c21e2f65cf57b16d4cdc4 Mon Sep 17 00:00:00 2001
From: Youssef ELOUAHBY <youssef@yaltik.com>
Date: Wed, 20 May 2020 00:06:57 +0000
Subject: [PATCH 2/7] Change upcoming filter to current & upcoming on event
 search

---
 golem_activity/__manifest__.py       |  3 ++-
 golem_activity/views/event_views.xml | 36 ++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 golem_activity/views/event_views.xml

diff --git a/golem_activity/__manifest__.py b/golem_activity/__manifest__.py
index af0e1d0..2f9d569 100644
--- a/golem_activity/__manifest__.py
+++ b/golem_activity/__manifest__.py
@@ -25,9 +25,10 @@
     'license': 'AGPL-3',
     'application': True,
     'installable': True,
-    'depends': ['product', 'account', 'golem_base', 'golem_season'],
+    'depends': ['product', 'account', 'golem_base', 'golem_season', 'event'],
     'data': ['security/ir.model.access.csv',
              'data/golem_activity_data.xml',
              'views/golem_activity_views.xml',
+             'views/event_views.xml',
              'report/golem_activity_report_templates.xml']
 }
diff --git a/golem_activity/views/event_views.xml b/golem_activity/views/event_views.xml
new file mode 100644
index 0000000..17a77da
--- /dev/null
+++ b/golem_activity/views/event_views.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2020 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2020 Youssef EL OUAHBY <youssef@yaltik.com>
+
+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/>.
+-->
+<odoo>
+  <data>
+    <record id="golem_activity_inherit_view_event_search" model="ir.ui.view">
+            <field name="name">Golem Activity Event Tracks</field>
+            <field name="inherit_id" ref="event.view_event_search"/>
+            <field name="model">event.event</field>
+            <field name="arch" type="xml">
+              <filter name="upcoming" position="replace">
+                <filter string="Current and Upcoming" name="upcoming"
+                    domain="['&amp;', ('state', '!=', 'cancel'), '|',
+                    ('date_begin','&gt;=', datetime.datetime.combine(context_today(), datetime.time(0,0,0))),
+                    ('date_end','&gt;=', datetime.datetime.combine(context_today(), datetime.time(0,0,0)))]"
+                    help="Upcoming events from today" />
+              </filter>
+            </field>
+   </record>
+  </data>
+</odoo>

From 60d9e37d9b63e73737b7814a135bb17a922b7771 Mon Sep 17 00:00:00 2001
From: Youssef ELOUAHBY <youssef@yaltik.com>
Date: Wed, 20 May 2020 13:58:18 +0000
Subject: [PATCH 3/7] remove event code from golem_activity

---
 golem_activity/__manifest__.py       |  1 -
 golem_activity/views/event_views.xml | 36 ----------------------------
 2 files changed, 37 deletions(-)
 delete mode 100644 golem_activity/views/event_views.xml

diff --git a/golem_activity/__manifest__.py b/golem_activity/__manifest__.py
index 2f9d569..76a3b10 100644
--- a/golem_activity/__manifest__.py
+++ b/golem_activity/__manifest__.py
@@ -29,6 +29,5 @@
     'data': ['security/ir.model.access.csv',
              'data/golem_activity_data.xml',
              'views/golem_activity_views.xml',
-             'views/event_views.xml',
              'report/golem_activity_report_templates.xml']
 }
diff --git a/golem_activity/views/event_views.xml b/golem_activity/views/event_views.xml
deleted file mode 100644
index 17a77da..0000000
--- a/golem_activity/views/event_views.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2020 Fabien Bourgeois <fabien@yaltik.com>
-Copyright 2020 Youssef EL OUAHBY <youssef@yaltik.com>
-
-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/>.
--->
-<odoo>
-  <data>
-    <record id="golem_activity_inherit_view_event_search" model="ir.ui.view">
-            <field name="name">Golem Activity Event Tracks</field>
-            <field name="inherit_id" ref="event.view_event_search"/>
-            <field name="model">event.event</field>
-            <field name="arch" type="xml">
-              <filter name="upcoming" position="replace">
-                <filter string="Current and Upcoming" name="upcoming"
-                    domain="['&amp;', ('state', '!=', 'cancel'), '|',
-                    ('date_begin','&gt;=', datetime.datetime.combine(context_today(), datetime.time(0,0,0))),
-                    ('date_end','&gt;=', datetime.datetime.combine(context_today(), datetime.time(0,0,0)))]"
-                    help="Upcoming events from today" />
-              </filter>
-            </field>
-   </record>
-  </data>
-</odoo>

From adc449fca58c7d4b6fe2824d0f95081111443016 Mon Sep 17 00:00:00 2001
From: Youssef ELOUAHBY <youssef@yaltik.com>
Date: Wed, 20 May 2020 14:24:49 +0000
Subject: [PATCH 4/7] create golem_event and edit upcoming filter

---
 golem_event/__init__.py                 |  17 +++++++++++
 golem_event/__manifest__.py             |  33 ++++++++++++++++++++++
 golem_event/static/description/icon.png | Bin 0 -> 4385 bytes
 golem_event/views/event_views.xml       |  36 ++++++++++++++++++++++++
 4 files changed, 86 insertions(+)
 create mode 100644 golem_event/__init__.py
 create mode 100644 golem_event/__manifest__.py
 create mode 100644 golem_event/static/description/icon.png
 create mode 100644 golem_event/views/event_views.xml

diff --git a/golem_event/__init__.py b/golem_event/__init__.py
new file mode 100644
index 0000000..40e5d37
--- /dev/null
+++ b/golem_event/__init__.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2020 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2020 Youssef EL OUAHBY <youssef@yaltik.com>
+#
+#    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/>.
diff --git a/golem_event/__manifest__.py b/golem_event/__manifest__.py
new file mode 100644
index 0000000..9415613
--- /dev/null
+++ b/golem_event/__manifest__.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2020 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2020 Youssef EL OUAHBY <youssef@yaltik.com>
+#
+#    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': 'GOLEM events',
+    'summary': 'Extends Odoo events',
+    'description': 'Extends Odoo events',
+    'version': '10.0.0.0.1',
+    'category': 'GOLEM',
+    'author': 'Fabien Bourgeois, Youssef EL OUAHBY',
+    'license': 'AGPL-3',
+    'application': True,
+    'installable': True,
+    'depends': ['event'],
+    'data': [
+             'views/event_views.xml',
+             ]
+}
diff --git a/golem_event/static/description/icon.png b/golem_event/static/description/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f96aee5ef3904fab6f0a184333dc555da5b5eda
GIT binary patch
literal 4385
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
bB$NLKN;8&UZ$xp-00000NkvXXu0mjf+Ldy)

literal 0
HcmV?d00001

diff --git a/golem_event/views/event_views.xml b/golem_event/views/event_views.xml
new file mode 100644
index 0000000..60b7187
--- /dev/null
+++ b/golem_event/views/event_views.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2020 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2020 Youssef EL OUAHBY <youssef@yaltik.com>
+
+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/>.
+-->
+<odoo>
+  <data>
+    <record id="golem_event_inherit_view_event_search" model="ir.ui.view">
+            <field name="name">Golem Event Tracks</field>
+            <field name="inherit_id" ref="event.view_event_search"/>
+            <field name="model">event.event</field>
+            <field name="arch" type="xml">
+              <filter name="upcoming" position="replace">
+                <filter string="Current and Upcoming" name="upcoming"
+                    domain="['&amp;', ('state', '!=', 'cancel'), '|',
+                    ('date_begin','&gt;=', datetime.datetime.combine(context_today(), datetime.time(0,0,0))),
+                    ('date_end','&gt;=', datetime.datetime.combine(context_today(), datetime.time(0,0,0)))]"
+                    help="Upcoming events from today" />
+              </filter>
+            </field>
+   </record>
+  </data>
+</odoo>

From fab585d247e1c49980ad243470e3ec9b8d3a4db1 Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Thu, 28 May 2020 09:22:28 +0200
Subject: [PATCH 5/7] [IMP]GOLEM Activity : show only default season per
 default

---
 golem_activity/__manifest__.py                | 4 ++--
 golem_activity/views/golem_activity_views.xml | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/golem_activity/__manifest__.py b/golem_activity/__manifest__.py
index af0e1d0..d739c0b 100644
--- a/golem_activity/__manifest__.py
+++ b/golem_activity/__manifest__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2016-2019 Fabien Bourgeois <fabien@yaltik.com>
+#    Copyright 2016-2020 Fabien Bourgeois <fabien@yaltik.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,7 +19,7 @@
     'name': 'GOLEM activities',
     'summary': 'Extends Odoo products for multi-activity',
     'description': 'Extends Odoo products for multi-activity',
-    'version': '10.0.2.8.0',
+    'version': '10.0.2.8.1',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois, Michel Dessenne',
     'license': 'AGPL-3',
diff --git a/golem_activity/views/golem_activity_views.xml b/golem_activity/views/golem_activity_views.xml
index 0e44032..8a6d0db 100644
--- a/golem_activity/views/golem_activity_views.xml
+++ b/golem_activity/views/golem_activity_views.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 Copyright 2017-2018 Fabien Bourgeois <fabien@yaltik.com>
+Copyright 2020 Youssef El Ouahby <youssef@yaltik.com>
 
 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
@@ -187,7 +188,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     <!-- Actions -->
     <act_window id="golem_activity_action" name="GOLEM Activities"
-      res_model="golem.activity" view_mode="tree,form,calendar"   
+      res_model="golem.activity" view_mode="tree,form,calendar"
       context="{'search_default_season_default': 1}"/>
     <act_window id="golem_activity_type_action" name="GOLEM Activity Types"
       res_model="golem.activity.type" view_mode="tree" />

From e0901a879e04e51c083ffb5d73f002f4be1877a2 Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Thu, 28 May 2020 09:41:06 +0200
Subject: [PATCH 6/7] [FIX]GOLEM Activity should not install event

---
 golem_activity/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/golem_activity/__manifest__.py b/golem_activity/__manifest__.py
index b721f84..d739c0b 100644
--- a/golem_activity/__manifest__.py
+++ b/golem_activity/__manifest__.py
@@ -25,7 +25,7 @@
     'license': 'AGPL-3',
     'application': True,
     'installable': True,
-    'depends': ['product', 'account', 'golem_base', 'golem_season', 'event'],
+    'depends': ['product', 'account', 'golem_base', 'golem_season'],
     'data': ['security/ir.model.access.csv',
              'data/golem_activity_data.xml',
              'views/golem_activity_views.xml',

From 71f933fdb388b6b127ac7f1e64f1aad03b3f41f5 Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Thu, 28 May 2020 09:41:57 +0200
Subject: [PATCH 7/7] [REF]GOLEM Event : small enhancements

---
 golem_event/__init__.py           |  2 +-
 golem_event/__manifest__.py       | 12 +++++-------
 golem_event/views/event_views.xml | 30 +++++++++++++++++-------------
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/golem_event/__init__.py b/golem_event/__init__.py
index 40e5d37..2e1bb93 100644
--- a/golem_event/__init__.py
+++ b/golem_event/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2020 Fabien Bourgeois <fabien@yaltik.com>
 #    Copyright 2020 Youssef EL OUAHBY <youssef@yaltik.com>
+#    Copyright 2020 Fabien Bourgeois <fabien@yaltik.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
diff --git a/golem_event/__manifest__.py b/golem_event/__manifest__.py
index 9415613..74ea473 100644
--- a/golem_event/__manifest__.py
+++ b/golem_event/__manifest__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-#    Copyright 2020 Fabien Bourgeois <fabien@yaltik.com>
 #    Copyright 2020 Youssef EL OUAHBY <youssef@yaltik.com>
+#    Copyright 2020 Fabien Bourgeois <fabien@yaltik.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -20,14 +20,12 @@
     'name': 'GOLEM events',
     'summary': 'Extends Odoo events',
     'description': 'Extends Odoo events',
-    'version': '10.0.0.0.1',
+    'version': '10.0.0.1.0',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois, Youssef EL OUAHBY',
     'license': 'AGPL-3',
-    'application': True,
+    'application': False,
     'installable': True,
-    'depends': ['event'],
-    'data': [
-             'views/event_views.xml',
-             ]
+    'depends': ['golem_base', 'event'],
+    'data': ['views/event_views.xml']
 }
diff --git a/golem_event/views/event_views.xml b/golem_event/views/event_views.xml
index 60b7187..029e525 100644
--- a/golem_event/views/event_views.xml
+++ b/golem_event/views/event_views.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright 2020 Fabien Bourgeois <fabien@yaltik.com>
 Copyright 2020 Youssef EL OUAHBY <youssef@yaltik.com>
+Copyright 2020 Fabien Bourgeois <fabien@yaltik.com>
 
 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
@@ -16,21 +16,25 @@ 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/>.
 -->
+
 <odoo>
-  <data>
-    <record id="golem_event_inherit_view_event_search" model="ir.ui.view">
-            <field name="name">Golem Event Tracks</field>
+    <data>
+
+        <!-- Search -->
+        <record id="golem_event_inherit_view_event_search" model="ir.ui.view">
+            <field name="name">Event Search Adaptations</field>
             <field name="inherit_id" ref="event.view_event_search"/>
             <field name="model">event.event</field>
             <field name="arch" type="xml">
-              <filter name="upcoming" position="replace">
-                <filter string="Current and Upcoming" name="upcoming"
-                    domain="['&amp;', ('state', '!=', 'cancel'), '|',
-                    ('date_begin','&gt;=', datetime.datetime.combine(context_today(), datetime.time(0,0,0))),
-                    ('date_end','&gt;=', datetime.datetime.combine(context_today(), datetime.time(0,0,0)))]"
-                    help="Upcoming events from today" />
-              </filter>
+                <filter name="upcoming" position="replace">
+                    <filter string="Current and Upcoming" name="upcoming"
+                        domain="['&amp;', ('state', '!=', 'cancel'), '|',
+                        ('date_begin','&gt;=', datetime.datetime.combine(context_today(), datetime.time(0,0,0))),
+                        ('date_end','&gt;=', datetime.datetime.combine(context_today(), datetime.time(0,0,0)))]"
+                        help="Current and upcoming events from today" />
+                </filter>
             </field>
-   </record>
-  </data>
+        </record>
+
+    </data>
 </odoo>