Merge lp:~jfb-tempo-consulting/unifield-wm/us-124 into lp:unifield-wm

[jftempo]

=== modified file 'account_override/account.py'
--- account_override/account.py	2015-02-19 14:55:53 +0000
+++ account_override/account.py	2015-03-12 11:12:42 +0000
@@ -775,6 +775,10 @@
         self.unlink(cr, uid, to_delete, context, check=False)
         return True
 
+    def get_valid_but_unbalanced(self, cr, uid, context=None):
+        cr.execute("select move_id, sum(debit-credit) from account_move_line where state='valid' group by move_id having abs(sum(debit-credit)) > 0.00001")
+        return [x[0] for x in cr.fetchall()]
+
 account_move()
 
 class account_move_reconcile(osv.osv):
 
=== modified file 'msf_doc_import/account.py'
--- msf_doc_import/account.py	2014-12-12 08:34:58 +0000
+++ msf_doc_import/account.py	2015-03-12 11:12:42 +0000
@@ -452,7 +452,7 @@
                 # Check if all is ok for the file
                 ## The lines should be balanced for each currency
                 for c in money:
-                    if (money[c]['debit'] - money[c]['credit']) >= 10**-2:
+                    if abs(money[c]['debit'] - money[c]['credit']) >= 10**-2:
                         raise osv.except_osv(_('Error'), _('Currency %s is not balanced: %s') % (money[c]['name'], (money[c]['debit'] - money[c]['credit']),))
             # Update wizard
             self.write(cr, uid, ids, {'message': _('Check complete. Reading potential errors or write needed changes.'), 'progression': 100.0})