Ujjvala Collins (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-account-asset-remove_report_view_file-uco
into lp:~openerp-dev/openobject-addons/trunk-account-asset.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-remove_report_view_file-uco/+merge/66902
[REM] account_asset:
-----------------------------------
* Removed account_asset_report_view.xml file and added its content to
asset_view file.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-remove_report_view_file-uco/+merge/66902
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-account-asset-remove_report_view_file-uco
into lp:~openerp-dev/openobject-addons/trunk-account-asset.
=== modified file 'account_asset/__openerp__.py'
--- account_asset/__openerp__.py 2011-07-01 13:41:52 +0000
+++ account_asset/__openerp__.py 2011-07-05 13:43:25 +0000
@@ -40,7 +40,6 @@
"wizard/account_asset_change_duration_view.xml",
"account_asset_view.xml",
"account_asset_invoice_view.xml",
- "account_asset_report_view.xml",
"report/account_asset_report_view.xml",
#modif
],
=== removed file 'account_asset/account_asset_report_view.xml'
--- account_asset/account_asset_report_view.xml 2011-06-29 05:01:38 +0000
+++ account_asset/account_asset_report_view.xml 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-<data>
- <act_window
- id="act_entries_open"
- name="Entries"
- res_model="account.move.line"
- src_model="account.asset.asset"
- context="{'search_default_asset_id': [active_id], 'default_asset_id': active_id}"/>
-</data>
-</openerp>
=== modified file 'account_asset/account_asset_view.xml'
--- account_asset/account_asset_view.xml 2011-07-05 12:35:52 +0000
+++ account_asset/account_asset_view.xml 2011-07-05 13:43:25 +0000
@@ -302,6 +302,13 @@
parent="menu_finance_assets"
id="menu_action_account_asset_asset_form"
action="action_account_asset_asset_form"/>
+
+ <act_window
+ id="act_entries_open"
+ name="Entries"
+ res_model="account.move.line"
+ src_model="account.asset.asset"
+ context="{'search_default_asset_id': [active_id], 'default_asset_id': active_id}"/>
<menuitem id="menu_finance_config_assets" name="Assets" parent="account.menu_finance_accounting"/>
<record model="ir.actions.act_window" id="action_account_asset_asset_list_normal">
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
