Merge lp:~jfb-tempo-consulting/unifield-server/us-4890 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/analytic_distribution/wizard/mass_reallocation_wizard.py'
--- bin/addons/analytic_distribution/wizard/mass_reallocation_wizard.py	2018-06-22 09:57:41 +0000
+++ bin/addons/analytic_distribution/wizard/mass_reallocation_wizard.py	2018-10-03 10:08:55 +0000
@@ -29,6 +29,7 @@
 from lxml import etree
 import threading
 import pooler
+from msf_field_access_rights.osv_override import _get_instance_level
 
 class mass_reallocation_verification_wizard(osv.osv_memory):
     _name = 'mass.reallocation.verification.wizard'
@@ -193,7 +194,10 @@
             if isinstance(ids, (int, long)):
                 ids = [ids]
             first_line = self.pool.get('account.analytic.line').browse(cr, uid, ids)[0]
-            domain = "[('category', 'in', ['OC', 'FUNDING', 'DEST']), ('type', '!=', 'view')]"
+            if _get_instance_level(self, cr, uid) == 'hq':
+                domain = "[('category', '=', 'FUNDING'), ('type', '!=', 'view')]"
+            else:
+                domain = "[('category', 'in', ['OC', 'FUNDING', 'DEST']), ('type', '!=', 'view')]"
             for free in ['FREE1', 'FREE2']:
                 if first_line.account_id and first_line.account_id.category == free:
                     domain = "[('category', '=', '" + free + "'), ('type', '!=', 'view')]"
@@ -352,6 +356,10 @@
             account_field_name = 'account_id'
             if wiz.account_id.category == 'OC':
                 account_field_name = 'cost_center_id'
+
+            if _get_instance_level(self, cr, uid) == 'hq' and wiz.account_id.category in ['OC', 'DEST']:
+                raise osv.except_osv(_('Error'), _('At HQ level you can only mass reallocate FP !'))
+
             not_ad_correctable_acc_ids = gl_acc_obj.search(cr, uid, [('is_not_ad_correctable', '=', True)],
                                                            order='NO_ORDER', context=context)
             search_args = [
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-09-27 16:17:57 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-10-03 10:08:55 +0000
@@ -101850,6 +101850,7 @@
 #, python-format
 msgid " goods products, please refer to the appropriate procedures"
 msgstr " veuillez vous référer aux procédures adéquates."
+<<<<<<< TREE
 
 #. module: account_override
 #: code:addons/account_override/account.py:517
@@ -101935,3 +101936,12 @@
 #: field:account.commitment.line,commit_number:0
 msgid "Commitment Voucher Number"
 msgstr "Numéro du Bon d'Engagement"
+=======
+
+#. module: analytic_distribution
+#: code:addons/analytic_distribution/wizard/mass_reallocation_wizard.py:361
+#, python-format
+msgid "At HQ level you can only mass reallocate FP !"
+msgstr "Au niveau HQ vous ne pouvez que réallouer des FP !""
+
+>>>>>>> MERGE-SOURCE