[IMP] kept periods on single line

[odoo/odoo.git] / addons / account / wizard / account_unreconcile.py

diff --git a/addons/account/wizard/account_unreconcile.py b/addons/account/wizard/account_unreconcile.py
index 02e6ee2..0e6c38f 100644 (file)
--- a/addons/account/wizard/account_unreconcile.py
+++ b/addons/account/wizard/account_unreconcile.py
@@ -18,7 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from osv import fields, osv
+
+from osv import osv
 
 class account_unreconcile(osv.osv_memory):
     _name = "account.unreconcile"
@@ -26,21 +27,11 @@ class account_unreconcile(osv.osv_memory):
 
     def trans_unrec(self, cr, uid, ids, context=None):
         obj_move_line = self.pool.get('account.move.line')
-        obj_move_reconcile = self.pool.get('account.move.reconcile')
         if context is None:
             context = {}
-        recs = obj_move_line.read(cr, uid, data['ids'], ['reconcile_id','reconcile_partial_id'])
-        unlink_ids = []
-        full_recs = filter(lambda x: x['reconcile_id'], recs)
-        rec_ids = [rec['reconcile_id'][0] for rec in full_recs]
-        part_recs = filter(lambda x: x['reconcile_partial_id'], recs)
-        part_rec_ids = [rec['reconcile_partial_id'][0] for rec in part_recs]
-        unlink_ids += rec_ids
-        unlink_ids += part_rec_ids
-
-        if len(unlink_ids):
-            self.pool.get('account.move.reconcile').unlink(cr, uid, unlink_ids)
-        return {}
+        if context.get('active_ids', False):
+            obj_move_line._remove_move_reconcile(cr, uid, context['active_ids'], context=context)
+        return {'type': 'ir.actions.act_window_close'}
 
 account_unreconcile()
 
@@ -50,12 +41,12 @@ class account_unreconcile_reconcile(osv.osv_memory):
 
     def trans_unrec_reconcile(self, cr, uid, ids, context=None):
         obj_move_reconcile = self.pool.get('account.move.reconcile')
-        rec_ids = context['active_ids']
         if context is None:
             context = {}
-        if len(rec_ids):
-            obj_move_reconcile.unlink(cr, uid, rec_ids)
-        return {}
+        rec_ids = context['active_ids']
+        if rec_ids:
+            obj_move_reconcile.unlink(cr, uid, rec_ids, context=context)
+        return {'type': 'ir.actions.act_window_close'}
 
 account_unreconcile_reconcile()