Merge lp:~fabien-morin/unifield-server/fm-us-1248 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/sync_client/sync_client.py'
--- bin/addons/sync_client/sync_client.py	2016-04-25 15:54:40 +0000
+++ bin/addons/sync_client/sync_client.py	2016-05-02 08:00:33 +0000
@@ -902,6 +902,11 @@
     def sync(self, cr, uid, context=None):
         if context is None:
             context = {}
+        # is sync modules installed ?
+        for sql_table, module in [('sync_client.version', 'update_client'),
+                       ('so.po.common', 'sync_so')]:
+            if not self.pool.get(sql_table):
+                raise osv.except_osv('Error', "%s module is not installed ! You need to install it to be able to sync." % module)
         # US_394: force synchronization lang to en_US
         context['lang'] = 'en_US'
         logger = context.get('logger')

=== modified file 'bin/addons/sync_server/rules.py'
--- bin/addons/sync_server/rules.py	2016-04-27 09:19:09 +0000
+++ bin/addons/sync_server/rules.py	2016-05-02 08:00:33 +0000
@@ -167,6 +167,10 @@
         return self.get_groups(cr, uid, children_list, context=context)
 
     def _get_rules_per_group(self, cr, uid, entity, context=None):
+        if not entity.group_ids:
+            raise osv.except_osv(_("Warning"), "Your instace does not belong "
+                    "to any group. Instance must be member of at least one "
+                    "group to be able to synchronize.")
         cr.execute("""SELECT g.id, array_agg(r.id)
                       FROM sync_server_entity_group g
                            JOIN sync_server_group_type t ON (g.type_id=t.id or t.name = 'USB')