Merge lp:~unifield-team/unifield-server/us-1214b into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account/account_move_line.py'
--- bin/addons/account/account_move_line.py	2016-03-23 14:52:23 +0000
+++ bin/addons/account/account_move_line.py	2016-04-14 13:11:13 +0000
@@ -1240,24 +1240,32 @@
                         move_obj.write(cr, uid, [line.move_id.id], {'date': todo_date}, context=context)
         return result
 
-    def _hook_check_period_state(self, cr, uid, result=False, context=None, *args, **kargs):
+    def _hook_check_period_state(self, cr, uid, result=False, context=None, raise_hq_closed=True, *args, **kargs):
         """
         Check period state
         """
         if not result:
             return False
+        res = True
         for (state,) in result:
             if state == 'done':
-                raise osv.except_osv(_('Error !'), _('You can not add/modify entries in a closed journal.'))
+                if raise_hq_closed:
+                    raise osv.except_osv(_('Error !'), _('You can not add/modify entries in a closed journal.'))
+                res = False
+                break
+        return res
 
-    def _update_journal_check(self, cr, uid, journal_id, period_id, context=None):
+    def _update_journal_check(self, cr, uid, journal_id, period_id,
+        context=None, raise_hq_closed=True):
         journal_obj = self.pool.get('account.journal')
         period_obj = self.pool.get('account.period')
         jour_period_obj = self.pool.get('account.journal.period')
         cr.execute('SELECT state FROM account_journal_period WHERE journal_id = %s AND period_id = %s', (journal_id, period_id))
         result = cr.fetchall()
-        self._hook_check_period_state(cr, uid, result, context=context)
-        if not result:
+        if result:
+            res = self._hook_check_period_state(cr, uid, result,
+                context=context, raise_hq_closed=raise_hq_closed)
+        else:
             journal = journal_obj.browse(cr, uid, journal_id, context=context)
             period = period_obj.browse(cr, uid, period_id, context=context)
             jour_period_obj.create(cr, uid, {
@@ -1265,7 +1273,8 @@
                 'journal_id': journal.id,
                 'period_id': period.id
             })
-        return True
+            res = True
+        return res
 
     def _update_check(self, cr, uid, ids, context=None):
         done = {}
 
=== modified file 'bin/addons/sync_client/special_handling.py'
--- bin/addons/sync_client/special_handling.py	2015-08-28 14:34:57 +0000
+++ bin/addons/sync_client/special_handling.py	2016-04-14 13:11:13 +0000
@@ -149,9 +149,62 @@
                             raise osv.except_osv(_('Error !'), _('You can not do this modification on a reconciled entry ! Please note that you can just change some non important fields !'))
                 t = (l.journal_id.id, l.period_id.id)
                 if t not in done:
-                    self._update_journal_check(cr, uid, l.journal_id.id, l.period_id.id, context)
+                    if not self._update_journal_check(cr, uid, l.journal_id.id,
+                        l.period_id.id, context=context, raise_hq_closed=False):
+                        # US 1214: HQ closed check more field not updated
+                        self._hook_call_update_check_hq_closed_rec(cr, uid, l,
+                            vals, context=context)
                     done[t] = True
 
+    def _hook_call_update_check_hq_closed_rec(self, cr, uid, ji_rec, vals,
+        context=None):
+        # US 1214: HQ closed tolerate update under certains conditions only
+        # Enable the sync on account.move.line field only if they are not : Dates / Journal / Sequence / Description / Reference / all field amounts / Third party / Currency / State
+        # http://jira.unifield.org/browse/US-1214?focusedCommentId=47237&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-47237
+
+        # => get field by field diff
+        fields_to_check = [
+            ('credit', 'float'),
+            ('credit_currency', 'float'),
+            ('currency_id', 'id'),
+            ('date', False),
+            ('debit', 'float'),
+            ('debit_currency', 'float'),
+            ('document_date', False),
+            ('employee_id', 'id'),
+            ('journal_id', 'id'),
+            ('move_id', 'id'),
+            ('partner_id', 'id'),
+            ('partner_txt', False),
+            ('period_id', 'id'),
+            ('ref', False),
+            ('state', False),
+            ('transfer_journal_id', 'id'),
+            ('transfer_amount', 'float'),
+        ]
+
+        for f, t in fields_to_check:
+            has_diff = False
+            if f in vals:
+                if not hasattr(ji_rec, f):
+                    continue
+                rec_val = getattr(ji_rec, f)
+                val = vals[f]
+
+                if t == 'id':
+                    if rec_val:
+                        has_diff = not val or val != rec_val.id
+                    else:
+                        has_diff = True if val else False
+                elif t == 'float':
+                    has_diff = abs((val or 0.) - (rec_val or 0.)) > 10**-4
+                else:
+                    has_diff = val != rec_val
+
+            if has_diff:
+                raise osv.except_osv(_('Error !'),
+                    _('You can not modify entries in a HQ closed journal'))
+
 account_move_line()
 
 class ir_model_data(osv.osv):