[IMP] improved warning messages
bzr revid: bde@tinyerp.com-20131202084204-r0br5ytoc12ysjrl
This commit is contained in:
parent
dfd010e48d
commit
baa430d237
|
@ -217,7 +217,7 @@ class delivery_grid(osv.osv):
|
||||||
ok = True
|
ok = True
|
||||||
break
|
break
|
||||||
if not ok:
|
if not ok:
|
||||||
raise osv.except_osv(_('No price available!'), _('No line matched this product or order in the chosen delivery grid.'))
|
raise osv.except_osv(_("Unable to fetch delivery method!"), _("Selected product in the delivery method doesn't fulfill any of the delivery grid(s) criteria."))
|
||||||
|
|
||||||
return price
|
return price
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,7 @@ class hr_timesheet_sheet(osv.osv):
|
||||||
def create(self, cr, uid, vals, *args, **argv):
|
def create(self, cr, uid, vals, *args, **argv):
|
||||||
if 'employee_id' in vals:
|
if 'employee_id' in vals:
|
||||||
if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).user_id:
|
if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).user_id:
|
||||||
raise osv.except_osv(_('Error!'), _('In order to create a timesheet for this employee, you must assign it to a user.'))
|
raise osv.except_osv(_('Error!'), _('In order to create a timesheet for this employee, you must relate a user to it.'))
|
||||||
if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).product_id:
|
if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).product_id:
|
||||||
raise osv.except_osv(_('Error!'), _('In order to create a timesheet for this employee, you must link the employee to a product, like \'Consultant\'.'))
|
raise osv.except_osv(_('Error!'), _('In order to create a timesheet for this employee, you must link the employee to a product, like \'Consultant\'.'))
|
||||||
if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).journal_id:
|
if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).journal_id:
|
||||||
|
@ -76,7 +76,7 @@ class hr_timesheet_sheet(osv.osv):
|
||||||
if 'employee_id' in vals:
|
if 'employee_id' in vals:
|
||||||
new_user_id = self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).user_id.id or False
|
new_user_id = self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).user_id.id or False
|
||||||
if not new_user_id:
|
if not new_user_id:
|
||||||
raise osv.except_osv(_('Error!'), _('In order to create a timesheet for this employee, you must assign it to a user.'))
|
raise osv.except_osv(_('Error!'), _('In order to create a timesheet for this employee, you must relate a user to it.'))
|
||||||
if not self._sheet_date(cr, uid, ids, forced_user_id=new_user_id):
|
if not self._sheet_date(cr, uid, ids, forced_user_id=new_user_id):
|
||||||
raise osv.except_osv(_('Error!'), _('You cannot have 2 timesheets that overlap!\nYou should use the menu \'My Timesheet\' to avoid this problem.'))
|
raise osv.except_osv(_('Error!'), _('You cannot have 2 timesheets that overlap!\nYou should use the menu \'My Timesheet\' to avoid this problem.'))
|
||||||
if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).product_id:
|
if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).product_id:
|
||||||
|
|
|
@ -476,7 +476,7 @@ class purchase_order(osv.osv):
|
||||||
if not acc_id:
|
if not acc_id:
|
||||||
acc_id = po_line.product_id.categ_id.property_account_expense_categ.id
|
acc_id = po_line.product_id.categ_id.property_account_expense_categ.id
|
||||||
if not acc_id:
|
if not acc_id:
|
||||||
raise osv.except_osv(_('Error!'), _('Define expense account for this company: "%s" (id:%d).') % (po_line.product_id.name, po_line.product_id.id,))
|
raise osv.except_osv(_('Error!'), _('Define expense account for this product: "%s" (id:%d).') % (po_line.product_id.name, po_line.product_id.id,))
|
||||||
else:
|
else:
|
||||||
acc_id = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category', context=context).id
|
acc_id = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category', context=context).id
|
||||||
fpos = po_line.order_id.fiscal_position or False
|
fpos = po_line.order_id.fiscal_position or False
|
||||||
|
@ -597,8 +597,7 @@ class purchase_order(osv.osv):
|
||||||
for inv in purchase.invoice_ids:
|
for inv in purchase.invoice_ids:
|
||||||
if inv and inv.state not in ('cancel','draft'):
|
if inv and inv.state not in ('cancel','draft'):
|
||||||
raise osv.except_osv(
|
raise osv.except_osv(
|
||||||
_('Unable to cancel this purchase order.'),
|
_('You must first cancel all invoices related to this purchase order.'))
|
||||||
_('You must first cancel all receptions related to this purchase order.'))
|
|
||||||
self.pool.get('account.invoice') \
|
self.pool.get('account.invoice') \
|
||||||
.signal_invoice_cancel(cr, uid, map(attrgetter('id'), purchase.invoice_ids))
|
.signal_invoice_cancel(cr, uid, map(attrgetter('id'), purchase.invoice_ids))
|
||||||
self.write(cr,uid,ids,{'state':'cancel'})
|
self.write(cr,uid,ids,{'state':'cancel'})
|
||||||
|
|
|
@ -38,7 +38,7 @@ class purchase_requisition_partner(osv.osv_memory):
|
||||||
record_id = context and context.get('active_id', False) or False
|
record_id = context and context.get('active_id', False) or False
|
||||||
tender = self.pool.get('purchase.requisition').browse(cr, uid, record_id, context=context)
|
tender = self.pool.get('purchase.requisition').browse(cr, uid, record_id, context=context)
|
||||||
if not tender.line_ids:
|
if not tender.line_ids:
|
||||||
raise osv.except_osv(_('Error!'), _('No Product in Tender.'))
|
raise osv.except_osv(_('Error!'), _('No Product in Requisition.'))
|
||||||
return res
|
return res
|
||||||
|
|
||||||
def create_order(self, cr, uid, ids, context=None):
|
def create_order(self, cr, uid, ids, context=None):
|
||||||
|
|
|
@ -160,7 +160,7 @@ class sale_order(osv.osv):
|
||||||
if s['state'] in ['draft', 'cancel']:
|
if s['state'] in ['draft', 'cancel']:
|
||||||
unlink_ids.append(s['id'])
|
unlink_ids.append(s['id'])
|
||||||
else:
|
else:
|
||||||
raise osv.except_osv(_('Invalid Action!'), _('In order to delete a confirmed sales order, you must cancel it.\nTo do so, you must first cancel related picking for delivery orders.'))
|
raise osv.except_osv(_('Invalid Action!'), _('In order to delete a confirmed sales order, you must cancel it. \nTo do so, you must first cancel all related delivery order(s).'))
|
||||||
|
|
||||||
return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
|
return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
|
||||||
|
|
||||||
|
|
|
@ -1195,7 +1195,7 @@ class stock_picking(osv.osv):
|
||||||
return True
|
return True
|
||||||
for move in pick.move_lines:
|
for move in pick.move_lines:
|
||||||
if move.state == 'done':
|
if move.state == 'done':
|
||||||
raise osv.except_osv(_('Error!'), _('You cannot cancel the picking as some moves have been done. You should cancel the picking lines.'))
|
raise osv.except_osv(_('Error!'), _('You cannot cancel the picking as some moves have been done. You should cancel remaining moves of this picking.'))
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def unlink(self, cr, uid, ids, context=None):
|
def unlink(self, cr, uid, ids, context=None):
|
||||||
|
|
Loading…
Reference in New Issue