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

[gpa(OpenERP)]

added changes for the milestone2

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount.py'
--- account_invoice_cash_discount/account_invoice_cash_discount.py	2010-08-05 07:53:59 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount.py	2010-08-06 12:30:56 +0000
@@ -323,6 +323,8 @@
                     line_tax_amount = 0.0
                     tax_account_id = False
                     tax_code_id = False
+                    tax_base = False
+                    tax_code = False
                     
                     for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, line.price_subtotal/line.quantity, line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):    
                         line_tax_amount += tax['amount']
@@ -339,13 +341,11 @@
                             tax_amt = discount_ratio * tax_data.amount
                             tax_real_amt = tax_amt / (1 + tax_data.amount)
                             total_tax_amount += tax_real_amt
-                            
-                            if tax_data.description:  
-                                tax_name = tax_data.description + " - " + tax_data.name
-                            else:
-                                tax_name = tax_data.name
-                            
-                            tax_invoice_id = invoice_tax_obj.search(cr,uid,[('invoice_id','=',invoice.id),('name','=',tax_name)])
+
+                            tax_base = tax_data.base_code_id.id
+                            tax_code = tax_data.tax_code_id.id  
+                            tax_invoice_id = invoice_tax_obj.search(cr, uid, [('invoice_id','=',invoice.id),('tax_code_id','=',tax_code),('base_code_id','=',tax_base)])
+                        
                             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
@@ -401,7 +401,8 @@
                     discount_amount_currency = 0.0
                     line_tax_amount = 0.0
                     total_tax_amount = 0.0  
-                    
+                    tax_base = False
+                    tax_code = False
                     for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, line.price_subtotal/line.quantity, 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
@@ -416,12 +417,10 @@
                         tax_real_amt = tax_amt / (1 + tax_data.amount)
                         total_tax_amount += tax_real_amt
 
-                        if tax_data.description:  
-                            tax_name = tax_data.description + " - " + tax_data.name
-                        else:
-                            tax_name = tax_data.name
+                        tax_base = tax_data.base_code_id.id
+                        tax_code = tax_data.tax_code_id.id
+                        tax_invoice_id = invoice_tax_obj.search(cr, uid, [('invoice_id','=',invoice.id),('tax_code_id','=',tax_code),('base_code_id','=',tax_base)])
                         
-                        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
@@ -481,6 +480,13 @@
         return res
 account_bank_statement_reconcile()    
 
+class account_bank_statement_reconcile_line(osv.osv):
+    _inherit='account.bank.statement.reconcile.line'
+    _columns = {
+        'tax_code_id': fields.many2one('account.tax.code', 'Tax Account'),
+    }
+account_bank_statement_reconcile_line()
+
 class res_company(osv.osv):
     _inherit  = "res.company"
 
@@ -581,14 +587,47 @@
                         company_currency_id, move.amount, context=context,
                         account=acc_cur)
 
-                st_tax_amount = 0.00
+                st_tax_amount = 0.0
                 st_base_code_id = False
+                move_tax_amount = 0.0
+                tax_real_amt = 0.0
                 
