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

Proposed by Ravish(OpenERP) on 2013-05-16
Status: Merged
Merged at revision: 9210
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-opw-590663-rmu
Merge into: lp:openobject-addons/7.0
Diff against target: 47 lines (+25/-1)
2 files modified
account/account_invoice.py (+1/-1)
account/i18n/account.pot (+24/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-opw-590663-rmu
Reviewer Review Type Date Requested Status
Olivier Dony (Odoo) Needs Fixing on 2013-06-07
Naresh(OpenERP) 2013-05-16 Pending
Review via email: mp+164068@code.launchpad.net

Description of the change

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..!!

To post a comment you must log in.
Olivier Dony (Odoo) (odo-openerp) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/account_invoice.py'
2--- account/account_invoice.py 2013-04-18 15:40:22 +0000
3+++ account/account_invoice.py 2013-05-16 05:35:54 +0000
4@@ -614,7 +614,7 @@
5 if r[1] == 'journal_id' and r[2] in journal_ids:
6 val['journal_id'] = r[2]
7 if not val.get('journal_id', False):
8- 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)))
9+ 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)))
10 dom = {'journal_id': [('id', 'in', journal_ids)]}
11 else:
12 journal_ids = obj_journal.search(cr, uid, [])
13
14=== modified file 'account/i18n/account.pot'
15--- account/i18n/account.pot 2013-03-07 12:19:34 +0000
16+++ account/i18n/account.pot 2013-05-16 05:35:54 +0000
17@@ -16,6 +16,30 @@
18 "Plural-Forms: \n"
19
20 #. module: account
21+#: code:addons/account/account_invoice.py:601
22+#, python-format
23+msgid "sale"
24+msgstr ""
25+
26+#. module: account
27+#: code:addons/account/account_invoice.py:603
28+#, python-format
29+msgid "sale_refund"
30+msgstr ""
31+
32+#. module: account
33+#: code:addons/account/account_invoice.py:605
34+#, python-format
35+msgid "purchase_refund"
36+msgstr ""
37+
38+#. module: account
39+#: code:addons/account/account_invoice.py:607
40+#, python-format
41+msgid "purchase"
42+msgstr ""
43+
44+#. module: account
45 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
46 msgid "System payment"
47 msgstr ""