forked from Yaltik/golem
[QUA][TYPO]GOLEM Activity Queue : little typos / quality enhancements
This commit is contained in:
parent
faee2e5e27
commit
a7173cdb22
@ -17,10 +17,10 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
{
|
||||
'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'
|
||||
]
|
||||
]
|
||||
}
|
||||
|
@ -16,6 +16,4 @@
|
||||
# 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/>.
|
||||
|
||||
from . import golem_activity_queue
|
||||
from . import golem_activity
|
||||
from . import golem_member
|
||||
from . import golem_activity_queue, golem_activity, golem_member
|
||||
|
@ -16,6 +16,8 @@
|
||||
# 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/>.
|
||||
|
||||
""" GOLEM Activity adaptations """
|
||||
|
||||
from odoo import models, fields, api, _
|
||||
from odoo.exceptions import ValidationError
|
||||
|
||||
|
@ -16,7 +16,7 @@
|
||||
# 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/>.
|
||||
|
||||
""" GOLEM activities related models """
|
||||
""" GOLEM Activity Queue """
|
||||
|
||||
from odoo import models, fields, api, _
|
||||
from odoo.exceptions import ValidationError
|
||||
|
@ -16,6 +16,8 @@
|
||||
# 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/>.
|
||||
|
||||
""" GOLEM Member adaptations """
|
||||
|
||||
from odoo import models, fields, api, _
|
||||
|
||||
class GolemMember(models.Model):
|
||||
|
@ -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
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 1.5 KiB |
@ -16,8 +16,9 @@
|
||||
# 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/>.
|
||||
|
||||
""" GOLEM Activity testing """
|
||||
|
||||
from odoo.tests.common import TransactionCase
|
||||
from odoo.models import ValidationError
|
||||
|
||||
|
||||
class TestGolemActivity(TransactionCase):
|
||||
|
@ -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})
|
||||
|
@ -16,8 +16,7 @@
|
||||
# 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/>.
|
||||
|
||||
""" GOLEM member testing """
|
||||
|
||||
""" GOLEM Member testing """
|
||||
|
||||
from odoo.tests.common import TransactionCase
|
||||
# from psycopg2 import IntegrityError
|
||||
|
@ -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 <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<odoo>
|
||||
<data>
|
||||
|
||||
<!--formulaire du modèle golem.activity.queue-->
|
||||
<record model="ir.ui.view" id="queue_form_view">
|
||||
<field name="name">queue.form</field>
|
||||
@ -34,6 +36,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!--Recherche du modèle golem.activity.queue-->
|
||||
<record model="ir.ui.view" id="queue_search_view">
|
||||
<field name="name">queue.search</field>
|
||||
@ -60,6 +63,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!--liste editable du modèle golem.activity.queue-->
|
||||
<record model="ir.ui.view" id="queue_tree_view">
|
||||
<field name="name">queue.tree</field>
|
||||
@ -80,6 +84,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- Action -->
|
||||
<record id="golem_activity_queue_action" model="ir.actions.act_window">
|
||||
<field name="name">GOLEM Activity Queue List</field>
|
||||
@ -87,10 +92,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
<field name="view_mode">tree,search</field>
|
||||
<field name="context">{'search_default_season_default': True}</field>
|
||||
</record>
|
||||
|
||||
<!-- Menu -->
|
||||
<menuitem id="golem_activity_queue_menu" name="Activity queue"
|
||||
parent="golem_activity.golem_activity_menu"
|
||||
action="golem_activity_queue_action"
|
||||
sequence="20" />
|
||||
|
||||
</data>
|
||||
</odoo>
|
||||
|
@ -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 <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<odoo>
|
||||
<data>
|
||||
|
||||
<!-- Forms -->
|
||||
<record id="golem_activity_form_inherit_golem_activity_queue"
|
||||
model="ir.ui.view">
|
||||
<field name="name">Add the queue registration items to activity form</field>
|
||||
@ -79,5 +82,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</odoo>
|
||||
|
@ -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 <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<odoo>
|
||||
<data>
|
||||
|
||||
<!-- add the queue registration items to member form-->
|
||||
<record id="golem_member_form_inherit_golem_activity_queue"
|
||||
model="ir.ui.view">
|
||||
@ -50,5 +52,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
</page>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</odoo>
|
||||
|
@ -16,5 +16,4 @@
|
||||
# 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/>.
|
||||
|
||||
from . import golem_activity_queue_choose
|
||||
from . import golem_activity_automated_queue_activate
|
||||
from . import golem_activity_queue_choose, golem_activity_automated_queue_activate
|
||||
|
@ -16,7 +16,7 @@
|
||||
# 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/>.
|
||||
|
||||
""" GOLEM Resources management """
|
||||
""" GOLEM Activity Automated Queue """
|
||||
|
||||
from odoo import models, fields
|
||||
|
||||
|
@ -44,6 +44,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
</data>
|
||||
</odoo>
|
||||
|
@ -16,12 +16,12 @@
|
||||
# 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/>.
|
||||
|
||||
""" 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")
|
||||
|
@ -18,6 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
<odoo>
|
||||
<data>
|
||||
|
||||
<!-- Forms -->
|
||||
<record model="ir.ui.view" id="golem_activity_queue_choose_wizard_view_form">
|
||||
<field name="name">GOLEM Activity Queue Choose Wizard Form</field>
|
||||
@ -38,5 +39,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</odoo>
|
||||
|
Loading…
Reference in New Issue
Block a user