Merge lp:~julie-w/unifield-server/US-2539 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/register_accounting/account_bank_statement.py'
--- bin/addons/register_accounting/account_bank_statement.py	2017-05-26 10:28:09 +0000
+++ bin/addons/register_accounting/account_bank_statement.py	2017-07-04 09:20:48 +0000
@@ -671,6 +671,32 @@
             'target': 'current',
         }
 
+    def get_pending_cheque_ids(self, cr, uid, register_ids, account_ids, min_posting_date, context=None):
+        """
+        Returns a list containing the ids of the JIs matching the following criteria:
+        - booked in the register(s) and in the account(s) in parameters
+        - either not reconciled or reconciled partially or totally with at least one reconciliation leg having a
+          posting date later than the min_posting_date in parameter
+        """
+        if context is None:
+            context = {}
+        aml_obj = self.pool.get('account.move.line')
+        aml_ids = aml_obj.search(cr, uid, [('statement_id', 'in', register_ids),
+                                           ('account_id', 'in', account_ids), ],
+                                 order='date DESC', context=context)
+        aml_list = []
+        for aml in aml_obj.browse(cr, uid, aml_ids,
+                                  fields_to_fetch=['is_reconciled', 'reconcile_id', 'reconcile_partial_id'], context=context):
+            total_rec_ok = aml.reconcile_id and aml_obj.search_exist(cr, uid,
+                                                                     [('reconcile_id', '=', aml.reconcile_id.id),
+                                                                      ('date', '>', min_posting_date)], context=context)
+            partial_rec_ok = aml.reconcile_partial_id and aml_obj.search_exist(cr, uid,
+                                                                               [('reconcile_partial_id', '=', aml.reconcile_partial_id.id),
+                                                                                ('date', '>', min_posting_date)], context=context)
+            if not aml.is_reconciled or total_rec_ok or partial_rec_ok:
+                aml_list.append(aml.id)
+        return aml_list
+
 account_bank_statement()
 
 class account_bank_statement_line(osv.osv):
 
=== modified file 'bin/addons/register_accounting/report/report_bank_reconciliation.py'
--- bin/addons/register_accounting/report/report_bank_reconciliation.py	2016-06-16 15:14:08 +0000
+++ bin/addons/register_accounting/report/report_bank_reconciliation.py	2017-07-04 09:20:48 +0000
@@ -67,8 +67,10 @@
             ids = abs_obj.search(self.cr, self.uid, abs_args, context=self.context)
 
             amvl_obj = self.pool.get('account.move.line')
-            amvl_ids = amvl_obj.search(self.cr, self.uid, [('statement_id', 'in', ids), ('is_reconciled', '=', False),
-                                                           ('account_id', 'in', account_ids)], context=self.context)
+            # include in the report only the JIs that are either not reconciled,
+            # or reconciled (totally or partially) with at least one entry belonging to a later period
+            amvl_ids = abs_obj.get_pending_cheque_ids(self.cr, self.uid, ids, account_ids, period.date_stop, context=self.context)
+
             # amount in booking currency
             for line in amvl_obj.read(self.cr, self.uid, amvl_ids, ['debit_currency', 'credit_currency'], context=self.context):
                 self.amount_pending_cheque += line['credit_currency']
 
=== modified file 'bin/addons/register_accounting/report/report_cheque_inventory.py'
--- bin/addons/register_accounting/report/report_cheque_inventory.py	2014-05-16 09:11:47 +0000
+++ bin/addons/register_accounting/report/report_cheque_inventory.py	2017-07-04 09:20:48 +0000
@@ -30,13 +30,41 @@
         })
         return
 
+    def _keep_register_line(self, cr, uid, acc_bank_statement_line, min_posting_date, context=None):
+        """
+        Checks the move lines linked to the acc_bank_statement_line in parameter, and returns True if one of them is:
+        - either reconciled partially or totally with at least one reconciliation leg having a posting date later than
+          the min_posting_date in parameter
+        - or not reconciled (but reconcilable)
+        """
+        if context is None:
+            context = {}
+        aml_obj = self.pool.get('account.move.line')
+        if acc_bank_statement_line.move_ids and acc_bank_statement_line.state == 'hard':
+            for move in acc_bank_statement_line.move_ids:
+                for move_line in move.line_id:
+                    if move_line.account_id.reconcile:
+                        total_rec_ok = move_line.reconcile_id and \
+                            aml_obj.search_exist(cr, uid,
+                                                 [('reconcile_id', '=', move_line.reconcile_id.id),
+                                                  ('date', '>', min_posting_date)], context=context)
+                        partial_rec_ok = move_line.reconcile_partial_id and \
+                            aml_obj.search_exist(cr, uid,
+                                                 [('reconcile_partial_id', '=', move_line.reconcile_partial_id.id),
+                                                  ('date', '>', min_posting_date)], context=context)
+                        if not move_line.is_reconciled or total_rec_ok or partial_rec_ok:
+                            return True
+        return False
+
     def getLines(self, statement):
         """
-        Return list of lines from given register and previous ones that are not reconciled
+        Return list of lines from given register and previous ones that are either not reconciled, or reconciled partially
+        or totally with at least one reconciliation leg having a posting date belonging to a later period than the register one
         """
         # Prepare some values
         res = []
         absl_obj = self.pool.get('account.bank.statement.line')
