Merge lp:~unifield-team/unifield-server/uf_1075_usability_requirements into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/__init__.py'
--- bin/addons/__init__.py	2011-01-27 09:56:54 +0000
+++ bin/addons/__init__.py	2012-07-13 12:06:07 +0000
@@ -665,7 +665,7 @@
 
     def load_test(cr, module_name, id_map, mode):
         cr.commit()
-        if not tools.config.options['test_disable']:
+        if not tools.config.options['test_disable'] and (not tools.config.options['test_module'] or module_name in tools.config.options['test_module'].split(',')):
             try:
                 _load_data(cr, module_name, id_map, mode, 'test')
             except Exception, e:
@@ -776,6 +776,9 @@
             for kind in ('init', 'demo', 'update'):
                 if hasattr(package, kind):
                     delattr(package, kind)
+            
+        elif (hasattr(package, 'demo') or package.dbdemo) and tools.config.options['test_module'] and m in tools.config.options['test_module'].split(','):
+                load_test(cr, m, idref, mode)
 
         statusi += 1
 

=== modified file 'bin/addons/base/ir/ir_values.py'
--- bin/addons/base/ir/ir_values.py	2010-12-06 13:19:28 +0000
+++ bin/addons/base/ir/ir_values.py	2012-07-13 12:06:07 +0000
@@ -85,12 +85,14 @@
             method=True, type='text', string='Metadata'),
         'res_id': fields.integer('Object ID', help="Keep 0 if the action must appear on all resources.", select=True),
         'user_id': fields.many2one('res.users', 'User', ondelete='cascade', select=True),
-        'company_id': fields.many2one('res.company', 'Company', select=True)
+        'company_id': fields.many2one('res.company', 'Company', select=True),
+        'sequence': fields.integer('Sequence'),
     }
     _defaults = {
         'key': lambda *a: 'action',
         'key2': lambda *a: 'tree_but_open',
-        'company_id': lambda *a: False
+        'company_id': lambda *a: False,
+        'sequence':  lambda *a: 100,
     }
 
     def _auto_init(self, cr, context=None):
@@ -173,7 +175,7 @@
                     where.append('res_id=%s')
                     params.append(res_id)
 
-            where.append('(user_id=%s or (user_id IS NULL)) order by id')
+            where.append('(user_id=%s or (user_id IS NULL)) order by sequence,id')
             params.append(uid)
             clause = ' and '.join(where)
             cr.execute('select id,name,value,object,meta, key from ir_values where ' + clause, params)

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2012-07-13 06:02:27 +0000
+++ bin/osv/orm.py	2012-07-13 12:06:07 +0000
@@ -1703,7 +1703,6 @@
             resaction = ir_values_obj.get(cr, user, 'action',
                     'client_action_multi', [(self._name, False)], False,
                     context)
-
             resrelate = ir_values_obj.get(cr, user, 'action',
                     'client_action_relate', [(self._name, False)], False,
                     context)

=== modified file 'bin/tools/config.py'
--- bin/tools/config.py	2012-06-20 08:49:14 +0000
+++ bin/tools/config.py	2012-07-13 12:06:07 +0000
@@ -88,6 +88,7 @@
             'test_file' : False,
             'test_report_directory' : False,
             'test_disable' : False,
+            'test_module' : False,
             'test_commit' : False,
             'static_http_enable': False,
             'static_http_document_root': None,
@@ -171,6 +172,8 @@
         group.add_option("--test-report-directory", dest="test_report_directory", help="If set, will save sample of all reports in this directory.")
         group.add_option("--test-disable", action="store_true", dest="test_disable",
                          default=False, help="Disable loading test files.")
+        group.add_option("--test-module", dest="test_module",
+                         default=False, help="module to test")
         group.add_option("--test-commit", action="store_true", dest="test_commit",
                          default=False, help="Commit database changes performed by tests.")
         parser.add_option_group(group)
@@ -315,7 +318,7 @@
             'debug_mode', 'smtp_ssl', 'load_language',
             'stop_after_init', 'logrotate', 'without_demo', 'netrpc', 'xmlrpc', 'syslog',
             'list_db', 'xmlrpcs',
-            'test_file', 'test_disable', 'test_commit', 'test_report_directory',
+            'test_file', 'test_disable', 'test_commit', 'test_module', 'test_report_directory',
             'osv_memory_count_limit', 'osv_memory_age_limit',
         ]