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

[gpa(OpenERP)]

solved the problem of account_id' referenced and account move lines entry for zero discount

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount.py'
--- account_invoice_cash_discount/account_invoice_cash_discount.py	2010-07-20 10:11:48 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount.py	2010-06-16 14:56:23 +0000
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution	
+#    OpenERP, Open Source Management Solution    
 #    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -70,16 +70,22 @@
         else:
             date2 =  time.strftime('%Y-%m-%d')   
 
-        from_dt = time.mktime(time.strptime(date1,'%Y-%m-%d'))
-        to_dt = time.mktime(time.strptime(date2,'%Y-%m-%d'))
-        diff_day = (from_dt-to_dt)/(3600*24)
+        if date1 > date2:
+            from_dt = time.mktime(time.strptime(date1,'%Y-%m-%d'))
+            to_dt = time.mktime(time.strptime(date2,'%Y-%m-%d'))
+            diff_day = (from_dt-to_dt)/(3600*24)
+        else:
+            from_dt = time.mktime(time.strptime(date2,'%Y-%m-%d'))
+            to_dt = time.mktime(time.strptime(date1,'%Y-%m-%d'))
+            diff_day = (from_dt-to_dt)/(3600*24)    
         discount = 0.0
         if payment_term:
             pt = self.pool.get('account.payment.term').browse(cr, uid, payment_term, context=context)
             if pt.cash_discount_ids:
                     res = 0.0
+                    dis = 0
                     for d in pt.cash_discount_ids:
-                        if diff_day == d.delay or diff_day < d.delay:
+                        if diff_day > dis and  diff_day < d.delay:
                             if resudial_amonut:
                                 res = resudial_amonut * d.discount
                             ted = 0.0
@@ -91,7 +97,7 @@
                                         rr += tex['amount']
                                     ted +=rr
                             discount = res + ted
-                            
+                        dis = d.delay
         return discount
      
     def _get_account(self, cr, uid, ids, resudial_amonut, payment_term, context=None):
