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

[gpa(OpenERP)]

Added modification in cash discount module by client. And solve problem of product_ean13_generator

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount.py'
--- account_invoice_cash_discount/account_invoice_cash_discount.py	2010-06-18 13:06:05 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount.py	2010-06-21 13:43:25 +0000
@@ -128,19 +128,23 @@
             payment_term_lines = self.pool.get('account.payment.term').browse(cr, uid, payment_term, context=context)
             if payment_term_lines.cash_discount_ids:
                     res = 0.0
+                    dis = 0.0
                     for discount_line in payment_term_lines.cash_discount_ids:
-                        if diff_day == discount_line.delay or diff_day < discount_line.delay:
+                        if diff_day >= dis and  diff_day <= discount_line.delay:
                             account_id = discount_line.discount_account_id.id
+                        dis = discount_line.delay    
                     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=''):
-        
         if context is None:
             context = {}
         #TODO check if we can use different period for payment and the writeoff line
         assert len(ids)==1, "Can only pay one invoice at a time"
         invoice = self.browse(cr, uid, ids[0])
         
+        tax_obj = self.pool.get('account.tax')
+        invoice_tax_obj = self.pool.get("account.invoice.tax")
+        
         if 'amount_currency' in context and context['amount_currency']:
             amount_currency = context['amount_currency']
         else:
@@ -183,6 +187,7 @@
             'currency_id':currency_id,
             'amount_currency':amount_currency and direction * amount_currency or 0.0,
         }
+
         l2 = {
             'debit': direction * (pay_amount-amount_discount)<0 and - direction * (pay_amount-amount_discount),
             'credit': direction * (pay_amount-amount_discount)>0 and direction * (pay_amount-amount_discount),
@@ -199,12 +204,47 @@
         l1['name'] = name
         l2['name'] = name
         lines = [(0, 0, l1), (0, 0, l2)]
+        
+        discount_amount = 0.0
+        tax_total_amount = 0.0
+        if 'cash_amount' in context and context['cash_amount']:
+            discount_amount = context['cash_amount']
+       
+        if discount_amount>0.0:         
+            for line in invoice.invoice_line:
+                if line.invoice_line_tax_id:
+                    for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, discount_amount, line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):
+                        tax_amount = tax['amount']
+                        tax_total_amount += tax['amount']
+        
+                        tax_invoice_id = invoice_tax_obj.search(cr,uid,[('invoice_id','=',invoice.id),('name','=',tax['name'])])
+                        for tax_id in tax_invoice_id:
+                            tax_value = invoice_tax_obj.browse(cr, uid, tax_id)
+                            tax_account_id = tax_value.account_id.id
 
