Merge lp:~openerp-dev/openobject-addons/7.0-opw-590663-rmu into lp:openobject-addons/7.0

[Ravish(OpenERP)]

Hello,

I have improved translation of journal in company_on_change.
when you change company, it will shown journal name in osv exception in user language.

Thanks lot..!!

[Olivier Dony (Odoo) (odo-openerp)]

Some problems that I will fix while merging:
- Changing the POT files to add terms that are not automatically found by our extractor is not a good idea, because they will be dropped later. You need to make sure that they are properly found
- Asking translators to translate the technical name of Journal Types is not a good idea either, you should use the label of the type
- The whole fix is useless because this onchange method does not receive a context, and we cannot add it in a stable series. We can workaround this problem by adding a fake context within the onchange, until the API can be fixed in the future.

Thanks

review: Needs Fixing

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2013-04-18 15:40:22 +0000
+++ account/account_invoice.py	2013-05-16 05:35:54 +0000
@@ -614,7 +614,7 @@
                 if r[1] == 'journal_id' and r[2] in journal_ids:
                     val['journal_id'] = r[2]
             if not val.get('journal_id', False):
-                raise osv.except_osv(_('Configuration Error!'), (_('Cannot find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration\Journals\Journals.') % (journal_type)))
+                raise osv.except_osv(_('Configuration Error!'), (_('Cannot find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration\Journals\Journals.') % _(journal_type)))
             dom = {'journal_id':  [('id', 'in', journal_ids)]}
         else:
             journal_ids = obj_journal.search(cr, uid, [])
 
=== modified file 'account/i18n/account.pot'
--- account/i18n/account.pot	2013-03-07 12:19:34 +0000
+++ account/i18n/account.pot	2013-05-16 05:35:54 +0000
@@ -16,6 +16,30 @@
 "Plural-Forms: \n"
 
 #. module: account
+#: code:addons/account/account_invoice.py:601
+#, python-format
+msgid "sale"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:603
+#, python-format
+msgid "sale_refund"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:605
+#, python-format
+msgid "purchase_refund"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:607
+#, python-format
+msgid "purchase"
+msgstr ""
+
+#. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "System payment"
 msgstr ""