diff --git a/golem_activity_queue/__manifest__.py b/golem_activity_queue/__manifest__.py index 03e8f7d..cd8eb35 100644 --- a/golem_activity_queue/__manifest__.py +++ b/golem_activity_queue/__manifest__.py @@ -17,10 +17,10 @@ # along with this program. If not, see . { - 'name': 'GOLEM activities queue', - 'summary': 'GOLEM activities queue', - 'description': ''' GOLEM resources management ''', - 'version': '10.0.2.1.0', + 'name': 'GOLEM activity queues', + 'summary': 'GOLEM activity queues', + 'description': ''' GOLEM activity queue management ''', + 'version': '10.0.1.0.0', 'category': 'GOLEM', 'author': 'Youssef El Ouahby, Fabien Bourgeois', 'license': 'AGPL-3', @@ -34,5 +34,5 @@ 'views/golem_member_views.xml', 'wizard/golem_activity_queue_choose_views.xml', 'wizard/golem_activity_automated_queue_activate_views.xml' - ] + ] } diff --git a/golem_activity_queue/models/__init__.py b/golem_activity_queue/models/__init__.py index 0ed9ff9..e5a38ed 100644 --- a/golem_activity_queue/models/__init__.py +++ b/golem_activity_queue/models/__init__.py @@ -16,6 +16,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_queue -from . import golem_activity -from . import golem_member +from . import golem_activity_queue, golem_activity, golem_member diff --git a/golem_activity_queue/models/golem_activity.py b/golem_activity_queue/models/golem_activity.py index 5036c1e..75a423e 100644 --- a/golem_activity_queue/models/golem_activity.py +++ b/golem_activity_queue/models/golem_activity.py @@ -16,6 +16,8 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . +""" GOLEM Activity adaptations """ + from odoo import models, fields, api, _ from odoo.exceptions import ValidationError diff --git a/golem_activity_queue/models/golem_activity_queue.py b/golem_activity_queue/models/golem_activity_queue.py index 2591d56..e7aded5 100644 --- a/golem_activity_queue/models/golem_activity_queue.py +++ b/golem_activity_queue/models/golem_activity_queue.py @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -""" GOLEM activities related models """ +""" GOLEM Activity Queue """ from odoo import models, fields, api, _ from odoo.exceptions import ValidationError diff --git a/golem_activity_queue/models/golem_member.py b/golem_activity_queue/models/golem_member.py index 31695d8..fa33aff 100644 --- a/golem_activity_queue/models/golem_member.py +++ b/golem_activity_queue/models/golem_member.py @@ -16,6 +16,8 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . +""" GOLEM Member adaptations """ + from odoo import models, fields, api, _ class GolemMember(models.Model): diff --git a/golem_activity_queue/security/ir.model.access.csv b/golem_activity_queue/security/ir.model.access.csv index 55c78a8..ed23a5f 100644 --- a/golem_activity_queue/security/ir.model.access.csv +++ b/golem_activity_queue/security/ir.model.access.csv @@ -1,3 +1,3 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_golem_activity_queue_user,Access GOLEM Activity Queue User,model_golem_activity_queue,golem_base.group_golem_user,1,1,1,1 -access_golem_activity_queue_manager,Access GOLEM Activity Queue Manager,model_golem_activity_queue,golem_base.group_golem_manager,1,1,1,1 +golem_activity_queue_user_rule,GOLEM Activity Queue User Rule,model_golem_activity_queue,golem_base.group_golem_user,1,1,1,1 +golem_activity_queue_manager_rule,GOLEM Activity Queue Manager Rule,model_golem_activity_queue,golem_base.group_golem_manager,1,1,1,1 diff --git a/golem_activity_queue/static/description/icon.png b/golem_activity_queue/static/description/icon.png index 87f67b4..794751a 100644 Binary files a/golem_activity_queue/static/description/icon.png and b/golem_activity_queue/static/description/icon.png differ diff --git a/golem_activity_queue/tests/test_golem_activity.py b/golem_activity_queue/tests/test_golem_activity.py index 055a540..a44c333 100644 --- a/golem_activity_queue/tests/test_golem_activity.py +++ b/golem_activity_queue/tests/test_golem_activity.py @@ -16,8 +16,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . +""" GOLEM Activity testing """ + from odoo.tests.common import TransactionCase -from odoo.models import ValidationError class TestGolemActivity(TransactionCase): diff --git a/golem_activity_queue/tests/test_golem_activity_queue.py b/golem_activity_queue/tests/test_golem_activity_queue.py index a32734e..f1ccf36 100644 --- a/golem_activity_queue/tests/test_golem_activity_queue.py +++ b/golem_activity_queue/tests/test_golem_activity_queue.py @@ -73,5 +73,5 @@ class TestGolemActivityQueue(TransactionCase): self.assertEqual(activity.activity_registration_ids[0].member_id, member1) #inscription du meme membre sur l'attente du meme activié: interdit with self.assertRaises(ValidationError): - activity_queue = self.activity_queue.create({'activity_id': activity.id, - 'member_id': member1.id}) + self.activity_queue.create({'activity_id': activity.id, + 'member_id': member1.id}) diff --git a/golem_activity_queue/tests/test_golem_member.py b/golem_activity_queue/tests/test_golem_member.py index f7a20b9..a923d16 100644 --- a/golem_activity_queue/tests/test_golem_member.py +++ b/golem_activity_queue/tests/test_golem_member.py @@ -16,8 +16,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -""" GOLEM member testing """ - +""" GOLEM Member testing """ from odoo.tests.common import TransactionCase # from psycopg2 import IntegrityError diff --git a/golem_activity_queue/views/golem_activity_queue_views.xml b/golem_activity_queue/views/golem_activity_queue_views.xml index 8caecc8..2a04f79 100644 --- a/golem_activity_queue/views/golem_activity_queue_views.xml +++ b/golem_activity_queue/views/golem_activity_queue_views.xml @@ -16,8 +16,10 @@ 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 . --> + + queue.form @@ -34,6 +36,7 @@ along with this program. If not, see . + queue.search @@ -60,6 +63,7 @@ along with this program. If not, see . + queue.tree @@ -80,6 +84,7 @@ along with this program. If not, see . + GOLEM Activity Queue List @@ -87,10 +92,12 @@ along with this program. If not, see . tree,search {'search_default_season_default': True} + + diff --git a/golem_activity_queue/views/golem_activity_views.xml b/golem_activity_queue/views/golem_activity_views.xml index 5f03397..39487b4 100644 --- a/golem_activity_queue/views/golem_activity_views.xml +++ b/golem_activity_queue/views/golem_activity_views.xml @@ -16,8 +16,11 @@ 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 . --> + + + Add the queue registration items to activity form @@ -79,5 +82,6 @@ along with this program. If not, see . + diff --git a/golem_activity_queue/views/golem_member_views.xml b/golem_activity_queue/views/golem_member_views.xml index 7f0ee85..b95e45d 100644 --- a/golem_activity_queue/views/golem_member_views.xml +++ b/golem_activity_queue/views/golem_member_views.xml @@ -16,8 +16,10 @@ 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 . --> + + @@ -50,5 +52,6 @@ along with this program. If not, see . + diff --git a/golem_activity_queue/wizard/__init__.py b/golem_activity_queue/wizard/__init__.py index c877b5e..03d4907 100644 --- a/golem_activity_queue/wizard/__init__.py +++ b/golem_activity_queue/wizard/__init__.py @@ -16,5 +16,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_queue_choose -from . import golem_activity_automated_queue_activate +from . import golem_activity_queue_choose, golem_activity_automated_queue_activate diff --git a/golem_activity_queue/wizard/golem_activity_automated_queue_activate.py b/golem_activity_queue/wizard/golem_activity_automated_queue_activate.py index b4f9111..c283ea8 100644 --- a/golem_activity_queue/wizard/golem_activity_automated_queue_activate.py +++ b/golem_activity_queue/wizard/golem_activity_automated_queue_activate.py @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -""" GOLEM Resources management """ +""" GOLEM Activity Automated Queue """ from odoo import models, fields diff --git a/golem_activity_queue/wizard/golem_activity_automated_queue_activate_views.xml b/golem_activity_queue/wizard/golem_activity_automated_queue_activate_views.xml index 2874a8e..de6a38d 100644 --- a/golem_activity_queue/wizard/golem_activity_automated_queue_activate_views.xml +++ b/golem_activity_queue/wizard/golem_activity_automated_queue_activate_views.xml @@ -44,6 +44,5 @@ along with this program. If not, see . - diff --git a/golem_activity_queue/wizard/golem_activity_queue_choose.py b/golem_activity_queue/wizard/golem_activity_queue_choose.py index c30aacb..515ea77 100644 --- a/golem_activity_queue/wizard/golem_activity_queue_choose.py +++ b/golem_activity_queue/wizard/golem_activity_queue_choose.py @@ -16,12 +16,12 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -""" GOLEM Resources management """ +""" GOLEM Activity Queue Choice """ from odoo import models, fields class GolemActivityQueueChooseWizard(models.TransientModel): - """GOLEM Resource wizard : rchoose activity queue to register in """ + """ GOLEM Activity Queue Choice """ _name = "golem.activity.queue.choose.wizard" activity_id = fields.Many2one("golem.activity") diff --git a/golem_activity_queue/wizard/golem_activity_queue_choose_views.xml b/golem_activity_queue/wizard/golem_activity_queue_choose_views.xml index c2acf37..b4ba674 100644 --- a/golem_activity_queue/wizard/golem_activity_queue_choose_views.xml +++ b/golem_activity_queue/wizard/golem_activity_queue_choose_views.xml @@ -18,6 +18,7 @@ along with this program. If not, see . --> + GOLEM Activity Queue Choose Wizard Form @@ -38,5 +39,6 @@ along with this program. If not, see . +