diff --git a/trytond/ir/action.xml b/trytond/ir/action.xml index 153a5353aa..ca9213502f 100644 --- a/trytond/ir/action.xml +++ b/trytond/ir/action.xml @@ -3,7 +3,11 @@ this repository contains the full copyright notices and license terms. --> - + ir.action form @@ -31,8 +35,11 @@ this repository contains the full copyright notices and license terms. --> - + ir.action.keyword @@ -73,8 +80,11 @@ this repository contains the full copyright notices and license terms. --> - + ir.action.act_window @@ -101,8 +111,11 @@ this repository contains the full copyright notices and license terms. --> - + ir.action.act_window.view @@ -171,8 +184,10 @@ this repository contains the full copyright notices and license terms. --> - + ir.action.url @@ -201,7 +216,10 @@ this repository contains the full copyright notices and license terms. --> - + diff --git a/trytond/ir/attachment.xml b/trytond/ir/attachment.xml index 789d26dc34..8713855e19 100644 --- a/trytond/ir/attachment.xml +++ b/trytond/ir/attachment.xml @@ -30,7 +30,10 @@ this repository contains the full copyright notices and license terms. --> - + diff --git a/trytond/ir/cron.xml b/trytond/ir/cron.xml index 7b1692a7d4..38832947a3 100644 --- a/trytond/ir/cron.xml +++ b/trytond/ir/cron.xml @@ -3,7 +3,10 @@ this repository contains the full copyright notices and license terms. --> - @@ -33,8 +36,11 @@ this repository contains the full copyright notices and license terms. --> - + run_once diff --git a/trytond/ir/email.xml b/trytond/ir/email.xml index b05437da6d..6663c27b8e 100644 --- a/trytond/ir/email.xml +++ b/trytond/ir/email.xml @@ -28,7 +28,11 @@ this repository contains the full copyright notices and license terms. --> - + @@ -86,6 +90,10 @@ this repository contains the full copyright notices and license terms. --> - + diff --git a/trytond/ir/export.xml b/trytond/ir/export.xml index 94cc20b52d..1cb5fdeb6b 100644 --- a/trytond/ir/export.xml +++ b/trytond/ir/export.xml @@ -30,8 +30,11 @@ this repository contains the full copyright notices and license terms. --> - + ir.export.line diff --git a/trytond/ir/lang.xml b/trytond/ir/lang.xml index a0280520a5..9c74d84483 100644 --- a/trytond/ir/lang.xml +++ b/trytond/ir/lang.xml @@ -3,7 +3,10 @@ this repository contains the full copyright notices and license terms. --> - bg @@ -493,8 +496,11 @@ this repository contains the full copyright notices and license terms. --> - + load_translations diff --git a/trytond/ir/message.xml b/trytond/ir/message.xml index e3bda1061d..90d9f935a9 100644 --- a/trytond/ir/message.xml +++ b/trytond/ir/message.xml @@ -27,7 +27,11 @@ this repository contains the full copyright notices and license terms. --> - + diff --git a/trytond/ir/model.xml b/trytond/ir/model.xml index b90704a794..fe825cd890 100644 --- a/trytond/ir/model.xml +++ b/trytond/ir/model.xml @@ -3,7 +3,11 @@ this repository contains the full copyright notices and license terms. --> - + ir.model form @@ -30,8 +34,11 @@ this repository contains the full copyright notices and license terms. --> - + ir.model.field form @@ -58,8 +65,11 @@ this repository contains the full copyright notices and license terms. --> - + ir.model.access tree @@ -86,8 +96,11 @@ this repository contains the full copyright notices and license terms. --> - + Access @@ -131,8 +144,11 @@ this repository contains the full copyright notices and license terms. --> - + Access @@ -210,8 +226,11 @@ this repository contains the full copyright notices and license terms. --> - + ir.model.button.rule @@ -295,7 +314,10 @@ this repository contains the full copyright notices and license terms. --> - sync diff --git a/trytond/ir/module.xml b/trytond/ir/module.xml index ccb3257885..cef87fd108 100644 --- a/trytond/ir/module.xml +++ b/trytond/ir/module.xml @@ -3,7 +3,11 @@ this repository contains the full copyright notices and license terms. --> - + ir.module form @@ -32,8 +36,11 @@ this repository contains the full copyright notices and license terms. --> - + activate @@ -93,8 +100,10 @@ this repository contains the full copyright notices and license terms. --> - @@ -149,9 +158,10 @@ this repository contains the full copyright notices and license terms. --> module_activate_upgrade_done_form - diff --git a/trytond/ir/note.xml b/trytond/ir/note.xml index 81d683fc63..f4d0114cb6 100644 --- a/trytond/ir/note.xml +++ b/trytond/ir/note.xml @@ -30,7 +30,10 @@ this repository contains the full copyright notices and license terms. --> - diff --git a/trytond/ir/rule.xml b/trytond/ir/rule.xml index 1ea85bb723..415d253f31 100644 --- a/trytond/ir/rule.xml +++ b/trytond/ir/rule.xml @@ -29,8 +29,11 @@ this repository contains the full copyright notices and license terms. --> - + ir.rule form diff --git a/trytond/ir/sequence.xml b/trytond/ir/sequence.xml index 54adabf1a6..7fc6519a26 100644 --- a/trytond/ir/sequence.xml +++ b/trytond/ir/sequence.xml @@ -3,7 +3,10 @@ this repository contains the full copyright notices and license terms. --> - @@ -34,8 +37,11 @@ this repository contains the full copyright notices and license terms. --> - + ir.sequence.strict @@ -68,8 +74,9 @@ this repository contains the full copyright notices and license terms. --> + sequence="10" + id="menu_sequence_strict_form" + icon="tryton-list"/> ir.sequence.type @@ -99,7 +106,10 @@ this repository contains the full copyright notices and license terms. --> - + diff --git a/trytond/ir/translation.xml b/trytond/ir/translation.xml index 3300fbe8d7..756df84992 100644 --- a/trytond/ir/translation.xml +++ b/trytond/ir/translation.xml @@ -44,8 +44,11 @@ this repository contains the full copyright notices and license terms. --> - + Translations @@ -90,11 +93,11 @@ this repository contains the full copyright notices and license terms. --> ir.ui.view,-1 - + sequence="90" + id="menu_translation_set"/> ir.translation.clean.start @@ -112,11 +115,11 @@ this repository contains the full copyright notices and license terms. --> Clean Translations ir.translation.clean - + sequence="91" + id="menu_translation_clean"/> ir.translation.update.start @@ -140,11 +143,11 @@ this repository contains the full copyright notices and license terms. --> ir.ui.view,-1 - + sequence="92" + id="menu_translation_update"/> ir.translation.export.start @@ -162,10 +165,10 @@ this repository contains the full copyright notices and license terms. --> Export Translations ir.translation.export - + sequence="93" + id="menu_translation_export"/> diff --git a/trytond/ir/trigger.xml b/trytond/ir/trigger.xml index cc2587931c..3f02abf5dd 100644 --- a/trytond/ir/trigger.xml +++ b/trytond/ir/trigger.xml @@ -27,8 +27,11 @@ this repository contains the full copyright notices and license terms. --> - + diff --git a/trytond/ir/ui/icon.xml b/trytond/ir/ui/icon.xml index ad3de48537..4bae5a7b7f 100644 --- a/trytond/ir/ui/icon.xml +++ b/trytond/ir/ui/icon.xml @@ -29,7 +29,10 @@ - + diff --git a/trytond/ir/ui/menu.py b/trytond/ir/ui/menu.py index 1dd1d98b8b..08616d1e5f 100644 --- a/trytond/ir/ui/menu.py +++ b/trytond/ir/ui/menu.py @@ -74,7 +74,10 @@ CLIENT_ICONS = [(x, x) for x in [ ]] -class UIMenu(DeactivableMixin, sequence_ordered(), tree(separator=' / '), +class UIMenu( + DeactivableMixin, + sequence_ordered(order='ASC NULLS LAST'), + tree(separator=' / '), ModelSQL, ModelView): "UI menu" __name__ = 'ir.ui.menu' @@ -108,9 +111,9 @@ class UIMenu(DeactivableMixin, sequence_ordered(), tree(separator=' / '), def default_icon(): return 'tryton-folder' - @staticmethod - def default_sequence(): - return 10 + @classmethod + def default_sequence(cls): + return 50 @staticmethod def list_icons(): diff --git a/trytond/ir/ui/menu.xml b/trytond/ir/ui/menu.xml index 7b11a1d0c5..05310f3888 100644 --- a/trytond/ir/ui/menu.xml +++ b/trytond/ir/ui/menu.xml @@ -54,8 +54,11 @@ this repository contains the full copyright notices and license terms. --> - + ir.ui.menu.favorite diff --git a/trytond/ir/ui/ui.xml b/trytond/ir/ui/ui.xml index c37d1e055a..c6cca51db3 100644 --- a/trytond/ir/ui/ui.xml +++ b/trytond/ir/ui/ui.xml @@ -36,7 +36,15 @@ this repository contains the full copyright notices and license terms. --> ui/icons/tryton-tree.svg - - + + diff --git a/trytond/ir/ui/view.xml b/trytond/ir/ui/view.xml index e4c61ea84e..e0396fe5ee 100644 --- a/trytond/ir/ui/view.xml +++ b/trytond/ir/ui/view.xml @@ -36,8 +36,11 @@ this repository contains the full copyright notices and license terms. --> - + show Show @@ -71,8 +74,11 @@ this repository contains the full copyright notices and license terms. --> - + ir.ui.view_tree_state @@ -101,7 +107,10 @@ this repository contains the full copyright notices and license terms. --> - @@ -131,7 +140,10 @@ this repository contains the full copyright notices and license terms. --> - diff --git a/trytond/res/group.xml b/trytond/res/group.xml index b5a23920f9..d1e40b915f 100644 --- a/trytond/res/group.xml +++ b/trytond/res/group.xml @@ -33,8 +33,11 @@ this repository contains the full copyright notices and license terms. --> - + diff --git a/trytond/res/res.xml b/trytond/res/res.xml index b4b40e9215..3fe5011c14 100644 --- a/trytond/res/res.xml +++ b/trytond/res/res.xml @@ -3,6 +3,10 @@ this repository contains the full copyright notices and license terms. --> - + diff --git a/trytond/res/user.xml b/trytond/res/user.xml index 51b88efb0c..2d2812c2f6 100644 --- a/trytond/res/user.xml +++ b/trytond/res/user.xml @@ -47,8 +47,11 @@ this repository contains the full copyright notices and license terms. --> - +