summaryrefslogtreecommitdiff
path: root/openerp/addons/base/module/wizard
diff options
context:
space:
mode:
authorRaphael Collet <rco@openerp.com>2014-07-06 16:44:26 +0200
committerAntony Lesuisse <al@openerp.com>2014-07-06 17:05:41 +0200
commitcbe2dbb672a6c55d86f2e515f9d1cdfee426ef80 (patch)
treed6ff62b719fce32392397783c961b734b1e4c50e /openerp/addons/base/module/wizard
parentd78192c489d3be66cd6487b39f5ce7ba4733a187 (diff)
[MERGE] new v8 api by rco
A squashed merge is required as the conversion of the apiculture branch from bzr to git was not correctly done. The git history contains irrelevant blobs and commits. This branch brings a lot of changes and fixes, too many to list exhaustively. - New orm api, objects are now used instead of ids - Environements to encapsulates cr uid context while maintaining backward compatibility - Field compute attribute is a new object oriented way to define function fields - Shared browse record cache - New onchange protocol - Optional copy flag on fields - Documentation update - Dead code cleanup - Lots of fixes
Diffstat (limited to 'openerp/addons/base/module/wizard')
-rw-r--r--openerp/addons/base/module/wizard/base_import_language.py2
-rw-r--r--openerp/addons/base/module/wizard/base_module_update.py50
-rw-r--r--openerp/addons/base/module/wizard/base_module_update_view.xml4
3 files changed, 14 insertions, 42 deletions
diff --git a/openerp/addons/base/module/wizard/base_import_language.py b/openerp/addons/base/module/wizard/base_import_language.py
index d8757605d64..bd554a47c5c 100644
--- a/openerp/addons/base/module/wizard/base_import_language.py
+++ b/openerp/addons/base/module/wizard/base_import_language.py
@@ -44,7 +44,7 @@ class base_language_import(osv.osv_memory):
context = {}
this = self.browse(cr, uid, ids[0])
if this.overwrite:
- context.update(overwrite=True)
+ context = dict(context, overwrite=True)
fileobj = TemporaryFile('w+')
try:
fileobj.write(base64.decodestring(this.data))
diff --git a/openerp/addons/base/module/wizard/base_module_update.py b/openerp/addons/base/module/wizard/base_module_update.py
index e2d8ce01d4a..2f3d0cc1af2 100644
--- a/openerp/addons/base/module/wizard/base_module_update.py
+++ b/openerp/addons/base/module/wizard/base_module_update.py
@@ -1,49 +1,23 @@
# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 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/>.
-#
-##############################################################################
-from openerp.osv import osv, fields
-
-class base_module_update(osv.osv_memory):
- """ Update Module """
+from openerp import models, fields, api
+class base_module_update(models.TransientModel):
_name = "base.module.update"
_description = "Update Module"
- _columns = {
- 'update': fields.integer('Number of modules updated', readonly=True),
- 'add': fields.integer('Number of modules added', readonly=True),
- 'state':fields.selection([('init','init'),('done','done')], 'Status', readonly=True),
- }
-
- _defaults = {
- 'state': 'init',
- }
+ updated = fields.Integer('Number of modules updated', readonly=True)
+ added = fields.Integer('Number of modules added', readonly=True)
+ state = fields.Selection([('init', 'init'), ('done', 'done')], 'Status', readonly=True, default='init')
- def update_module(self, cr, uid, ids, context=None):
- module_obj = self.pool.get('ir.module.module')
- update, add = module_obj.update_list(cr, uid,)
- self.write(cr, uid, ids, {'update': update, 'add': add, 'state': 'done'}, context=context)
+ @api.one
+ def update_module(self):
+ self.updated, self.added = self.env['ir.module.module'].update_list()
+ self.state = 'done'
return False
- def action_module_open(self, cr, uid, ids, context):
+ @api.multi
+ def action_module_open(self):
res = {
'domain': str([]),
'name': 'Modules',
@@ -54,5 +28,3 @@ class base_module_update(osv.osv_memory):
'type': 'ir.actions.act_window',
}
return res
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/module/wizard/base_module_update_view.xml b/openerp/addons/base/module/wizard/base_module_update_view.xml
index 3dccc061593..eff8e790677 100644
--- a/openerp/addons/base/module/wizard/base_module_update_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_update_view.xml
@@ -13,8 +13,8 @@
<label string="Click on Update below to start the process..." />
</group>
<group states="done" >
- <field name="update"/>
- <field name="add" />
+ <field name="updated"/>
+ <field name="added" />
</group>
<footer>
<div states="init">