Merge lp:~openerp-dev/openobject-addons/trunk-bug-901166-mdi into lp:openobject-addons

[DJ Patel (OpenERP)]

Hello Sir,

I have fix the issue: https://bugs.launchpad.net/openobject-addons/+bug/901166 "Able to reconcile unposted entries".

Thanks and Regards,

Divyesh Makwana(MDI)

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

I think we should directly fix in def reconcile and def reconcile_partial method on account_move_line.py file, so it can be more generic fix.

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-bug-901166-mdi]

5909. By DJ Patel (OpenERP) on 2011-12-13

[IMP] account : Improved the code

[DJ Patel (OpenERP) (mdi-openerp)]

Hello Sir,

I have improved the code as per your suggestion.

Thanks and Regards,

Divyesh Makwana(MDI)

review: Needs Resubmitting

[Purnendu Singh (OpenERP) (purnendu-singh)]

Hello,

It's breaking the normal flow of invoicing..
Test this way..
1) create invoice
2) try to pay it with voucher

You will not be able to pay it!!!

Thanks,
Purnendu Singh

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-bug-901166-mdi]

5910. By DJ Patel (OpenERP) on 2011-12-15

[FIX] account : Able to reconcile unposted entries

Unmerged revisions

5910. By DJ Patel (OpenERP) on 2011-12-15

[FIX] account : Able to reconcile unposted entries

5909. By DJ Patel (OpenERP) on 2011-12-13

[IMP] account : Improved the code

5908. By DJ Patel (OpenERP) on 2011-12-12

[FIX] account : Able to reconcile unposted entries

=== modified file 'account/wizard/account_reconcile.py'
--- account/wizard/account_reconcile.py	2011-11-03 09:56:12 +0000
+++ account/wizard/account_reconcile.py	2011-12-15 12:38:13 +0000
@@ -65,13 +65,26 @@
                 account_id = line.account_id.id
         return {'trans_nbr': count, 'account_id': account_id, 'credit': credit, 'debit': debit, 'writeoff': debit - credit}
 
+    def check_unreconcile_entries(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        account_move_line_obj = self.pool.get('account.move.line')
+        if context.get('active_ids',False) :
+            for line in account_move_line_obj.browse(cr, uid, context['active_ids'], context=context):
+                if line.move_id.state == "draft":
+                    raise osv.except_osv(_('Error !'), _('You cannot reconcile the unposted entries.'))
+        return True
+
     def trans_rec_addendum_writeoff(self, cr, uid, ids, context=None):
+        self.check_unreconcile_entries(cr, uid, ids, context=context)
         return self.pool.get('account.move.line.reconcile.writeoff').trans_rec_addendum(cr, uid, ids, context)
 
     def trans_rec_reconcile_partial_reconcile(self, cr, uid, ids, context=None):
+        self.check_unreconcile_entries(cr, uid, ids, context=context)
         return self.pool.get('account.move.line.reconcile.writeoff').trans_rec_reconcile_partial(cr, uid, ids, context)
 
     def trans_rec_reconcile_full(self, cr, uid, ids, context=None):
+        self.check_unreconcile_entries(cr, uid, ids, context=context)
         account_move_line_obj = self.pool.get('account.move.line')
         period_obj = self.pool.get('account.period')
         date = False