From 4da1c7e3209b7d7084e5eab3697168c54f8aafdb Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Wed, 29 Dec 2010 10:26:10 +0100
Subject: [PATCH 1/2] [FIX] account_voucher: analytic account on writeoff

bzr revid: qdp-launchpad@tinyerp.com-20101229092610-jui1s12crz4zuom2
---
 addons/account_voucher/account_voucher.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 4e08ad9112b..11d4585f9d0 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -777,8 +777,8 @@ class account_voucher(osv.osv):
                     'debit': diff < 0 and -diff or 0.0,
 		    'amount_currency': company_currency <> current_currency and currency_pool.compute(cr, uid, company_currency, current_currency, diff * -1, context=context_multi_currency) or 0.0,
                     'currency_id': company_currency <> current_currency and current_currency or False,
+                    'analytic_account_id': inv.analytic_id.id,
                 }
-
                 move_line_pool.create(cr, uid, move_line)
 
             self.write(cr, uid, [inv.id], {

From ab401b3788b35a548a947086885a27f68dcbb78c Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Wed, 29 Dec 2010 10:27:28 +0100
Subject: [PATCH 2/2] [IMP] account: chart installer and coa generation
 usability

bzr revid: qdp-launchpad@tinyerp.com-20101229092728-b1h3ayiqrxq8mlc5
---
 addons/account/account_installer.xml |  4 ++--
 addons/account/account_view.xml      | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 495b4f4e5ba..95dc29e64f6 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -25,10 +25,10 @@
                 </xpath>
                 <group colspan="8">
                     <group colspan="4" height="450" width="600">
-                        <field name="charts"/>
+                            <field name="charts"/>
                             <group colspan="4" groups="base.group_extended">
                                 <separator col="4" colspan="4" string="Configure Fiscal Year"/>
-                                <field name="company_id" colspan="4" widget="selection" groups="base.group_multi_company"/>
+                                <field name="company_id" colspan="4" widget="selection"/> <!--always visible because we assume that this wizard will be ran by administrators only and because it was source of blocking form with 'correct red fields' message without displaying the field -->
                                 <field name="date_start" on_change="on_change_start_date(date_start)"/>
                                 <field name="date_stop"/>
                                 <field name="period" colspan="4"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 39b861d1775..c8226c2627f 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2445,12 +2445,14 @@
                           <attribute name='string'></attribute>
                   </xpath>
                 <group string="res_config_contents" position="replace">
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <field name ="code_digits" groups="base.group_extended"/>
+                    <field name="company_id" widget="selection"/> <!--always visible because we assume that this wizard will be ran by administrators only and because it was source of blocking form with 'correct red fields' message without displaying the field -->
                     <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)"/>
+                    <newline/>
+                    <field name ="code_digits" groups="base.group_extended"/>
                     <field name ="seq_journal" groups="base.group_extended"/>
-                  <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'))]"/>
+                    <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/>
                     <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">
                         <form string="Bank Information">
                             <field name="acc_name"/>