-                if move.tax_id:
-                    tax = tax_obj.compute(cr, uid, [move.tax_id], move.amount, 1.00)[0]
-                    st_tax_amount = tax['amount']
-                    st_base_code_id = tax['base_code_id']
-                        
+                if move.type == 'general':
+                    if move.tax_type == 'tax_included':
+                        st_tax_data = tax_obj.browse(cr, uid, move.tax_id.id, context=context)
+                        st_tax_amt = move.amount * st_tax_data.amount
+                        st_tax_amount = st_tax_amt / (1 + st_tax_data.amount)
+                        st_base_code_id = st_tax_data.base_code_id.id
+                        amount = amount - st_tax_amount
+                        tax_pay = st_tax_amount
+                        st_tax_amount = 0.0
+
+                    else:
+                        st_tax_data = tax_obj.browse(cr, uid, move.tax_id.id, context=context)
+                        st_tax_amt = move.amount * st_tax_data.amount
+                        st_tax_amount = st_tax_amt
+                        tax_pay = st_tax_amount
+                        st_base_code_id = st_tax_data.base_code_id.id
+                    
+                    if not st_tax_data.tax_code_id.id:
+                        tax_val = {
+                            'name': move.name,
+                            'date': move.date,
+                            'ref': move.ref,
+                            'move_id': move_id,
+                            'partner_id': ((move.partner_id) and move.partner_id.id) or False,
+                            'account_id': (move.account_id) and move.account_id.id,
+                            'credit': ((tax_pay>0) and tax_pay) or 0.0,
+                            'debit': ((tax_pay<0) and -tax_pay) or 0.0,
+                            'statement_id': st.id,
+                            'journal_id': st.journal_id.id,
+                            'period_id': st.period_id.id,
+                            'currency_id': st.currency.id,
+                            'tax_code_id':st_base_code_id,
+                            'tax_amount':move_tax_amount,
+                        }
+                        torec.append(account_move_line_obj.create(cr, uid, tax_val, context=context))    
+                            
                 val = {
                     'name': move.name,
                     'date': move.date,
@@ -604,7 +643,7 @@
                     'currency_id': st.currency.id,
                     'tax_code_id':st_base_code_id,
                     'account_tax_id':move.tax_id.id,
-                    'tax_amount':move.amount,
+                    'tax_amount':move_tax_amount,
                 }
                 amount = res_currency_obj.compute(cr, uid, st.currency.id,
                         company_currency_id, move.amount, context=context,
@@ -624,7 +663,7 @@
                                 move.account_id.currency_id.id, amount, context=context,
                                 account=acc_cur)
                     val['amount_currency'] = amount_cur
-
+                
                 torec.append(account_move_line_obj.create(cr, uid, val, context=context))
                 
                 newline_sum = 0.0
@@ -641,6 +680,8 @@
                             'debit': newline.amount>0 and newline.amount or 0.0,
                             'credit': newline.amount<0 and -newline.amount or 0.0,
                             'statement_id': st.id,
+                            'tax_code_id':newline.tax_code_id.id,
+                            'tax_amount':-newline.amount,
                             'journal_id': st.journal_id.id,
                             'period_id': st.period_id.id,
 
@@ -732,7 +773,6 @@
                             'amount_currency': amount_currency,
                             'currency_id': currency_id,
                             }, context=context)
-                        
                 account_move_line_obj.create(cr, uid, {
                     'name': move.name,
                     'date': move.date,
@@ -804,10 +844,28 @@
             return False    
     _columns = {
         'tax_id': fields.many2one('account.tax', 'Tax'),
+        'tax_type': fields.selection([('tax_included','Tax included'),
+                                        ('tax_excluded','Tax excluded')],
+                                        'Tax method', required=True,),
     }
+    
+    def onchange_account_id(self, cr, uid, ids, account_id, context=None):
+        result={}
+        tax = False
+        taxes = self.pool.get('account.account').browse(cr, uid, account_id, context=context).tax_ids
+        for tax_id in taxes:
+            tax = tax_id.id
+            
+        if tax:
+           result['tax_id'] = tax
+        else:
+           result['tax_id'] = False
+           
+        return {'value': result}
     _defaults = {
         'account_id': _get_account,
         'tax_id': _get_tax,
+        'tax_type':lambda *a :'tax_included',
     }
 account_bank_statement_line()
 

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount_view.xml'
--- account_invoice_cash_discount/account_invoice_cash_discount_view.xml	2010-08-05 07:30:49 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount_view.xml	2010-08-06 12:30:56 +0000
@@ -161,6 +161,19 @@
             <field name="note">This Configuration step use to set default Account</field>
             <field name="action_id" ref="action_res_company_wizard"/>
        </record>
+       
+       
+       <record model="ir.ui.view" id="view_bank_statement_reconcile_view122">
+            <field name="name">account.bank.statement.reconcile.form</field>
+            <field name="model">account.bank.statement.reconcile</field>
+            <field name="inherit_id" ref="account.view_bank_statement_reconcile" />
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='line_new_ids']/tree/field[@name='name']" position="after">
+                    <field name="tax_code_id"/>
+                </xpath>
+            </field>
+        </record>
 
        <record id="view_move_line_tree1" model="ir.ui.view">
             <field name="name">account.move.line.tree</field>
@@ -188,6 +201,19 @@
             </field>
         </record>
         
+        <record model="ir.ui.view" id="view_bank_statement_form23233">
+            <field name="name">account.bank.statement.form1</field>
+            <field name="model">account.bank.statement</field>
+            <field name="inherit_id" ref="account.view_bank_statement_form" />
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="account_id" position="replace">
+		            <field name="account_id" on_change="onchange_account_id(account_id)"/>
+                </field>
+            </field>
+        </record>
+        
+        
         <record model="ir.ui.view" id="view_bank_statement_form222">
             <field name="name">account.bank.statement.tree1</field>
             <field name="model">account.bank.statement</field>
@@ -196,10 +222,23 @@
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='line_ids']/tree/field[@name='reconcile_amount']" position="after">
                     <field name="tax_id"/>
