From fee97685ea927faad9072c6b4cd80d353c59be1e Mon Sep 17 00:00:00 2001 From: "Apa (Open ERP)" Date: Wed, 21 Jan 2009 16:19:34 +0530 Subject: [PATCH 1/3] [FIX]:all amounts don t have all the same format bzr revid: apa@tinyerp.com-20090121104934-4r9l70liuk3rrny8 --- bin/report/report_sxw.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py index 1e8874d2bea..7450ab131ff 100644 --- a/bin/report/report_sxw.py +++ b/bin/report/report_sxw.py @@ -153,7 +153,7 @@ class _format(object): lang = self.object._context.get('lang', 'en_US') or 'en_US' try: if os.name == 'nt': - locale.setlocale(locale.LC_ALL, _LOCALE2WIN32.get(lang, lang) + '.' + encoding) + locale.setlocale(locale.LC_ALL, str(_LOCALE2WIN32.get(lang, lang) + '.' + encoding)) else: locale.setlocale(locale.LC_ALL,str( lang + '.' + encoding)) except Exception: @@ -335,8 +335,8 @@ class rml_parse(object): def formatLang(self, value, digits=2, date=False,date_time=False, grouping=True, monetary=False, currency=None): - if not value: - return '' +# if not value: +# return '' pool_lang=self.pool.get('res.lang') lang = self.localcontext.get('lang', 'en_US') or 'en_US' lang_obj = pool_lang.browse(self.cr,self.uid,pool_lang.search(self.cr,self.uid,[('code','=',lang)])[0]) From cef5c7651413e17ffcc475f4a0b1cc63982cbe51 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Wed, 21 Jan 2009 12:19:56 +0100 Subject: [PATCH 2/3] [FIX] unlink take the context in parameter lp bug: https://launchpad.net/bugs/319172 fixed bzr revid: christophe@tinyerp.com-20090121111956-nu8qi42x2d8xlcbv --- bin/addons/base/res/res_user.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py index 96ccfa52b7b..a33b4ddf28e 100644 --- a/bin/addons/base/res/res_user.py +++ b/bin/addons/base/res/res_user.py @@ -170,10 +170,10 @@ class users(osv.osv): self.pool.get('ir.rule').domain_get.clear_cache(cr.dbname) return res - def unlink(self, cr, uid, ids): + def unlink(self, cr, uid, ids, context=None): if 1 in ids: raise osv.except_osv(_('Can not remove root user!'), _('You can not remove the admin user as it is used internally for resources created by OpenERP (updates, module installation, ...)')) - return super(users, self).unlink(cr, uid, ids) + return super(users, self).unlink(cr, uid, ids, context=context) def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=80): if not args: From 2b1ecd58d65406803cdc279c6cfc52635b945107 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Wed, 21 Jan 2009 13:19:36 +0100 Subject: [PATCH 3/3] [FIX] demo files were always parsed in 'init' mode [IMP] ensure modobj exists before upgrading module state and version bzr revid: christophe@tinyerp.com-20090121121936-2fdqa7kblh2to74k --- bin/addons/__init__.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py index 7abefe589a2..4b0eb58fd08 100644 --- a/bin/addons/__init__.py +++ b/bin/addons/__init__.py @@ -457,7 +457,7 @@ class MigrationManager(object): parsed_installed_version = parse_version(pkg.installed_version or '') current_version = parse_version(convert_version(pkg.data.get('version', '0'))) - + versions = _get_migration_versions(pkg) for version in versions: @@ -477,7 +477,7 @@ class MigrationManager(object): fp = tools.file_open(opj(modulename, pyfile)) # imp.load_source need a real file object, so we create - # on from the file-like object we get from file_open + # one from the file-like object we get from file_open fp2 = os.tmpfile() fp2.write(fp.read()) fp2.seek(0) @@ -582,24 +582,21 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs): logger.notifyChannel('init', netsvc.LOG_INFO, 'module %s: loading %s' % (m, xml)) fp = tools.file_open(opj(m, xml)) if ext == '.csv': - tools.convert_csv_import(cr, m, os.path.basename(xml), fp.read(), idref, noupdate=True) + tools.convert_csv_import(cr, m, os.path.basename(xml), fp.read(), idref, mode=mode, noupdate=True) else: - tools.convert_xml_import(cr, m, fp, idref, noupdate=True, **kwargs) + tools.convert_xml_import(cr, m, fp, idref, mode=mode, noupdate=True, **kwargs) fp.close() cr.execute('update ir_module_module set demo=%s where id=%s', (True, mid)) package_todo.append(package.name) - ver = release.major_version + '.' + package.data.get('version', '1.0') - # update the installed version in database... - #cr.execute("update ir_module_module set state='installed', latest_version=%s where id=%s", (ver, mid,)) - # Set new modules and dependencies - modobj.write(cr, 1, [mid], {'state': 'installed', 'latest_version': ver}) - cr.commit() - - # Update translations for all installed languages if modobj: + ver = release.major_version + '.' + package.data.get('version', '1.0') + # Set new modules and dependencies + modobj.write(cr, 1, [mid], {'state': 'installed', 'latest_version': ver}) + # Update translations for all installed languages modobj.update_translations(cr, 1, [mid], None) cr.commit() + migrations.migrate_module(package, 'post') statusi += 1