@@ -100,7 +106,9 @@
         """
         if context is None:
            context = {}
-
+        
+        account_id = False
+           
         tax_obj = self.pool.get('account.tax')
         invoice = self.browse(cr, uid, ids[0], context=context)
         
@@ -113,10 +121,16 @@
             date2 = context['date_p']
         else:
             date2 =  time.strftime('%Y-%m-%d')   
+        
+        if date1 > date2:
+            from_dt = time.mktime(time.strptime(date1,'%Y-%m-%d'))
+            to_dt = time.mktime(time.strptime(date2,'%Y-%m-%d'))
+            diff_day = (from_dt-to_dt)/(3600*24)
+        else:
+            from_dt = time.mktime(time.strptime(date2,'%Y-%m-%d'))
+            to_dt = time.mktime(time.strptime(date1,'%Y-%m-%d'))
+            diff_day = (from_dt-to_dt)/(3600*24)    
 
-        from_dt = time.mktime(time.strptime(date1,'%Y-%m-%d'))
-        to_dt = time.mktime(time.strptime(date2,'%Y-%m-%d'))
-        diff_day = (from_dt-to_dt)/(3600*24)
         if payment_term:
             pt = self.pool.get('account.payment.term').browse(cr, uid, payment_term, context=context)
             if pt.cash_discount_ids:
@@ -124,7 +138,7 @@
                     for d in pt.cash_discount_ids:
                         if diff_day == d.delay or diff_day < d.delay:
                             account_id = d.discount_account_id.id
-        return account_id 
+                    return account_id 
             
     def pay_and_reconcile(self, cr, uid, ids, pay_amount, pay_account_id, period_id, pay_journal_id, writeoff_acc_id, writeoff_period_id, writeoff_journal_id, context=None, name=''):
         
@@ -138,11 +152,11 @@
             amount_currency = context['amount_currency']
         else:
             amount_currency = invoice.residual
-
+        amount_discount = 0.0    
         if invoice.payment_term:
             # Return the discount on for the payment term
             amount_discount = self._get_payment(cr, uid, ids, amount_currency, invoice.payment_term.id, context=context)
-
+            
         src_account_id = invoice.account_id.id
         # Take the seq as name for move
         types = {'out_invoice': -1, 'in_invoice': 1, 'out_refund': 1, 'in_refund': -1}
@@ -186,28 +200,31 @@
             'currency_id':currency_id,
             'amount_currency':amount_currency and - direction * amount_currency or 0.0,
         }
-        l3 = {
-            'debit': direction * amount_discount<0 and - direction * amount_discount,
-            'credit': direction * amount_discount>0 and  direction * amount_discount,
-            'account_id': context['account_id'],
-            'partner_id': invoice.partner_id.id,
-            'ref':ref,
-            'date': date,
-            'currency_id':currency_id,
-            'amount_currency':amount_currency and direction * amount_currency or 0.0,
-        }
 
         if not name:
             name = invoice.invoice_line and invoice.invoice_line[0].name or invoice.number
         l1['name'] = name
         l2['name'] = name
-        l3['name'] = name
-        
+        lines = [(0, 0, l1), (0, 0, l2)]
+
         if amount_discount>0:
+            if 'account_id' in context and context['account_id']:
+                account_id =   context['account_id']  
+
+            l3 = {
+                'debit': direction * amount_discount<0 and - direction * amount_discount,
+                'credit': direction * amount_discount>0 and  direction * amount_discount,
+                'account_id': account_id,
+                'partner_id': invoice.partner_id.id,
+                'ref':ref,
+                'date': date,
+                'currency_id':currency_id,
+                'amount_currency':amount_currency and direction * amount_currency or 0.0,
+            }
+            l3['name'] = name
+            
             lines = [(0, 0, l1), (0, 0, l2), (0, 0, l3)]
-        else:
-            lines = [(0, 0, l1), (0, 0, l2)]    
-
+            
 
         move = {'ref': ref, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id, 'date': date}
         move_id = self.pool.get('account.move').create(cr, uid, move, context=context)

=== modified file 'account_invoice_cash_discount/wizard/account_pay_invoice.py'
--- account_invoice_cash_discount/wizard/account_pay_invoice.py	2010-07-20 10:11:48 +0000
+++ account_invoice_cash_discount/wizard/account_pay_invoice.py	2010-06-16 14:56:23 +0000
@@ -65,7 +65,7 @@
         }
 
     def view_init(self, cr, uid, ids, context=None):
-        invoice = self.pool.get('account.invoice').browse(cr, uid, context['id'], context=context)
+        invoice = self.pool.get('account.invoice').browse(cr, uid, context['active_id'], context=context)
         if invoice.state in ['draft', 'proforma2', 'cancel']:
             raise osv.except_osv(_('Error !'), _('Can not pay draft/proforma/cancel invoice.'))
         pass
@@ -104,7 +104,8 @@
         invoice =  obj_inv.browse(cr, uid, context['id'], context=context)
         account = obj_inv._get_account(cr, uid, [context['id']] , invoice.residual, invoice.payment_term.id, context=context)
         fpos = invoice.fiscal_position or False
-        account = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, account)
+        if account:
+            account = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, account)
         return account
     
     _defaults = {

=== modified file 'account_invoice_cash_discount/wizard/account_pay_invoice_view.xml'
--- account_invoice_cash_discount/wizard/account_pay_invoice_view.xml	2010-06-01 05:48:55 +0000
+++ account_invoice_cash_discount/wizard/account_pay_invoice_view.xml	2010-06-16 14:56:23 +0000
@@ -15,7 +15,7 @@
 					    <field name="journal_id"/>
 					    <field name="period_id"/>
 					    <field name="cash_amount"/>
-					    <field name="account_id"/>
+					    <field name="account_id" attrs="{'required':[('cash_amount','>',0)]}"/>
                 	</group>
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>