Merge lp:~openbig/bigconsulting/payable_invoice into lp:bigconsulting

[gpa(OpenERP)]

added changes for the payable invoice

=== modified file 'account_payment_discount_extension/wizard/wizard_payment_discount_order.py'
--- account_payment_discount_extension/wizard/wizard_payment_discount_order.py	2010-09-16 05:53:25 +0000
+++ account_payment_discount_extension/wizard/wizard_payment_discount_order.py	2010-09-17 12:39:43 +0000
@@ -47,7 +47,6 @@
 
 
 def search_entries(self, cr, uid, data, context):
-
     search_due_date = data['form']['duedate']
     pool = pooler.get_pool(cr.dbname)
     order_obj = pool.get('payment.order')
@@ -62,20 +61,25 @@
         ctx = '''context="{'journal_id': %d}"''' % payment.mode.journal.id
 
     # Search for move line to pay:
-    domain = [('reconcile_id', '=', False),('account_id.type', '=', payment.type),('amount_to_pay', '>', 0)]#,('account_id.type', '=', payment.type),('amount_to_pay', '<>', 0)]
+    domain = [('reconcile_id', '=', False),('amount_to_pay', '>', 0)]#,('account_id.type', '=', payment.type),('amount_to_pay', '<>', 0)]
 #    domain = domain + ['|',('date_maturity','<',search_due_date),('date_maturity','=',False)]
     #if payment.mode:
      #   domain = [('payment_type','=',payment.mode.type.id)] + domain
     sel_line_ids = line_obj.search(cr, uid, domain, order='date_maturity', context=context)
     line_ids = []    
-
+    line_invoice_ids = []
+    current_date = datetime.now().strftime('%Y-%m-%d')
+    
     for line in line_obj.browse(cr, uid, sel_line_ids, context):
         if line.invoice.id:
             invoice_data = invoice_obj.browse(cr, uid, line.invoice.id, context=context)
-            current_date = datetime.now().strftime('%Y-%m-%d')
-            if invoice_data.date_due <= search_due_date or (invoice_data.next_payment_date >= current_date and invoice_data.next_payment_date < search_due_date):
-                line_ids.append(line.id)
-
+            if payment.type == 'payable':
+                if invoice_data.type in ['in_invoice','out_refund'] and line.credit > 0.0 and invoice_data.date_due <= search_due_date or (invoice_data.next_payment_date >= current_date and invoice_data.next_payment_date < search_due_date):
+                    line_ids.append(line.id)
+            elif payment.type == 'receivable':
+                if invoice_data.type in ['out_invoice','in_refund']  and line.debit > 0.0 and invoice_data.date_due <= search_due_date or (invoice_data.next_payment_date >= current_date and invoice_data.next_payment_date < search_due_date):
+                    line_ids.append(line.id)
+                
     FORM.string = '''<?xml version="1.0" encoding="utf-8"?>
 <form string="Populate Payment:">
     <field name="entries" colspan="4" height="300" width="800" nolabel="1"
@@ -131,15 +135,16 @@
         cash_discount = 0.0
         account = False
         discount_account = False
-        payment_data = payment_term_obj.browse(cr, uid, invoice_data.payment_term.id)
-
-        for dis_line in payment_data.cash_discount_ids:
-            current_date = datetime.now().strftime('%Y-%m-%d')
-            discount_date =  (DateTime.strptime(invoice_data.date_invoice, '%Y-%m-%d') + DateTime.RelativeDateTime(days=dis_line.delay)).strftime('%Y-%m-%d')
-            if discount_date >=current_date and discount_date <= data['form']['duedate']:
-                cash_discount = dis_line.discount
-                account = dis_line.sup_discount_account_id.id
-                break
+        
+        if invoice_data.payment_term:
+            payment_data = payment_term_obj.browse(cr, uid, invoice_data.payment_term.id)
+            for dis_line in payment_data.cash_discount_ids:
+                current_date = datetime.now().strftime('%Y-%m-%d')
+                discount_date =  (DateTime.strptime(invoice_data.date_invoice, '%Y-%m-%d') + DateTime.RelativeDateTime(days=dis_line.delay)).strftime('%Y-%m-%d')
+                if discount_date >=current_date and discount_date <= data['form']['duedate']:
+                    cash_discount = dis_line.discount
+                    account = dis_line.sup_discount_account_id.id
+                    break
 
         if cash_discount > 0.0:
             discount = invoice_data.amount_total * cash_discount /100