[MERGE] Merged IRA's branch for the fix of correction in address_get method and addit...

bzr revid: pso@tinyerp.com-20110701065837-qmzxvichj0sr6l1v

diff --cc bin/addons/base/res/partner/partner_view.xml
index 8ca7e43,38f9633..06b08f5
--- 1/bin/addons/base/res/partner/partner_view.xml
--- 2/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@@ -77,6 -77,6 +77,7 @@@
                  <form string="Address">
                      <group colspan="4" col="6">
                          <field name="partner_id" colspan="2"/>
++                        <field name="active"/>
                          <field name="company_id" groups="base.group_multi_company" widget="selection" colspan="2"/>
                          <newline/>
                          <field name="name"/>