From f2e0e0ead91cbd385adb2972c2382d4381de95d6 Mon Sep 17 00:00:00 2001 From: "Albert Cervera i Areny - http://www.NaN-tic.com" <> Date: Wed, 6 Oct 2010 19:01:59 +0530 Subject: [PATCH 1/7] [FIX] Account : Automatic reonciliation now sorts move lines by maturity date lp bug: https://launchpad.net/bugs/599087 fixed bzr revid: jvo@tinyerp.com-20101006133159-sekg06vnxxu7trc9 --- addons/account/wizard/account_automatic_reconcile.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/account/wizard/account_automatic_reconcile.py b/addons/account/wizard/account_automatic_reconcile.py index efce4bc4da4..f94082445da 100644 --- a/addons/account/wizard/account_automatic_reconcile.py +++ b/addons/account/wizard/account_automatic_reconcile.py @@ -200,7 +200,8 @@ class account_automatic_reconcile(osv.osv_memory): "AND partner_id=%s " \ "AND reconcile_id IS NULL " \ "AND state <> 'draft' " \ - "AND debit > 0", + "AND debit > 0 " \ + "ORDER BY date_maturity", (account_id, partner_id)) debits = cr.fetchall() @@ -212,7 +213,8 @@ class account_automatic_reconcile(osv.osv_memory): "AND partner_id=%s " \ "AND reconcile_id IS NULL " \ "AND state <> 'draft' " \ - "AND credit > 0", + "AND credit > 0 " \ + "ORDER BY date_maturity", (account_id, partner_id)) credits = cr.fetchall() From 43fe238c96c27d923e41eb6276a02dd700d48ed9 Mon Sep 17 00:00:00 2001 From: "Jay (OpenERP)" Date: Wed, 6 Oct 2010 19:57:45 +0530 Subject: [PATCH 2/7] [FIX] Account/stock : Better context-handling at tax computation to avoid wrong context-passing bzr revid: jvo@tinyerp.com-20101006142745-hosp53x09d6hjnr5 --- addons/account/invoice.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 1aa4e30d95d..777955d5a8e 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -650,18 +650,19 @@ class account_invoice(osv.osv): return ok def button_reset_taxes(self, cr, uid, ids, context=None): - if not context: + if context is None: context = {} + ctx = context.copy() ait_obj = self.pool.get('account.invoice.tax') for id in ids: cr.execute("DELETE FROM account_invoice_tax WHERE invoice_id=%s", (id,)) - partner = self.browse(cr, uid, id, context=context).partner_id + partner = self.browse(cr, uid, id, context=ctx).partner_id if partner.lang: - context.update({'lang': partner.lang}) - for taxe in ait_obj.compute(cr, uid, id, context=context).values(): + ctx.update({'lang': partner.lang}) + for taxe in ait_obj.compute(cr, uid, id, context=ctx).values(): ait_obj.create(cr, uid, taxe) # Update the stored value (fields.function), so we write to trigger recompute - self.pool.get('account.invoice').write(cr, uid, ids, {'invoice_line':[]}, context=context) + self.pool.get('account.invoice').write(cr, uid, ids, {'invoice_line':[]}, context=ctx) return True def button_compute(self, cr, uid, ids, context=None, set_total=False): From 9e1d2deb5d377af830a91f620d2d03236b067b8a Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 6 Oct 2010 18:16:52 +0200 Subject: [PATCH 3/7] modifs bzr revid: fp@tinyerp.com-20101006161652-7uftzxuoxu5zcmxu --- addons/association/profile_association.xml | 5 ++- .../base_report_designer_installer.xml | 17 ++++---- addons/base_setup/base_setup_installer.xml | 1 + addons/base_setup/base_setup_todo.xml | 2 +- addons/crm/crm_installer_view.xml | 43 ++++++++++--------- .../document_ics_config_wizard.xml | 1 + addons/hr/hr_installer.xml | 1 + addons/knowledge/knowledge_installer.xml | 1 + addons/marketing/marketing_view.xml | 1 + addons/mrp/mrp_installer.xml | 1 + addons/profile_tools/misc_tools_installer.xml | 1 + addons/project/board_project_manager_view.xml | 39 ++--------------- addons/project/project_installer.xml | 5 ++- .../report_designer_installer.xml | 1 + addons/sale/sale_installer.py | 8 ++-- addons/sale/sale_installer.xml | 3 +- addons/sale/sale_view.xml | 1 + addons/sale/wizard/sale_line_invoice.xml | 16 +++---- addons/thunderbird/thunderbird_installer.xml | 5 ++- 19 files changed, 67 insertions(+), 85 deletions(-) diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml index 8460cfa6cc9..d5a5baab946 100644 --- a/addons/association/profile_association.xml +++ b/addons/association/profile_association.xml @@ -48,8 +48,9 @@ - - 3 + + 3 + always diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml index 4ea4970d19a..2c0cf191e4e 100644 --- a/addons/base_report_designer/base_report_designer_installer.xml +++ b/addons/base_report_designer/base_report_designer_installer.xml @@ -19,7 +19,7 @@ This plug-in allows you to create/modify OpenERP Reports into OpenOffice Writer. - +