Hardik Sanchawat (OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-exception-warning-imp-dbr-sale-hsa
into lp:~openerp-dev/openobject-addons/trunk-exception-warning-imp-dbr.
Requested reviews:
Kuldeep Joshi(OpenERP) (kjo-openerp)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-exception-warning-imp-dbr-sale-hsa/+merge/114806
Hello,
I update warning messages in sale module.
Thanks
-hsa
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-exception-warning-imp-dbr-sale-hsa/+merge/114806
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-exception-warning-imp-dbr.
=== modified file 'sale/sale.py'
--- sale/sale.py 2012-07-11 12:38:48 +0000
+++ sale/sale.py 2012-07-13 08:54:25 +0000
@@ -295,7 +295,7 @@
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 @@
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 @@
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)
@@ -1211,7 +1211,7 @@
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,
@@ -1255,7 +1255,7 @@
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'})
@@ -1348,7 +1348,7 @@
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')
=== modified file 'sale/wizard/sale_make_invoice.py'
--- sale/wizard/sale_make_invoice.py 2011-12-26 08:41:35 +0000
+++ sale/wizard/sale_make_invoice.py 2012-07-13 08:54:25 +0000
@@ -39,7 +39,7 @@
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):
=== modified file 'sale_crm/wizard/crm_make_sale.py'
--- sale_crm/wizard/crm_make_sale.py 2012-06-19 12:10:16 +0000
+++ sale_crm/wizard/crm_make_sale.py 2012-07-13 08:54:25 +0000
@@ -85,7 +85,7 @@
['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),
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