-                </xpath>
-            </field>
-        </record>
-        
-
+                    <field name="tax_type"/>
+                </xpath>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_bank_statement_form2322">
+            <field name="name">account.bank.statement.tree1</field>
+            <field name="model">account.bank.statement</field>
+            <field name="inherit_id" ref="account.view_bank_statement_form" />
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='line_ids']/form/field[@name='ref']" position="after">
+                    <field name="tax_type"/>
+                </xpath>
+            </field>
+        </record>
+        
+        
     </data>
 </openerp>

=== modified file 'account_invoice_cash_discount/wizard/account_pay_invoice.py'
--- account_invoice_cash_discount/wizard/account_pay_invoice.py	2010-08-03 10:41:37 +0000
+++ account_invoice_cash_discount/wizard/account_pay_invoice.py	2010-08-06 12:30:56 +0000
@@ -143,6 +143,9 @@
                 total_tax_amount = 0.0
                 ########
                 line_tax_amount = 0.0
+                tax_base = False
+                tax_code = False
+                
                 for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, line.price_subtotal/line.quantity, 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
@@ -157,12 +160,11 @@
                         tax_amt = discount_pay * tax_data.amount
                         tax_real_amt = tax_amt / (1 + tax_data.amount)
                         total_tax_amount += tax_real_amt
-                        if tax_data.description:  
-                            tax_name = tax_data.description + " - " + tax_data.name
-                        else:
-                            tax_name = tax_data.name
+
+                        tax_base = tax_data.base_code_id.id
+                        tax_code = tax_data.tax_code_id.id
                         
-                        tax_invoice_id = invoice_tax_obj.search(cr,uid,[('invoice_id','=',invoice.id),('name','=',tax_name)])
+                        tax_invoice_id = invoice_tax_obj.search(cr, uid, [('invoice_id','=',invoice.id),('tax_code_id','=',tax_code),('base_code_id','=',tax_base)])
                         for tax_id in tax_invoice_id:
                             tax_value = invoice_tax_obj.browse(cr, uid, tax_id)
                             base_code_id = tax_value.base_code_id.id
@@ -211,6 +213,9 @@
 
         tax_code_id = False
         tax_account_id = False
+        tax_base = False
+        tax_code = False
+        
         discount = self._get_discount(cr, uid, context=context)
         if discount>0.0:
             for line in invoice.invoice_line:
@@ -231,13 +236,12 @@
                         tax_amt = discount_pay * tax_data.amount
                         tax_real_amt = tax_amt / (1 + tax_data.amount)
                         total_tax_amount += tax_real_amt
