Merge lp:~unifield-team/unifield-server/us-1031 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account_mcdb/account_mcdb.py'
--- bin/addons/account_mcdb/account_mcdb.py	2016-04-01 07:23:49 +0000
+++ bin/addons/account_mcdb/account_mcdb.py	2016-05-26 14:33:38 +0000
@@ -300,7 +300,7 @@
                     domain.append((m2m[1], operator, tuple([x.id for x in getattr(wiz, m2m[0])])))
             # Then MANY2ONE fields
             for m2o in [('abs_id', 'statement_id'), ('partner_id', 'partner_id'), ('employee_id', 'employee_id'),
-                ('transfer_journal_id', 'transfer_journal_id'), ('booking_currency_id', 'currency_id'), ('reconcile_id', 'reconcile_id')]:
+                ('transfer_journal_id', 'transfer_journal_id'), ('booking_currency_id', 'currency_id')]:
                 if getattr(wiz, m2o[0]):
                     domain.append((m2o[1], '=', getattr(wiz, m2o[0]).id))
             # Finally others fields
@@ -329,15 +329,15 @@
                 if getattr(wiz, inf[0]):
                     domain.append((inf[1], '<=', getattr(wiz, inf[0])))
             # RECONCILE field
-            if wiz.reconciled:
+            if wiz.reconcile_id:
+                # total or partial and override  reconciled status
+                domain.append(('reconcile_total_partial_id', '=', wiz.reconcile_id.id))
+            elif wiz.reconciled:
                 if wiz.reconciled == 'reconciled':
-                    domain.append(('reconcile_id', '!=', False))
+                    domain.append(('reconcile_id', '!=', False))  # only full reconcile
                 elif wiz.reconciled == 'unreconciled':
-                    domain.append(('reconcile_id', '=', False))
-            if wiz.reconcile_id:
-                domain.append('|')
-                domain.append(('reconcile_id', '=', wiz.reconcile_id.id))
-                domain.append(('reconcile_partial_id', '=', wiz.reconcile_id.id))
+                    domain.append(('reconcile_id', '=', False))   # partial or not reconcile (dont take care of reconcile_partial_id state)
+
             # REALLOCATION field
             if wiz.reallocated:
                 if wiz.reallocated == 'reallocated':

=== modified file 'bin/addons/account_override/account_move_line.py'
--- bin/addons/account_override/account_move_line.py	2016-03-23 09:07:28 +0000
+++ bin/addons/account_override/account_move_line.py	2016-05-26 14:33:38 +0000
@@ -220,13 +220,18 @@
         if not args:
             return []
 
+        # US-1031: consider reconciled only if full reconcile.
+        # but kept _get_is_reconciled() behaviour: reconciled if full or partial for no firther impact
         if args[0][2] and args[0][2] == True:
-            return ['|', ('reconcile_partial_id', '!=', False), ('reconcile_id', '!=', False)]
+            return [ ('reconcile_id', '!=', False), ]
         elif args[0] and args[0][2] in [False, 0]:
             # Add account_id.reconcile in #BKLG-70
-            return [('reconcile_id', '=', False),
-                    ('account_id.reconcile', '!=', False)
-                    ]
+            return [
+                ('account_id.reconcile', '!=', False),
+                '|',
+                ('reconcile_id', '=', False),
+                ('reconcile_partial_id', '!=', False),    
+            ]
 
         return []