+                        l3 = {
+                            'debit': direction * tax_amount<0 and - direction * tax_amount,
+                            'credit': direction * tax_amount>0 and  direction * tax_amount,
+                            'account_id': tax_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.append((0, 0, l3))
+            
         if amount_discount>0:
             if 'account_id' in context and context['account_id']:
-                account_id =   context['account_id']  
-
-            l3 = {
+                account_id = context['account_id']  
+            
+            if tax_total_amount>0:
+                amount_discount = (amount_discount - tax_total_amount)
+            else:
+                amount_discount = amount_discount
+                
+            l4 = {
                 'debit': direction * amount_discount<0 and - direction * amount_discount,
                 'credit': direction * amount_discount>0 and  direction * amount_discount,
                 'account_id': account_id,
@@ -214,10 +254,8 @@
                 '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)]
-            
+            l4['name'] = name
+            lines.append((0, 0, l4))
 
         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-06-18 13:06:05 +0000
+++ account_invoice_cash_discount/wizard/account_pay_invoice.py	2010-06-21 13:43:25 +0000
@@ -79,7 +79,6 @@
 
     def _get_amount(self, cr, uid, context=None):
         residual_amount = self.pool.get('account.invoice').browse(cr, uid, context['id'], context=context).residual
-        residual_amount -= self._get_discount(cr, uid, context=context)
         return residual_amount
     
     def on_change_ammount(self, cr, uid, ids, amount, context=None):
@@ -110,6 +109,13 @@
             account = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, account)
         return account
     
+    def default_get(self, cr, uid, fields, context=None):
+      res = super(account_invoice_pay, self).default_get(cr, uid, fields, context=context)
+      invoice = self.pool.get('account.invoice').browse(cr, uid, context['id'], context=context)
+      if invoice.state in ['draft', 'proforma2', 'cancel']:
+          raise osv.except_osv(_('Error !'), _('Can not pay draft/proforma/cancel invoice.'))
+      return res
+  
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d'),
         'period_id': _get_period,
@@ -143,9 +149,9 @@
         # Get the current amount paid in company currency
         if journal.currency and invoice.company_id.currency_id.id<>journal.currency.id:
             ctx = {'date':data['date']}
-            amount_paid = cur_obj.compute(cr, uid, journal.currency.id, invoice.company_id.currency_id.id, data['amount']+data['cash_amount'], round=True, context=ctx)
+            amount_paid = cur_obj.compute(cr, uid, journal.currency.id, invoice.company_id.currency_id.id, data['amount'], round=True, context=ctx)
         else:
-            amount_paid = data['amount'] + data['cash_amount']
+            amount_paid = data['amount']
         # Get the old payment if there are some
         if invoice.payment_ids:
             debit=credit=0.0
@@ -186,8 +192,8 @@
             writeoff_journal_id = context['write_off']['writeoff_journal_id']
             comment = context['write_off']['comment']
 
-        amount = data['amount'] + data['cash_amount']
-
+        amount = data['amount'] 
+        
         invoice = self.pool.get('account.invoice').browse(cr, uid, context['id'], context=context)
         journal = self.pool.get('account.journal').browse(cr, uid, data['journal_id'], context=context)
         # Compute the amount in company's currency, with the journal currency (which is equal to payment currency)
@@ -197,14 +203,14 @@
             amount = cur_obj.compute(cr, uid, journal.currency.id, invoice.company_id.currency_id.id, amount, context=ctx)
             currency_id = journal.currency.id
             # Put the paid amount in currency, and the currency, in the context if currency is different from company's currency
-            context.update({'amount_currency':data['amount'] + data['cash_amount'],'currency_id':currency_id})
+            context.update({'amount_currency':data['amount'],'currency_id':currency_id})
 
         if invoice.company_id.currency_id.id<>invoice.currency_id.id:
             ctx = {'date':data['date']}
             amount = cur_obj.compute(cr, uid, invoice.currency_id.id, invoice.company_id.currency_id.id, amount, context=ctx)
             currency_id = invoice.currency_id.id
             # Put the paid amount in currency, and the currency, in the context if currency is different from company's currency
-            context.update({'amount_currency':data['amount'] + data['cash_amount'],'currency_id':currency_id})
+            context.update({'amount_currency':data['amount'],'currency_id':currency_id})
 
         # Take the choosen date
         if comment:
@@ -212,7 +218,7 @@
         else:
             context.update({'date_p':data['date'],'comment':False})
 
-        context.update({'account_id':data['account_id'],'cash_amount':data['cash_amount'],'amount_currency':data['amount'] + data['cash_amount']})        
+        context.update({'account_id':data['account_id'],'cash_amount':data['cash_amount'],'amount_currency':data['amount']})        
         
         acc_id = journal.default_credit_account_id and journal.default_credit_account_id.id
         if not acc_id:
 
=== modified file 'account_invoice_cash_discount/wizard/account_pay_invoice_view.xml'
--- account_invoice_cash_discount/wizard/account_pay_invoice_view.xml	2010-08-05 13:41:54 +0000
+++ account_invoice_cash_discount/wizard/account_pay_invoice_view.xml	2010-06-21 13:43:25 +0000
@@ -12,7 +12,7 @@
 					    <newline/>
 					    <field name="name"/>
 					    <field name="date"/>
-					    <field name="journal_id"/>
+					    <field name="journal_id" domain="[('type','=','cash')]"/>
 					    <field name="period_id"/>
 					    <field name="cash_amount" attrs="{'required':[('cash_amount','>',0)]}"/>
 					    <field name="account_id" attrs="{'required':[('cash_amount','>',0)]}"/>
 
=== modified file 'product_ean13_generator/product_ean13_generator.py'
--- product_ean13_generator/product_ean13_generator.py	2010-06-03 06:48:10 +0000
+++ product_ean13_generator/product_ean13_generator.py	2010-06-21 13:43:25 +0000
@@ -37,20 +37,21 @@
             raise ValueError('invalid test')
         cr.execute('select id from ir_sequence where '+test+' and active=%s', (sequence_id, True,))
         res = cr.dictfetchone()
-        ean_nr = self.browse(cr, uid, res['id'], context=context)
-        sequence = super(ir_sequence, self).get_id(cr, uid, sequence_id, test, context)
-        code = 'generator.ean13'
-        
-        if ean_nr.code == code:
-            number = ean_nr.number_max
-            check_seq = sequence[8:]
-            if check_seq >= ean_nr.warning_number:
-                obj = self.pool.get("ir.actions.server")
-                action_name = "EAN Generator Action"
-                id = obj.search(cr, uid, [('name',"ilike",action_name)])
-                context.update({'active_id':res['id']})
-                obj.run(cr, uid, id, context)
-        return sequence
+        if res:
+            ean_nr = self.browse(cr, uid, res['id'], context=context)
+            sequence = super(ir_sequence, self).get_id(cr, uid, sequence_id, test, context)
+            code = 'generator.ean13'
+
+            if ean_nr.code == code:
+                number = ean_nr.number_max
+                check_seq = sequence[8:]
+                if check_seq >= ean_nr.warning_number:
+                    obj = self.pool.get("ir.actions.server")
+                    action_name = "EAN Generator Action"
+                    id = obj.search(cr, uid, [('name',"ilike",action_name)])
+                    context.update({'active_id':res['id']})
+                    obj.run(cr, uid, id, context)
+            return sequence
     
 ir_sequence()