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

[jftempo]

=== modified file 'bin/addons/register_accounting/invoice.py'
--- bin/addons/register_accounting/invoice.py	2016-03-23 09:57:20 +0000
+++ bin/addons/register_accounting/invoice.py	2016-05-02 07:53:11 +0000
@@ -37,36 +37,54 @@
         if args and args[0] and len(args[0]) == 3:
             if args[0][1] != '=':
                 raise osv.except_osv(_('Error'), _('Operator not supported yet!'))
-            # Search all imported invoice
-            sql = """SELECT INV_ID, INV_TOTAL, abs(SUM(absl.amount))
-                FROM (
-                    SELECT inv.id AS INV_ID, inv.amount_total AS INV_TOTAL, aml.id AS AML
-                    FROM account_invoice inv, account_move_line aml, account_move am
-                    WHERE inv.move_id = am.id
-                    AND aml.move_id = am.id
-                    AND inv.state = 'open'
-                    ORDER BY inv.id
-                ) AS move_lines, imported_invoice imp, account_bank_statement_line absl
-                WHERE imp.move_line_id = move_lines.AML
-                AND imp.st_line_id = absl.id
-                GROUP BY INV_ID, INV_TOTAL"""
             # Fetch second args (type of import)
             s = args[0][2]
-            # Complete SQL query if needed
-            if s == 'imported':
-                sql += """ HAVING INV_TOTAL = abs(SUM(absl.amount))"""
-            elif s == 'partial':
-                sql += """ HAVING INV_TOTAL != abs(SUM(absl.amount))"""
-            # finish SQL query
-            sql += """ ORDER BY INV_ID;"""
+            if s == 'not':
+                # (US-1275) Display only the invoices "draft", or "open" but not yet partially or fully imported
+                sql = """SELECT id FROM
+                    (
+                      SELECT id FROM account_invoice
+                      WHERE state = 'draft'
+                      UNION
+                        SELECT inv.id
+                        FROM account_invoice inv
+                        INNER JOIN account_move am ON inv.move_id = am.id
+                        INNER JOIN account_move_line aml ON aml.move_id = am.id
+                        WHERE inv.state = 'open'
+                        AND ABS(aml.amount_residual_import_inv - inv.amount_total) < 0.001
+                        AND aml.is_counterpart = 't'
+                        AND aml.account_id = inv.account_id
+                        AND aml.move_id = inv.move_id
+                    ) AS draft_and_not_imported
+                    ORDER BY id;"""
+            else:
+                # Search all imported invoices
+                sql = """SELECT INV_ID, INV_TOTAL, RESIDUAL
+                    FROM (
+                        SELECT inv.id AS INV_ID, inv.amount_total AS INV_TOTAL, aml.id AS AML, aml.amount_residual_import_inv AS RESIDUAL
+                        FROM account_invoice inv
+                        INNER JOIN account_move am ON inv.move_id = am.id
+                        INNER JOIN account_move_line aml ON aml.move_id = am.id
+                        WHERE inv.state = 'open'
+                        AND aml.is_counterpart = 't'
+                        AND aml.account_id = inv.account_id
+                        AND aml.move_id = inv.move_id
+                        ORDER BY inv.id
+                    ) AS move_lines, imported_invoice imp
+                    WHERE imp.move_line_id = move_lines.AML
+                    GROUP BY INV_ID, INV_TOTAL, RESIDUAL"""
+                # Complete SQL query if needed
+                having = ''
+                if s == 'imported':
+                    having = ' HAVING RESIDUAL <= 0.001'
+                elif s == 'partial':
+                    having = ' HAVING RESIDUAL > 0.001 AND RESIDUAL < INV_TOTAL'
+                # finish SQL query
+                sql = ''.join((sql, having, ' ORDER BY INV_ID;'))
             # execution
             cr.execute(sql)
             sql_res = cr.fetchall()
-            # process regarding second args
-            if s in ['partial', 'imported']:
-                res = [('id', 'in', [x and x[0] for x in sql_res])]
-            else:
-                res = [('id', 'not in', [x and x[0] for x in sql_res])]
+            res = [('id', 'in', [x and x[0] for x in sql_res])]
         return res
 
     def _get_imported_state(self, cr, uid, ids, field_name=None, arg=None, context=None):
@@ -80,18 +98,30 @@
         if not context:
             context = {}
         res = {}
+        acc_ml_obj = self.pool.get('account.move.line')
+        acc_obj = self.pool.get('account.account')
+        acc_list = acc_obj.search(cr, uid, [('type', 'in', ['payable', 'receivable'])])
         for inv in self.browse(cr, uid, ids, context):
             res[inv.id] = 'none'
             if inv.move_id:
-                absl_ids = self.pool.get('account.bank.statement.line').search(cr, uid, [('imported_invoice_line_ids', 'in', [x.id for x in inv.move_id.line_id])])
-                if absl_ids:
+                absl_ids = self.pool.get('account.bank.statement.line').search(cr, uid, [('imported_invoice_line_ids', 'in', [x.id for x in inv.move_id.line_id])], context=context)
+                account = inv.account_id
+                if absl_ids and account and (account.id in acc_list):
                     res[inv.id] = 'imported'
-                    if isinstance(absl_ids, (int, long)):
-                        absl_ids = [absl_ids]
-                    if inv.amount_total != sum([x and abs(x.amount) or 0.0 for x in self.pool.get('account.bank.statement.line').browse(cr, uid, absl_ids)]):
-                        res[inv.id] = 'partial'
-                    continue
-                res[inv.id] = 'not'
+                    acc_ml_id = acc_ml_obj.search(cr, uid, [('account_id', '=', account.id),
+                                                            ('is_counterpart', '=', True),
+                                                            ('move_id', '=', inv.move_id.id)], context=context)
+                    acc_ml = acc_ml_obj.browse(cr, uid, acc_ml_id, context)
+                    if acc_ml:
+                        residual = acc_ml[0].amount_residual_import_inv
+                        if residual and abs(residual - inv.amount_total) < 0.001:
+                            res[inv.id] = 'not'
+                        elif residual and residual < inv.amount_total and residual > 0.001:
+                            res[inv.id] = 'partial'
+                    else:
+                        res[inv.id] = 'not'
+                else:
+                    res[inv.id] = 'not'
         return res
 
     def _get_down_payment_ids(self, cr, uid, ids, field_name=None, arg=None, context=None):