Merge lp:~openerp-dev/openobject-addons/trunk-usability1_typo-jar into lp:openobject-addons

[Jaydeep Barot(OpenERP)]

Hello,

I have done following issues.

1) Typo in Messages demo.
2) Typo in constraint message.
3) Set meaningful warning message, when user tries to scrap the product from virtual location.

Thanks,
Jaydeep Barot (JAR)

[Richard Mathot (Odoo, formerly OpenERP) (rim-openerp)]

LGTM

review: Approve

=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2014-04-24 06:53:06 +0000
+++ account/account_move_line.py	2014-04-25 06:01:23 +0000
@@ -642,7 +642,7 @@
         (_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 debited and negative when account is credited.', ['amount_currency']),
         (_check_currency_company, "You cannot provide a secondary currency if it is the same than the company one." , ['currency_id']),
     ]
 

=== modified file 'mail/data/mail_demo.xml'
--- mail/data/mail_demo.xml	2014-04-09 10:16:04 +0000
+++ mail/data/mail_demo.xml	2014-04-25 06:01:23 +0000
@@ -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"/>

=== modified file 'stock/stock.py'
--- stock/stock.py	2014-04-18 06:12:56 +0000
+++ stock/stock.py	2014-04-25 06:01:23 +0000
@@ -2506,7 +2506,7 @@
                 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 = {