[MERGE] merged the branch 3

bzr revid: qdp-launchpad@tinyerp.com-20101014180200-efrsxtvumfqlbhxa

diff --cc addons/account/account_view.xml
index fa9d5ba,22cb310..49de367
--- 1/addons/account/account_view.xml
--- 2/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@@ -845,10 -894,10 +894,10 @@@
              <field name="arch" type="xml">
                  <form string="Account Tax">
                      <group colspan="4" col="6">
-                         <field name="name" select="1"/>
-                         <field name="description" select="1"/>
+                         <field name="name"/>
+                         <field name="description"/>
 -                  <field name="type_tax_use"/>
 -                        <field name="price_include" groups="base.group_extended"/>
 +                        <field name="type_tax_use"/>
 +                        <field name="price_include"/>
                          <field name="active"/>
                          <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                      </group>