Merge lp:~unifield-team/unifield-server/us1044-regline-cashreturn into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account_corrections/account_move_line.py'
--- bin/addons/account_corrections/account_move_line.py	2016-01-12 13:07:05 +0000
+++ bin/addons/account_corrections/account_move_line.py	2016-04-25 07:54:02 +0000
@@ -632,7 +632,7 @@
                             # we informs new move line that it have correct a statement line
                             self.write(cr, uid, corrected_line_ids, {'corrected_st_line_id': st_line.id}, context=context)
                             break
-                    else:
+                    elif not st_line.from_cash_return: #US-1044: only update the account on line if the regline is not cash return!
                         #US-303: If not the case, then we inform the new move line that it has corrected a statement line
                         absl_obj.write(cr, uid, [st_line.id], {'account_id': account_id}, context=context)
                         self.write(cr, uid, corrected_line_ids, {'corrected_st_line_id': st_line.id}, context=context)