diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot index 64cd1ee5a8c..daecfe2de4e 100644 --- a/addons/sale/i18n/sale.pot +++ b/addons/sale/i18n/sale.pot @@ -131,8 +131,8 @@ msgstr "" #: code:addons/sale/sale.py:295 #, python-format msgid "" -"In order to delete a confirmed sale order, you must cancel it before ! To " -"cancel a sale order, you must first cancel related picking or delivery " +"In order to delete a confirmed sales order, you must cancel it before ! To " +"cancel a sale order, you must first cancel related picking for delivery " "orders." msgstr "" @@ -796,7 +796,7 @@ msgstr "" #. module: sale #: code:addons/sale/sale.py:1078 #, python-format -msgid "Could not cancel sales order line!" +msgid "Cannot cancel sale order line!" msgstr "" #. module: sale @@ -1460,8 +1460,8 @@ msgstr "" #: code:addons/sale/sale.py:1171 #, python-format msgid "" -"You have to select a customer in the sales form !\n" -"Please set one customer before choosing a product." +"Before choosing a product,\n " +"select a customer in the sales form." msgstr "" #. module: sale @@ -1492,7 +1492,7 @@ msgstr "" #. module: sale #: code:addons/sale/sale.py:604 #, python-format -msgid "You must first cancel all picking attached to this sales order." +msgid "First cancelled all picking attached to this sale order." msgstr "" #. module: sale @@ -1981,7 +1981,7 @@ msgstr "" #. module: sale #: code:addons/sale/sale.py:618 #, python-format -msgid "You must first cancel all invoices attached to this sales order." +msgid "First cancelled all invoices attached to this sale order." msgstr "" #. module: sale diff --git a/addons/sale/sale.py b/addons/sale/sale.py index aeede7e5533..2d9d3dcc056 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -295,7 +295,7 @@ class sale_order(osv.osv): if s['state'] in ['draft', 'cancel']: unlink_ids.append(s['id']) else: - raise osv.except_osv(_('Invalid action !'), _('In order to delete a confirmed sale order, you must cancel it before ! To cancel a sale order, you must first cancel related picking or delivery orders.')) + raise osv.except_osv(_('Invalid action !'), _('In order to delete a confirmed sales order, you must cancel it before ! To cancel a sale order, you must first cancel related picking for delivery orders.')) return osv.osv.unlink(self, cr, uid, unlink_ids, context=context) @@ -702,8 +702,8 @@ class sale_order(osv.osv): for pick in sale.picking_ids: if pick.state not in ('draft', 'cancel'): raise osv.except_osv( - _('Could not cancel sales order !'), - _('You must first cancel all picking attached to this sales order.')) + _('Could not cancel sales order!'), + _('First cancelled all picking attached to this sale order.')) if pick.state == 'cancel': for mov in pick.move_lines: proc_ids = proc_obj.search(cr, uid, [('move_id', '=', mov.id)]) @@ -716,8 +716,8 @@ class sale_order(osv.osv): for inv in sale.invoice_ids: if inv.state not in ('draft', 'cancel'): raise osv.except_osv( - _('Could not cancel this sales order !'), - _('You must first cancel all invoices attached to this sales order.')) + _('Could not cancel this sales order!'), + _('First cancelled all invoices attached to this sale order.')) for r in self.read(cr, uid, ids, ['invoice_ids']): for inv in r['invoice_ids']: wf_service.trg_validate(uid, 'account.invoice', inv, 'invoice_cancel', cr) @@ -1210,7 +1210,7 @@ class sale_order_line(osv.osv): account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, account_id) if not account_id: raise osv.except_osv(_('Error !'), - _('There is no income category account defined in default Properties for Product Category or Fiscal Position is not defined !')) + _('There is no Fiscal Position defined or income category account defined for Product Categories default Properties.')) return { 'name': line.name, 'origin': line.order_id.name, @@ -1253,7 +1253,7 @@ class sale_order_line(osv.osv): for move_line in line.move_ids: if move_line.state != 'cancel': raise osv.except_osv( - _('Could not cancel sales order line!'), + _('Cannot cancel sale order line!'), _('You must first cancel stock moves attached to this sales order line.')) return self.write(cr, uid, ids, {'state': 'cancel'}) @@ -1346,7 +1346,7 @@ class sale_order_line(osv.osv): context = context or {} lang = lang or context.get('lang',False) if not partner_id: - raise osv.except_osv(_('No Customer Defined !'), _('You have to select a customer in the sales form !\nPlease set one customer before choosing a product.')) + raise osv.except_osv(_('No Customer Defined !'), _('Before choosing a product,\n select a customer in the sales form.')) warning = {} product_uom_obj = self.pool.get('product.uom') partner_obj = self.pool.get('res.partner') diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py index 5265afb9bff..809983dc273 100644 --- a/addons/sale/wizard/sale_make_invoice.py +++ b/addons/sale/wizard/sale_make_invoice.py @@ -39,7 +39,7 @@ class sale_make_invoice(osv.osv_memory): record_id = context and context.get('active_id', False) order = self.pool.get('sale.order').browse(cr, uid, record_id, context=context) if order.state == 'draft': - raise osv.except_osv(_('Warning !'),'You can not create invoice when sales order is not confirmed.') + raise osv.except_osv(_('Warning !'),'You cannot create invoice when sales order is not confirmed.') return False def make_invoices(self, cr, uid, ids, context=None): diff --git a/addons/sale_crm/i18n/sale_crm.pot b/addons/sale_crm/i18n/sale_crm.pot index f32adb6e193..94a25994d20 100644 --- a/addons/sale_crm/i18n/sale_crm.pot +++ b/addons/sale_crm/i18n/sale_crm.pot @@ -45,7 +45,7 @@ msgstr "" #. module: sale_crm #: code:addons/sale_crm/wizard/crm_make_sale.py:89 #, python-format -msgid "Customer has no addresses defined!" +msgid "No address defined for customer!" msgstr "" #. module: sale_crm diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py index 823d8d6ab07..21041da404d 100644 --- a/addons/sale_crm/wizard/crm_make_sale.py +++ b/addons/sale_crm/wizard/crm_make_sale.py @@ -85,7 +85,7 @@ 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(_('Data Insufficient!'), _('No address defined for customer!')) vals = { 'origin': _('Opportunity: %s') % str(case.id),