From f00358b871ae2d2b1f060a7890ce919e62aed211 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 5 Jun 2012 18:17:19 +0530 Subject: [PATCH 1/3] [IMP]:account:small imp bzr revid: apa@tinyerp.com-20120605124719-b42stb7s9fz0lbx5 --- addons/account/account_installer.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml index 8c2865ea9b9..060a8a63d17 100644 --- a/addons/account/account_installer.xml +++ b/addons/account/account_installer.xml @@ -13,9 +13,11 @@ Configure Your Chart of Accounts - - The default Chart of Accounts is matching your country selection. If no certified Chart of Accounts exists for your specified country, a generic one can be installed and will be selected by default. - + + + + + Configure From 76bc2a11b26707d4bb87a43adf4b2d69b52b082a Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 5 Jun 2012 18:23:18 +0530 Subject: [PATCH 2/3] [IMP]:idea bzr revid: apa@tinyerp.com-20120605125318-8xsw6vvuinawo075 --- addons/idea/idea_view.xml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml index 0e9fb40020f..652bd464d86 100644 --- a/addons/idea/idea_view.xml +++ b/addons/idea/idea_view.xml @@ -100,20 +100,20 @@ - + - - idea.stat.form - idea.stat - form - -
- - - - - -
+ + + + + + + + + + + + From 37ac236cc5051b650ca2edc2a44322674d105ee2 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Tue, 5 Jun 2012 18:58:12 +0530 Subject: [PATCH 3/3] [IMP]:point_of_sale bzr revid: apa@tinyerp.com-20120605132812-mblxngyk7qi6si3d --- addons/point_of_sale/wizard/pos_box_entries.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/point_of_sale/wizard/pos_box_entries.py b/addons/point_of_sale/wizard/pos_box_entries.py index 3a4675a8296..943b6dba767 100644 --- a/addons/point_of_sale/wizard/pos_box_entries.py +++ b/addons/point_of_sale/wizard/pos_box_entries.py @@ -34,7 +34,7 @@ def get_journal(self, cr, uid, context=None): @param context: A standard dictionary @return :Return the list of journal """ - + journal_obj = self.pool.get('account.journal') statement_obj = self.pool.get('account.bank.statement') @@ -42,7 +42,7 @@ def get_journal(self, cr, uid, context=None): obj_ids = statement_obj.search(cr, uid, [('state', '=', 'open'), ('user_id', '=', uid), ('journal_id', 'in', j_ids)], context=context) res = statement_obj.read(cr, uid, obj_ids, ['journal_id'], context=context) res = [(r['journal_id']) for r in res] - if not len(res): + if not len(res) and context: raise osv.except_osv(_('Error !'), _('You do not have any open cash register. You must create a payment method or open a cash register.')) return res