From 1cb348e1334284665f3d29545be3863e5b8dd54f Mon Sep 17 00:00:00 2001 From: "Hiral Patel (OpenERP)" Date: Thu, 10 Jan 2013 15:44:59 +0530 Subject: [PATCH 01/58] [7.0][project_crm][FIX] sale_order_id does not appear in the correct location on project.task bzr revid: hip@tinyerp.com-20130110101459-c5q6t465i4p8nftk --- addons/project_mrp/project_mrp_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml index 881ed9b6b29..499a0259214 100644 --- a/addons/project_mrp/project_mrp_view.xml +++ b/addons/project_mrp/project_mrp_view.xml @@ -26,9 +26,9 @@ project.task - + - + From 8d47d83bbf7aab82859f269a670b63bd43689bf5 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Thu, 17 Jan 2013 17:28:14 +0530 Subject: [PATCH 02/58] [FIX] config_id problem with pos session.--fixes:lp1098226 bzr revid: bth@tinyerp.com-20130117115814-kf2365ydkq5fwu5i --- addons/point_of_sale/point_of_sale.py | 2 +- addons/point_of_sale/wizard/pos_session_opening.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 970eb1fbed7..22a6b5cd95b 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -290,7 +290,7 @@ class pos_session(osv.osv): _constraints = [ (_check_unicity, "You cannot create two active sessions with the same responsible!", ['user_id', 'state']), - (_check_pos_config, "You cannot create two active sessions related to the same point of sale!", ['config_id']), + (_check_pos_config, "You cannot create two active sessions related to the same point of sale! Use not used point of sale", ['config_id']), ] def create(self, cr, uid, values, context=None): diff --git a/addons/point_of_sale/wizard/pos_session_opening.py b/addons/point_of_sale/wizard/pos_session_opening.py index 1aa4cb702c4..ac64da706aa 100644 --- a/addons/point_of_sale/wizard/pos_session_opening.py +++ b/addons/point_of_sale/wizard/pos_session_opening.py @@ -88,6 +88,7 @@ class pos_session_opening(osv.osv_memory): session_ids = proxy.search(cr, uid, [ ('state', '!=', 'closed'), ('config_id', '=', config_id), + ('user_id', '=', uid), ], context=context) if session_ids: session = proxy.browse(cr, uid, session_ids[0], context=context) From 75ee662647d0209516997bdce7bed23afa1c32af Mon Sep 17 00:00:00 2001 From: Niels Huylebroeck Date: Fri, 25 Jan 2013 17:07:11 +0100 Subject: [PATCH 03/58] [FIX] account_payment: imported payments from invoices on payment order do not reflect the reference type of the invoice lp bug: https://launchpad.net/bugs/1105067 fixed bzr revid: nh@agaplan.eu-20130125160711-cofis6ftzw3zvcza --- addons/account_payment/wizard/account_payment_order.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/account_payment/wizard/account_payment_order.py b/addons/account_payment/wizard/account_payment_order.py index 455475b0ae5..60b1bc9c1d1 100644 --- a/addons/account_payment/wizard/account_payment_order.py +++ b/addons/account_payment/wizard/account_payment_order.py @@ -88,6 +88,7 @@ class payment_order_create(osv.osv_memory): 'partner_id': line.partner_id and line.partner_id.id or False, 'communication': line.ref or '/', 'date': date_to_pay, + 'state': line.invoice and line.invoice.reference_type != 'none' and 'structured' or 'normal', 'currency': (line.invoice and line.invoice.currency_id.id) or line.journal_id.currency.id or line.journal_id.company_id.currency_id.id, }, context=context) return {'type': 'ir.actions.act_window_close'} From 2ace4972e671934526ad9f501e22d570ab3d062f Mon Sep 17 00:00:00 2001 From: Peter Langenberg Date: Tue, 29 Jan 2013 15:34:28 +0100 Subject: [PATCH 04/58] [FIX]l10n_be_coda Agaplan 661 OpenERP Maintenance bzr revid: pl@agaplan.eu-20130129143428-l74j4vzt8z8j6ebr --- addons/l10n_be_coda/wizard/account_coda_import.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py index 213040d6204..78d3dbcc545 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import.py +++ b/addons/l10n_be_coda/wizard/account_coda_import.py @@ -246,7 +246,7 @@ class account_coda_import(osv.osv_memory): elif line[0] == '9': statement['balanceMin'] = float(rmspaces(line[22:37])) / 1000 statement['balancePlus'] = float(rmspaces(line[37:52])) / 1000 - if not statement['balance_end_real']: + if not statement.get('balance_end_real'): statement['balance_end_real'] = statement['balance_start'] + statement['balancePlus'] - statement['balanceMin'] for i, statement in enumerate(statements): statement['coda_note'] = '' From 242c0094d9777396e5ca0e7438e3e7d75a20b09c Mon Sep 17 00:00:00 2001 From: Rifakat Date: Wed, 6 Feb 2013 12:52:26 +0530 Subject: [PATCH 05/58] [FIX] l10n_be_coda: bank statement line has wrong domain concerning parent which is error prone as its a list view which does not have parent view bzr revid: rha@tinyerp.com-20130206072226-q08kv4h2txrgr1tb --- addons/l10n_be_coda/l10n_be_coda_view.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/l10n_be_coda/l10n_be_coda_view.xml b/addons/l10n_be_coda/l10n_be_coda_view.xml index 2464e5e9082..07af80b5660 100644 --- a/addons/l10n_be_coda/l10n_be_coda_view.xml +++ b/addons/l10n_be_coda/l10n_be_coda_view.xml @@ -44,11 +44,12 @@ + - - + + From fd485cd9e71202c1180322001c0fee1d921d6a6a Mon Sep 17 00:00:00 2001 From: "Pinakin Nayi (OpenERP)" Date: Thu, 14 Feb 2013 18:08:56 +0530 Subject: [PATCH 06/58] [FIX]account_analytic_plans:open analytic rules and try to groupby analytic account it not getting analytic account in tree view so generate client error bzr revid: pna@tinyerp.com-20130214123856-hr30ewdc9rrwhimq --- addons/account_analytic_plans/account_analytic_plans_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml index 3dcbcda6952..dbd793af5ae 100644 --- a/addons/account_analytic_plans/account_analytic_plans_view.xml +++ b/addons/account_analytic_plans/account_analytic_plans_view.xml @@ -272,7 +272,7 @@ account.analytic.default - + From de240e28183be881078af89893b504fc6478051a Mon Sep 17 00:00:00 2001 From: Peter Langenberg Date: Thu, 14 Feb 2013 13:58:41 +0100 Subject: [PATCH 07/58] [fix]l10n_be_coda/wizard/account_coda_import.py warning No transactions or no period in coda file ! to avoid key error lp bug: https://launchpad.net/bugs/1125165 fixed bzr revid: pl@agaplan.eu-20130214125841-ytdwspwug910v1hv --- addons/l10n_be_coda/wizard/account_coda_import.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py index 78d3dbcc545..b952ee5d0f6 100644 --- a/addons/l10n_be_coda/wizard/account_coda_import.py +++ b/addons/l10n_be_coda/wizard/account_coda_import.py @@ -264,6 +264,8 @@ class account_coda_import(osv.osv_memory): raise osv.except_osv(_('Error'), _("Configuration Error in journal %s!\nPlease verify the Default Debit and Credit Account settings.") % statement['journal_id'].name) if balance_start_check != statement['balance_start']: statement['coda_note'] = _("The CODA Statement %s Starting Balance (%.2f) does not correspond with the previous Closing Balance (%.2f) in journal %s!") % (statement['description'] + ' #' + statement['paperSeqNumber'], statement['balance_start'], balance_start_check, statement['journal_id'].name) + if not(statement.get('period_id')): + raise osv.except_osv(_('Error') + ' R3006', _(' No transactions or no period in coda file !')) data = { 'name': statement['paperSeqNumber'], 'date': statement['date'], From 1f5e98aa591855da34b2b982cb459b629b2d50d6 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Fri, 15 Feb 2013 15:34:37 +0530 Subject: [PATCH 08/58] [FIX]stock: added domain and default search to display proper user on proper field [customer, supplier] bzr revid: mma@tinyerp.com-20130215100437-d8ke7al2ef0ma1jb --- addons/stock/stock_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index a559aad9aac..9bf0ae8a55e 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -908,7 +908,7 @@ - + @@ -1034,7 +1034,7 @@