From 7d738f59896d81b2fb2479277318a1a044361af6 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 20 Jan 2011 15:26:53 +0530
Subject: [PATCH 1/4] [FIX] Account: add account_id field on
 account.ivnocie.tax object tree view available on customer and supplier
 invoice with group=account invoice

bzr revid: mra@mra-laptop-20110120095653-glkjyjsye2t4i915
---
 addons/account/account_invoice_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 48c817ff58f..6fa3b8c09d2 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -190,6 +190,7 @@
                                 <field name="tax_line" nolabel="1">
                                     <tree editable="bottom" string="Taxes">
                                         <field name="name"/>
+                                        <field name="account_id" groups="account.group_account_invoice"/>
                                         <field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
                                         <field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/>
 
@@ -284,7 +285,8 @@
                                 <field name="tax_line" nolabel="1">
                                     <tree editable="bottom" string="Taxes">
                                         <field name="name"/>
-                                         <field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
+                                        <field name="account_id" groups="account.group_account_invoice"/>
+                                        <field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
                                         <field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/>
                                         <field invisible="True" name="base_amount"/>
                                         <field invisible="True" name="tax_amount"/>

From 88f37ff570acccb868bfd580291cb70d73027097 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 20 Jan 2011 15:37:31 +0530
Subject: [PATCH 2/4] [FIX] Account: remove constraints on account.move.line if
 the partner is not exists for receivable and paybletype account

bzr revid: mra@mra-laptop-20110120100731-yln0ib71ehcavwrv
---
 addons/account/account_move_line.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index b834ecf12e7..7ed1c675662 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -588,18 +588,10 @@ class account_move_line(osv.osv):
                 return False
         return True
 
-    def _check_partner_id(self, cr, uid, ids, context=None):
-        lines = self.browse(cr, uid, ids, context=context)
-        for l in lines:
-            if l.account_id.type in ('receivable', 'payable') and not l.partner_id:
-                return False
-        return True
-
     _constraints = [
         (_check_no_view, 'You can not create move line on view account.', ['account_id']),
         (_check_no_closed, 'You can not create move line on closed account.', ['account_id']),
         (_check_company_id, 'Company must be same for its related account and period.',['company_id'] ),
-        (_check_partner_id, 'You can not create move line on receivable/payable account without partner', ['account_id'] )
     ]
 
     #TODO: ONCHANGE_ACCOUNT_ID: set account_tax_id

From 17d7e186e3a7b70b3b3d93b4787a730f50c0b875 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 20 Jan 2011 16:59:36 +0530
Subject: [PATCH 3/4] [FIX] Account: tracebak on configuration wizard

lp bug: https://launchpad.net/bugs/705350 fixed

bzr revid: mra@mra-laptop-20110120112936-ervqmcj5l15997n9
---
 addons/account/account.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 9e48ca554b1..511997ecc88 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2616,7 +2616,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             chart_template_id = ids[0]
             purchase_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
                                           , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence")
-            return purchase_tax_ids[0]
+            return purchase_tax_ids and purchase_tax_ids[0] or False
         return False
 
     def _get_sale_tax(self, cr, uid, context=None):
@@ -2625,7 +2625,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             chart_template_id = ids[0]
             sale_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
                                           , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence")
-            return sale_tax_ids[0]
+            return sale_tax_ids and sale_tax_ids[0] or False
         return False
 
     def _get_chart(self, cr, uid, context=None):

From 1df94f7aad5eb3939807be053dbfa2289e091790 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 20 Jan 2011 17:13:16 +0530
Subject: [PATCH 4/4] [FIX] Account: v6rc2 account - journal - bank and cheques
 - needs compulsory accounts selection

lp bug: https://launchpad.net/bugs/705071 fixed

bzr revid: mra@mra-laptop-20110120114316-13ntf960r17rcyj3
---
 addons/account/account_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index afa05f01821..3c07a6cb859 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -421,8 +421,8 @@
                             <group col="2" colspan="2">
                                 <group colspan="2" col="2">
                                     <separator string="Accounts" colspan="4"/>
-                                    <field name="default_debit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                                    <field name="default_credit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                    <field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                    <field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                                 </group>
                                 <group colspan="2" col="2">
                                     <separator string="Journal View" colspan="4"/>
@@ -2394,7 +2394,7 @@
                     <field name="sale_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
                     <field name="purchase_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
                     <newline/> <!-- extended view because the web UI is not good for one2many -->
-                    <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list" groups="base.group_extended"> 
+                    <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list" groups="base.group_extended">
                         <form string="Bank Information">
                             <field name="acc_name"/>
                             <field name="account_type"/>