From b855f0bdd81e41c1596072e0e8061b3248b8121c Mon Sep 17 00:00:00 2001 From: Dhruti Shastri <> Date: Mon, 5 Nov 2012 11:45:18 +0530 Subject: [PATCH 1/3] [FIX]l10_be : Wizard thorws error instead of User Friendly Warning bzr revid: mma@tinyerp.com-20121105061518-9zixa8lr22z7v9j5 --- addons/l10n_be/wizard/l10n_be_partner_vat_listing.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py index d15b300597e..5234dadf479 100644 --- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py +++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py @@ -65,6 +65,8 @@ class partner_vat(osv.osv_memory): partners = [] partner_ids = obj_partner.search(cr, uid, [('vat_subjected', '!=', False), ('vat','ilike','BE%')], context=context) + if not partner_ids: + raise osv.except_osv(_('Missing Partner Configuration'),_('Could not find VAT and Legal Statement Validation')) cr.execute("""SELECT sub1.partner_id, sub1.name, sub1.vat, sub1.turnover, sub2.vat_amount FROM (SELECT l.partner_id, p.name, p.vat, SUM(CASE WHEN c.code ='49' THEN -l.tax_amount ELSE l.tax_amount END) as turnover FROM account_move_line l @@ -190,7 +192,7 @@ class partner_vat_list(osv.osv_memory): addr = obj_partner.address_get(cr, uid, [obj_cmpny.partner_id.id], ['invoice']) if addr.get('invoice',False): ads = obj_partner.browse(cr, uid, [addr['invoice']], context=context)[0] - phone = ads.phone.replace(' ','') or '' + phone = ads.phone.replace(' ','') if ads.phone else '' email = ads.email or '' name = ads.name or '' city = ads.city or '' @@ -259,6 +261,8 @@ class partner_vat_list(osv.osv_memory): # Turnover and Farmer tags are not included client_datas = self._get_datas(cr, uid, ids, context=context) + if not client_datas: + raise osv.except_osv(_('Data Insufficient!'),_('No data available for the client.')) data_client_info = '' for amount_data in client_datas: data_client_info += """ @@ -309,6 +313,8 @@ class partner_vat_list(osv.osv_memory): datas['year'] = context['year'] datas['limit_amount'] = context['limit_amount'] datas['client_datas'] = self._get_datas(cr, uid, ids, context=context) + if not datas['client_datas']: + raise osv.except_osv(_('Error !'),_('No record to print.')) return { 'type': 'ir.actions.report.xml', 'report_name': 'partner.vat.listing.print', From 3518a4f2dcdb111440c9e9dc6231b71f8ae72983 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Mon, 5 Nov 2012 15:44:07 +0530 Subject: [PATCH 2/3] [IMP]10_be : improved code bzr revid: mma@tinyerp.com-20121105101407-fsxjwisg9ajgim07 --- addons/l10n_be/wizard/l10n_be_partner_vat_listing.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py index 5234dadf479..6d82541345f 100644 --- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py +++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py @@ -66,7 +66,7 @@ class partner_vat(osv.osv_memory): partners = [] partner_ids = obj_partner.search(cr, uid, [('vat_subjected', '!=', False), ('vat','ilike','BE%')], context=context) if not partner_ids: - raise osv.except_osv(_('Missing Partner Configuration'),_('Could not find VAT and Legal Statement Validation')) + raise osv.except_osv(_('Missing Partner Configuration'),_('Could not find VAT and Legal Statement Validation'.)) cr.execute("""SELECT sub1.partner_id, sub1.name, sub1.vat, sub1.turnover, sub2.vat_amount FROM (SELECT l.partner_id, p.name, p.vat, SUM(CASE WHEN c.code ='49' THEN -l.tax_amount ELSE l.tax_amount END) as turnover FROM account_move_line l @@ -314,7 +314,7 @@ class partner_vat_list(osv.osv_memory): datas['limit_amount'] = context['limit_amount'] datas['client_datas'] = self._get_datas(cr, uid, ids, context=context) if not datas['client_datas']: - raise osv.except_osv(_('Error !'),_('No record to print.')) + raise osv.except_osv(_('Error!'),_('No record to print.')) return { 'type': 'ir.actions.report.xml', 'report_name': 'partner.vat.listing.print', From ce2d38922e409da2bc1e81b08e792a2c6e5b6db7 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Mon, 5 Nov 2012 15:51:02 +0530 Subject: [PATCH 3/3] [FIX]l10_be : imp little bit bzr revid: mma@tinyerp.com-20121105102102-sxbu9q584bp7gyfy --- addons/l10n_be/wizard/l10n_be_partner_vat_listing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py index 6d82541345f..4f5863d76b2 100644 --- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py +++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py @@ -66,7 +66,7 @@ class partner_vat(osv.osv_memory): partners = [] partner_ids = obj_partner.search(cr, uid, [('vat_subjected', '!=', False), ('vat','ilike','BE%')], context=context) if not partner_ids: - raise osv.except_osv(_('Missing Partner Configuration'),_('Could not find VAT and Legal Statement Validation'.)) + raise osv.except_osv(_('Missing Partner Configuration'),_('Could not find VAT and Legal Statement Validation.')) cr.execute("""SELECT sub1.partner_id, sub1.name, sub1.vat, sub1.turnover, sub2.vat_amount FROM (SELECT l.partner_id, p.name, p.vat, SUM(CASE WHEN c.code ='49' THEN -l.tax_amount ELSE l.tax_amount END) as turnover FROM account_move_line l