Merge lp:~openerp-dev/openobject-addons/trunk-wizard_osv_memory_convert-uco into lp:openobject-addons

[Ujjvala Collins]

[IMP] account_asset:
----------------------------------
* Converted "Close Asset" wizard to osv_memory wizard. (Right now not used anywhere)

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

[Raphael Collet (OpenERP) (rco-openerp)]

review: Approve

[Raphael Collet (OpenERP) (rco-openerp)]

I had a closer look at the module. Assets are closed with a button on their form, so the wizard is useless. It's dead, please remove it completely.

Thanks,
Raphael

review: Needs Fixing

[Raphael Collet (OpenERP) (rco-openerp)]

Never mind, I will do it.

=== modified file 'account_asset/__openerp__.py'
--- account_asset/__openerp__.py	2011-10-11 14:03:35 +0000
+++ account_asset/__openerp__.py	2011-10-19 13:02:33 +0000
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,7 +25,7 @@
     "depends" : ["account"],
     "author" : "OpenERP S.A.",
     "description": """Financial and accounting asset management.
-    This Module manages the assets owned by a company or an individual. It will keep track of depreciation's occurred on 
+    This Module manages the assets owned by a company or an individual. It will keep track of depreciation's occurred on
     those assets. And it allows to create Move's of the depreciation lines.
     """,
     "website" : "http://www.openerp.com",
@@ -45,7 +45,7 @@
         "account_asset_view.xml",
         "account_asset_invoice_view.xml",
         "report/account_asset_report_view.xml",
-	
+
     ],
     "active": False,
     "installable": True,

=== modified file 'account_asset/wizard/__init__.py'
--- account_asset/wizard/__init__.py	2011-09-22 09:55:31 +0000
+++ account_asset/wizard/__init__.py	2011-10-19 13:02:33 +0000
@@ -18,9 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
+
 import account_asset_change_duration
 import wizard_asset_compute
-import wizard_asset_close
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

=== removed file 'account_asset/wizard/wizard_asset_close.py'
--- account_asset/wizard/wizard_asset_close.py	2011-09-22 09:55:31 +0000
+++ account_asset/wizard/wizard_asset_close.py	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-
-asset_end_arch = '''<?xml version="1.0"?>
-<form string="Close asset">
-    <separator string="General information" colspan="4"/>
-</form>'''
-
-asset_end_fields = {
-}
-
-class wizard_asset_close(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type':'form', 'arch':asset_end_arch, 'fields':asset_end_fields, 'state':[
-                ('end','Cancel'),
-                ('asset_close','End of asset')
-            ]}
-        },
-        'asset_close': {
-            'actions': [],
-            'result': {'type' : 'state', 'state': 'end'}
-        }
-    }
-wizard_asset_close('account.asset.close')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-