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

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

diff --combined 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" />
@@@ -88,6 -88,8 +89,8 @@@
                            <field name="amount"/>
                            <field name="depreciated_value"/>
                            <field name="remaining_value"/>
+                           <field name="move_id" invisible="1"/>
+                          <button name="create_move" attrs="{'invisible':[('move_id','!=',False)]}" icon="gtk-execute" string="Create Move" type="object"/>
                         </tree>
                         <graph type="bar">
                            <field name="name"/>