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

[gpa(OpenERP)]

Changes for the statement line now when general type then tax is filled

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount.py'
--- account_invoice_cash_discount/account_invoice_cash_discount.py	2010-08-09 10:13:18 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount.py	2010-08-10 11:55:58 +0000
@@ -837,36 +837,37 @@
 
 class account_bank_statement_line(osv.osv):
     _inherit="account.bank.statement.line"
-    
-    def _get_tax(self, cr, uid, context={}):
-        tax_id = self.pool.get('account.tax').search(cr, uid, [])
-        if tax_id:
-            return tax_id[0]
-        else:
-            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}
+    
+    def onchange_type(self, cr, uid, ids, type, context=None):
+        result={}
+        tax_id = self.pool.get('account.tax').search(cr, uid, [])
+
+        if type == 'general' and tax_id:
+           result['tax_id'] = tax_id[0]
+        else:
+            result['tax_id'] =  False
         return {'value': result}
     
     _defaults = {
-        '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-06 10:33:20 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount_view.xml	2010-08-10 11:55:58 +0000
@@ -189,19 +189,7 @@
             </field>
         </record>
         
-        <record model="ir.ui.view" id="view_bank_statement_form111">
-            <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">
-                <xpath expr="//field[@name='line_ids']/form/field[@name='ref']" position="after">
-                    <field name="tax_id"/>
-                </xpath>
-            </field>
-        </record>
-        
-        <record model="ir.ui.view" id="view_bank_statement_form23233">
+        <record model="ir.ui.view" id="view_bank_statement_acc_on_change_form">
             <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" />
@@ -214,10 +202,10 @@
         </record>
         
         
-        <record model="ir.ui.view" id="view_bank_statement_form222">
+        <record model="ir.ui.view" id="view_bank_statement_tax_tree">
             <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="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='line_ids']/tree/field[@name='reconcile_amount']" position="after">
@@ -227,18 +215,30 @@
             </field>
         </record>
         
-        <record model="ir.ui.view" id="view_bank_statement_form2322">
-            <field name="name">account.bank.statement.tree1</field>
+        <record model="ir.ui.view" id="view_bank_statement_tax_form">
+            <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">
                 <xpath expr="//field[@name='line_ids']/form/field[@name='ref']" position="after">
+                    <field name="tax_id"/>
                     <field name="tax_type"/>
                 </xpath>
             </field>
         </record>
         
+        <record model="ir.ui.view" id="view_bank_statement_type_on_change_form">
+            <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="type" position="replace">
+                    <field name="type" on_change="onchange_type(type)"/>
+                </field>
+            </field>
+        </record>
         
     </data>
 </openerp>