From b7d5d7c00818f308945ed0f45c0c3839f1ff7b13 Mon Sep 17 00:00:00 2001 From: "qdp-launchpad@tinyerp.com" <> Date: Mon, 3 Jan 2011 09:47:15 +0100 Subject: [PATCH 01/12] [FIX] account: removed translate=True on account type in order to fix the translations bzr revid: qdp-launchpad@tinyerp.com-20110103084715-hihr3cz55l1i43wt --- addons/account/account.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account.py b/addons/account/account.py index f79e36c7681..3fed8c45f17 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -131,7 +131,7 @@ class account_account_type(osv.osv): _name = "account.account.type" _description = "Account Type" _columns = { - 'name': fields.char('Acc. Type Name', size=64, required=True, translate=True), + 'name': fields.char('Acc. Type Name', size=64, required=True), 'code': fields.char('Code', size=32, required=True), 'close_method': fields.selection([('none', 'None'), ('balance', 'Balance'), ('detail', 'Detail'), ('unreconciled', 'Unreconciled')], 'Deferral Method', required=True, help="""Set here the method that will be used to generate the end of year journal entries for all the accounts of this type. From 501673e54f3822460751e24e3113a6b8e43a08c9 Mon Sep 17 00:00:00 2001 From: "MTR(OpenERP)" <> Date: Mon, 3 Jan 2011 16:05:06 +0530 Subject: [PATCH 02/12] [FIX] l10n_fr: buildbot fixes for yaml bzr revid: mra@mra-laptop-20110103103506-s1uude440q9d3cil --- addons/l10n_fr/test/l10n_fr_report.yml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/addons/l10n_fr/test/l10n_fr_report.yml b/addons/l10n_fr/test/l10n_fr_report.yml index 7cf9b161223..aadd2c97311 100644 --- a/addons/l10n_fr/test/l10n_fr_report.yml +++ b/addons/l10n_fr/test/l10n_fr_report.yml @@ -1,23 +1,9 @@ -- - In order to test Generate Fiscalyear Opening Entries wizard of OpenERP I first create a fiscalyear "Fiscal Year 2011" to which the entries will move -- - !record {model: account.fiscalyear, id: account_fiscalyear_01}: - code: FY2011 - company_id: base.main_company - date_start: '2012-01-01' - date_stop: '2012-12-31' - name: Fiscal Year 2012 -- - I create the fiscal periods -- - !python {model: account.fiscalyear}: - self.create_period(cr, uid, [ref('account_fiscalyear_01'),]) - In order to test the PDF reports defined on a l10n_fr, we will print an Account Move Line Report for l10n_fr - !python {model: account.move.line}: | import netsvc, tools, os, time - (data, format) = netsvc.LocalService('report.l10n.fr.bilan').create(cr, uid, [], {'model':'account.move.line', 'form':{'fiscalyear_id': ref('account_fiscalyear_01')}}, {}) + (data, format) = netsvc.LocalService('report.l10n.fr.bilan').create(cr, uid, [], {'model':'account.move.line', 'form':{'fiscalyear_id': ref('account.data_fiscalyear')}}, {}) if tools.config['test_report_directory']: file(os.path.join(tools.config['test_report_directory'], 'l10n_fr-bilan_report.'+format), 'wb+').write(data) From 328ef4cacb31d3d16f67eca98f846716a8eaa293 Mon Sep 17 00:00:00 2001 From: "UCO(OpenERP)" <> Date: Mon, 3 Jan 2011 16:36:05 +0530 Subject: [PATCH 03/12] [Fix] project_timesheet: pass the journal_id bzr revid: sbh@tinyerp.com-20110103110605-h0g1pnpv8v72814k --- addons/project_timesheet/project_timesheet.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py index 42b9c4733ba..b6ec7d069bd 100644 --- a/addons/project_timesheet/project_timesheet.py +++ b/addons/project_timesheet/project_timesheet.py @@ -111,7 +111,7 @@ class project_work(osv.osv): # Compute based on pricetype amount_unit = obj_timesheet.on_change_unit_amount(cr, uid, timeline_id, - prod_id, amount, False, unit, context=context) + prod_id, amount, False, unit, vals_line['journal_id'], context=context) if amount_unit and 'amount' in amount_unit.get('value',{}): updv = { 'amount': amount_unit['value']['amount'] } obj_timesheet.write(cr, uid, [timeline_id], updv, context=context) @@ -158,7 +158,7 @@ class project_work(osv.osv): # Compute based on pricetype amount_unit = timesheet_obj.on_change_unit_amount(cr, uid, line_id.id, prod_id=prod_id, company_id=False, - unit_amount=vals_line['unit_amount'], unit=False, context=context) + unit_amount=vals_line['unit_amount'], unit=False, journal_id=vals_line['journal_id'], context=context) if amount_unit and 'amount' in amount_unit.get('value',{}): vals_line['amount'] = amount_unit['value']['amount'] From 263c058565329fdecd536a25e4df883a49b6be2e Mon Sep 17 00:00:00 2001 From: "Sbh (OpenERP)" Date: Mon, 3 Jan 2011 16:38:32 +0530 Subject: [PATCH 04/12] [IMP] project_timesheet: rename the project to Analytic account/project bzr revid: sbh@tinyerp.com-20110103110832-t013w7l0ncicvqrh --- addons/project_timesheet/project_timesheet_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml index 4f5e0ce5891..7b84165b102 100644 --- a/addons/project_timesheet/project_timesheet_view.xml +++ b/addons/project_timesheet/project_timesheet_view.xml @@ -50,7 +50,7 @@ - + @@ -72,7 +72,7 @@ - + From 623b5bbfaaeedd4ab4be9d12a6bb48323bfd630e Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Mon, 3 Jan 2011 13:34:12 +0100 Subject: [PATCH 05/12] [IMP] update version number bzr revid: chs@openerp.com-20110103123412-r5jtzfkflunxknvb --- bin/release.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/release.py b/bin/release.py index 1683db52ba4..ea830cd2205 100644 --- a/bin/release.py +++ b/bin/release.py @@ -21,7 +21,7 @@ ############################################################################## name = 'openerp-server' -version = '6.0.0-rc1' +version = '6.0.0-rc2' major_version = '6.0' description = 'OpenERP Server' long_desc = '''OpenERP is a complete ERP and CRM. The main features are accounting (analytic From 96b6e91a30d87d8fe9d596da566579e71bb9050c Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Mon, 3 Jan 2011 13:34:56 +0100 Subject: [PATCH 06/12] [FIX] base: rename bad variable name bzr revid: chs@openerp.com-20110103123456-mqxqymhj62d3sw05 --- bin/addons/base/module/wizard/base_module_upgrade.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/addons/base/module/wizard/base_module_upgrade.py b/bin/addons/base/module/wizard/base_module_upgrade.py index fd9bde9a129..ca82cfb20d2 100644 --- a/bin/addons/base/module/wizard/base_module_upgrade.py +++ b/bin/addons/base/module/wizard/base_module_upgrade.py @@ -82,12 +82,10 @@ class base_module_upgrade(osv.osv_memory): return {'module_info': '\n'.join(map(lambda x: x['name']+' : '+x['state'], res))} def upgrade_module(self, cr, uid, ids, context=None): - pool = pooler.get_pool(cr.dbname) mod_obj = self.pool.get('ir.module.module') - data_obj = self.pool.get('ir.model.data') ids = mod_obj.search(cr, uid, [('state', 'in', ['to upgrade', 'to remove', 'to install'])]) unmet_packages = [] - mod_dep_obj = pool.get('ir.module.module.dependency') + mod_dep_obj = self.pool.get('ir.module.module.dependency') for mod in mod_obj.browse(cr, uid, ids): depends_mod_ids = mod_dep_obj.search(cr, uid, [('module_id', '=', mod.id)]) for dep_mod in mod_dep_obj.browse(cr, uid, depends_mod_ids): @@ -97,8 +95,9 @@ class base_module_upgrade(osv.osv_memory): raise osv.except_osv(_('Unmet dependency !'), _('Following modules are not installed or unknown: %s') % ('\n\n' + '\n'.join(unmet_packages))) mod_obj.download(cr, uid, ids, context=context) cr.commit() - _, pool = pooler.restart_pool(cr.dbname, update_module=True) + _db, pool = pooler.restart_pool(cr.dbname, update_module=True) + data_obj = pool.get('ir.model.data') id2 = data_obj._get_id(cr, uid, 'base', 'view_base_module_upgrade_install') if id2: id2 = data_obj.browse(cr, uid, id2, context=context).res_id From 6b487a9e4d977253b104cf52134ee7fb2bead7ee Mon Sep 17 00:00:00 2001 From: "Sbh (OpenERP)" Date: Mon, 3 Jan 2011 18:31:08 +0530 Subject: [PATCH 07/12] [IMP] project_long_term: rename other info tab to Schedule and display info bzr revid: sbh@tinyerp.com-20110103130108-og8g7v3e0i3fe487 --- addons/project_long_term/project_long_term_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 7eaed6e120c..61e0a7dd7f9 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -190,14 +190,14 @@