+        period_obj = self.pool.get('account.period')
         # Fetch all previous registers linked to this one
         prev_reg_ids = [statement.id]
         if statement.prev_reg_id:
@@ -46,9 +74,15 @@
                 prev_reg_id = prev_reg_id.prev_reg_id or False
                 if prev_reg_id:
                     prev_reg_ids.append(prev_reg_id.id)
-        absl_ids = absl_obj.search(self.cr, self.uid, [('statement_id', 'in', prev_reg_ids), ('reconciled', '=', False)])
-        if absl_ids:
-            res = absl_obj.browse(self.cr, self.uid, absl_ids)
+        absl_ids = absl_obj.search(self.cr, self.uid, [('statement_id', 'in', prev_reg_ids)])
+        period_r = period_obj.read(self.cr, self.uid, statement.period_id.id,
+                                   ['date_stop'])  # used not to format the date in the user language
+        absl_ids_to_keep = []
+        for absl in absl_obj.browse(self.cr, self.uid, absl_ids, fields_to_fetch=['move_ids', 'state']):
+            if self._keep_register_line(self.cr, self.uid, absl, period_r['date_stop']):
+                absl_ids_to_keep.append(absl.id)
+        if absl_ids_to_keep:
+            res = absl_obj.browse(self.cr, self.uid, absl_ids_to_keep)
         return res
 
 SpreadsheetReport('report.cheque.inventory.2','account.bank.statement','addons/register_accounting/report/cheque_inventory_xls.mako', parser=report_cheque_inventory)
 
=== modified file 'bin/addons/register_accounting/report/report_liquidity_position.py'
--- bin/addons/register_accounting/report/report_liquidity_position.py	2016-06-08 09:40:53 +0000
+++ bin/addons/register_accounting/report/report_liquidity_position.py	2017-07-04 09:20:48 +0000
@@ -237,10 +237,9 @@
             # Search register lines
             journal = reg.journal_id
             account_ids = [journal.default_debit_account_id.id, journal.default_credit_account_id.id]
-            aml_ids = aml_obj.search(self.cr, self.uid, [('statement_id', '=', reg.id), ('is_reconciled', '=', False),
-                                                         ('account_id', 'in', account_ids),])
-            if isinstance(aml_ids, (int, long)):
-                aml_ids = [aml_ids]
+            # include in the report only the JIs that are either not reconciled,
+            # or reconciled (totally or partially) with at least one entry belonging to a later period
+            aml_ids = reg_obj.get_pending_cheque_ids(self.cr, self.uid, [reg.id], account_ids, self.getPeriod().date_stop)
             lines = aml_obj.browse(self.cr, self.uid, aml_ids)
 
             # Get the amounts in booking and functional currency
 
=== modified file 'bin/addons/register_accounting/report/report_pending_cheque.py'
--- bin/addons/register_accounting/report/report_pending_cheque.py	2016-05-23 14:56:46 +0000
+++ bin/addons/register_accounting/report/report_pending_cheque.py	2017-07-04 09:20:48 +0000
@@ -41,17 +41,18 @@
         pool = pooler.get_pool(self.cr.dbname)
         aml_obj = pool.get('account.move.line')
 
-        period_r = self.pool.get('account.period').read(self.cr, self.uid, register.period_id.id, ['date_start'])
+        period_r = self.pool.get('account.period').read(self.cr, self.uid, register.period_id.id,
+                                                        ['date_start', 'date_stop'])  # used not to format dates in the user language
         # Search for all registers with the same Journal, and the same period or a previous period
         period_ids = self.pool.get('account.period').\
             search(self.cr, self.uid, [('date_start', '<=', period_r['date_start'])])
-        registers_ids = self.pool.get('account.bank.statement').\
-            search(self.cr, self.uid, ['&', ('journal_id', '=', journal.id), ('period_id', 'in', period_ids)])
+        reg_obj = self.pool.get('account.bank.statement')
+        registers_ids = reg_obj.search(self.cr, self.uid, ['&', ('journal_id', '=', journal.id), ('period_id', 'in', period_ids)])
 
         # Search register lines
-        aml_ids = aml_obj.search(self.cr, self.uid, [('statement_id', 'in', registers_ids), ('is_reconciled', '=', False), ('account_id', 'in', account_ids),], order='date DESC')
-        if isinstance(aml_ids, (int, long)):
-            aml_ids = [aml_ids]
+        # include in the report only the JIs that are either not reconciled,
+        # or reconciled (totally or partially) with at least one entry belonging to a later period
+        aml_ids = reg_obj.get_pending_cheque_ids(self.cr, self.uid, registers_ids, account_ids, period_r['date_stop'])
         return aml_obj.browse(self.cr, self.uid, aml_ids)
 
     def getTotals(self, register):