From 5bc04994f3daea53a6179b515700e764a3023ad2 Mon Sep 17 00:00:00 2001
From: Jaydeep Barot <jar@tinyerp.com>
Date: Mon, 21 Apr 2014 12:20:09 +0530
Subject: [PATCH] [IMP] typo error message and validateError and typo in
 chatter msg

bzr revid: jar@tinyerp.com-20140421065009-4j8z0awc9t4b82tb
---
 addons/account/account_move_line.py | 2 +-
 addons/mail/data/mail_demo.xml      | 2 +-
 addons/stock/stock.py               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index b48e842caf5..730c8faa062 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -628,7 +628,7 @@ class account_move_line(osv.osv):
         (_check_date, 'The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal.', ['date']),
         (_check_currency, 'The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal.', ['currency_id']),
         (_check_currency_and_amount, "You cannot create journal items with a secondary currency without recording both 'currency' and 'amount currency' field.", ['currency_id','amount_currency']),
-        (_check_currency_amount, 'The amount expressed in the secondary currency must be positive when the journal item is a debit and negative when if it is a credit.', ['amount_currency']),
+        (_check_currency_amount, 'The amount expressed in the secondary currency must be positive when account is a debited and negative when account is a credit.', ['amount_currency']),
         (_check_currency_company, "You cannot provide a secondary currency if it is the same than the company one." , ['currency_id']),
     ]
 
diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index 09415ba89e0..d9f8ea33d28 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -259,7 +259,7 @@
         <!-- Short thread: Admin ask, Agrolait answer [DEMO: mark thread as done] -->
         <record id="msg_discus1" model="mail.message">
             <field name="subject">Feedback about our On Site Assistance</field>
-            <field name="body"><![CDATA[<p>Hi Virginie,</p><p>I writing to you about our <i>On Site Assistance Service</i> that we delivered to Agrolait last week. Do you have any feedback or remark about our service? I noticed you requested new IP phones. Will it be used for new employees, or did you have any issue with the ones we provided?<br />Best regards,</p>]]></field>
+            <field name="body"><![CDATA[<p>Hi Virginie,</p><p>I wrote to you about our <i>On Site Assistance Service</i> that we delivered to Agrolait last week. Do you have any feedback or remark about our service? I noticed you requested new IP phones. Will it be used for new employees, or did you have any issue with the ones we provided?<br />Best regards,</p>]]></field>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
             <field name="author_id" ref="base.partner_root"/>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 7e73d7fcd53..49e5cf6b3e3 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2506,7 +2506,7 @@ class stock_move(osv.osv):
                 source_location = move.location_dest_id
             if source_location.usage != 'internal':
                 #restrict to scrap from a virtual location because it's meaningless and it may introduce errors in stock ('creating' new products from nowhere)
-                raise osv.except_osv(_('Error!'), _('Forbidden operation: it is not allowed to scrap products from a virtual location.'))
+                raise osv.except_osv(_('Error!'), _('Operation Forbidden! it is not allowed to scrap products from a virtual location: %s' %(move.location_id.complete_name)))
             move_qty = move.product_qty
             uos_qty = quantity / move_qty * move.product_uos_qty
             default_val = {