diff --git a/golem_activity_place/__openerp__.py b/golem_activity_place/__openerp__.py
index 62cd6ac7..82980eb1 100644
--- a/golem_activity_place/__openerp__.py
+++ b/golem_activity_place/__openerp__.py
@@ -16,8 +16,8 @@
# along with this program. If not, see .
{
- 'name': 'GOLEM Activity Sessions Places',
- 'summary': 'GOLEM Activities Session avdanced places management',
+ 'name': 'GOLEM Activity Places',
+ 'summary': 'GOLEM Activity avdanced places management',
'description': ''' Management of minimum places, overbook and max
overbook... ''',
'version': '0.1',
@@ -27,6 +27,6 @@
'application': False,
'installable': True,
'auto_install': False,
- 'depends': ['golem_activity_session_registration'],
+ 'depends': ['golem_activity_registration'],
'data': ['views/golem_activity_view.xml']
}
diff --git a/golem_activity_place/i18n/fr.po b/golem_activity_place/i18n/fr.po
index 8ea24c2b..1db5dd8f 100644
--- a/golem_activity_place/i18n/fr.po
+++ b/golem_activity_place/i18n/fr.po
@@ -1,13 +1,13 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
-# * golem_activity_session_place
+# * golem_activity_place
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-03 15:21+0000\n"
-"PO-Revision-Date: 2016-08-03 15:21+0000\n"
+"POT-Creation-Date: 2016-10-10 16:26+0000\n"
+"PO-Revision-Date: 2016-10-10 16:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,25 +15,45 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#. module: golem_activity_session_place
-#: view:golem.activity.session:golem_activity_session_place.searches
-msgid "Full"
-msgstr "Plein"
+#. module: golem_activity_place
+#: field:golem.activity,is_overbooked:0
+msgid "Allow overbook?"
+msgstr "Autoriser la surcharge ?"
-#. module: golem_activity_session_place
-#: model:ir.model,name:golem_activity_session_place.model_golem_activity_session
-msgid "GOLEM Activities Sessions"
-msgstr "Séances des activités"
+#. module: golem_activity_place
+#: model:ir.model,name:golem_activity_place.model_golem_activity
+msgid "GOLEM Activity"
+msgstr "Activité"
-#. module: golem_activity_session_place
-#: code:addons/golem_activity_session_place/models/golem_activity_session.py:52
+#. module: golem_activity_place
+#: field:golem.activity,places_min:0
+msgid "Minimum places"
+msgstr "Places minimum"
+
+#. module: golem_activity_place
+#: help:golem.activity,places_min:0
+msgid "Minimum places to maintain the activity"
+msgstr "Nombre de places minimales pour maintenir l'activité"
+
+#. module: golem_activity_place
+#: code:addons/golem_activity_place/models/golem_activity.py:51
#, python-format
msgid "Number of places cannot be negative."
msgstr "Le nombre de places ne peut pas être négatif"
-#. module: golem_activity_session_place
-#: code:addons/golem_activity_session_place/models/golem_activity_session.py:55
+#. module: golem_activity_place
+#: code:addons/golem_activity_place/models/golem_activity.py:54
#, python-format
msgid "Overbooked places cannot be inferior than places"
-msgstr "Le nombre de places avec surcharge ne peut être inférieur aux places"
+msgstr "Le nombre de places avec surcharge ne peut être inférieur aux place
+
+#. module: golem_activity_place
+#: field:golem.activity,places_overbooked:0
+msgid "Places with overbook"
+msgstr "Places avec surcharge"
+
+#. module: golem_activity_place
+#: view:golem.activity:golem_activity_place.tree
+msgid "darkgrey: places_used < places_min; red: places_remain == 0; orange: places_remain <= 4;"
+msgstr "darkgrey: places_used < places_min; red: places_remain == 0; orange: places_remain <= 4;"
diff --git a/golem_activity_place/i18n/golem_activity_place.pot b/golem_activity_place/i18n/golem_activity_place.pot
index 022724d0..4b66a63f 100644
--- a/golem_activity_place/i18n/golem_activity_place.pot
+++ b/golem_activity_place/i18n/golem_activity_place.pot
@@ -1,13 +1,13 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
-# * golem_activity_session_place
+# * golem_activity_place
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-03 15:20+0000\n"
-"PO-Revision-Date: 2016-08-03 15:20+0000\n"
+"POT-Creation-Date: 2016-10-10 16:25+0000\n"
+"PO-Revision-Date: 2016-10-10 16:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,25 +15,45 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: golem_activity_session_place
-#: view:golem.activity.session:golem_activity_session_place.searches
-msgid "Full"
+#. module: golem_activity_place
+#: field:golem.activity,is_overbooked:0
+msgid "Allow overbook?"
msgstr ""
-#. module: golem_activity_session_place
-#: model:ir.model,name:golem_activity_session_place.model_golem_activity_session
-msgid "GOLEM Activities Sessions"
+#. module: golem_activity_place
+#: model:ir.model,name:golem_activity_place.model_golem_activity
+msgid "GOLEM Activity"
msgstr ""
-#. module: golem_activity_session_place
-#: code:addons/golem_activity_session_place/models/golem_activity_session.py:52
+#. module: golem_activity_place
+#: field:golem.activity,places_min:0
+msgid "Minimum places"
+msgstr ""
+
+#. module: golem_activity_place
+#: help:golem.activity,places_min:0
+msgid "Minimum places to maintain the activity"
+msgstr ""
+
+#. module: golem_activity_place
+#: code:addons/golem_activity_place/models/golem_activity.py:51
#, python-format
msgid "Number of places cannot be negative."
msgstr ""
-#. module: golem_activity_session_place
-#: code:addons/golem_activity_session_place/models/golem_activity_session.py:55
+#. module: golem_activity_place
+#: code:addons/golem_activity_place/models/golem_activity.py:54
#, python-format
msgid "Overbooked places cannot be inferior than places"
msgstr ""
+#. module: golem_activity_place
+#: field:golem.activity,places_overbooked:0
+msgid "Places with overbook"
+msgstr ""
+
+#. module: golem_activity_place
+#: view:golem.activity:golem_activity_place.tree
+msgid "darkgrey: places_used < places_min; red: places_remain == 0; orange: places_remain <= 4;"
+msgstr ""
+
diff --git a/golem_activity_place/models/__init__.py b/golem_activity_place/models/__init__.py
index 1bba04cc..6b474dc1 100644
--- a/golem_activity_place/models/__init__.py
+++ b/golem_activity_place/models/__init__.py
@@ -15,4 +15,4 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see .
-from . import golem_activity_session
+from . import golem_activity
diff --git a/golem_activity_place/models/golem_activity.py b/golem_activity_place/models/golem_activity.py
index 77302838..b2e6d081 100644
--- a/golem_activity_place/models/golem_activity.py
+++ b/golem_activity_place/models/golem_activity.py
@@ -18,11 +18,11 @@
from openerp import models, fields, api, _
-class GolemActivitySession(models.Model):
- _inherit = 'golem.activity.session'
+class GolemActivity(models.Model):
+ _inherit = 'golem.activity'
places_min = fields.Integer('Minimum places', default=0,
- help='Minimum places to maintain the session')
+ help='Minimum places to maintain the activity')
is_overbooked = fields.Boolean('Allow overbook?', default=False)
places_overbooked = fields.Integer('Places with overbook', default=0)
diff --git a/golem_activity_place/views/golem_activity_view.xml b/golem_activity_place/views/golem_activity_view.xml
index 7f7ca01f..18b47d4f 100644
--- a/golem_activity_place/views/golem_activity_view.xml
+++ b/golem_activity_place/views/golem_activity_view.xml
@@ -20,10 +20,10 @@ along with this program. If not, see .
- GOLEM Activity Sessions Places Form additions
- golem.activity.session
+ GOLEM Activity Places Form additions
+ golem.activity
+ ref="golem_activity_registration.activity_form" />
@@ -35,11 +35,11 @@ along with this program. If not, see .
-
- Session list places adaptations
- golem.activity.session
+
+ Activity list places adaptations
+ golem.activity
+ ref="golem_activity_registration.activity_tree" />
darkgrey: places_used < places_min; red: places_remain == 0; orange: places_remain <= 4;