Merge lp:~vauxoo/addons-vauxoo/7.0-addons-vauxoo-her-cancel-dev-julio into lp:addons-vauxoo/7.0

[Julio Serna-http://www.vauxoo.com]

Modified function cancel of expense, changed _remove_move_reconcile by unlink of ids of concilation partial or full

=== modified file 'hr_expense_replenishment/model/hr_expense.py'
--- hr_expense_replenishment/model/hr_expense.py	2014-05-09 21:51:34 +0000
+++ hr_expense_replenishment/model/hr_expense.py	2014-05-14 21:33:13 +0000
@@ -34,14 +34,22 @@
     def expense_canceled(self, cr, uid, ids, context=None):
         obj_move_line = self.pool.get('account.move.line')
         obj_move = self.pool.get('account.move')
+        obj_move_rec = self.pool.get('account.move.reconcile')
+        
         res = super(hr_expense_expense,
                         self).expense_canceled(cr, uid, ids, context=context)
         for expense in self.browse(cr, uid, ids, context=context):
             if expense.account_move_id:
-                obj_move_line._remove_move_reconcile(cr, uid,
-                    [move_line.id
-                        for move_line in expense.account_move_id.line_id],
-                    context=context)
+                reconcile_id = [move_line.reconcile_id.id
+                            for move_line in expense.account_move_id.line_id
+                                if move_line.reconcile_id]
+                reconcile_partial_id = [move_line.reconcile_partial_id.id
+                            for move_line in expense.account_move_id.line_id
+                                if move_line.reconcile_partial_id]
+                recs = reconcile_id + reconcile_partial_id
+                all_moves_recs = list( set(recs) )
+                if all_moves_recs:
+                    obj_move_rec.unlink(cr, uid, all_moves_recs)
                 obj_move.unlink(cr, uid, [expense.account_move_id.id],
                                 context=context)
         return res