[MERGE] merged the pso branch with button on depreciation line (+improved asset.categ...

bzr revid: qdp-launchpad@openerp.com-20110512165442-s1c6426afv5nqz7z

diff --cc addons/account_asset/account_asset_view.xml
index 6ba615c,713652d..527acc0
--- 1/addons/account_asset/account_asset_view.xml
--- 2/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@@ -16,6 -16,6 +16,7 @@@
                  <field name="journal_id"/>
                  <field name="account_asset_id"/>
                  <field name="account_depreciation_id"/>
++                <field name="account_expense_depreciation_id"/>
             </group>
          <group col="6" colspan="4" groups="analytic.group_analytic_accounting">
          <separator string="Accounts information" colspan="4" />