-                        
-                        if tax_data.description:  
-                            tax_name = tax_data.description + " - " + tax_data.name
-                        else:
-                            tax_name = tax_data.name
-                        
-                        tax_invoice_id = invoice_tax_obj.search(cr,uid,[('invoice_id','=',invoice.id),('name','=',tax_name)])
+
+                        tax_base = tax_data.base_code_id.id
+                        tax_code = tax_data.tax_code_id.id
+                        
+                        tax_invoice_id = invoice_tax_obj.search(cr, uid, [('invoice_id','=',invoice.id),('tax_code_id','=',tax_code),('base_code_id','=',tax_base)])
+                        
                         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
@@ -335,6 +339,8 @@
         tax_code_id = False
         base_code_id = False
         tax_account_id = False
+        tax_base = False
+        tax_code = False
         
         for line in invoice.invoice_line:
             line_tax_amount = 0.0
@@ -353,12 +359,11 @@
                     tax_amt = discount_pay * tax_data.amount
                     tax_real_amt = tax_amt / (1 + tax_data.amount)
                     total_tax_amount += tax_real_amt
-                    if tax_data.description:  
-                        tax_name = tax_data.description + " - " + tax_data.name
-                    else:
-                        tax_name =  tax_data.name
-                           
-                    tax_invoice_id = invoice_tax_obj.search(cr, uid, [('invoice_id','=',invoice.id),('name','=',tax_name)])
+
+                    tax_base = tax_data.base_code_id.id
+                    tax_code = tax_data.tax_code_id.id
+                    
+                    tax_invoice_id = invoice_tax_obj.search(cr, uid, [('invoice_id','=',invoice.id),('tax_code_id','=',tax_code),('base_code_id','=',tax_base)])
                     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

=== modified file 'account_invoice_cash_discount/wizard/invoice_statement_payment.py'
--- account_invoice_cash_discount/wizard/invoice_statement_payment.py	2010-08-03 10:41:37 +0000
+++ account_invoice_cash_discount/wizard/invoice_statement_payment.py	2010-08-06 12:30:56 +0000
@@ -146,8 +146,11 @@
             invoice = obj_inv.browse(cursor, user, line.invoice.id, context=context)
             for invoice_line in invoice.invoice_line:
                 line_tax_amount = 0.0
+                invoice_amount = 0.0
                 total_tax_amount = 0.0
                 tax_account_id = False
+                tax_code_id = False
+                tax_base_id = False
                 #####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_line.quantity, invoice.address_invoice_id.id, invoice_line.product_id, invoice.partner_id):    
                     line_tax_amount += tax['amount']
@@ -170,22 +173,23 @@
                         tax_real_amt = tax_amt / (1 + tax_data.amount)
                         total_tax_amount += tax_real_amt
                         
-                        if tax_data.description:  
-                            tax_name = tax_data.description + " - " + tax_data.name
-                        else:
-                            tax_name = tax_data.name
-
-                        tax_invoice_id = invoice_tax_obj.search(cursor, user, [('invoice_id','=',invoice.id),('name','=',tax_name)])
+                        tax_base = tax_data.base_code_id.id
+                        tax_code = tax_data.tax_code_id.id
+                        
+                        tax_invoice_id = invoice_tax_obj.search(cursor, user, [('invoice_id','=',invoice.id),('tax_code_id','=',tax_code),('base_code_id','=',tax_base)])
                         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
-                            
+                            tax_code_id = tax_value.tax_code_id.id
+                            tax_base_id = tax_value.base_code_id.id
+
                         if tax_real_amt>0:
                             statement_reconcile_line_obj.create(cursor, user, {
                                 'name': line.name,
                                 'amount': tax_real_amt,
                                 'account_id': tax_account_id,
                                 'line_id': reconcile_id,
+                                'tax_code_id':tax_code_id
                                 }, context=context)
                 if discount>0:
                     discount = discount * line_ratio
@@ -194,6 +198,7 @@
                         'amount': discount - total_tax_amount,
                         'account_id': account,
                         'line_id': reconcile_id,
+                        'tax_code_id':tax_base_id
                         }, context=context)
         ##########################################################################