Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-959114-tta into lp:openobject-addons

  1. trunk-bug-959114-tta
  2. Merge into trunk
Proposed by SnippetBucket.com
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-959114-tta
Merge into: lp:openobject-addons
Diff against target: 336 lines (+28/-1)
28 files modified
account/account.py (+1/-1)
stock/i18n/ar.po (+1/-0)
stock/i18n/bg.po (+1/-0)
stock/i18n/bs.po (+1/-0)
stock/i18n/ca.po (+1/-0)
stock/i18n/cs.po (+1/-0)
stock/i18n/da.po (+1/-0)
stock/i18n/de.po (+1/-0)
stock/i18n/el.po (+1/-0)
stock/i18n/es.po (+1/-0)
stock/i18n/es_AR.po (+1/-0)
stock/i18n/es_CL.po (+1/-0)
stock/i18n/es_CR.po (+1/-0)
stock/i18n/es_DO.po (+1/-0)
stock/i18n/es_EC.po (+1/-0)
stock/i18n/es_MX.po (+1/-0)
stock/i18n/es_VE.po (+1/-0)
stock/i18n/et.po (+1/-0)
stock/i18n/fi.po (+1/-0)
stock/i18n/fr.po (+1/-0)
stock/i18n/gl.po (+1/-0)
stock/i18n/hr.po (+1/-0)
stock/i18n/hu.po (+1/-0)
stock/i18n/id.po (+1/-0)
stock/i18n/it.po (+1/-0)
stock/i18n/ja.po (+1/-0)
stock/i18n/ko.po (+1/-0)
stock/i18n/lt.po (+1/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-959114-tta
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+144220@code.launchpad.net

Description of the change

Hello,

Fixed Bug: 959114

 * Stock Journal name can't be translated.

 * Reported Bug: https://bugs.launchpad.net/openobject-addons/+bug/959114

Thanks,
tta

To post a comment you must log in.

Unmerged revisions

8513. By SnippetBucket.com

[IMP] Updated Translation file.

8512. By SnippetBucket.com

[FIX] Stock Journal: Enable translation for journal names, Bug/addons/959114.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/account.py'
2--- account/account.py 2013-01-07 13:55:07 +0000
3+++ account/account.py 2013-01-22 06:33:22 +0000
4@@ -703,7 +703,7 @@
5 _description = "Journal"
6 _columns = {
7 'with_last_closing_balance' : fields.boolean('Opening With Last Closing Balance'),
8- 'name': fields.char('Journal Name', size=64, required=True),
9+ 'name': fields.char('Journal Name', size=64, required=True, translate=True),
10 'code': fields.char('Code', size=5, required=True, help="The code will be displayed on reports."),
11 'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'), ('cash', 'Cash'), ('bank', 'Bank and Checks'), ('general', 'General'), ('situation', 'Opening/Closing Situation')], 'Type', size=32, required=True,
12 help="Select 'Sale' for customer invoices journals."\
13
14=== modified file 'stock/i18n/ar.po'
15--- stock/i18n/ar.po 2013-01-04 09:39:53 +0000
16+++ stock/i18n/ar.po 2013-01-22 06:33:22 +0000
17@@ -2853,6 +2853,7 @@
18
19 #. module: stock
20 #: model:ir.model,name:stock.model_stock_journal
21+#: model:account.journal,name:stock.stock_journal
22 #: field:product.category,property_stock_journal:0
23 #: field:report.stock.move,stock_journal:0
24 #: view:stock.journal:0
25
26=== modified file 'stock/i18n/bg.po'
27--- stock/i18n/bg.po 2013-01-04 09:39:53 +0000
28+++ stock/i18n/bg.po 2013-01-22 06:33:22 +0000
29@@ -2801,6 +2801,7 @@
30
31 #. module: stock
32 #: model:ir.model,name:stock.model_stock_journal
33+#: model:account.journal,name:stock.stock_journal
34 #: field:product.category,property_stock_journal:0
35 #: field:report.stock.move,stock_journal:0
36 #: view:stock.journal:0
37
38=== modified file 'stock/i18n/bs.po'
39--- stock/i18n/bs.po 2013-01-04 09:39:53 +0000
40+++ stock/i18n/bs.po 2013-01-22 06:33:22 +0000
41@@ -2795,6 +2795,7 @@
42
43 #. module: stock
44 #: model:ir.model,name:stock.model_stock_journal
45+#: model:account.journal,name:stock.stock_journal
46 #: field:product.category,property_stock_journal:0
47 #: field:report.stock.move,stock_journal:0
48 #: view:stock.journal:0
49
50=== modified file 'stock/i18n/ca.po'
51--- stock/i18n/ca.po 2013-01-04 09:39:53 +0000
52+++ stock/i18n/ca.po 2013-01-22 06:33:22 +0000
53@@ -2877,6 +2877,7 @@
54
55 #. module: stock
56 #: model:ir.model,name:stock.model_stock_journal
57+#: model:account.journal,name:stock.stock_journal
58 #: field:product.category,property_stock_journal:0
59 #: field:report.stock.move,stock_journal:0
60 #: view:stock.journal:0
61
62=== modified file 'stock/i18n/cs.po'
63--- stock/i18n/cs.po 2013-01-04 09:39:53 +0000
64+++ stock/i18n/cs.po 2013-01-22 06:33:22 +0000
65@@ -2806,6 +2806,7 @@
66
67 #. module: stock
68 #: model:ir.model,name:stock.model_stock_journal
69+#: model:account.journal,name:stock.stock_journal
70 #: field:product.category,property_stock_journal:0
71 #: field:report.stock.move,stock_journal:0
72 #: view:stock.journal:0
73
74=== modified file 'stock/i18n/da.po'
75--- stock/i18n/da.po 2013-01-04 09:39:53 +0000
76+++ stock/i18n/da.po 2013-01-22 06:33:22 +0000
77@@ -2796,6 +2796,7 @@
78
79 #. module: stock
80 #: model:ir.model,name:stock.model_stock_journal
81+#: model:account.journal,name:stock.stock_journal
82 #: field:product.category,property_stock_journal:0
83 #: field:report.stock.move,stock_journal:0
84 #: view:stock.journal:0
85
86=== modified file 'stock/i18n/de.po'
87--- stock/i18n/de.po 2013-01-10 12:51:29 +0000
88+++ stock/i18n/de.po 2013-01-22 06:33:22 +0000
89@@ -3067,6 +3067,7 @@
90
91 #. module: stock
92 #: model:ir.model,name:stock.model_stock_journal
93+#: model:account.journal,name:stock.stock_journal
94 #: field:product.category,property_stock_journal:0
95 #: field:report.stock.move,stock_journal:0
96 #: view:stock.journal:0
97
98=== modified file 'stock/i18n/el.po'
99--- stock/i18n/el.po 2013-01-04 09:39:53 +0000
100+++ stock/i18n/el.po 2013-01-22 06:33:22 +0000
101@@ -2810,6 +2810,7 @@
102
103 #. module: stock
104 #: model:ir.model,name:stock.model_stock_journal
105+#: model:account.journal,name:stock.stock_journal
106 #: field:product.category,property_stock_journal:0
107 #: field:report.stock.move,stock_journal:0
108 #: view:stock.journal:0
109
110=== modified file 'stock/i18n/es.po'
111--- stock/i18n/es.po 2013-01-04 09:39:53 +0000
112+++ stock/i18n/es.po 2013-01-22 06:33:22 +0000
113@@ -3053,6 +3053,7 @@
114
115 #. module: stock
116 #: model:ir.model,name:stock.model_stock_journal
117+#: model:account.journal,name:stock.stock_journal
118 #: field:product.category,property_stock_journal:0
119 #: field:report.stock.move,stock_journal:0
120 #: view:stock.journal:0
121
122=== modified file 'stock/i18n/es_AR.po'
123--- stock/i18n/es_AR.po 2013-01-04 09:39:53 +0000
124+++ stock/i18n/es_AR.po 2013-01-22 06:33:22 +0000
125@@ -2798,6 +2798,7 @@
126
127 #. module: stock
128 #: model:ir.model,name:stock.model_stock_journal
129+#: model:account.journal,name:stock.stock_journal
130 #: field:product.category,property_stock_journal:0
131 #: field:report.stock.move,stock_journal:0
132 #: view:stock.journal:0
133
134=== modified file 'stock/i18n/es_CL.po'
135--- stock/i18n/es_CL.po 2013-01-04 09:39:53 +0000
136+++ stock/i18n/es_CL.po 2013-01-22 06:33:22 +0000
137@@ -2885,6 +2885,7 @@
138
139 #. module: stock
140 #: model:ir.model,name:stock.model_stock_journal
141+#: model:account.journal,name:stock.stock_journal
142 #: field:product.category,property_stock_journal:0
143 #: field:report.stock.move,stock_journal:0
144 #: view:stock.journal:0
145
146=== modified file 'stock/i18n/es_CR.po'
147--- stock/i18n/es_CR.po 2013-01-04 09:39:53 +0000
148+++ stock/i18n/es_CR.po 2013-01-22 06:33:22 +0000
149@@ -2904,6 +2904,7 @@
150
151 #. module: stock
152 #: model:ir.model,name:stock.model_stock_journal
153+#: model:account.journal,name:stock.stock_journal
154 #: field:product.category,property_stock_journal:0
155 #: field:report.stock.move,stock_journal:0
156 #: view:stock.journal:0
157
158=== modified file 'stock/i18n/es_DO.po'
159--- stock/i18n/es_DO.po 2013-01-04 09:39:53 +0000
160+++ stock/i18n/es_DO.po 2013-01-22 06:33:22 +0000
161@@ -2796,6 +2796,7 @@
162
163 #. module: stock
164 #: model:ir.model,name:stock.model_stock_journal
165+#: model:account.journal,name:stock.stock_journal
166 #: field:product.category,property_stock_journal:0
167 #: field:report.stock.move,stock_journal:0
168 #: view:stock.journal:0
169
170=== modified file 'stock/i18n/es_EC.po'
171--- stock/i18n/es_EC.po 2013-01-04 09:39:53 +0000
172+++ stock/i18n/es_EC.po 2013-01-22 06:33:22 +0000
173@@ -2876,6 +2876,7 @@
174
175 #. module: stock
176 #: model:ir.model,name:stock.model_stock_journal
177+#: model:account.journal,name:stock.stock_journal
178 #: field:product.category,property_stock_journal:0
179 #: field:report.stock.move,stock_journal:0
180 #: view:stock.journal:0
181
182=== modified file 'stock/i18n/es_MX.po'
183--- stock/i18n/es_MX.po 2013-01-04 09:39:53 +0000
184+++ stock/i18n/es_MX.po 2013-01-22 06:33:22 +0000
185@@ -2809,6 +2809,7 @@
186
187 #. module: stock
188 #: model:ir.model,name:stock.model_stock_journal
189+#: model:account.journal,name:stock.stock_journal
190 #: field:product.category,property_stock_journal:0
191 #: field:report.stock.move,stock_journal:0
192 #: view:stock.journal:0
193
194=== modified file 'stock/i18n/es_VE.po'
195--- stock/i18n/es_VE.po 2013-01-04 09:39:53 +0000
196+++ stock/i18n/es_VE.po 2013-01-22 06:33:22 +0000
197@@ -2799,6 +2799,7 @@
198
199 #. module: stock
200 #: model:ir.model,name:stock.model_stock_journal
201+#: model:account.journal,name:stock.stock_journal
202 #: field:product.category,property_stock_journal:0
203 #: field:report.stock.move,stock_journal:0
204 #: view:stock.journal:0
205
206=== modified file 'stock/i18n/et.po'
207--- stock/i18n/et.po 2013-01-10 12:51:29 +0000
208+++ stock/i18n/et.po 2013-01-22 06:33:22 +0000
209@@ -2797,6 +2797,7 @@
210
211 #. module: stock
212 #: model:ir.model,name:stock.model_stock_journal
213+#: model:account.journal,name:stock.stock_journal
214 #: field:product.category,property_stock_journal:0
215 #: field:report.stock.move,stock_journal:0
216 #: view:stock.journal:0
217
218=== modified file 'stock/i18n/fi.po'
219--- stock/i18n/fi.po 2013-01-04 09:39:53 +0000
220+++ stock/i18n/fi.po 2013-01-22 06:33:22 +0000
221@@ -2827,6 +2827,7 @@
222
223 #. module: stock
224 #: model:ir.model,name:stock.model_stock_journal
225+#: model:account.journal,name:stock.stock_journal
226 #: field:product.category,property_stock_journal:0
227 #: field:report.stock.move,stock_journal:0
228 #: view:stock.journal:0
229
230=== modified file 'stock/i18n/fr.po'
231--- stock/i18n/fr.po 2013-01-10 12:51:29 +0000
232+++ stock/i18n/fr.po 2013-01-22 06:33:22 +0000
233@@ -2920,6 +2920,7 @@
234
235 #. module: stock
236 #: model:ir.model,name:stock.model_stock_journal
237+#: model:account.journal,name:stock.stock_journal
238 #: field:product.category,property_stock_journal:0
239 #: field:report.stock.move,stock_journal:0
240 #: view:stock.journal:0
241
242=== modified file 'stock/i18n/gl.po'
243--- stock/i18n/gl.po 2013-01-04 09:39:53 +0000
244+++ stock/i18n/gl.po 2013-01-22 06:33:22 +0000
245@@ -2796,6 +2796,7 @@
246
247 #. module: stock
248 #: model:ir.model,name:stock.model_stock_journal
249+#: model:account.journal,name:stock.stock_journal
250 #: field:product.category,property_stock_journal:0
251 #: field:report.stock.move,stock_journal:0
252 #: view:stock.journal:0
253
254=== modified file 'stock/i18n/hr.po'
255--- stock/i18n/hr.po 2013-01-04 09:39:53 +0000
256+++ stock/i18n/hr.po 2013-01-22 06:33:22 +0000
257@@ -2867,6 +2867,7 @@
258
259 #. module: stock
260 #: model:ir.model,name:stock.model_stock_journal
261+#: model:account.journal,name:stock.stock_journal
262 #: field:product.category,property_stock_journal:0
263 #: field:report.stock.move,stock_journal:0
264 #: view:stock.journal:0
265
266=== modified file 'stock/i18n/hu.po'
267--- stock/i18n/hu.po 2013-01-15 09:57:38 +0000
268+++ stock/i18n/hu.po 2013-01-22 06:33:22 +0000
269@@ -3071,6 +3071,7 @@
270
271 #. module: stock
272 #: model:ir.model,name:stock.model_stock_journal
273+#: model:account.journal,name:stock.stock_journal
274 #: field:product.category,property_stock_journal:0
275 #: field:report.stock.move,stock_journal:0
276 #: view:stock.journal:0
277
278=== modified file 'stock/i18n/id.po'
279--- stock/i18n/id.po 2013-01-04 09:39:53 +0000
280+++ stock/i18n/id.po 2013-01-22 06:33:22 +0000
281@@ -2836,6 +2836,7 @@
282
283 #. module: stock
284 #: model:ir.model,name:stock.model_stock_journal
285+#: model:account.journal,name:stock.stock_journal
286 #: field:product.category,property_stock_journal:0
287 #: field:report.stock.move,stock_journal:0
288 #: view:stock.journal:0
289
290=== modified file 'stock/i18n/it.po'
291--- stock/i18n/it.po 2013-01-10 12:51:29 +0000
292+++ stock/i18n/it.po 2013-01-22 06:33:22 +0000
293@@ -2815,6 +2815,7 @@
294
295 #. module: stock
296 #: model:ir.model,name:stock.model_stock_journal
297+#: model:account.journal,name:stock.stock_journal
298 #: field:product.category,property_stock_journal:0
299 #: field:report.stock.move,stock_journal:0
300 #: view:stock.journal:0
301
302=== modified file 'stock/i18n/ja.po'
303--- stock/i18n/ja.po 2013-01-04 09:39:53 +0000
304+++ stock/i18n/ja.po 2013-01-22 06:33:22 +0000
305@@ -2829,6 +2829,7 @@
306
307 #. module: stock
308 #: model:ir.model,name:stock.model_stock_journal
309+#: model:account.journal,name:stock.stock_journal
310 #: field:product.category,property_stock_journal:0
311 #: field:report.stock.move,stock_journal:0
312 #: view:stock.journal:0
313
314=== modified file 'stock/i18n/ko.po'
315--- stock/i18n/ko.po 2013-01-04 09:39:53 +0000
316+++ stock/i18n/ko.po 2013-01-22 06:33:22 +0000
317@@ -2796,6 +2796,7 @@
318
319 #. module: stock
320 #: model:ir.model,name:stock.model_stock_journal
321+#: model:account.journal,name:stock.stock_journal
322 #: field:product.category,property_stock_journal:0
323 #: field:report.stock.move,stock_journal:0
324 #: view:stock.journal:0
325
326=== modified file 'stock/i18n/lt.po'
327--- stock/i18n/lt.po 2013-01-04 09:39:53 +0000
328+++ stock/i18n/lt.po 2013-01-22 06:33:22 +0000
329@@ -2797,6 +2797,7 @@
330
331 #. module: stock
332 #: model:ir.model,name:stock.model_stock_journal
333+#: model:account.journal,name:stock.stock_journal
334 #: field:product.category,property_stock_journal:0
335 #: field:report.stock.move,stock_journal:0
336 #: view:stock.journal:0

Subscribers

People subscribed via source and target branches

to all changes: