odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] Improved warning messages for purchase module 

bzr revid: pso@tinyerp.com-20120725101229-p6pohqemj1tdenb3
This commit is contained in:
pso (OpenERP) 2012-07-25 15:42:29 +05:30
parent a028157690
commit 78c6d6e5c6
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/purchase/i18n/purchase.pot
View File

@ -640,7 +640,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/purchase.py:349
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)"
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
#. module: purchase
@ -1744,7 +1744,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:359
#: code:addons/purchase/wizard/purchase_line_invoice.py:112
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)"
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
#. module: purchase

4
addons/purchase/purchase.py
View File

@ -428,7 +428,7 @@ class purchase_order(osv.osv):
journal_ids = journal_obj.search(cr, uid, [('type', '=','purchase'),('company_id', '=', order.company_id.id)], limit=1)
if not journal_ids:
raise osv.except_osv(_('Error !'),
_('Define purchase journal for this company: "%s" (id:%d)') % (order.company_id.name, order.company_id.id))
_('Define purchase journal for this company: "%s" (id:%d).') % (order.company_id.name, order.company_id.id))
# generate invoice line correspond to PO line and link that to created invoice (inv_id) and PO line
inv_lines = []
@ -438,7 +438,7 @@ class purchase_order(osv.osv):
if not acc_id:
acc_id = po_line.product_id.categ_id.property_account_expense_categ.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 company: "%s" (id:%d).') % (po_line.product_id.name, po_line.product_id.id,))
else:
acc_id = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category').id
fpos = order.fiscal_position or False

2
addons/purchase/wizard/purchase_line_invoice.py
View File

@ -107,7 +107,7 @@ class purchase_line_invoice(osv.osv_memory):
a = line.product_id.categ_id.property_account_expense_categ.id
if not a:
raise osv.except_osv(_('Error !'),
_('Define expense account for this product: "%s" (id:%d)') % \
_('Define expense account for this product: "%s" (id:%d).') % \
(line.product_id.name, line.product_id.id,))
else:
a = property_obj.get(cr, uid,