Merge lp:~openerp-dev/openobject-addons/pap_autoreconcile_partial into lp:~openerp-dev/openobject-addons/trunk-dev-addons3

[pap(openerp)]

added code for partial reconciliation in automatic reconciliation wizard
backlog_id = 227

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

thanks your changes has been merged with dev3 branch

Mustufa (mra)

review: Approve

=== modified file 'account/wizard/account_automatic_reconcile.py'
--- account/wizard/account_automatic_reconcile.py	2010-06-14 09:17:41 +0000
+++ account/wizard/account_automatic_reconcile.py	2010-06-14 10:39:32 +0000
@@ -145,6 +145,19 @@
         if not form['account_ids']:
             raise osv.except_osv(_('UserError'), _('You must select accounts to reconcile'))
         for account_id in form['account_ids']:
+<<<<<<< TREE
+=======
+            if not context.get('allow_write_off', False):
+                query = "SELECT partner_id FROM account_move_line WHERE account_id=%s AND reconcile_id IS NULL \
+                AND state <> 'draft' GROUP BY partner_id \
+                HAVING ABS(SUM(debit-credit)) <> %s AND count(*)>0"%(account_id, 0.0)
+#                query="SELECT partner_id FROM account_move_line WHERE account_id=%s AND reconcile_id IS NULL \
+#                AND state <> 'draft' GROUP BY partner_id AND debit = credi"%(account_id)
+            else:
+                query = "SELECT partner_id FROM account_move_line WHERE account_id=%s AND reconcile_id IS NULL \
+                AND state <> 'draft' GROUP BY partner_id \
+                HAVING ABS(SUM(debit-credit)) <= %s AND count(*)>0"%(account_id, max_amount or 0.0)
+>>>>>>> MERGE-SOURCE
             # reconcile automatically all transactions from partners whose balance is 0
             cr.execute(
                 "SELECT partner_id " \
@@ -167,6 +180,7 @@
                     (account_id, partner_id))
                 line_ids = [id for (id,) in cr.fetchall()]
                 if len(line_ids):
+<<<<<<< TREE
                     move_line_obj.reconcile(cr, uid, line_ids, 'auto', form['writeoff_acc_id'], form['period_id'], form['journal_id'], context)
                     reconciled += len(line_ids)
 
@@ -224,6 +238,69 @@
                 (account_id,))
             additional_unrec = cr.fetchone()[0]
         context.update({'reconciled': reconciled, 'unreconciled': unreconciled + additional_unrec})
+=======
+                    reconciled += len(line_ids)                    
+                    if not context.get('allow_write_off', False):
+                        move_line_obj.reconcile_partial(cr, uid, line_ids, 'manual', context={})
+                    else:
+                        move_line_obj.reconcile(cr, uid, line_ids, 'auto', form['writeoff_acc_id'], form['period_id'], form['journal_id'], context)
+
+                        # get the list of partners who have more than one unreconciled transaction
+                        cr.execute(
+                            "SELECT partner_id " \
+                            "FROM account_move_line " \
+                            "WHERE account_id=%s " \
+                            "AND reconcile_id IS NULL " \
+                            "AND state <> 'draft' " \
+                            "AND partner_id IS NOT NULL " \
+                            "GROUP BY partner_id " \
+                            "HAVING count(*)>1",
+                            (account_id,))
+                        partner_ids = [id for (id,) in cr.fetchall()]
+                        #filter?
+                        for partner_id in partner_ids:
+                            # get the list of unreconciled 'debit transactions' for this partner
+                            cr.execute(
+                                "SELECT id, debit " \
+                                "FROM account_move_line " \
+                                "WHERE account_id=%s " \
+                                "AND partner_id=%s " \
+                                "AND reconcile_id IS NULL " \
+                                "AND state <> 'draft' " \
+                                "AND debit > 0",
+                                (account_id, partner_id))
+                            debits = cr.fetchall()
+            
+                            # get the list of unreconciled 'credit transactions' for this partner
+                            cr.execute(
+                                "SELECT id, credit " \
+                                "FROM account_move_line " \
+                                "WHERE account_id=%s " \
+                                "AND partner_id=%s " \
+                                "AND reconcile_id IS NULL " \
+                                "AND state <> 'draft' " \
+                                "AND credit > 0",
+                                (account_id, partner_id))
+                            credits = cr.fetchall()
+            
+                            (rec, unrec) = self.do_reconcile(cr, uid, credits, debits, max_amount, power, form['writeoff_acc_id'], form['period_id'], form['journal_id'], context)
+                            reconciled += rec
+                            unreconciled += unrec
+            
+                        # add the number of transactions for partners who have only one
+                        # unreconciled transactions to the unreconciled count
+                        partner_filter = partner_ids and 'AND partner_id not in (%s)' % ','.join(map(str, filter(None, partner_ids))) or ''
+                        cr.execute(
+                            "SELECT count(*) " \
+                            "FROM account_move_line " \
+                            "WHERE account_id=%s " \
+                            "AND reconcile_id IS NULL " \
+                            "AND state <> 'draft' " + partner_filter,
+                            (account_id,))
+                        additional_unrec = cr.fetchone()[0]
+                        unreconciled = unreconciled + additional_unrec
+        context.update({'reconciled': reconciled, 'unreconciled': unreconciled})
+>>>>>>> MERGE-SOURCE
         model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','account_automatic_reconcile_view1')])
         resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])[0]['res_id']
         return {