From fe5956057aa7b86ea95eacb880c0f794b9bc1d4a Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Tue, 7 Aug 2012 12:23:26 +0200 Subject: [PATCH] [FIX] spelling: 'insufficient data' instead of 'data insufficient' bzr revid: abo@openerp.com-20120807102326-sro2nxr4zn95zhs1 --- addons/account/account_invoice.py | 2 +- .../account/wizard/account_invoice_refund.py | 2 +- .../wizard/hr_timesheet_analytic_profit.py | 2 +- .../wizard/l10n_be_account_vat_declaration.py | 14 ++++---- .../wizard/l10n_be_partner_vat_listing.py | 22 ++++++------- addons/l10n_be/wizard/l10n_be_vat_intra.py | 32 +++++++++---------- addons/procurement/procurement.py | 16 +++++----- addons/sale_crm/wizard/crm_make_sale.py | 4 +-- 8 files changed, 47 insertions(+), 47 deletions(-) diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index 79e5bc10c17..7786750abda 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -521,7 +521,7 @@ class account_invoice(osv.osv): pterm_list.sort() res = {'value':{'date_due': pterm_list[-1]}} else: - raise osv.except_osv(_('Data Insufficient !'), _('The payment term of supplier does not have a payment term line!')) + raise osv.except_osv(_('Insufficient Data!'), _('The payment term of supplier does not have a payment term line.')) return res def onchange_invoice_line(self, cr, uid, ids, lines): diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py index be3c9ccaca6..f872607c763 100644 --- a/addons/account/wizard/account_invoice_refund.py +++ b/addons/account/wizard/account_invoice_refund.py @@ -143,7 +143,7 @@ class account_invoice_refund(osv.osv_memory): description = inv.name if not period: - raise osv.except_osv(_('Data Insufficient !'), \ + raise osv.except_osv(_('Insufficient Data!'), \ _('No period found on the invoice.')) refund_id = inv_obj.refund(cr, uid, [inv.id], date, period, description, journal_id) diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py index b4db228c938..0ab5b434a91 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py +++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py @@ -55,7 +55,7 @@ class account_analytic_profit(osv.osv_memory): ('user_id', 'in', data['form']['employee_ids']), ], context=context) if not ids_chk: - raise osv.except_osv(_('Data Insufficient!'), _('No record(s) found for Report!')) + raise osv.except_osv(_('Insufficient Data!'), _('No record(s) found for this report.')) data['form']['journal_ids'] = [(6, 0, data['form']['journal_ids'])] # Improve me => Change the rml/sxw so that it can support withou [0][2] data['form']['employee_ids'] = [(6, 0, data['form']['employee_ids'])] diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py index 95978ac52e7..5e357facd86 100644 --- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py +++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py @@ -3,8 +3,8 @@ # # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). -# -# Adapted by Noviat to +# +# Adapted by Noviat to # - enforce correct vat number # - support negative balance # - assign amount of tax code 71-72 correclty to grid 71 or 72 @@ -83,7 +83,7 @@ class l10n_be_vat_declaration(osv.osv_memory): obj_company = obj_user.browse(cr, uid, uid, context=context).company_id vat_no = obj_company.partner_id.vat if not vat_no: - raise osv.except_osv(_('Data Insufficient'), _('No VAT Number Associated with Main Company!')) + raise osv.except_osv(_('Insufficient Data!'), _('No VAT Number Associated with Main Company.')) vat_no = vat_no.replace(' ','').upper() vat = vat_no[2:] @@ -107,9 +107,9 @@ class l10n_be_vat_declaration(osv.osv_memory): quarter = str(((int(starting_month) - 1) / 3) + 1) if not email: - raise osv.except_osv(_('Data Insufficient!'),_('No email address associated with the company.')) + raise osv.except_osv(_('Insufficient Data!'),_('No email address associated with the company.')) if not phone: - raise osv.except_osv(_('Data Insufficient!'),_('No phone associated with the company.')) + raise osv.except_osv(_('Insufficient Data!'),_('No phone associated with the company.')) file_data = { 'issued_by': issued_by, 'vat_no': vat_no, @@ -130,7 +130,7 @@ class l10n_be_vat_declaration(osv.osv_memory): 'ask_payment': (data['ask_payment'] and 'YES' or 'NO'), 'comments': comments, } - + data_of_file = """ @@ -186,7 +186,7 @@ class l10n_be_vat_declaration(osv.osv_memory): 'amount': str(abs(item['sum_period'])), } data_of_file += '\n\t\t\t%(amount)s' % (grid_amount_data) - + data_of_file += '\n\t\t' data_of_file += '\n\t\t%(client_nihil)s' % (file_data) data_of_file += '\n\t\t' % (file_data) 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 68ad3f703e1..8cad2d01a3e 100644 --- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py +++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py @@ -7,7 +7,7 @@ # Corrections & modifications by Noviat nv/sa, (http://www.noviat.be): # - VAT listing based upon year in stead of fiscal year # - sql query adapted to select only 'tax-out' move lines -# - extra button to print readable PDF report +# - extra button to print readable PDF report # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -61,7 +61,7 @@ class partner_vat(osv.osv_memory): company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id period_ids = obj_period.search(cr, uid, [('date_start' ,'>=', date_start), ('date_stop','<=',date_stop), ('company_id','=',company_id)]) if not period_ids: - raise osv.except_osv(_('Data Insufficient!'), _('No data for the selected Year.')) + raise osv.except_osv(_('Insufficient Data!'), _('No data for the selected year.')) partners = [] partner_ids = obj_partner.search(cr, uid, [('vat_subjected', '!=', False), ('vat','ilike','BE%')], context=context) @@ -78,7 +78,7 @@ class partner_vat(osv.osv_memory): FROM account_move_line l2 LEFT JOIN account_tax_code c2 ON l2.tax_code_id = c2.id WHERE c2.code IN ('54','64') - AND l2.partner_id IN %s + AND l2.partner_id IN %s AND l2.period_id IN %s GROUP BY l2.partner_id) AS sub2 ON sub1.partner_id = sub2.partner_id """,(tuple(partner_ids),tuple(period_ids),tuple(partner_ids),tuple(period_ids))) @@ -176,7 +176,7 @@ class partner_vat_list(osv.osv_memory): company_vat = obj_cmpny.partner_id.vat if not company_vat: - raise osv.except_osv(_('Data Insufficient'),_('No VAT Number Associated with Main Company!')) + raise osv.except_osv(_('Insufficient Data!'),_('No VAT number associated with the company.')) company_vat = company_vat.replace(' ','').upper() SenderId = company_vat[2:] @@ -206,9 +206,9 @@ class partner_vat_list(osv.osv_memory): comp_name = obj_cmpny.name if not email: - raise osv.except_osv(_('Data Insufficient!'),_('No email address associated with the company.')) + raise osv.except_osv(_('Insufficient Data!'),_('No email address associated with the company.')) if not phone: - raise osv.except_osv(_('Data Insufficient!'),_('No phone associated with the company.')) + raise osv.except_osv(_('Insufficient Data!'),_('No phone associated with the company.')) annual_listing_data = { 'issued_by': issued_by, 'company_vat': company_vat, @@ -245,11 +245,11 @@ class partner_vat_list(osv.osv_memory): %(SenderId)s %(comp_name)s %(street)s - %(zip)s - %(city)s - %(country)s - %(email)s - %(phone)s + %(zip)s + %(city)s + %(country)s + %(email)s + %(phone)s %(period)s """ % annual_listing_data diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra.py b/addons/l10n_be/wizard/l10n_be_vat_intra.py index 358ab39828f..47a29a8457f 100644 --- a/addons/l10n_be/wizard/l10n_be_vat_intra.py +++ b/addons/l10n_be/wizard/l10n_be_vat_intra.py @@ -4,7 +4,7 @@ # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # -# Adapted by Noviat to +# Adapted by Noviat to # - make the 'mand_id' field optional # - support Noviat tax code scheme # @@ -104,23 +104,23 @@ class partner_vat_intra(osv.osv_memory): data_company = wiz_data.tax_code_id.company_id else: data_company = obj_user.browse(cr, uid, uid, context=context).company_id - + # Get Company vat company_vat = data_company.partner_id.vat if not company_vat: - raise osv.except_osv(_('Data Insufficient'),_('No VAT Number Associated with Main Company!')) + raise osv.except_osv(_('Insufficient Data!'),_('No VAT number associated with the company.')) company_vat = company_vat.replace(' ','').upper() issued_by = company_vat[:2] if len(wiz_data.period_code) != 6: - raise osv.except_osv(_('Wrong Period Code'), _('Period code is not valid.')) + raise osv.except_osv(_('Error!'), _('Period code is not valid.')) if not wiz_data.period_ids: - raise osv.except_osv(_('Data Insufficient!'),_('Please select at least one Period.')) + raise osv.except_osv(_('Insufficient Data!'),_('Please select at least one Period.')) p_id_list = obj_partner.search(cr, uid, [('vat','!=',False)], context=context) if not p_id_list: - raise osv.except_osv(_('Data Insufficient!'),_('No partner has a VAT Number asociated with him.')) + raise osv.except_osv(_('Insufficient Data!'),_('No partner has a VAT number asociated with him.')) seq_declarantnum = obj_sequence.get(cr, uid, 'declarantnum') dnum = company_vat[2:] + seq_declarantnum[-4:] @@ -144,14 +144,14 @@ class partner_vat_intra(osv.osv_memory): if not country: country = company_vat[:2] if not email: - raise osv.except_osv(_('Data Insufficient!'),_('No email address associated with the company.')) + raise osv.except_osv(_('Insufficient Data!'),_('No email address associated with the company.')) if not phone: - raise osv.except_osv(_('Data Insufficient!'),_('No phone associated with the company.')) + raise osv.except_osv(_('Insufficient Data!'),_('No phone associated with the company.')) xmldict.update({ 'company_name': data_company.name, - 'company_vat': company_vat, + 'company_vat': company_vat, 'vatnum': company_vat[2:], - 'mand_id': wiz_data.mand_id, + 'mand_id': wiz_data.mand_id, 'sender_date': str(time.strftime('%Y-%m-%d')), 'street': street, 'city': city, @@ -160,13 +160,13 @@ class partner_vat_intra(osv.osv_memory): 'email': email, 'phone': phone.replace('/','').replace('.','').replace('(','').replace(')','').replace(' ',''), 'period': wiz_data.period_code, - 'clientlist': [], + 'clientlist': [], 'comments': comments, 'issued_by': issued_by, }) - + codes = ('44', '46L', '46T', '48s44', '48s46L', '48s46T') - cr.execute('''SELECT p.name As partner_name, l.partner_id AS partner_id, p.vat AS vat, + cr.execute('''SELECT p.name As partner_name, l.partner_id AS partner_id, p.vat AS vat, (CASE WHEN t.code = '48s44' THEN '44' WHEN t.code = '48s46L' THEN '46L' WHEN t.code = '48s46T' THEN '46T' @@ -195,8 +195,8 @@ class partner_vat_intra(osv.osv_memory): xmldict['clientlist'].append({ 'partner_name': row['partner_name'], - 'seq': seq, - 'vatnum': row['vat'][2:].replace(' ','').upper(), + 'seq': seq, + 'vatnum': row['vat'][2:].replace(' ','').upper(), 'vat': row['vat'], 'country': row['vat'][:2], 'amount': amt, @@ -243,7 +243,7 @@ class partner_vat_intra(osv.osv_memory): data_clientinfo = '' for client in xml_data['clientlist']: if not client['vatnum']: - raise osv.except_osv(_('Data Insufficient!'),_('No vat number defined for %s') % client['partner_name']) + raise osv.except_osv(_('Insufficient Data!'),_('No vat number defined for %s.') % client['partner_name']) data_clientinfo +='\n\t\t\n\t\t\t%(vatnum)s\n\t\t\t%(code)s\n\t\t\t%(amount)s\n\t\t' % (client) data_decl = '\n\t' % (xml_data) diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index 1c83711abf7..c69e7776e72 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -166,7 +166,7 @@ class procurement_order(osv.osv): """ return all(procurement.move_id.state == 'cancel' for procurement in self.browse(cr, uid, ids, context=context)) - #This Function is create to avoid a server side Error Like 'ERROR:tests.mrp:name 'check_move' is not defined' + #This Function is create to avoid a server side Error Like 'ERROR:tests.mrp:name 'check_move' is not defined' def check_move(self, cr, uid, ids, context=None): pass @@ -277,7 +277,7 @@ class procurement_order(osv.osv): if not res: return False return True - + def check_buy(self, cr, uid, ids): """ Checks product type. @return: True or Product Id. @@ -327,8 +327,8 @@ class procurement_order(osv.osv): move_obj = self.pool.get('stock.move') for procurement in self.browse(cr, uid, ids, context=context): if procurement.product_qty <= 0.00: - raise osv.except_osv(_('Data Insufficient !'), - _('Please check the quantity in procurement order(s), it should not be 0 or less!')) + raise osv.except_osv(_('Insufficient Data!'), + _('Please check the quantity in procurement order(s), it should not be 0 or less.')) if procurement.product_id.type in ('product', 'consu'): if not procurement.move_id: source = procurement.location_id.id @@ -359,7 +359,7 @@ class procurement_order(osv.osv): message = _('From stock: products assigned.') self.write(cr, uid, ids, {'state': 'running', 'message': message}, context=context) - self.message_append_note(cr, uid, ids, body=message, context=context) + self.message_append_note(cr, uid, ids, body=message, context=context) self.running_send_note(cr, uid, ids, context=context) return True @@ -392,7 +392,7 @@ class procurement_order(osv.osv): if message: message = _("Procurement '%s' is in exception: ") % (procurement.name) + message cr.execute('update procurement_order set message=%s where id=%s', (message, procurement.id)) - self.message_append_note(cr, uid, [procurement.id], body=message, context=context) + self.message_append_note(cr, uid, [procurement.id], body=message, context=context) return ok def action_produce_assign_service(self, cr, uid, ids, context=None): @@ -607,7 +607,7 @@ class stock_warehouse_orderpoint(osv.osv): v = {'product_uom': prod.uom_id.id} return {'value': v} return {} - + def copy(self, cr, uid, id, default=None, context=None): if not default: default = {} @@ -615,7 +615,7 @@ class stock_warehouse_orderpoint(osv.osv): 'name': self.pool.get('ir.sequence').get(cr, uid, 'stock.orderpoint') or '', }) return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context=context) - + stock_warehouse_orderpoint() class product_product(osv.osv): diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py index 1125f3fc051..6ca9ac8230f 100644 --- a/addons/sale_crm/wizard/crm_make_sale.py +++ b/addons/sale_crm/wizard/crm_make_sale.py @@ -85,8 +85,8 @@ class crm_make_sale(osv.osv_memory): ['default', 'invoice', 'delivery', 'contact']) pricelist = partner.property_product_pricelist.id if False in partner_addr.values(): - raise osv.except_osv(_('Data Insufficient!'), _('Customer has no addresses defined!')) - + raise osv.except_osv(_('Insufficient Data!'), _('No addresse(s) defined for this customer.')) + vals = { 'origin': _('Opportunity: %s') % str(case.id), 'section_id': case.section_id and case.section_id.id or False,