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

[gpa(OpenERP)]

changes in milestone1 and milestone2 functionality to calculate tax and discount

[lp:~openbig/bigconsulting/changes_in_mileston]

61. By gpa(OpenERP) on 2010-07-29

added changes in milestone1

62. By gpa(OpenERP) on 2010-07-29

changes in the tax fied bas amount

63. By gpa(OpenERP) on 2010-07-29

changes in calculation of ratio

Unmerged revisions

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount.py'
--- account_invoice_cash_discount/account_invoice_cash_discount.py	2010-07-27 14:33:57 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount.py	2010-07-29 11:49:41 +0000
@@ -317,24 +317,30 @@
             if amount_discount>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, amount_discount, 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'])])
+                        total_tax_amount = 0.0
+                        for tax_id in line.invoice_line_tax_id:
+                            tax_data = tax_obj.browse(cr, uid, tax_id.id, context=context)
+                            tax_amt = amount_discount * tax_data.amount
+                            tax_real_amt = tax_amt / (1 + tax_data.amount)
+                            total_tax_amount += tax_real_amt
+                            tax_invoice_id = invoice_tax_obj.search(cr,uid,[('invoice_id','=',invoice.id),('name','=',tax_data.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
+                                tax_code_id = tax_value.tax_code_id.id
+                           
                             l3 = {
-                                'debit': direction * tax_amount<0 and - direction * tax_amount,
-                                'credit': direction * tax_amount>0 and  direction * tax_amount,
+                                'debit': direction * tax_real_amt<0 and - direction * tax_real_amt,
+                                'credit': direction * tax_real_amt>0 and  direction * tax_real_amt,
                                 '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,
-                                'tax_code_id':tax_value.tax_code_id.id,
-                                'tax_amount':tax_amount,
+                                'tax_code_id':tax_code_id,
+                                'tax_amount':tax_real_amt,
                             }
                             l3['name'] = name
                             lines.append((0, 0, l3))
@@ -358,16 +364,12 @@
                         'tax_amount':move_line_data.tax_amount,
                       }
                 lines.append((0, 0, l4))
-
         else:
             if amount_discount>0:
                 account_id = False
                 if 'account_id' in context and context['account_id']:
                     account_id = context['account_id']
-#                if tax_total_amount>0:
-#                    amount_discount = (amount_discount - tax_total_amount)
-#                else:
-#                    amount_discount = amount_discount
+
                 for line in invoice.invoice_line:
                     line_tax_amount = 0.0
                     tax_amount = 0.0
@@ -379,20 +381,32 @@
                     invoice_res_amount = invoice.amount_total
                     line_ratio = line_total / invoice_res_amount
                     
-                    discount = amount_discount * line_ratio
-                    
-                    for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, amount_discount, line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):    
-                        tax_amount = tax['amount']
-                    
+                    discount_ratio = amount_discount * line_ratio
+                    total_tax_amount = 0.0  
+                    
+                    for tax_id in line.invoice_line_tax_id:
+                        tax_data = tax_obj.browse(cr, uid, tax_id.id, context=context)
+                        tax_amt = discount_ratio * tax_data.amount
+                        tax_real_amt = tax_amt / (1 + tax_data.amount)
+                        total_tax_amount += tax_real_amt
+                        
+                    tax_invoice_id = invoice_tax_obj.search(cr,uid,[('invoice_id','=',invoice.id),('name','=',tax_data.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
+                        base_code_id = tax_value.base_code_id.id
+                        
                     l4 = {
-                        'debit': direction * (discount - tax_amount)<0 and - direction * (discount - tax_amount),
-                        'credit': direction * (discount - tax_amount)>0 and  direction * (discount - tax_amount),
+                        'debit': direction * (discount - total_tax_amount)<0 and - direction * (discount - total_tax_amount),
+                        'credit': direction * (discount - total_tax_amount)>0 and  direction * (discount - total_tax_amount),
                         '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,
+                        'tax_code_id':base_code_id,
+                        'tax_amount':line.price_unit,
                     }
                     l4['name'] = name
                     lines.append((0, 0, l4))
@@ -530,9 +544,9 @@
                 amount = res_currency_obj.compute(cr, uid, st.currency.id,
                         company_currency_id, move.amount, context=context,
                         account=acc_cur)
-                if move.reconcile_id and move.reconcile_id.line_new_ids:
-                    for newline in move.reconcile_id.line_new_ids:
-                        amount += newline.amount
+#                if move.reconcile_id and move.reconcile_id.line_new_ids:
+#                    for newline in move.reconcile_id.line_new_ids:
+#                        amount += newline.amount
 
                 val = {
                     'name': move.name,
@@ -569,9 +583,10 @@
                     val['amount_currency'] = amount_cur
 
                 torec.append(account_move_line_obj.create(cr, uid, val , context=context))
-
+                newline_sum = 0.0
                 if move.reconcile_id and move.reconcile_id.line_new_ids:
                     for newline in move.reconcile_id.line_new_ids:
+                        newline_sum += newline.amount
                         account_move_line_obj.create(cr, uid, {
                             'name': newline.name or move.name,
                             'date': move.date,
@@ -673,8 +688,6 @@
                             'amount_currency': amount_currency,
                             'currency_id': currency_id,
                             }, context=context)
-                else:
-                    continue
 
                 account_move_line_obj.create(cr, uid, {
                     'name': move.name,
@@ -683,8 +696,8 @@
                     'move_id': move_id,
                     'partner_id': ((move.partner_id) and move.partner_id.id) or False,
                     'account_id': account_id,
-                    'credit': ((amount < 0) and -amount) or 0.0,
-                    'debit': ((amount > 0) and amount) or 0.0,
+                    'credit': (((amount-newline_sum) < 0) and -(amount-newline_sum)) or 0.0,
+                    'debit': (((amount-newline_sum) > 0) and (amount-newline_sum)) or 0.0,
                     'statement_id': st.id,
                     'journal_id': st.journal_id.id,
                     'period_id': st.period_id.id,
 
=== modified file 'account_invoice_cash_discount/wizard/account_pay_invoice.py'
--- account_invoice_cash_discount/wizard/account_pay_invoice.py	2010-07-27 14:33:57 +0000
+++ account_invoice_cash_discount/wizard/account_pay_invoice.py	2010-07-29 11:49:41 +0000
@@ -142,41 +142,45 @@
             for line in invoice.invoice_line:
                 tax_amount = 0.0
                 line_tax_amount = 0.0
-                
+                ########
+                line_tax_amount = 0.0
                 for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, line.price_subtotal, line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):    
-                    line_tax_amount = tax['amount']
-                
+                    line_tax_amount += tax['amount']
                 line_total = line.price_subtotal + line_tax_amount
                 invoice_res_amount = invoice.amount_total
                 line_ratio = line_total / invoice_res_amount
+                #####################################################
+                discount_pay = discount * line_ratio
                 
                 if line.invoice_line_tax_id:
-                    for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, discount, line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):
-                        tax_amount = tax['amount']
-                        tax_invoice_id = invoice_tax_obj.search(cr,uid,[('invoice_id','=',invoice.id),('name','=',tax['name'])])
+                    total_tax_amount = 0.0
+                    for tax_id in line.invoice_line_tax_id:
+                        tax_data = tax_obj.browse(cr, uid, tax_id.id, context=context)
+                    
+                        tax_amt = discount_pay * tax_data.amount
+                        tax_real_amt = tax_amt / (1 + tax_data.amount)
+                        total_tax_amount += tax_real_amt
+                        tax_invoice_id = invoice_tax_obj.search(cr,uid,[('invoice_id','=',invoice.id),('name','=',tax_data.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
                             base_code_id = tax_value.base_code_id.id
-    
-                        if invoice.company_id.currency_id.id<>invoice.currency_id.id:
-                            amount = cur_obj.compute(cr, uid, invoice.currency_id.id, invoice.company_id.currency_id.id, tax_amount, context=context)
-    
-                discount_pay = discount * line_ratio
+                            
+                
                 if invoice.company_id.currency_id.id<>invoice.currency_id.id:
-                    discount_amount = discount - tax_amount
+                    discount_amount = discount - tax_real_amt
                     amount = cur_obj.compute(cr, uid, invoice.currency_id.id, invoice.company_id.currency_id.id, discount_amount, context=context)
                     
                 l4 = {
-                    'debit': direction * (discount_pay - tax_amount)<0 and - direction * (discount_pay - tax_amount),
-                    'credit': direction * (discount_pay - tax_amount)>0 and  direction * (discount_pay - tax_amount),
+                    'debit': direction * (discount_pay - total_tax_amount)<0 and - direction * (discount_pay - total_tax_amount),
+                    'credit': direction * (discount_pay - total_tax_amount)>0 and  direction * (discount_pay - total_tax_amount),
                     'account_id': discount_account_id,
                     'date': date,
                     'name':name,
                     'currency_id':invoice.currency_id.id or False,
                     'journal_id':invoice.journal_id.id,
                     'tax_code_id':base_code_id,
-                    'tax_amount':tax_amount,
+                    'tax_amount':line.price_unit,
                     'amount_currency':amount and direction * amount or 0.0,
                     'analytic_account_id':line.account_analytic_id.id or False,
                     }
@@ -206,33 +210,48 @@
         line_ids = []
 
         tax_code_id = False
+        tax_account_id = False
         discount = self._get_discount(cr, uid, context=context)
         if discount>0.0:
             for line in invoice.invoice_line:
-                tax_amount = 0.0
                 line_tax_amount = 0.0
+                total_tax_amount = 0.0
+                ############# Ratio#####
+                for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, line.price_subtotal, line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):    
+                    line_tax_amount += tax['amount']
+                line_total = line.price_subtotal + line_tax_amount
+                invoice_res_amount = invoice.amount_total
+                line_ratio = line_total / invoice_res_amount
+                #############
+                
+                ### discount for the invoice line
+                discount_pay = discount * line_ratio
+                                
                 if line.invoice_line_tax_id:
-                    for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, discount, line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):
-                        tax_amount = tax['amount']
-                        tax_invoice_id = invoice_tax_obj.search(cr,uid,[('invoice_id','=',invoice.id),('name','=',tax['name'])])
+                    for tax_id in line.invoice_line_tax_id:
+                        tax_data = tax_obj.browse(cr, uid, tax_id.id, context=context)
+                        tax_amt = discount_pay * tax_data.amount
+                        tax_real_amt = tax_amt / (1 + tax_data.amount)
+                        total_tax_amount += tax_real_amt
+                        tax_invoice_id = invoice_tax_obj.search(cr,uid,[('invoice_id','=',invoice.id),('name','=',tax_data.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
                             tax_code_id = tax_value.tax_code_id.id
-                        
+                    
                         if invoice.company_id.currency_id.id<>invoice.currency_id.id:
                             amount = cur_obj.compute(cr, uid, invoice.currency_id.id, invoice.company_id.currency_id.id, tax_amount, context=context)
-                            
+                                
                         l3 = {
-                            'debit': direction * tax_amount<0 and - direction * tax_amount,
-                            'credit': direction * tax_amount>0 and  direction * tax_amount,
+                            'debit': direction * tax_real_amt<0 and - direction * tax_real_amt,
+                            'credit': direction * tax_real_amt>0 and  direction * tax_real_amt,
                             'account_id': tax_account_id,
                             'date': date,
                             'journal_id':invoice.journal_id.id or False,
                             'name':name,
                             'currency_id':invoice.currency_id.id or False,
-                            'tax_code_id':tax_value.tax_code_id.id,
-                            'tax_amount':-tax_amount,
+                            'tax_code_id':tax_code_id,
+                            'tax_amount':discount_pay,
                             'amount_currency':amount and direction * amount or 0.0,
                             'analytic_account_id':line.account_analytic_id.id or False,
                         }
@@ -315,18 +334,23 @@
         for line in invoice.invoice_line:
             tax_amount = 0.0
             line_tax_amount = 0.0
-            
+            total_tax_amount = 0.0
             #####get the ratio of the line in the total invoice amount 
             for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, line.price_subtotal, line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):    
-                line_tax_amount = tax['amount']
+                line_tax_amount += tax['amount']
             line_total = line.price_subtotal + line_tax_amount
             invoice_res_amount = invoice.amount_total
             line_ratio = line_total / invoice_res_amount
             ###########################
+            discount_pay = data['cash_amount'] * line_ratio
             if line.invoice_line_tax_id:
-                for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, data['cash_amount'], line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):
-                    tax_amount = tax['amount']
-                    tax_invoice_id = invoice_tax_obj.search(cr,uid,[('invoice_id','=',invoice.id),('name','=',tax['name'])])
+                for tax_id in line.invoice_line_tax_id:
+                    tax_data = tax_obj.browse(cr, uid, tax_id.id, context=context)
+                    tax_amt = discount_pay * tax_data.amount
+                    tax_real_amt = tax_amt / (1 + tax_data.amount)
+                    total_tax_amount += tax_real_amt
+
+                    tax_invoice_id = invoice_tax_obj.search(cr,uid,[('invoice_id','=',invoice.id),('name','=',tax_data.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
@@ -337,15 +361,15 @@
                         amount = cur_obj.compute(cr, uid, invoice.currency_id.id, invoice.company_id.currency_id.id, tax_amount, context=context)
                         
                     l3 = {
-                        'debit': direction * tax_amount<0 and - direction * tax_amount,
-                        'credit': direction * tax_amount>0 and  direction * tax_amount,
+                        'debit': direction * tax_real_amt<0 and - direction * tax_real_amt,
+                        'credit': direction * tax_real_amt>0 and  direction * tax_real_amt,
                         'account_id': tax_account_id,
                         'date': date,
                         'journal_id':data.get('journal_id',False) ,
                         'name':name,
                         'currency_id':invoice.currency_id.id or False,
                         'tax_code_id':tax_value.tax_code_id.id,
-                        'tax_amount':-tax_amount,
+                        'tax_amount':discount_pay,
                         'amount_currency':amount and direction * amount or 0.0,
                         'analytic_account_id':line.account_analytic_id.id or False,
                     }
@@ -368,21 +392,20 @@
             else:
                  discount_account_id = data['account_id']
             
-            discount = data['cash_amount'] * line_ratio
             if invoice.company_id.currency_id.id<>invoice.currency_id.id:
-                discount_amount = discount - tax_amount
+                discount_amount = discount_pay - tax_amount
                 amount = cur_obj.compute(cr, uid, invoice.currency_id.id, invoice.company_id.currency_id.id, discount_amount, context=context)
-                
+
             l4 = {
-                'debit': direction * (discount - tax_amount)<0 and - direction * (discount - tax_amount),
-                'credit': direction * (discount - tax_amount)>0 and  direction * (discount - tax_amount),
+                'debit': direction * (discount_pay - total_tax_amount)<0 and - direction * (discount_pay - total_tax_amount),
+                'credit': direction * (discount_pay - total_tax_amount)>0 and  direction * (discount_pay - total_tax_amount),
                 'account_id': discount_account_id,
                 'date': date,
                 'name':name,
                 'currency_id':invoice.currency_id.id or False,
                 'journal_id':data.get('journal_id',False),
                 'tax_code_id':base_code_id,
-                'tax_amount':tax_amount,
+                'tax_amount':line.price_unit,
                 'amount_currency':amount and direction * amount or 0.0,
                 'analytic_account_id':line.account_analytic_id.id or False,
                 }
@@ -516,7 +539,7 @@
                 debit+=payment.debit
                 credit+=payment.credit
             amount_paid+=abs(debit-credit)
-            
+        
         if data['cash_residual_amount'] == 0.0 or  self.pool.get('res.currency').is_zero(cr, uid, invoice.company_id.currency_id,
                 (amount_paid - inv_amount_company_currency)):
             return self.pay_and_reconcile(cr, uid, ids, context=context)
 
=== modified file 'account_invoice_cash_discount/wizard/account_pay_invoice_view.xml'
--- account_invoice_cash_discount/wizard/account_pay_invoice_view.xml	2010-07-26 12:24:39 +0000
+++ account_invoice_cash_discount/wizard/account_pay_invoice_view.xml	2010-07-29 11:49:41 +0000
@@ -76,7 +76,7 @@
             <field name="model">account.move.line.memory</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-				<tree string="Account Move Line">
+				<tree string="Account Move Line" editable="bottom">
                		 <field name="date"/>
                		 <field name="name"/>
                		 <field name="account_id"/>
 
=== modified file 'account_invoice_cash_discount/wizard/invoice_statement_payment.py'
--- account_invoice_cash_discount/wizard/invoice_statement_payment.py	2010-07-23 11:30:07 +0000
+++ account_invoice_cash_discount/wizard/invoice_statement_payment.py	2010-07-29 11:49:41 +0000
@@ -138,47 +138,57 @@
             'line_ids': [(6, 0, [line.id])]
             }, context=context)
         
-        ######################################### Calculation for discount and taxes######
+         ######################################### Calculation for discount and taxes######
         if line.invoice.id:
             
             discount = 0.0
             account = False
-            tax_total_amount = 0.0 
-            total_discount = 0.0
             invoice = obj_inv.browse(cursor, user, line.invoice.id, context=context)
-        
             for invoice_line in invoice.invoice_line:
+                line_tax_amount = 0.0
+                total_tax_amount = 0.0
+                #####get the ratio of the line in the total invoice amount 
+                for tax in tax_obj.compute(cursor, user, invoice_line.invoice_line_tax_id, invoice_line.price_subtotal, invoice_line.quantity, invoice.address_invoice_id.id, invoice_line.product_id, invoice.partner_id):    
+                    line_tax_amount += tax['amount']
+                line_total = invoice_line.price_subtotal + line_tax_amount
+                invoice_res_amount = invoice.amount_total
+                line_ratio = line_total / invoice_res_amount
+                ###########################
+                amount = obj_inv._get_amount(cursor, user, [invoice.id] ,invoice.residual, invoice.payment_term.id, context=context)
+                invoice_amount = amount['amount']
+                discount = obj_inv._get_payment(cursor, user, [invoice.id]  , invoice_amount, invoice.payment_term.id, context=context)
+                account = obj_inv._get_account(cursor, user, [invoice.id] , invoice.residual, invoice.payment_term.id, context=context)
+                
+                 ### discount for the invoice line
+                discount_pay = discount * line_ratio
                 if invoice_line.invoice_line_tax_id:
-                    amount_invoice_line = obj_inv._get_amount(cursor, user, [invoice.id]  , invoice_line.price_subtotal, invoice.payment_term.id, context=context)
-                    line_amount = amount_invoice_line['amount']
-                    discount = obj_inv._get_payment(cursor, user, [invoice.id]  , line_amount, invoice.payment_term.id, context=context)
-                    account = obj_inv._get_account(cursor, user, [invoice.id] , invoice.residual, invoice.payment_term.id, context=context)
-
-                    tax_amount = 0.0 
-                    for tax in tax_obj.compute(cursor, user, invoice_line.invoice_line_tax_id, discount, invoice_line.quantity, invoice.address_invoice_id.id, invoice_line.product_id, invoice.partner_id):
-                        tax_amount = tax['amount']
-                        tax_total_amount += tax['amount']
-                        tax_invoice_id = invoice_tax_obj.search(cursor,user,[('invoice_id','=',invoice.id),('name','=',tax['name'])])
+                    tax_real_amt = 0.0
+                    for tax_id in invoice_line.invoice_line_tax_id:
+                        tax_data = tax_obj.browse(cursor, user, tax_id.id, context=context)
+                        tax_amt = discount_pay * tax_data.amount
+                        tax_real_amt = tax_amt / (1 + tax_data.amount)
+                        total_tax_amount += tax_real_amt
+                        
+                        tax_invoice_id = invoice_tax_obj.search(cursor, user,[('invoice_id','=',invoice.id),('name','=',tax_data.name)])
                         for tax_id in tax_invoice_id:
                             tax_value = invoice_tax_obj.browse(cursor, user, tax_id)
                             tax_account_id = tax_value.account_id.id
-            
-                        if tax_amount>0:
+
+                        if tax_real_amt>0:
                             statement_reconcile_line_obj.create(cursor, user, {
                                 'name': line.name,
-                                'amount': tax_amount,
+                                'amount': tax_real_amt,
                                 'account_id': tax_account_id,
                                 'line_id': reconcile_id,
                                 }, context=context)
-                            
-                    if discount>0:
-                        total_discount += discount 
-                        statement_reconcile_line_obj.create(cursor, user, {
-                            'name': line.name,
-                            'amount': discount - tax_amount,
-                            'account_id': account,
-                            'line_id': reconcile_id,
-                            }, context=context)
+                if discount>0:
+                    discount = discount * line_ratio
+                    statement_reconcile_line_obj.create(cursor, user, {
+                        'name': line.name,
+                        'amount': discount - total_tax_amount,
+                        'account_id': account,
+                        'line_id': reconcile_id,
+                        }, context=context)
         ##########################################################################
         
         if line.journal_id.type == 'sale':
@@ -190,7 +200,7 @@
             
         statement_line_obj.create(cursor, user, {
             'name': line.name or '?',
-            'amount': amount,
+            'amount': invoice_amount,
             'type': type,
             'partner_id': line.partner_id.id,
             'account_id': line.account_id.id,