Merge lp:~syleam/openobject-addons/trunk-more-translation into lp:~openerp/openobject-addons/old_trunk
- trunk-more-translation
- Merge into old_trunk
Proposed by
Christophe CHAUVET
Status: | Merged |
---|---|
Merged at revision: | not available |
Proposed branch: | lp:~syleam/openobject-addons/trunk-more-translation |
Merge into: | lp:~openerp/openobject-addons/old_trunk |
Diff against target: | None lines |
To merge this branch: | bzr merge lp:~syleam/openobject-addons/trunk-more-translation |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP Core Team | Pending | ||
Review via email: mp+4265@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Christophe CHAUVET (christophe-chauvet) wrote : | # |
Revision history for this message
Alan Lord (theopensourcerer) wrote : | # |
In document.py 'You do not permissions to write on the server side.' is not very good English.
It should (probably) be 'You do not have permissions to write on the server side.' although, to be honest, I am not sure I understand the error.
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 2009-02-19 09:27:40 +0000 |
3 | +++ account/account.py 2009-03-06 23:50:10 +0000 |
4 | @@ -1496,7 +1496,7 @@ |
5 | for model in self.browse(cr, uid, ids, context): |
6 | period_id = self.pool.get('account.period').find(cr,uid, context=context) |
7 | if not period_id: |
8 | - raise osv.except_osv('No period found !', 'Unable to find a valid period !') |
9 | + raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !')) |
10 | period_id = period_id[0] |
11 | move_id = self.pool.get('account.move').create(cr, uid, { |
12 | 'ref': model.ref, |
13 | |
14 | === modified file 'account/project/wizard/wizard_account_analytic_line.py' |
15 | --- account/project/wizard/wizard_account_analytic_line.py 2009-01-04 22:12:50 +0000 |
16 | +++ account/project/wizard/wizard_account_analytic_line.py 2009-03-06 23:50:10 +0000 |
17 | @@ -77,3 +77,4 @@ |
18 | } |
19 | } |
20 | account_analytic_line('account.analytic.line') |
21 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
22 | |
23 | === modified file 'account/report/account_balance.py' |
24 | --- account/report/account_balance.py 2009-03-04 11:53:18 +0000 |
25 | +++ account/report/account_balance.py 2009-03-06 23:50:10 +0000 |
26 | @@ -227,3 +227,4 @@ |
27 | return self.sum_debit |
28 | |
29 | report_sxw.report_sxw('report.account.account.balance', 'account.account', 'addons/account/report/account_balance.rml', parser=account_balance, header=False) |
30 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
31 | |
32 | === modified file 'account/report/account_tax_code.py' |
33 | --- account/report/account_tax_code.py 2009-01-04 22:12:50 +0000 |
34 | +++ account/report/account_tax_code.py 2009-03-06 23:50:10 +0000 |
35 | @@ -38,3 +38,4 @@ |
36 | report_sxw.report_sxw('report.account.tax.code.entries', 'account.tax.code', |
37 | 'addons/account/report/account_tax_code.rml', parser=account_tax_code_report, header=False) |
38 | |
39 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
40 | |
41 | === modified file 'account/report/aged_trial_balance.py' |
42 | --- account/report/aged_trial_balance.py 2009-01-21 13:40:51 +0000 |
43 | +++ account/report/aged_trial_balance.py 2009-03-06 23:50:10 +0000 |
44 | @@ -178,3 +178,4 @@ |
45 | 'addons/account/report/aged_trial_balance.rml',parser=aged_trial_report,header=False) |
46 | |
47 | |
48 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
49 | |
50 | === modified file 'account/report/general_ledger.py' |
51 | --- account/report/general_ledger.py 2009-01-23 06:25:25 +0000 |
52 | +++ account/report/general_ledger.py 2009-03-06 23:50:10 +0000 |
53 | @@ -427,3 +427,4 @@ |
54 | |
55 | |
56 | report_sxw.report_sxw('report.account.general.ledger', 'account.account', 'addons/account/report/general_ledger.rml', parser=general_ledger, header=False) |
57 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
58 | |
59 | === modified file 'account/report/general_ledger_landscape.py' |
60 | --- account/report/general_ledger_landscape.py 2009-01-23 06:04:03 +0000 |
61 | +++ account/report/general_ledger_landscape.py 2009-03-06 23:50:10 +0000 |
62 | @@ -406,3 +406,4 @@ |
63 | return currency_total |
64 | |
65 | report_sxw.report_sxw('report.account.general.ledger_landscape', 'account.account', 'addons/account/report/general_ledger_landscape.rml', parser=general_ledger_landscape, header=False) |
66 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
67 | |
68 | === modified file 'account/report/invoice.py' |
69 | --- account/report/invoice.py 2009-01-21 13:40:51 +0000 |
70 | +++ account/report/invoice.py 2009-03-06 23:50:10 +0000 |
71 | @@ -35,3 +35,4 @@ |
72 | 'addons/account/report/invoice.rml', |
73 | parser=account_invoice |
74 | ) |
75 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
76 | |
77 | === modified file 'account/report/partner_balance.py' |
78 | --- account/report/partner_balance.py 2009-01-13 05:47:41 +0000 |
79 | +++ account/report/partner_balance.py 2009-03-06 23:50:10 +0000 |
80 | @@ -617,3 +617,4 @@ |
81 | report_sxw.report_sxw('report.account.partner.balance', 'res.partner', |
82 | 'account/report/partner_balance.rml',parser=partner_balance, |
83 | header=False) |
84 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
85 | |
86 | === modified file 'account/report/rml_parse.py' |
87 | --- account/report/rml_parse.py 2009-01-04 22:12:50 +0000 |
88 | +++ account/report/rml_parse.py 2009-03-06 23:50:10 +0000 |
89 | @@ -175,3 +175,4 @@ |
90 | |
91 | |
92 | |
93 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
94 | |
95 | === modified file 'account/report/tax_report.py' |
96 | --- account/report/tax_report.py 2009-01-16 05:11:48 +0000 |
97 | +++ account/report/tax_report.py 2009-03-06 23:50:10 +0000 |
98 | @@ -236,3 +236,4 @@ |
99 | report_sxw.report_sxw('report.account.vat.declaration', 'account.tax.code', |
100 | 'addons/account/report/tax_report.rml', parser=tax_report, header=False) |
101 | |
102 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
103 | |
104 | === modified file 'account/report/third_party_ledger.py' |
105 | --- account/report/third_party_ledger.py 2009-01-13 06:45:01 +0000 |
106 | +++ account/report/third_party_ledger.py 2009-03-06 23:50:10 +0000 |
107 | @@ -447,3 +447,4 @@ |
108 | 'addons/account/report/third_party_ledger.rml',parser=third_party_ledger, |
109 | header=False) |
110 | |
111 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
112 | |
113 | === modified file 'account/sequence.py' |
114 | --- account/sequence.py 2009-01-29 17:09:55 +0000 |
115 | +++ account/sequence.py 2009-03-06 23:50:10 +0000 |
116 | @@ -49,3 +49,4 @@ |
117 | ir_sequence() |
118 | |
119 | |
120 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
121 | |
122 | === modified file 'account/wizard/wizard_account_balance_report.py' |
123 | --- account/wizard/wizard_account_balance_report.py 2009-01-27 11:01:08 +0000 |
124 | +++ account/wizard/wizard_account_balance_report.py 2009-03-06 23:50:10 +0000 |
125 | @@ -23,6 +23,7 @@ |
126 | import wizard |
127 | import pooler |
128 | import time |
129 | +from tools.translate import _ |
130 | |
131 | period_form = '''<?xml version="1.0"?> |
132 | <form string="Select period"> |
133 | @@ -115,11 +116,11 @@ |
134 | res = cr.dictfetchall() |
135 | if res: |
136 | if (data['form']['date_to'] > res[0]['date_stop'] or data['form']['date_to'] < res[0]['date_start']): |
137 | - raise wizard.except_wizard('UserError','Date to must be set between ' + res[0]['date_start'] + " and " + res[0]['date_stop']) |
138 | + raise wizard.except_wizard(_('UserError'),_('Date to must be set between %s and %s') % (res[0]['date_start'], res[0]['date_stop'])) |
139 | else: |
140 | return 'report' |
141 | else: |
142 | - raise wizard.except_wizard('UserError','Date not in a defined fiscal year') |
143 | + raise wizard.except_wizard(_('UserError'),_('Date not in a defined fiscal year')) |
144 | |
145 | states = { |
146 | |
147 | @@ -141,3 +142,4 @@ |
148 | } |
149 | } |
150 | wizard_report('account.account.balance.report') |
151 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
152 | |
153 | === modified file 'account/wizard/wizard_aged_trial_balance.py' |
154 | --- account/wizard/wizard_aged_trial_balance.py 2009-01-04 22:12:50 +0000 |
155 | +++ account/wizard/wizard_aged_trial_balance.py 2009-03-06 23:50:10 +0000 |
156 | @@ -26,6 +26,7 @@ |
157 | import pooler |
158 | |
159 | from mx.DateTime import * |
160 | +from tools.translate import _ |
161 | |
162 | _aged_trial_form = """<?xml version="1.0"?> |
163 | <form string="Aged Trial Balance"> |
164 | @@ -63,7 +64,7 @@ |
165 | res = {} |
166 | period_length = data['form']['period_length'] |
167 | if period_length<=0: |
168 | - raise wizard.except_wizard('UserError', 'You must enter a period length that cannot be 0 or below !') |
169 | + raise wizard.except_wizard(_('UserError'), _('You must enter a period length that cannot be 0 or below !')) |
170 | start = datetime.date.fromtimestamp(time.mktime(time.strptime(data['form']['date1'],"%Y-%m-%d"))) |
171 | start = DateTime(int(start.year),int(start.month),int(start.day)) |
172 | if data['form']['direction_selection'] == 'past': |
173 | @@ -110,3 +111,4 @@ |
174 | } |
175 | wizard_report('account.aged.trial.balance') |
176 | |
177 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
178 | |
179 | === modified file 'account/wizard/wizard_automatic_reconcile.py' |
180 | --- account/wizard/wizard_automatic_reconcile.py 2009-01-26 18:10:51 +0000 |
181 | +++ account/wizard/wizard_automatic_reconcile.py 2009-03-06 23:50:10 +0000 |
182 | @@ -24,6 +24,7 @@ |
183 | import netsvc |
184 | import pooler |
185 | import time |
186 | +from tools.translate import _ |
187 | |
188 | #TODO: |
189 | |
190 | |
191 | === modified file 'account/wizard/wizard_general_ledger_report.py' |
192 | --- account/wizard/wizard_general_ledger_report.py 2009-01-27 11:04:32 +0000 |
193 | +++ account/wizard/wizard_general_ledger_report.py 2009-03-06 23:50:10 +0000 |
194 | @@ -24,6 +24,7 @@ |
195 | import pooler |
196 | import locale |
197 | import time |
198 | +from tools.translate import _ |
199 | |
200 | account_form = '''<?xml version="1.0"?> |
201 | <form string="Select Chart"> |
202 | @@ -108,12 +109,12 @@ |
203 | res = cr.dictfetchall() |
204 | if res: |
205 | if (data['form']['date_to'] > res[0]['date_stop'] or data['form']['date_to'] < res[0]['date_start']): |
206 | - raise wizard.except_wizard('UserError','Date to must be set between ' + res[0]['date_start'] + " and " + res[0]['date_stop']) |
207 | + raise wizard.except_wizard(_('UserError'),_('Date to must be set between %s and %s') % (str(res[0]['date_start']), str(res[0]['date_stop']))) |
208 | else: |
209 | return 'checkreport' |
210 | |
211 | else: |
212 | - raise wizard.except_wizard('UserError','Date not in a defined fiscal year') |
213 | + raise wizard.except_wizard(_('UserError'),_('Date not in a defined fiscal year')) |
214 | |
215 | def _check_state(self, cr, uid, data, context): |
216 | |
217 | @@ -173,3 +174,4 @@ |
218 | } |
219 | } |
220 | wizard_report('account.general.ledger.report') |
221 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
222 | |
223 | === modified file 'account/wizard/wizard_partner_balance_report.py' |
224 | --- account/wizard/wizard_partner_balance_report.py 2009-01-28 06:10:27 +0000 |
225 | +++ account/wizard/wizard_partner_balance_report.py 2009-03-06 23:50:10 +0000 |
226 | @@ -23,6 +23,7 @@ |
227 | import time |
228 | import wizard |
229 | import pooler |
230 | +from tools.translate import _ |
231 | |
232 | period_form = '''<?xml version="1.0"?> |
233 | <form string="Select Date-Period"> |
234 | @@ -106,12 +107,12 @@ |
235 | res = cr.dictfetchall() |
236 | if res: |
237 | if (data['form']['date2'] > res[0]['date_stop'] or data['form']['date2'] < res[0]['date_start']): |
238 | - raise wizard.except_wizard('UserError','Date to must be set between ' + res[0]['date_start'] + " and " + res[0]['date_stop']) |
239 | + raise wizard.except_wizard(_('UserError'),_('Date to must be set between %s and %s') % (str(res[0]['date_start']), str(res[0]['date_stop']))) |
240 | else: |
241 | return 'report' |
242 | |
243 | else: |
244 | - raise wizard.except_wizard('UserError','Date not in a defined fiscal year') |
245 | + raise wizard.except_wizard(_('UserError'),_('Date not in a defined fiscal year')) |
246 | |
247 | states = { |
248 | 'init': { |
249 | @@ -125,3 +126,4 @@ |
250 | } |
251 | } |
252 | wizard_report('account.partner.balance.report') |
253 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
254 | |
255 | === modified file 'account/wizard/wizard_refund.py' |
256 | --- account/wizard/wizard_refund.py 2009-03-05 09:47:13 +0000 |
257 | +++ account/wizard/wizard_refund.py 2009-03-06 23:50:10 +0000 |
258 | @@ -24,6 +24,7 @@ |
259 | import osv |
260 | import netsvc |
261 | import time |
262 | +from tools.translate import _ |
263 | |
264 | sur_form = '''<?xml version="1.0"?> |
265 | <form string="Credit Note"> |
266 | |
267 | === modified file 'account/wizard/wizard_state_open.py' |
268 | --- account/wizard/wizard_state_open.py 2009-01-04 22:12:50 +0000 |
269 | +++ account/wizard/wizard_state_open.py 2009-03-06 23:50:10 +0000 |
270 | @@ -38,7 +38,7 @@ |
271 | pool_obj = pooler.get_pool(cr.dbname) |
272 | data_inv = pool_obj.get('account.invoice').browse(cr, uid, data['ids'][0]) |
273 | if data_inv.reconciled: |
274 | - raise wizard.except_wizard('Warning', 'Invoice is already reconciled') |
275 | + raise wizard.except_wizard(_('Warning'), _('Invoice is already reconciled')) |
276 | wf_service = netsvc.LocalService("workflow") |
277 | res = wf_service.trg_validate(uid, 'account.invoice', data['ids'][0], 'open_test', cr) |
278 | return {} |
279 | |
280 | === modified file 'account/wizard/wizard_statement_from_invoice.py' |
281 | --- account/wizard/wizard_statement_from_invoice.py 2009-01-27 15:23:53 +0000 |
282 | +++ account/wizard/wizard_statement_from_invoice.py 2009-03-06 23:50:10 +0000 |
283 | @@ -1,3 +1,4 @@ |
284 | +# -*- encoding: utf-8 -*- |
285 | ############################################################################## |
286 | # |
287 | # Copyright (c) 2008 Camptocamp SA All Rights Reserved. (JGG) |
288 | @@ -171,3 +172,4 @@ |
289 | }, |
290 | } |
291 | PopulateStatementFromInv('populate_statement_from_inv') |
292 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
293 | |
294 | === modified file 'account/wizard/wizard_third_party_ledger.py' |
295 | --- account/wizard/wizard_third_party_ledger.py 2009-01-28 06:10:27 +0000 |
296 | +++ account/wizard/wizard_third_party_ledger.py 2009-03-06 23:50:10 +0000 |
297 | @@ -23,6 +23,7 @@ |
298 | import time |
299 | import wizard |
300 | import pooler |
301 | +from tools.translate import _ |
302 | |
303 | |
304 | period_form = '''<?xml version="1.0"?> |
305 | @@ -112,12 +113,12 @@ |
306 | res = cr.dictfetchall() |
307 | if res: |
308 | if (data['form']['date2'] > res[0]['date_stop'] or data['form']['date2'] < res[0]['date_start']): |
309 | - raise wizard.except_wizard('UserError','Date to must be set between ' + res[0]['date_start'] + " and " + res[0]['date_stop']) |
310 | + raise wizard.except_wizard(_('UserError'),_('Date to must be set between %s and %s') % (str(res[0]['date_start']) , str(res[0]['date_stop']))) |
311 | else: |
312 | return 'report' |
313 | |
314 | else: |
315 | - raise wizard.except_wizard('UserError','Date not in a defined fiscal year') |
316 | + raise wizard.except_wizard(_('UserError'),_('Date not in a defined fiscal year')) |
317 | |
318 | |
319 | def _check_state(self, cr, uid, data, context): |
320 | @@ -142,3 +143,4 @@ |
321 | wizard_report('account.third_party_ledger.report') |
322 | |
323 | |
324 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
325 | |
326 | === modified file 'account/wizard/wizard_use_model.py' |
327 | --- account/wizard/wizard_use_model.py 2009-01-26 21:28:04 +0000 |
328 | +++ account/wizard/wizard_use_model.py 2009-03-06 23:50:10 +0000 |
329 | @@ -23,6 +23,7 @@ |
330 | import time |
331 | import datetime |
332 | import pooler |
333 | +from tools.translate import _ |
334 | |
335 | model_form = """<?xml version="1.0"?> |
336 | <form string="Select Message"> |
337 | @@ -52,7 +53,7 @@ |
338 | |
339 | period_id = pool_obj.get('account.period').find(cr,uid, context=context) |
340 | if not period_id: |
341 | - raise wizard.except_wizard('No period found !', 'Unable to find a valid period !') |
342 | + raise wizard.except_wizard(_('No period found !'), _('Unable to find a valid period !')) |
343 | period_id = period_id[0] |
344 | move_id = pool_obj.get('account.move').create(cr, uid, { |
345 | 'ref': model.ref, |
346 | |
347 | === modified file 'account/wizard/wizard_vat.py' |
348 | --- account/wizard/wizard_vat.py 2009-01-04 22:12:50 +0000 |
349 | +++ account/wizard/wizard_vat.py 2009-03-06 23:50:10 +0000 |
350 | @@ -88,3 +88,4 @@ |
351 | wizard_report('account.vat.declaration') |
352 | |
353 | |
354 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
355 | |
356 | === modified file 'account_analytic_default/__init__.py' |
357 | --- account_analytic_default/__init__.py 2009-01-04 22:12:50 +0000 |
358 | +++ account_analytic_default/__init__.py 2009-03-06 23:50:10 +0000 |
359 | @@ -20,3 +20,4 @@ |
360 | # |
361 | ############################################################################## |
362 | import account_analytic_default |
363 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
364 | |
365 | === modified file 'account_analytic_default/account_analytic_default.py' |
366 | --- account_analytic_default/account_analytic_default.py 2009-01-24 01:55:45 +0000 |
367 | +++ account_analytic_default/account_analytic_default.py 2009-03-06 23:50:10 +0000 |
368 | @@ -106,3 +106,4 @@ |
369 | return res_prod |
370 | account_invoice_line() |
371 | |
372 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
373 | |
374 | === modified file 'account_analytic_plans/account_analytic_plans.py' |
375 | --- account_analytic_plans/account_analytic_plans.py 2009-01-27 08:31:11 +0000 |
376 | +++ account_analytic_plans/account_analytic_plans.py 2009-03-06 23:50:10 +0000 |
377 | @@ -30,6 +30,7 @@ |
378 | import ir |
379 | |
380 | import tools |
381 | +from tools.translate import _ |
382 | |
383 | class one2many_mod2(fields.one2many): |
384 | def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None): |
385 | @@ -176,7 +177,7 @@ |
386 | |
387 | pids = self.pool.get('account.analytic.plan.instance').search(cr, uid, [('name','=',vals['name']),('code','=',vals['code']),('plan_id','<>',False)]) |
388 | if pids: |
389 | - raise osv.except_osv('Error', 'A model having this name and code already exists !') |
390 | + raise osv.except_osv(_('Error'), _('A model having this name and code already exists !')) |
391 | |
392 | res = self.pool.get('account.analytic.plan.line').search(cr,uid,[('plan_id','=',journal.plan_id.id)]) |
393 | for i in res: |
394 | @@ -189,7 +190,7 @@ |
395 | if self.pool.get('account.analytic.account').search(cr,uid,[('parent_id','child_of',[item.root_analytic_id.id]),('id','=',tempo[2]['analytic_account_id'])]): |
396 | total_per_plan += tempo[2]['rate'] |
397 | if total_per_plan < item.min_required or total_per_plan > item.max_required: |
398 | - raise osv.except_osv("Value Error" ,"The Total Should be Between " + str(item.min_required) + " and " + str(item.max_required)) |
399 | + raise osv.except_osv(_('Value Error') ,_('The Total Should be Between %s and %s" % (str(item.min_required), str(item.max_required)))) |
400 | |
401 | return super(account_analytic_plan_instance, self).create(cr, uid, vals, context) |
402 | |
403 | @@ -374,3 +375,4 @@ |
404 | } |
405 | analytic_default() |
406 | |
407 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
408 | |
409 | === modified file 'account_analytic_plans/wizard/create_model.py' |
410 | --- account_analytic_plans/wizard/create_model.py 2009-01-04 22:12:50 +0000 |
411 | +++ account_analytic_plans/wizard/create_model.py 2009-03-06 23:50:10 +0000 |
412 | @@ -23,6 +23,7 @@ |
413 | import time |
414 | import netsvc |
415 | import pooler |
416 | +from tools.translate import _ |
417 | |
418 | info = '''<?xml version="1.0"?> |
419 | <form string="Distribution Model Saved"> |
420 | @@ -35,10 +36,10 @@ |
421 | if data['id']: |
422 | plan = plan_obj.browse(cr, uid, data['id'], context) |
423 | if (not plan.name) or (not plan.code): |
424 | - raise wizard.except_wizard('Error', 'Please put a name and a code before saving the model !') |
425 | + raise wizard.except_wizard(_('Error'), _('Please put a name and a code before saving the model !')) |
426 | pids = pooler.get_pool(cr.dbname).get('account.analytic.plan').search(cr, uid, [], context=context) |
427 | if (not pids): |
428 | - raise wizard.except_wizard('Error', 'No analytic plan defined !') |
429 | + raise wizard.except_wizard(_('Error'), _('No analytic plan defined !')) |
430 | plan_obj.write(cr,uid,[data['id']],{'plan_id':pids[0]}) |
431 | return 'info' |
432 | else: |
433 | |
434 | === modified file 'account_analytic_plans/wizard/wizard_crossovered_analytic.py' |
435 | --- account_analytic_plans/wizard/wizard_crossovered_analytic.py 2009-01-04 22:12:50 +0000 |
436 | +++ account_analytic_plans/wizard/wizard_crossovered_analytic.py 2009-03-06 23:50:10 +0000 |
437 | @@ -23,6 +23,7 @@ |
438 | import time |
439 | import datetime |
440 | import pooler |
441 | +from tools.translate import _ |
442 | |
443 | form = """<?xml version="1.0"?> |
444 | <form string="Select Information"> |
445 | @@ -59,7 +60,7 @@ |
446 | break |
447 | |
448 | if flag: |
449 | - raise wizard.except_wizard('User Error',"There are no Analytic lines related to Account '" + name +"'" ) |
450 | + raise wizard.except_wizard(_('User Error'),_('There are no Analytic lines related to Account %s' % name)) |
451 | return {} |
452 | |
453 | states = { |
454 | |
455 | === modified file 'account_budget/crossovered_budget.py' |
456 | --- account_budget/crossovered_budget.py 2009-01-29 00:07:53 +0000 |
457 | +++ account_budget/crossovered_budget.py 2009-03-06 23:50:10 +0000 |
458 | @@ -25,6 +25,7 @@ |
459 | from mx import DateTime |
460 | import time |
461 | import datetime |
462 | +from tools.translate import _ |
463 | |
464 | |
465 | def strToDate(dt): |
466 | @@ -161,7 +162,7 @@ |
467 | for line in self.browse(cr, uid, ids): |
468 | acc_ids = [x.id for x in line.general_budget_id.account_ids] |
469 | if not acc_ids: |
470 | - raise osv.except_osv('Error!',"The General Budget '" + str(line.general_budget_id.name) + "' has no Accounts!" ) |
471 | + raise osv.except_osv(_('Error!'),_("The General Budget '%s' has no Accounts!" % str(line.general_budget_id.name))) |
472 | date_to = line.date_to |
473 | date_from = line.date_from |
474 | if context.has_key('wizard_date_from'): |
475 | |
476 | === modified file 'account_budget/wizard/wizard_budget_report.py' |
477 | --- account_budget/wizard/wizard_budget_report.py 2009-01-04 22:12:50 +0000 |
478 | +++ account_budget/wizard/wizard_budget_report.py 2009-03-06 23:50:10 +0000 |
479 | @@ -24,6 +24,7 @@ |
480 | import wizard |
481 | import datetime |
482 | import pooler |
483 | +from tools.translate import _ |
484 | |
485 | dates_form = '''<?xml version="1.0"?> |
486 | <form string="Select period"> |
487 | @@ -41,7 +42,7 @@ |
488 | pool_obj = pooler.get_pool(cr.dbname) |
489 | data_model = pool_obj.get(data['model']).browse(cr,uid,data['id']) |
490 | if not data_model.dotation_ids: |
491 | - raise wizard.except_wizard('Insufficient Data!',"No Dotations or Master Budget Expenses Found on Budget '"+ data_model.name +"'!") |
492 | + raise wizard.except_wizard(_('Insufficient Data!'),_('No Dotations or Master Budget Expenses Found on Budget %s!') % data_model.name) |
493 | return data['form'] |
494 | |
495 | states = { |
496 | |
497 | === modified file 'account_date_check/account_date_check.py' |
498 | --- account_date_check/account_date_check.py 2009-01-04 22:12:50 +0000 |
499 | +++ account_date_check/account_date_check.py 2009-03-06 23:50:10 +0000 |
500 | @@ -29,6 +29,7 @@ |
501 | from mx import DateTime |
502 | import pooler |
503 | from tools import config |
504 | +from tools.translate import _ |
505 | |
506 | class account_journal(osv.osv): |
507 | _inherit='account.journal' |
508 | @@ -62,7 +63,7 @@ |
509 | if not journal.allow_date: |
510 | period=self.pool.get('account.period').browse(cr,uid,[period_id])[0] |
511 | if not time.strptime(vals['date'],'%Y-%m-%d')>=time.strptime(period.date_start,'%Y-%m-%d') and time.strptime(vals['date'],'%Y-%m-%d')<=time.strptime(period.date_stop,'%Y-%m-%d'): |
512 | - raise osv.except_osv('Error','The date of your account move is not in the defined period !') |
513 | + raise osv.except_osv(_('Error'),_('The date of your account move is not in the defined period !')) |
514 | else: |
515 | return True |
516 | |
517 | |
518 | === modified file 'account_payment/account_move_line.py' |
519 | --- account_payment/account_move_line.py 2009-01-04 22:12:50 +0000 |
520 | +++ account_payment/account_move_line.py 2009-03-06 23:50:10 +0000 |
521 | @@ -21,7 +21,7 @@ |
522 | ############################################################################## |
523 | |
524 | from osv import fields, osv |
525 | - |
526 | +from tools.translate import _ |
527 | |
528 | class account_move_line(osv.osv): |
529 | _inherit = "account.move.line" |
530 | |
531 | === modified file 'account_payment/report/__init__.py' |
532 | --- account_payment/report/__init__.py 2009-01-04 22:12:50 +0000 |
533 | +++ account_payment/report/__init__.py 2009-03-06 23:50:10 +0000 |
534 | @@ -21,3 +21,4 @@ |
535 | ############################################################################## |
536 | |
537 | import payment_order |
538 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
539 | |
540 | === modified file 'account_payment/report/payment_order.py' |
541 | --- account_payment/report/payment_order.py 2009-01-04 22:12:50 +0000 |
542 | +++ account_payment/report/payment_order.py 2009-03-06 23:50:10 +0000 |
543 | @@ -31,4 +31,6 @@ |
544 | 'time': time, |
545 | |
546 | }) |
547 | -report_sxw.report_sxw('report.payment.order', 'payment.order', 'addons/account_payment/report/payment_order.rml', parser=payment_order,header=False) |
548 | \ No newline at end of file |
549 | +report_sxw.report_sxw('report.payment.order', 'payment.order', 'addons/account_payment/report/payment_order.rml', parser=payment_order,header=False) |
550 | + |
551 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
552 | |
553 | === modified file 'account_report/account.py' |
554 | --- account_report/account.py 2009-01-27 11:15:46 +0000 |
555 | +++ account_report/account.py 2009-03-06 23:50:10 +0000 |
556 | @@ -24,6 +24,7 @@ |
557 | from osv import fields, osv |
558 | import pooler |
559 | from tools.misc import currency |
560 | +from tools.translate import _ |
561 | |
562 | import mx.DateTime |
563 | from mx.DateTime import RelativeDateTime, now, DateTime, localtime |
564 | |
565 | === modified file 'account_report/wizard/wizard_print_indicators.py' |
566 | --- account_report/wizard/wizard_print_indicators.py 2009-01-19 10:30:59 +0000 |
567 | +++ account_report/wizard/wizard_print_indicators.py 2009-03-06 23:50:10 +0000 |
568 | @@ -22,6 +22,7 @@ |
569 | |
570 | import wizard |
571 | import pooler |
572 | +from tools.translate import _ |
573 | |
574 | form = '''<?xml version="1.0"?> |
575 | <form string="Print Indicators"> |
576 | @@ -55,7 +56,7 @@ |
577 | |
578 | def _check_len(self, cr, uid, data, context): |
579 | if len(data['form']['base_selection'][0][2])>8: |
580 | - raise wizard.except_wizard('User Error!',"Please select maximum 8 records to fit the page-width.") |
581 | + raise wizard.except_wizard(_('User Error!'),_("Please select maximum 8 records to fit the page-width.")) |
582 | return data['form'] |
583 | |
584 | class wizard_print_indicators(wizard.interface): |
585 | |
586 | === modified file 'account_voucher/__init__.py' |
587 | --- account_voucher/__init__.py 2009-01-04 22:12:50 +0000 |
588 | +++ account_voucher/__init__.py 2009-03-06 23:50:10 +0000 |
589 | @@ -23,3 +23,4 @@ |
590 | import voucher |
591 | import voucher_account |
592 | import report |
593 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
594 | |
595 | === modified file 'account_voucher/report/__init__.py' |
596 | --- account_voucher/report/__init__.py 2009-01-04 22:12:50 +0000 |
597 | +++ account_voucher/report/__init__.py 2009-03-06 23:50:10 +0000 |
598 | @@ -20,4 +20,6 @@ |
599 | # |
600 | ############################################################################## |
601 | import report_voucher |
602 | -import report_voucher_amount |
603 | \ No newline at end of file |
604 | +import report_voucher_amount |
605 | + |
606 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
607 | |
608 | === modified file 'account_voucher/report/report_voucher.py' |
609 | --- account_voucher/report/report_voucher.py 2009-01-04 22:12:50 +0000 |
610 | +++ account_voucher/report/report_voucher.py 2009-03-06 23:50:10 +0000 |
611 | @@ -64,4 +64,6 @@ |
612 | 'account.voucher', |
613 | 'addons/account_voucher/report/report_voucher.rml', |
614 | parser=report_voucher,header=False |
615 | -) |
616 | \ No newline at end of file |
617 | +) |
618 | + |
619 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
620 | |
621 | === modified file 'account_voucher/report/report_voucher_amount.py' |
622 | --- account_voucher/report/report_voucher_amount.py 2009-01-04 22:12:50 +0000 |
623 | +++ account_voucher/report/report_voucher_amount.py 2009-03-06 23:50:10 +0000 |
624 | @@ -43,4 +43,6 @@ |
625 | 'account.voucher', |
626 | 'addons/account_voucher/report/report_voucher_amount.rml', |
627 | parser=report_voucher_amount,header=False |
628 | -) |
629 | \ No newline at end of file |
630 | +) |
631 | + |
632 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
633 | |
634 | === modified file 'account_voucher/voucher.py' |
635 | --- account_voucher/voucher.py 2009-01-21 11:21:21 +0000 |
636 | +++ account_voucher/voucher.py 2009-03-06 23:50:10 +0000 |
637 | @@ -28,6 +28,7 @@ |
638 | from mx.DateTime import RelativeDateTime |
639 | |
640 | from tools import config |
641 | +from tools.translate import _ |
642 | |
643 | type2journal = { |
644 | 'rec_voucher':'cash', |
645 | @@ -180,7 +181,7 @@ |
646 | if t['state'] in ('draft', 'cancel'): |
647 | unlink_ids.append(t['id']) |
648 | else: |
649 | - raise osv.except_osv('Invalid action !', 'Cannot delete invoice(s) which are already opened or paid !') |
650 | + raise osv.except_osv(_('Invalid action !'), _('Cannot delete invoice(s) which are already opened or paid !')) |
651 | osv.osv.unlink(self, cr, uid, unlink_ids, context=context) |
652 | return True |
653 | |
654 | @@ -604,3 +605,4 @@ |
655 | } |
656 | VoucherLine() |
657 | |
658 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
659 | |
660 | === modified file 'account_voucher/voucher_account.py' |
661 | --- account_voucher/voucher_account.py 2009-01-04 22:12:50 +0000 |
662 | +++ account_voucher/voucher_account.py 2009-03-06 23:50:10 +0000 |
663 | @@ -144,3 +144,4 @@ |
664 | } |
665 | |
666 | Account() |
667 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
668 | |
669 | === modified file 'account_voucher/wizard/__init__.py' |
670 | --- account_voucher/wizard/__init__.py 2009-01-04 22:12:50 +0000 |
671 | +++ account_voucher/wizard/__init__.py 2009-03-06 23:50:10 +0000 |
672 | @@ -20,3 +20,4 @@ |
673 | # |
674 | ############################################################################## |
675 | import open_voucher |
676 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
677 | |
678 | === modified file 'analytic_user_function/analytic_user_function.py' |
679 | --- analytic_user_function/analytic_user_function.py 2009-01-04 22:12:50 +0000 |
680 | +++ analytic_user_function/analytic_user_function.py 2009-03-06 23:50:10 +0000 |
681 | @@ -21,6 +21,7 @@ |
682 | ############################################################################## |
683 | from osv import fields,osv |
684 | from osv import orm |
685 | +from tools.translate import _ |
686 | |
687 | class analytic_user_funct_grid(osv.osv): |
688 | |
689 | @@ -94,9 +95,9 @@ |
690 | if not a: |
691 | a = r.product_id.categ_id.property_account_expense_categ.id |
692 | if not a: |
693 | - raise osv.except_osv('Error !', |
694 | - 'There is no expense account define ' \ |
695 | - 'for this product: "%s" (id:%d)' % \ |
696 | + raise osv.except_osv(_('Error !'), |
697 | + _('There is no expense account define ' \ |
698 | + 'for this product: "%s" (id:%d)') % \ |
699 | (r.product_id.name, r.product_id.id,)) |
700 | amount = unit_amount * self.pool.get('product.uom')._compute_price(cr, uid, |
701 | r.product_id.uom_id.id, r.product_id.standard_price, False) |
702 | @@ -127,9 +128,9 @@ |
703 | if not a: |
704 | a = r.product_id.categ_id.property_account_expense_categ.id |
705 | if not a: |
706 | - raise osv.except_osv('Error !', |
707 | - 'There is no expense account define ' \ |
708 | - 'for this product: "%s" (id:%d)' % \ |
709 | + raise osv.except_osv(_('Error !'), |
710 | + _('There is no expense account define ' \ |
711 | + 'for this product: "%s" (id:%d)') % \ |
712 | (r.product_id.name, r.product_id.id,)) |
713 | amount = unit_amount * r.product_id.uom_id._compute_price(cr, uid, |
714 | r.product_id.uom_id.id, r.product_id.standard_price, False) |
715 | |
716 | === modified file 'auction/auction.py' |
717 | --- auction/auction.py 2009-01-04 22:12:50 +0000 |
718 | +++ auction/auction.py 2009-03-06 23:50:10 +0000 |
719 | @@ -25,6 +25,7 @@ |
720 | from osv import fields, osv, orm |
721 | import ir |
722 | from mx import DateTime |
723 | +from tools.translate import _ |
724 | |
725 | #---------------------------------------------------------- |
726 | # Auction Artists |
727 | @@ -627,7 +628,7 @@ |
728 | continue |
729 | partner_r=self.pool.get('res.partner') |
730 | if not lot.ach_uid.id: |
731 | - raise orm.except_orm('Missed buyer !', 'The object "%s" has no buyer assigned.' % (lot.name,)) |
732 | + raise orm.except_orm(_('Missed buyer !'), _('The object "%s" has no buyer assigned.') % (lot.name,)) |
733 | else: |
734 | partner_ref =lot.ach_uid.id |
735 | lot_name = lot.obj_num |
736 | @@ -635,7 +636,7 @@ |
737 | contact_addr_id = res['contact'] |
738 | invoice_addr_id = res['invoice'] |
739 | if not invoice_addr_id: |
740 | - raise orm.except_orm('No Invoice Address', 'The Buyer "%s" has no Invoice Address.' % (contact_addr_id,)) |
741 | + raise orm.except_orm(_('No Invoice Address'), _('The Buyer "%s" has no Invoice Address.') % (contact_addr_id,)) |
742 | inv = { |
743 | 'name': 'Auction proforma:' +lot.name, |
744 | 'journal_id': lot.auction_id.journal_id.id, |
745 | @@ -754,13 +755,13 @@ |
746 | continue |
747 | partner_r=self.pool.get('res.partner') |
748 | if not lot.ach_uid.id: |
749 | - raise orm.except_orm('Missed buyer !', 'The object "%s" has no buyer assigned.' % (lot.name,)) |
750 | + raise orm.except_orm(_('Missed buyer !'), _('The object "%s" has no buyer assigned.') % (lot.name,)) |
751 | if (lot.auction_id.id,lot.ach_uid.id) in invoices: |
752 | inv_id = invoices[(lot.auction_id.id,lot.ach_uid.id)] |
753 | else: |
754 | add = partner_r.read(cr, uid, [lot.ach_uid.id], ['address'])[0]['address'] |
755 | if not len(add): |
756 | - raise orm.except_orm('Missed Address !', 'The Buyer has no Invoice Address.') |
757 | + raise orm.except_orm(_('Missed Address !'), _('The Buyer has no Invoice Address.')) |
758 | price = lot.obj_price or 0.0 |
759 | lot_name =lot.obj_num |
760 | inv={ |
761 | |
762 | === modified file 'auction/barcode/__init__.py' |
763 | --- auction/barcode/__init__.py 2008-08-24 14:45:43 +0000 |
764 | +++ auction/barcode/__init__.py 2009-03-06 23:50:10 +0000 |
765 | @@ -31,3 +31,4 @@ |
766 | # |
767 | |
768 | __version__ = '0.9' |
769 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
770 | |
771 | === modified file 'auction/barcode/code128.py' |
772 | --- auction/barcode/code128.py 2008-08-24 14:45:43 +0000 |
773 | +++ auction/barcode/code128.py 2009-03-06 23:50:10 +0000 |
774 | @@ -319,3 +319,4 @@ |
775 | dval = dval + _patterns[c] |
776 | self.decomposed = dval |
777 | return self.decomposed |
778 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
779 | |
780 | === modified file 'auction/barcode/code39.py' |
781 | --- auction/barcode/code39.py 2008-08-24 14:45:43 +0000 |
782 | +++ auction/barcode/code39.py 2009-03-06 23:50:10 +0000 |
783 | @@ -253,3 +253,4 @@ |
784 | raise ValueError |
785 | self.encoded = _encode39(self.encoded, self.checksum) |
786 | return self.encoded |
787 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
788 | |
789 | === modified file 'auction/barcode/code93.py' |
790 | --- auction/barcode/code93.py 2008-08-24 14:45:43 +0000 |
791 | +++ auction/barcode/code93.py 2009-03-06 23:50:10 +0000 |
792 | @@ -230,3 +230,4 @@ |
793 | raise ValueError |
794 | self.encoded = _encode93(self.encoded) |
795 | return self.encoded |
796 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
797 | |
798 | === modified file 'auction/barcode/common.py' |
799 | --- auction/barcode/common.py 2008-08-24 14:45:43 +0000 |
800 | +++ auction/barcode/common.py 2009-03-06 23:50:10 +0000 |
801 | @@ -703,3 +703,4 @@ |
802 | dval = dval + self.patterns[c] + 'i' |
803 | self.decomposed = dval[:-1] |
804 | return self.decomposed |
805 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
806 | |
807 | === modified file 'auction/barcode/fourstate.py' |
808 | --- auction/barcode/fourstate.py 2008-08-24 14:45:43 +0000 |
809 | +++ auction/barcode/fourstate.py 2009-03-06 23:50:10 +0000 |
810 | @@ -79,3 +79,4 @@ |
811 | } |
812 | |
813 | #http://www.auspost.com.au/futurepost/ |
814 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
815 | |
816 | === modified file 'auction/barcode/test.py' |
817 | --- auction/barcode/test.py 2008-12-12 01:19:20 +0000 |
818 | +++ auction/barcode/test.py 2009-03-06 23:50:10 +0000 |
819 | @@ -53,3 +53,4 @@ |
820 | run() |
821 | |
822 | |
823 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
824 | |
825 | === modified file 'auction/barcode/usps.py' |
826 | --- auction/barcode/usps.py 2008-08-24 14:45:43 +0000 |
827 | +++ auction/barcode/usps.py 2009-03-06 23:50:10 +0000 |
828 | @@ -229,3 +229,4 @@ |
829 | h = self.fbarheight |
830 | self.rect(left, 0.0, self.barwide, h) |
831 | left = left + self.barwide + self.spacewide |
832 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
833 | |
834 | === modified file 'auction/report/buyer_list.py' |
835 | --- auction/report/buyer_list.py 2009-01-04 22:12:50 +0000 |
836 | +++ auction/report/buyer_list.py 2009-03-06 23:50:10 +0000 |
837 | @@ -25,6 +25,7 @@ |
838 | import time |
839 | from report import report_sxw |
840 | from osv import osv |
841 | +from tools.translate import _ |
842 | |
843 | class buyer_list(report_sxw.rml_parse): |
844 | auc_lot_ids=[] |
845 | |
846 | === modified file 'auction/wizard/wizard_aie_send.py' |
847 | --- auction/wizard/wizard_aie_send.py 2009-01-06 12:12:59 +0000 |
848 | +++ auction/wizard/wizard_aie_send.py 2009-03-06 23:50:10 +0000 |
849 | @@ -30,6 +30,7 @@ |
850 | import mimetypes |
851 | import httplib |
852 | import threading |
853 | +from tools.translate import _ |
854 | |
855 | login_form = '''<?xml version="1.0"?> |
856 | <form title="Login"> |
857 | |
858 | === modified file 'auction/wizard/wizard_aie_send_result.py' |
859 | --- auction/wizard/wizard_aie_send_result.py 2009-01-06 12:12:59 +0000 |
860 | +++ auction/wizard/wizard_aie_send_result.py 2009-03-06 23:50:10 +0000 |
861 | @@ -26,6 +26,7 @@ |
862 | |
863 | import wizard |
864 | import netsvc |
865 | +from tools.translate import _ |
866 | |
867 | login_form = '''<?xml version="1.0"?> |
868 | <form title="Login"> |
869 | |
870 | === modified file 'audittrail/audittrail.py' |
871 | --- audittrail/audittrail.py 2009-01-22 08:44:05 +0000 |
872 | +++ audittrail/audittrail.py 2009-03-06 23:50:10 +0000 |
873 | @@ -27,6 +27,7 @@ |
874 | import pooler |
875 | import string |
876 | import time,copy |
877 | +from tools.translate import _ |
878 | |
879 | class audittrail_rule(osv.osv): |
880 | _name = 'audittrail.rule' |
881 | @@ -59,8 +60,8 @@ |
882 | obj = self.pool.get(thisrule.object_id.model) |
883 | if not obj: |
884 | raise osv.except_osv( |
885 | - 'WARNING:audittrail is not part of the pool', |
886 | - 'Change audittrail depends -- Setting rule as DRAFT') |
887 | + _('WARNING:audittrail is not part of the pool'), |
888 | + _('Change audittrail depends -- Setting rule as DRAFT')) |
889 | self.write(cr, uid, [thisrule.id], {"state": "draft"}) |
890 | val={ |
891 | "name":'View Log', |
892 | |
893 | === modified file 'base_module_merge/wizard/base_module_merge.py' |
894 | --- base_module_merge/wizard/base_module_merge.py 2009-01-06 12:12:59 +0000 |
895 | +++ base_module_merge/wizard/base_module_merge.py 2009-03-06 23:50:10 +0000 |
896 | @@ -26,6 +26,7 @@ |
897 | import tools |
898 | import os |
899 | from xml.dom import minidom |
900 | +from tools.translate import _ |
901 | |
902 | info_start_form = '''<?xml version="1.0"?> |
903 | <form string="Module Merging"> |
904 | |
905 | === modified file 'base_module_publish/wizard/base_module_publish.py' |
906 | --- base_module_publish/wizard/base_module_publish.py 2009-01-04 22:12:50 +0000 |
907 | +++ base_module_publish/wizard/base_module_publish.py 2009-03-06 23:50:10 +0000 |
908 | @@ -29,6 +29,7 @@ |
909 | |
910 | import module_zip |
911 | import tools |
912 | +from tools.translate import _ |
913 | |
914 | intro_form = '''<?xml version="1.0"?> |
915 | <form string="Module publication"> |
916 | |
917 | === modified file 'base_module_publish/wizard/base_module_publish_all.py' |
918 | --- base_module_publish/wizard/base_module_publish_all.py 2009-01-04 22:12:50 +0000 |
919 | +++ base_module_publish/wizard/base_module_publish_all.py 2009-03-06 23:50:10 +0000 |
920 | @@ -25,6 +25,7 @@ |
921 | import module_zip |
922 | from base_module_publish import post_multipart |
923 | from urllib import urlopen |
924 | +from tools.translate import _ |
925 | |
926 | intro_form = '''<?xml version="1.0"?> |
927 | <form string="Module publication"> |
928 | @@ -102,7 +103,7 @@ |
929 | res['module_file']) |
930 | ]) |
931 | if result[0] == "1": |
932 | - raise wizard.except_wizard('Error', 'Login failed!') |
933 | + raise wizard.except_wizard(_('Error'), _('Login failed!')) |
934 | elif result[0] == "0": |
935 | log[0].append(mod.name) |
936 | elif result[0] == "2": |
937 | |
938 | === modified file 'base_module_publish/wizard/module_zip.py' |
939 | --- base_module_publish/wizard/module_zip.py 2009-01-04 22:12:50 +0000 |
940 | +++ base_module_publish/wizard/module_zip.py 2009-03-06 23:50:10 +0000 |
941 | @@ -21,6 +21,7 @@ |
942 | ############################################################################## |
943 | import pooler |
944 | import addons |
945 | +from tools.translate import _ |
946 | |
947 | def createzip(cr, uid, moduleid, context, b64enc=True, src=True): |
948 | pool = pooler.get_pool(cr.dbname) |
949 | |
950 | === modified file 'base_report_creator/base_report_creator.py' |
951 | --- base_report_creator/base_report_creator.py 2009-01-04 22:12:50 +0000 |
952 | +++ base_report_creator/base_report_creator.py 2009-03-06 23:50:10 +0000 |
953 | @@ -24,6 +24,7 @@ |
954 | import time |
955 | import tools |
956 | from osv import fields,osv,orm |
957 | +from tools.translate import _ |
958 | |
959 | #class ir_model_fields(osv.osv): |
960 | # _inherit = 'ir.model.fields' |
961 | @@ -216,7 +217,7 @@ |
962 | if reference_model_dict: |
963 | self.model_set_id = model_dict.get(reference_model_dict.keys()[reference_model_dict.values().index(min(reference_model_dict.values()))]) |
964 | if model_list and not len(model_dict.keys()) == 1: |
965 | - raise osv.except_osv("No Related Models!!",'These is/are model(s) (%s) in selection which is/are not related to any other model'%','.join(model_list) ) |
966 | + raise osv.except_osv(_('No Related Models!!'),_('These is/are model(s) (%s) in selection which is/are not related to any other model') % ','.join(model_list)) |
967 | if filter_ids and where_list<>[]: |
968 | where_list.append('and') |
969 | where_list.append(' ') |
970 | |
971 | === modified file 'base_report_designer/wizard/base_report_designer_modify.py' |
972 | --- base_report_designer/wizard/base_report_designer_modify.py 2009-01-06 12:12:59 +0000 |
973 | +++ base_report_designer/wizard/base_report_designer_modify.py 2009-03-06 23:50:10 +0000 |
974 | @@ -27,6 +27,7 @@ |
975 | import urllib |
976 | import base64 |
977 | import tools |
978 | +from tools.translate import _ |
979 | |
980 | intro_form = '''<?xml version="1.0"?> |
981 | <form string="Report designer"> |
982 | |
983 | === modified file 'board/wizard/board_wizard.py' |
984 | --- board/wizard/board_wizard.py 2009-01-04 22:12:50 +0000 |
985 | +++ board/wizard/board_wizard.py 2009-03-06 23:50:10 +0000 |
986 | @@ -25,6 +25,7 @@ |
987 | import wizard |
988 | import osv |
989 | import pooler |
990 | +from tools.translate import _ |
991 | |
992 | section_form = '''<?xml version="1.0"?> |
993 | <form string="Create Menu For Dashboard"> |
994 | @@ -42,7 +43,7 @@ |
995 | pool = pooler.get_pool(cr.dbname) |
996 | board = pool.get('board.board').browse(cr, uid, data['id']) |
997 | if not board.line_ids: |
998 | - raise wizard.except_wizard('User Error!',"Please Insert Dashboard View(s) !") |
999 | + raise wizard.except_wizard(_('User Error!'),_('Please Insert Dashboard View(s) !')) |
1000 | return data['form'] |
1001 | |
1002 | def board_menu_create(self, cr, uid, data, context): |
1003 | |
1004 | === modified file 'board_auction/__init__.py' |
1005 | --- board_auction/__init__.py 2008-08-24 14:45:43 +0000 |
1006 | +++ board_auction/__init__.py 2009-03-06 23:50:10 +0000 |
1007 | @@ -0,0 +1,1 @@ |
1008 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1009 | |
1010 | === modified file 'board_crm_configuration/__init__.py' |
1011 | --- board_crm_configuration/__init__.py 2009-01-04 22:12:50 +0000 |
1012 | +++ board_crm_configuration/__init__.py 2009-03-06 23:50:10 +0000 |
1013 | @@ -20,3 +20,4 @@ |
1014 | # |
1015 | ############################################################################## |
1016 | |
1017 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1018 | |
1019 | === modified file 'board_document/__init__.py' |
1020 | --- board_document/__init__.py 2008-08-24 14:45:43 +0000 |
1021 | +++ board_document/__init__.py 2009-03-06 23:50:10 +0000 |
1022 | @@ -0,0 +1,1 @@ |
1023 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1024 | |
1025 | === modified file 'crm_configuration/__init__.py' |
1026 | --- crm_configuration/__init__.py 2009-01-04 22:12:50 +0000 |
1027 | +++ crm_configuration/__init__.py 2009-03-06 23:50:10 +0000 |
1028 | @@ -23,3 +23,4 @@ |
1029 | import report |
1030 | import wizard |
1031 | |
1032 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1033 | |
1034 | === modified file 'crm_configuration/wizard/__init__.py' |
1035 | --- crm_configuration/wizard/__init__.py 2009-01-04 22:12:50 +0000 |
1036 | +++ crm_configuration/wizard/__init__.py 2009-03-06 23:50:10 +0000 |
1037 | @@ -23,3 +23,4 @@ |
1038 | import meeting_planify |
1039 | import wizard_partner_create |
1040 | import wizard_opportunity_set |
1041 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1042 | |
1043 | === modified file 'crm_configuration/wizard/meeting_planify.py' |
1044 | --- crm_configuration/wizard/meeting_planify.py 2009-01-04 22:12:50 +0000 |
1045 | +++ crm_configuration/wizard/meeting_planify.py 2009-03-06 23:50:10 +0000 |
1046 | @@ -73,3 +73,4 @@ |
1047 | |
1048 | make_meeting('crm.case.meeting') |
1049 | |
1050 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1051 | |
1052 | === modified file 'crm_configuration/wizard/wizard_opportunity_set.py' |
1053 | --- crm_configuration/wizard/wizard_opportunity_set.py 2009-01-04 22:12:50 +0000 |
1054 | +++ crm_configuration/wizard/wizard_opportunity_set.py 2009-03-06 23:50:10 +0000 |
1055 | @@ -26,6 +26,7 @@ |
1056 | import netsvc |
1057 | import ir |
1058 | import pooler |
1059 | +from tools.translate import _ |
1060 | |
1061 | case_form = """<?xml version="1.0"?> |
1062 | <form string="Convert To Opportunity"> |
1063 | @@ -49,7 +50,7 @@ |
1064 | case_obj = pool.get('crm.case') |
1065 | for case in case_obj.browse(cr, uid, data['ids']): |
1066 | if not case.partner_id: |
1067 | - raise wizard.except_wizard("Warning !", |
1068 | + raise wizard.except_wizard(_('Warning !'), |
1069 | _('You must assign a partner to this lead before converting to opportunity.\n' \ |
1070 | 'You can use the convert to partner button.')) |
1071 | return {'name': case.name, 'probability': case.probability or 20.0, 'planned_revenue':case.planned_revenue} |
1072 | @@ -60,7 +61,7 @@ |
1073 | data_obj = pool.get('ir.model.data') |
1074 | id = section_obj.search(cr, uid, [('code','=','oppor')], context=context) |
1075 | if not id: |
1076 | - raise wizard.except_wizard(_("Error !"), |
1077 | + raise wizard.except_wizard(_('Error !'), |
1078 | _('You did not installed the opportunities tracking when you configured the crm_configuration module.' \ |
1079 | '\nI can not convert the lead to an opportunity, you must create a section with the code \'oppor\'.' |
1080 | )) |
1081 | @@ -106,3 +107,4 @@ |
1082 | |
1083 | make_opportunity('crm.case.opportunity_set') |
1084 | |
1085 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1086 | |
1087 | === modified file 'crm_configuration/wizard/wizard_partner_create.py' |
1088 | --- crm_configuration/wizard/wizard_partner_create.py 2009-02-17 05:38:02 +0000 |
1089 | +++ crm_configuration/wizard/wizard_partner_create.py 2009-03-06 23:50:10 +0000 |
1090 | @@ -26,6 +26,7 @@ |
1091 | import netsvc |
1092 | import ir |
1093 | import pooler |
1094 | +from tools.translate import _ |
1095 | |
1096 | case_form = """<?xml version="1.0"?> |
1097 | <form string="Convert To Partner"> |
1098 | @@ -46,7 +47,7 @@ |
1099 | case_obj = pool.get('crm.case') |
1100 | for case in case_obj.browse(cr, uid, data['ids']): |
1101 | if case.partner_id: |
1102 | - raise wizard.except_wizard("Warning !", |
1103 | + raise wizard.except_wizard(_('Warning !'), |
1104 | _('A partner is already defined on this lead.')) |
1105 | return {} |
1106 | |
1107 | @@ -58,7 +59,7 @@ |
1108 | for case in case_obj.browse(cr, uid, data['ids']): |
1109 | partner_id = partner_obj.search(cr, uid, [('name', '=', case.partner_name or case.name)]) |
1110 | if partner_id: |
1111 | - raise wizard.except_wizard("Warning !",_('A partner is already existing with the same name.')) |
1112 | + raise wizard.except_wizard(_('Warning !'),_('A partner is already existing with the same name.')) |
1113 | else: |
1114 | partner_id = partner_obj.create(cr, uid, { |
1115 | 'name': case.partner_name or case.name, |
1116 | |
1117 | === modified file 'crm_vertical/__init__.py' |
1118 | --- crm_vertical/__init__.py 2009-01-04 22:12:50 +0000 |
1119 | +++ crm_vertical/__init__.py 2009-03-06 23:50:10 +0000 |
1120 | @@ -20,3 +20,4 @@ |
1121 | # |
1122 | ############################################################################## |
1123 | #import crm_vertical |
1124 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1125 | |
1126 | === modified file 'crm_vertical/crm_vertical.py' |
1127 | --- crm_vertical/crm_vertical.py 2009-01-04 22:12:50 +0000 |
1128 | +++ crm_vertical/crm_vertical.py 2009-03-06 23:50:10 +0000 |
1129 | @@ -26,6 +26,7 @@ |
1130 | import os |
1131 | import mx.DateTime |
1132 | import base64 |
1133 | +from tools.translate import _ |
1134 | |
1135 | # here need to implement inheritance on osv_memory object. after that, it will work well. |
1136 | class crm_menu_config_wizard(osv.osv_memory): |
1137 | @@ -40,7 +41,8 @@ |
1138 | try: |
1139 | tools.convert_xml_import(cr, 'crm_configuration', tools.file_open(os.path.join('crm_vertical',file_name )), {}, 'init', *args) |
1140 | except Exception, e: |
1141 | - raise osv.except_osv('Error !', e) |
1142 | + raise osv.except_osv(_('Error !'), str(e)) |
1143 | return res |
1144 | |
1145 | crm_menu_config_wizard() |
1146 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1147 | |
1148 | === modified file 'document/document.py' |
1149 | --- document/document.py 2009-02-26 07:26:53 +0000 |
1150 | +++ document/document.py 2009-03-06 23:50:10 +0000 |
1151 | @@ -38,6 +38,7 @@ |
1152 | from psycopg2 import Binary |
1153 | from tools import config |
1154 | import tools |
1155 | +from tools.translate import _ |
1156 | |
1157 | def random_name(): |
1158 | random.seed() |
1159 | @@ -376,14 +377,14 @@ |
1160 | return True |
1161 | def write(self, cr, uid, ids, vals, context=None): |
1162 | if not self._check_duplication(cr,uid,vals,ids,op='write'): |
1163 | - raise osv.except_osv('ValidateError', _('Directory name must be unique!')) |
1164 | + raise osv.except_osv(_('ValidateError'), _('Directory name must be unique!')) |
1165 | return super(document_directory,self).write(cr,uid,ids,vals,context=context) |
1166 | |
1167 | def create(self, cr, uid, vals, context=None): |
1168 | if not self._check_duplication(cr,uid,vals): |
1169 | - raise osv.except_osv('ValidateError', _('Directory name must be unique!')) |
1170 | + raise osv.except_osv(_('ValidateError'), _('Directory name must be unique!')) |
1171 | if vals.get('name',False) and (vals.get('name').find('/')+1 or vals.get('name').find('@')+1 or vals.get('name').find('$')+1 or vals.get('name').find('#')+1) : |
1172 | - raise osv.except_osv('ValidateError', _('Directory name contains special characters!')) |
1173 | + raise osv.except_osv(_('ValidateError'), _('Directory name contains special characters!')) |
1174 | return super(document_directory,self).create(cr, uid, vals, context) |
1175 | |
1176 | document_directory() |
1177 | @@ -516,7 +517,7 @@ |
1178 | try: |
1179 | os.makedirs(path) |
1180 | except: |
1181 | - raise except_orm('Permission Denied !', 'You do not permissions to write on the server side.') |
1182 | + raise except_orm(_('Permission Denied !'), _('You do not permissions to write on the server side.')) |
1183 | |
1184 | flag = None |
1185 | # This can be improved |
1186 | @@ -534,7 +535,7 @@ |
1187 | cr.execute('update ir_attachment set store_fname=%s,store_method=%s,file_size=%s where id=%s', (os.path.join(flag,filename),'fs',len(v),id)) |
1188 | return True |
1189 | except Exception,e : |
1190 | - raise except_orm('Error!', str(e)) |
1191 | + raise except_orm(_('Error!'), str(e)) |
1192 | |
1193 | _columns = { |
1194 | 'user_id': fields.many2one('res.users', 'Owner', select=1), |
1195 | @@ -598,7 +599,7 @@ |
1196 | if not len(res): |
1197 | return False |
1198 | if not self._check_duplication(cr,uid,vals,ids,'write'): |
1199 | - raise except_orm('ValidateError', 'File name must be unique!') |
1200 | + raise except_orm(_('ValidateError'), _('File name must be unique!')) |
1201 | result = super(document_file,self).write(cr,uid,ids,vals,context=context) |
1202 | cr.commit() |
1203 | try: |
1204 | @@ -651,7 +652,7 @@ |
1205 | datas=vals.get('datas',False) |
1206 | vals['file_size']= len(datas) |
1207 | if not self._check_duplication(cr,uid,vals): |
1208 | - raise except_orm('ValidateError', 'File name must be unique!') |
1209 | + raise except_orm(_('ValidateError'), _('File name must be unique!')) |
1210 | result = super(document_file,self).create(cr, uid, vals, context) |
1211 | cr.commit() |
1212 | try: |
1213 | |
1214 | === modified file 'document_ics/__init__.py' |
1215 | --- document_ics/__init__.py 2009-01-04 22:12:50 +0000 |
1216 | +++ document_ics/__init__.py 2009-03-06 23:50:10 +0000 |
1217 | @@ -21,3 +21,4 @@ |
1218 | ############################################################################## |
1219 | |
1220 | import document |
1221 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1222 | |
1223 | === modified file 'event/event.py' |
1224 | --- event/event.py 2009-01-04 22:12:50 +0000 |
1225 | +++ event/event.py 2009-03-06 23:50:10 +0000 |
1226 | @@ -25,6 +25,7 @@ |
1227 | import netsvc |
1228 | import pooler |
1229 | import tools |
1230 | +from tools.translate import _ |
1231 | |
1232 | class crm_case_log(osv.osv): |
1233 | _inherit = 'crm.case.log' |
1234 | |
1235 | === modified file 'event/wizard/confirm_registration.py' |
1236 | --- event/wizard/confirm_registration.py 2009-01-04 22:12:50 +0000 |
1237 | +++ event/wizard/confirm_registration.py 2009-03-06 23:50:10 +0000 |
1238 | @@ -78,3 +78,4 @@ |
1239 | } |
1240 | |
1241 | confirm_registration('event.confirm_registration') |
1242 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1243 | |
1244 | === modified file 'event_project/wizard/event_task.py' |
1245 | --- event_project/wizard/event_task.py 2009-01-04 22:12:50 +0000 |
1246 | +++ event_project/wizard/event_task.py 2009-03-06 23:50:10 +0000 |
1247 | @@ -21,13 +21,14 @@ |
1248 | ############################################################################## |
1249 | import wizard |
1250 | import pooler |
1251 | +from tools.translate import _ |
1252 | |
1253 | def _event_tasks(self, cr, uid, data, context): |
1254 | event_id = data['id'] |
1255 | cr.execute('SELECT project_id FROM event_event WHERE id = %s', (event_id, )) |
1256 | res = cr.fetchone() |
1257 | if not res[0]: |
1258 | - raise wizard.except_wizard('Error !', 'No project defined for this event.\nYou can create one with the retro-planning button !') |
1259 | + raise wizard.except_wizard(_('Error !'), _('No project defined for this event.\nYou can create one with the retro-planning button !')) |
1260 | value = { |
1261 | 'domain': [('project_id', '=', res[0])], |
1262 | 'name': 'Tasks', |
1263 | |
1264 | === modified file 'hr/hr.py' |
1265 | --- hr/hr.py 2009-02-01 17:06:59 +0000 |
1266 | +++ hr/hr.py 2009-03-06 23:50:10 +0000 |
1267 | @@ -171,3 +171,4 @@ |
1268 | hr_timesheet() |
1269 | |
1270 | |
1271 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1272 | |
1273 | === modified file 'hr_holidays/hr.py' |
1274 | --- hr_holidays/hr.py 2009-03-03 21:44:55 +0000 |
1275 | +++ hr_holidays/hr.py 2009-03-06 23:50:10 +0000 |
1276 | @@ -34,7 +34,7 @@ |
1277 | import netsvc |
1278 | import datetime |
1279 | from osv import fields, osv |
1280 | - |
1281 | +from tools.translate import _ |
1282 | |
1283 | def _employee_get(obj,cr,uid,context={}): |
1284 | ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)]) |
1285 | @@ -206,7 +206,7 @@ |
1286 | leaves_rest=obj_holidays_per_user.max_leaves - obj_holidays_per_user.leaves_taken |
1287 | if not obj_holidays_per_user.holiday_status.limit: |
1288 | if leaves_rest < leave_asked: |
1289 | - raise osv.except_osv('Attention!','You Cannot Validate leaves while available leaves are less than asked leaves.') |
1290 | + raise osv.except_osv(_('Attention!'),_('You Cannot Validate leaves while available leaves are less than asked leaves.')) |
1291 | self.pool.get('hr.holidays.per.user').write(cr,uid,obj_holidays_per_user.id,{'leaves_taken':obj_holidays_per_user.leaves_taken + leave_asked}) |
1292 | if record.holiday_status.section_id: |
1293 | vals={} |
1294 | |
1295 | === modified file 'hr_timesheet/hr_timesheet.py' |
1296 | --- hr_timesheet/hr_timesheet.py 2009-01-04 22:12:50 +0000 |
1297 | +++ hr_timesheet/hr_timesheet.py 2009-03-06 23:50:10 +0000 |
1298 | @@ -24,7 +24,7 @@ |
1299 | from osv import fields |
1300 | from osv import osv |
1301 | from osv.orm import except_orm |
1302 | - |
1303 | +from tools.translate import _ |
1304 | |
1305 | class hr_employee(osv.osv): |
1306 | _name = "hr.employee" |
1307 | @@ -124,7 +124,7 @@ |
1308 | raise except_orm(_('ValidateError'), |
1309 | _('No analytic account defined on the project.\nPlease set one or we can not automatically fill the timesheet.')) |
1310 | else: |
1311 | - raise |
1312 | + raise except_orm(_('UnknownError'), str(e)) |
1313 | |
1314 | def on_change_user_id(self, cr, uid, ids, user_id): |
1315 | if not user_id: |
1316 | |
1317 | === modified file 'l10n_be/wizard/__init__.py' |
1318 | --- l10n_be/wizard/__init__.py 2009-01-04 22:12:50 +0000 |
1319 | +++ l10n_be/wizard/__init__.py 2009-03-06 23:50:10 +0000 |
1320 | @@ -20,4 +20,6 @@ |
1321 | # |
1322 | ############################################################################## |
1323 | import account_vat_declaration |
1324 | -import partner_vat_listing |
1325 | \ No newline at end of file |
1326 | +import partner_vat_listing |
1327 | + |
1328 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1329 | |
1330 | === modified file 'l10n_be/wizard/account_vat_declaration.py' |
1331 | --- l10n_be/wizard/account_vat_declaration.py 2009-02-05 13:18:41 +0000 |
1332 | +++ l10n_be/wizard/account_vat_declaration.py 2009-03-06 23:50:10 +0000 |
1333 | @@ -127,3 +127,4 @@ |
1334 | } |
1335 | |
1336 | wizard_vat_declaration('wizard.account.xml.vat.declaration') |
1337 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1338 | |
1339 | === modified file 'l10n_be/wizard/partner_vat_listing.py' |
1340 | --- l10n_be/wizard/partner_vat_listing.py 2009-02-05 13:18:41 +0000 |
1341 | +++ l10n_be/wizard/partner_vat_listing.py 2009-03-06 23:50:10 +0000 |
1342 | @@ -24,6 +24,7 @@ |
1343 | import datetime |
1344 | import pooler |
1345 | import base64 |
1346 | +from tools.translate import _ |
1347 | |
1348 | form = """<?xml version="1.0"?> |
1349 | <form string="Select Fiscal Year"> |
1350 | @@ -67,7 +68,7 @@ |
1351 | obj_cmpny = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid).company_id |
1352 | company_vat = obj_cmpny.partner_id.vat |
1353 | if not company_vat: |
1354 | - raise wizard.except_wizard('Data Insufficient','No VAT Number Associated with Main Company!') |
1355 | + raise wizard.except_wizard(_('Data Insufficient'),_('No VAT Number Associated with Main Company!')) |
1356 | |
1357 | cref = company_vat + seq_controlref |
1358 | dnum = cref + seq_declarantnum |
1359 | @@ -75,7 +76,7 @@ |
1360 | p_id_list=pooler.get_pool(cr.dbname).get('res.partner').search(cr,uid,[('vat_subjected','!=',False)]) |
1361 | |
1362 | if not p_id_list: |
1363 | - raise wizard.except_wizard('Data Insufficient!','No partner has a VAT Number asociated with him.') |
1364 | + raise wizard.except_wizard(_('Data Insufficient!'),_('No partner has a VAT Number asociated with him.')) |
1365 | obj_year=pooler.get_pool(cr.dbname).get('account.fiscalyear').browse(cr,uid,data['form']['fyear']) |
1366 | period_ids = pooler.get_pool(cr.dbname).get('account.period').search(cr, uid, [('fiscalyear_id', '=', data['form']['fyear'])]) |
1367 | period = "("+','.join(map(lambda x: str(x), period_ids)) +")" |
1368 | @@ -193,3 +194,4 @@ |
1369 | } |
1370 | |
1371 | wizard_vat('list.vat.detail') |
1372 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1373 | |
1374 | === modified file 'l10n_ch/__init__.py' |
1375 | --- l10n_ch/__init__.py 2009-02-13 15:53:46 +0000 |
1376 | +++ l10n_ch/__init__.py 2009-03-06 23:50:10 +0000 |
1377 | @@ -41,3 +41,4 @@ |
1378 | import report |
1379 | import bank |
1380 | import account_move_line |
1381 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1382 | |
1383 | === modified file 'l10n_ch/__terp__.py' |
1384 | --- l10n_ch/__terp__.py 2009-02-16 10:31:29 +0000 |
1385 | +++ l10n_ch/__terp__.py 2009-03-06 23:50:10 +0000 |
1386 | @@ -107,3 +107,4 @@ |
1387 | "active": False, |
1388 | "installable": True, |
1389 | } |
1390 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1391 | |
1392 | === modified file 'l10n_ch/account_move_line.py' |
1393 | --- l10n_ch/account_move_line.py 2009-02-13 15:53:46 +0000 |
1394 | +++ l10n_ch/account_move_line.py 2009-03-06 23:50:10 +0000 |
1395 | @@ -68,3 +68,4 @@ |
1396 | return line2bank |
1397 | |
1398 | AccountMoveLine() |
1399 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1400 | |
1401 | === modified file 'l10n_ch/bank.py' |
1402 | --- l10n_ch/bank.py 2009-02-13 15:53:46 +0000 |
1403 | +++ l10n_ch/bank.py 2009-03-06 23:50:10 +0000 |
1404 | @@ -43,3 +43,4 @@ |
1405 | } |
1406 | |
1407 | Bank() |
1408 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1409 | |
1410 | === modified file 'l10n_ch/company.py' |
1411 | --- l10n_ch/company.py 2009-02-13 15:53:46 +0000 |
1412 | +++ l10n_ch/company.py 2009-03-06 23:50:10 +0000 |
1413 | @@ -47,3 +47,4 @@ |
1414 | } |
1415 | res_company() |
1416 | |
1417 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1418 | |
1419 | === modified file 'l10n_ch/dta.py' |
1420 | --- l10n_ch/dta.py 2009-02-13 15:53:46 +0000 |
1421 | +++ l10n_ch/dta.py 2009-03-06 23:50:10 +0000 |
1422 | @@ -93,3 +93,4 @@ |
1423 | account_dta_line() |
1424 | |
1425 | |
1426 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1427 | |
1428 | === modified file 'l10n_ch/invoice.py' |
1429 | --- l10n_ch/invoice.py 2009-02-13 15:53:46 +0000 |
1430 | +++ l10n_ch/invoice.py 2009-03-06 23:50:10 +0000 |
1431 | @@ -207,4 +207,6 @@ |
1432 | ### The case code of the taxt code |
1433 | 'code': fields.char('Case Code', size=512), |
1434 | } |
1435 | -account_tax_code() |
1436 | \ No newline at end of file |
1437 | +account_tax_code() |
1438 | + |
1439 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1440 | |
1441 | === modified file 'l10n_ch/partner.py' |
1442 | --- l10n_ch/partner.py 2009-02-13 15:53:46 +0000 |
1443 | +++ l10n_ch/partner.py 2009-03-06 23:50:10 +0000 |
1444 | @@ -96,3 +96,4 @@ |
1445 | |
1446 | |
1447 | res_partner_bank() |
1448 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1449 | |
1450 | === modified file 'l10n_ch/payment.py' |
1451 | --- l10n_ch/payment.py 2009-02-13 15:53:46 +0000 |
1452 | +++ l10n_ch/payment.py 2009-03-06 23:50:10 +0000 |
1453 | @@ -41,3 +41,4 @@ |
1454 | return 'l10n_ch','wizard_account_dta_create' |
1455 | return super(payment_order,self).get_wizard(mode) |
1456 | payment_order() |
1457 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1458 | |
1459 | === modified file 'l10n_ch/report/__init__.py' |
1460 | --- l10n_ch/report/__init__.py 2009-02-13 15:53:46 +0000 |
1461 | +++ l10n_ch/report/__init__.py 2009-03-06 23:50:10 +0000 |
1462 | @@ -31,3 +31,4 @@ |
1463 | ############################################################################## |
1464 | |
1465 | import bvr |
1466 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1467 | |
1468 | === modified file 'l10n_ch/report/bvr.py' |
1469 | --- l10n_ch/report/bvr.py 2009-02-13 15:53:46 +0000 |
1470 | +++ l10n_ch/report/bvr.py 2009-03-06 23:50:10 +0000 |
1471 | @@ -100,3 +100,4 @@ |
1472 | parser=account_invoice_bvr, |
1473 | header=False) |
1474 | |
1475 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1476 | |
1477 | === modified file 'l10n_ch/report/tiny_sxw2rml.py' |
1478 | --- l10n_ch/report/tiny_sxw2rml.py 2009-02-13 15:53:46 +0000 |
1479 | +++ l10n_ch/report/tiny_sxw2rml.py 2009-03-06 23:50:10 +0000 |
1480 | @@ -339,3 +339,4 @@ |
1481 | result = style.applyStylesheet(doc, None) |
1482 | xml = style.saveResultToString(result) |
1483 | print xml |
1484 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1485 | |
1486 | === modified file 'l10n_ch/wizard/__init__.py' |
1487 | --- l10n_ch/wizard/__init__.py 2009-02-13 15:53:46 +0000 |
1488 | +++ l10n_ch/wizard/__init__.py 2009-03-06 23:50:10 +0000 |
1489 | @@ -34,3 +34,4 @@ |
1490 | import wizard_bvr |
1491 | import bvr_import |
1492 | import journal_config |
1493 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1494 | |
1495 | === modified file 'l10n_ch/wizard/bvr_import.py' |
1496 | --- l10n_ch/wizard/bvr_import.py 2009-02-13 15:53:46 +0000 |
1497 | +++ l10n_ch/wizard/bvr_import.py 2009-03-06 23:50:10 +0000 |
1498 | @@ -35,6 +35,8 @@ |
1499 | import time |
1500 | from tools import mod10r |
1501 | import re |
1502 | +from tools.translate import _ |
1503 | + |
1504 | ASK_FORM = """<?xml version="1.0"?> |
1505 | <form string="BVR Import"> |
1506 | <field name="file"/> |
1507 | @@ -103,12 +105,12 @@ |
1508 | |
1509 | if line[0:3] in ('999', '995'): |
1510 | if find_total: |
1511 | - raise wizard.except_wizard('Error', |
1512 | - 'Too much total record found!') |
1513 | + raise wizard.except_wizard(_('Error'), |
1514 | + _('Too much total record found!')) |
1515 | find_total = True |
1516 | if lines: |
1517 | - raise wizard.except_wizard('Error', |
1518 | - 'Record found after total record!') |
1519 | + raise wizard.except_wizard(_('Error'), |
1520 | + _('Record found after total record!')) |
1521 | amount = float(line[39:49]) + (float(line[49:51]) / 100) |
1522 | cost = float(line[69:76]) + (float(line[76:78]) / 100) |
1523 | if line[2] == '5': |
1524 | @@ -117,11 +119,11 @@ |
1525 | |
1526 | if round(amount - total_amount, 2) >= 0.01 \ |
1527 | or round(cost - total_cost, 2) >= 0.01: |
1528 | - raise wizard.except_wizard('Error', |
1529 | - 'Total record different from the computed!') |
1530 | + raise wizard.except_wizard(_('Error'), |
1531 | + _('Total record different from the computed!')) |
1532 | if int(line[51:63]) != len(records): |
1533 | - raise wizard.except_wizard('Error', |
1534 | - 'Number record different from the computed!') |
1535 | + raise wizard.except_wizard(_('Error'), |
1536 | + _('Number record different from the computed!')) |
1537 | else: |
1538 | record = { |
1539 | 'reference': line[12:39], |
1540 | @@ -132,8 +134,8 @@ |
1541 | } |
1542 | |
1543 | if record['reference'] != mod10r(record['reference'][:-1]): |
1544 | - raise wizard.except_wizard('Error', |
1545 | - 'Recursive mod10 is invalid for reference: %s' % \ |
1546 | + raise wizard.except_wizard(_('Error'), |
1547 | + _('Recursive mod10 is invalid for reference: %s') % \ |
1548 | record['reference']) |
1549 | |
1550 | if line[2] == '5': |
1551 | @@ -202,8 +204,8 @@ |
1552 | else: |
1553 | account_id = account_payable |
1554 | if not account_id : |
1555 | - raise wizard.except_wizard('Error', |
1556 | - 'The properties account payable account receivable') |
1557 | + raise wizard.except_wizard(_('Error'), |
1558 | + _('The properties account payable account receivable')) |
1559 | values['account_id'] = account_id |
1560 | values['partner_id'] = partner_id |
1561 | |
1562 | @@ -248,3 +250,4 @@ |
1563 | } |
1564 | |
1565 | BVRImport('l10n_ch.bvr_import') |
1566 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1567 | |
1568 | === modified file 'l10n_ch/wizard/dta_wizard.py' |
1569 | --- l10n_ch/wizard/dta_wizard.py 2009-02-13 15:53:46 +0000 |
1570 | +++ l10n_ch/wizard/dta_wizard.py 2009-03-06 23:50:10 +0000 |
1571 | @@ -35,6 +35,7 @@ |
1572 | import time |
1573 | import pooler |
1574 | import mx.DateTime |
1575 | +from tools.translate import _ |
1576 | |
1577 | |
1578 | FORM = """<?xml version="1.0"?> |
1579 | @@ -99,7 +100,7 @@ |
1580 | Must instanciate a fields list, field = (name,size) |
1581 | and update a local_values dict. |
1582 | """ |
1583 | - raise "not implemented" |
1584 | + raise _('not implemented') |
1585 | |
1586 | def generate(self): |
1587 | res='' |
1588 | @@ -362,18 +363,18 @@ |
1589 | payment = payment_obj.browse(cr, uid, data['id'], context=context) |
1590 | |
1591 | if not payment.mode or payment.mode.type.code != 'dta': |
1592 | - raise wizard.except_wizard('Error', |
1593 | - 'No payment mode or payment type code invalid.') |
1594 | + raise wizard.except_wizard(_('Error'), |
1595 | + _('No payment mode or payment type code invalid.')) |
1596 | bank = payment.mode.bank_id |
1597 | if not bank: |
1598 | - raise wizard.except_wizard('Error', 'No bank account for the company.') |
1599 | + raise wizard.except_wizard(_('Error'), _('No bank account for the company.')) |
1600 | |
1601 | v['comp_bank_name']= bank.bank and bank.bank.name or False |
1602 | v['comp_bank_clearing'] = bank.bank.clearing |
1603 | |
1604 | if not v['comp_bank_clearing']: |
1605 | - raise wizard.except_wizard('Error', |
1606 | - 'You must provide a Clearing Number for your bank account.') |
1607 | + raise wizard.except_wizard(_('Error'), |
1608 | + _('You must provide a Clearing Number for your bank account.')) |
1609 | |
1610 | user = pool.get('res.users').browse(cr,uid,[uid])[0] |
1611 | company= user.company_id |
1612 | @@ -393,8 +394,8 @@ |
1613 | else: |
1614 | v['comp_bank_iban'] = '' |
1615 | if not v['comp_bank_iban']: |
1616 | - raise wizard.except_wizard('Error', |
1617 | - 'No IBAN for the company bank account.') |
1618 | + raise wizard.except_wizard(_('Error'), |
1619 | + _('No IBAN for the company bank account.')) |
1620 | |
1621 | dta_line_obj = pool.get('account.dta.line') |
1622 | res_partner_bank_obj = pool.get('res.partner.bank') |
1623 | @@ -405,13 +406,13 @@ |
1624 | |
1625 | for pline in payment.line_ids: |
1626 | if not pline.bank_id: |
1627 | - raise wizard.except_wizard('Error', 'No bank account defined\n' \ |
1628 | - 'on line: ' + pline.name) |
1629 | + raise wizard.except_wizard(_('Error'), _('No bank account defined\n' \ |
1630 | + 'on line: %s') % pline.name) |
1631 | if not pline.bank_id.bank: |
1632 | - raise wizard.except_wizard('Error', 'No bank defined\n' \ |
1633 | - 'for the bank account: ' + pline.bank_id.state + '\n' \ |
1634 | - 'on the partner: ' + pline.partner_id.name + '\n' \ |
1635 | - 'on line: ' + pline.name) |
1636 | + raise wizard.except_wizard(_('Error'), _('No bank defined\n' \ |
1637 | + 'for the bank account: %s\n' \ |
1638 | + 'on the partner: %s\n' \ |
1639 | + 'on line: %s') + (pline.bank_id.state, pline.partner_id.name, pline.name)) |
1640 | |
1641 | v['sequence'] = str(seq).rjust(5).replace(' ', '0') |
1642 | v['amount_to_pay']= str(pline.amount_currency).replace('.', ',') |
1643 | @@ -421,10 +422,10 @@ |
1644 | v['partner_bank_name'] = pline.bank_id.bank.name or False |
1645 | v['partner_bank_clearing'] = pline.bank_id.bank.clearing or False |
1646 | if not v['partner_bank_name'] : |
1647 | - raise wizard.except_wizard('Error', 'No bank name defined\n' \ |
1648 | - 'for the bank account: ' + pline.bank_id.state + '\n' \ |
1649 | - 'on the partner: ' + pline.partner_id.name + '\n' \ |
1650 | - 'on line: ' + pline.name) |
1651 | + raise wizard.except_wizard(_('Error'), _('No bank name defined\n' \ |
1652 | + 'for the bank account: %s\n' \ |
1653 | + 'on the partner: %s\n' \ |
1654 | + 'on line: %s') % (pline.bank_id.state, pline.partner_id.name, pline.name)) |
1655 | |
1656 | v['partner_bank_iban']= pline.bank_id.iban or False |
1657 | v['partner_bank_number']= pline.bank_id.acc_number \ |
1658 | @@ -470,9 +471,9 @@ |
1659 | v['partner_city']= '' |
1660 | v['partner_zip']= '' |
1661 | v['partner_country']= '' |
1662 | - raise wizard.except_wizard('Error', 'No address defined \n' \ |
1663 | - 'for the partner: ' + pline.partner_id.name + '\n' \ |
1664 | - 'on line: ' + pline.name) |
1665 | + raise wizard.except_wizard(_('Error'), _('No address defined \n' \ |
1666 | + 'for the partner: %s\n' \ |
1667 | + 'on line: %s') % (pline.partner_id.name, pline.name)) |
1668 | |
1669 | if pline.order_id.date_planned : |
1670 | date_value = mx.DateTime.strptime(pline.order_id.date_planned, '%Y-%m-%d') |
1671 | @@ -491,11 +492,9 @@ |
1672 | v['comp_country'] = co_addr.country_id and co_addr.country_id.code+'-' or '' |
1673 | record_type = record_gt836 |
1674 | if not v['partner_bank_iban']: |
1675 | - raise wizard.except_wizard('Error', 'No IBAN defined \n' \ |
1676 | - 'for the bank account: ' + \ |
1677 | - res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], |
1678 | - context)[0][1] + '\n' \ |
1679 | - 'on line: ' + pline.name) |
1680 | + raise wizard.except_wizard(_('Error'), _('No IBAN defined \n' \ |
1681 | + 'for the bank account: %s\n' + \ |
1682 | + 'on line: %s') % (res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1] , pline.name)) |
1683 | |
1684 | if v['partner_bank_code'] : # bank code is swift (BIC address) |
1685 | v['option_id_bank']= 'A' |
1686 | @@ -509,11 +508,9 @@ |
1687 | + ' ' + v['partner_bank_city'] \ |
1688 | + ' ' + v['partner_bank_country'] |
1689 | else: |
1690 | - raise wizard.except_wizard('Error', 'You must provide the bank city ' |
1691 | - 'or the bic code for the partner bank: \n' + \ |
1692 | - res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], |
1693 | - context)[0][1] + '\n' \ |
1694 | - 'on line: ' + pline.name) |
1695 | + raise wizard.except_wizard(_('Error'), _('You must provide the bank city ' |
1696 | + 'or the bic code for the partner bank: \n %d\n' + \ |
1697 | + 'on line: %s') %(res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1], pline.name)) |
1698 | |
1699 | elif elec_pay == 'bvrbank' or elec_pay == 'bvrpost': |
1700 | from tools import mod10r |
1701 | @@ -522,15 +519,13 @@ |
1702 | '').rjust(27).replace(' ', '0') |
1703 | if not v['reference'] \ |
1704 | or mod10r(v['reference'][:-1]) != v['reference']: |
1705 | - raise wizard.except_wizard('Error', 'You must provide ' \ |
1706 | - 'a valid BVR reference number \n' + |
1707 | - 'for the line: ' + pline.name) |
1708 | + raise wizard.except_wizard(_('Error'), _('You must provide ' \ |
1709 | + 'a valid BVR reference number \n' \ |
1710 | + 'for the line: %s') % pline.name) |
1711 | if not v['partner_bvr']: |
1712 | - raise wizard.except_wizard('Error', 'You must provide a BVR number\n' |
1713 | - 'for the bank account: ' + \ |
1714 | - res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], |
1715 | - context)[0][1] + '\n' \ |
1716 | - 'on line: ' + pline.name) |
1717 | + raise wizard.except_wizard(_('Error'), _('You must provide a BVR number\n' |
1718 | + 'for the bank account: %s' \ |
1719 | + 'on line: %s') % (res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id],context)[0][1] ,pline.name)) |
1720 | record_type = record_gt826 |
1721 | |
1722 | elif elec_pay == 'bvbank': |
1723 | @@ -538,38 +533,30 @@ |
1724 | if v['partner_bank_iban'] : |
1725 | v['partner_bank_number']= v['partner_bank_iban'] |
1726 | else: |
1727 | - raise wizard.except_wizard('Error', 'You must provide ' \ |
1728 | + raise wizard.except_wizard(_('Error'), _('You must provide ' \ |
1729 | 'a bank number \n' \ |
1730 | - 'for the partner bank: ' + \ |
1731 | - res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], |
1732 | - context)[0][1] + '\n' \ |
1733 | - 'on line: ' + pline.name) |
1734 | + 'for the partner bank: %s\n' \ |
1735 | + 'on line: %s') % (res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1] , pline.name)) |
1736 | if not v['partner_bank_clearing']: |
1737 | - raise wizard.except_wizard('Error', 'You must provide ' \ |
1738 | + raise wizard.except_wizard(_('Error'), _('You must provide ' \ |
1739 | 'a Clearing Number\n' \ |
1740 | - 'for the partner bank: ' + \ |
1741 | - res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], |
1742 | - context)[0][1] + '\n' \ |
1743 | - 'on line '+ pline.name) |
1744 | + 'for the partner bank: %s\n' \ |
1745 | + 'on line %s') % (res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1] , pline.name)) |
1746 | v['partner_bank_number'] = '/C/'+v['partner_bank_number'] |
1747 | record_type = record_gt827 |
1748 | elif elec_pay == 'bvpost': |
1749 | if not v['partner_post_number']: |
1750 | - raise wizard.except_wizard('Error', 'You must provide ' \ |
1751 | + raise wizard.except_wizard(_('Error'), _('You must provide ' \ |
1752 | 'a post number \n' \ |
1753 | - 'for the partner bank: ' + \ |
1754 | - res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], |
1755 | - context)[0][1] + '\n' \ |
1756 | - 'on line: ' + pline.name) |
1757 | + 'for the partner bank: %s\n' \ |
1758 | + 'on line: %s') % (res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1] ,pline.name)) |
1759 | v['partner_bank_clearing']= '' |
1760 | v['partner_bank_number'] = '/C/'+v['partner_post_number'] |
1761 | record_type = record_gt827 |
1762 | else: |
1763 | - raise wizard.except_wizard('Error', 'The Bank type ' + elec_pay + \ |
1764 | - 'of the bank account: ' + \ |
1765 | - res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], |
1766 | - context)[0][1] + ' '\ |
1767 | - 'is not supported') |
1768 | + raise wizard.except_wizard(_('Error'), _('The Bank type ' + elec_pay + \ |
1769 | + 'of the bank account: %s ' \ |
1770 | + 'is not supported') % res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1] |
1771 | |
1772 | dta_line = record_type(v).generate() |
1773 | |
1774 | @@ -609,3 +596,4 @@ |
1775 | } |
1776 | |
1777 | wizard_dta_create('account.dta_create') |
1778 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1779 | |
1780 | === modified file 'l10n_ch/wizard/journal_config.py' |
1781 | --- l10n_ch/wizard/journal_config.py 2009-02-13 15:53:46 +0000 |
1782 | +++ l10n_ch/wizard/journal_config.py 2009-03-06 23:50:10 +0000 |
1783 | @@ -162,4 +162,6 @@ |
1784 | } |
1785 | |
1786 | |
1787 | -Journal() |
1788 | \ No newline at end of file |
1789 | +Journal() |
1790 | + |
1791 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1792 | |
1793 | === modified file 'l10n_ch/wizard/wizard_bvr.py' |
1794 | --- l10n_ch/wizard/wizard_bvr.py 2009-02-13 15:53:46 +0000 |
1795 | +++ l10n_ch/wizard/wizard_bvr.py 2009-03-06 23:50:10 +0000 |
1796 | @@ -33,33 +33,33 @@ |
1797 | import wizard |
1798 | import pooler |
1799 | import re |
1800 | +from tools.translate import _ |
1801 | |
1802 | def _check(self, cr, uid, data, context): |
1803 | pool = pooler.get_pool(cr.dbname) |
1804 | invoice_obj = pool.get('account.invoice') |
1805 | for invoice in invoice_obj.browse(cr, uid, data['ids'], context): |
1806 | if not invoice.partner_bank: |
1807 | - raise wizard.except_wizard('UserError', |
1808 | - 'No bank specified on invoice:\n' + \ |
1809 | - invoice_obj.name_get(cr, uid, [invoice.id], |
1810 | - context=context)[0][1]) |
1811 | + raise wizard.except_wizard(_('UserError'), |
1812 | + _('No bank specified on invoice:\n%s') % \ |
1813 | + invoice_obj.name_get(cr, uid, [invoice.id], context=context)[0][1]) |
1814 | + |
1815 | if not re.compile('[0-9][0-9]-[0-9]{3,6}-[0-9]').match( |
1816 | invoice.partner_bank.bvr_number or ''): |
1817 | - raise wizard.except_wizard('UserError', |
1818 | - 'Your bank BVR number should be of the form 0X-XXX-X!\n' \ |
1819 | + raise wizard.except_wizard(_('UserError'), |
1820 | + _('Your bank BVR number should be of the form 0X-XXX-X!\n' \ |
1821 | 'Please check your company ' \ |
1822 | - 'information for the invoice:\n' + \ |
1823 | - invoice_obj.name_get(cr, uid, [invoice.id], |
1824 | - context=context)[0][1]) |
1825 | + 'information for the invoice:\n%s') % \ |
1826 | + invoice_obj.name_get(cr, uid, [invoice.id], context=context)[0][1]) |
1827 | + |
1828 | if invoice.partner_bank.bvr_adherent_num \ |
1829 | and not re.compile('[0-9]*$').match( |
1830 | invoice.partner_bank.bvr_adherent_num): |
1831 | - raise wizard.except_wizard('UserError', |
1832 | - 'Your bank BVR adherent number must contain exactly seven' \ |
1833 | + raise wizard.except_wizard(_('UserError'), |
1834 | + _('Your bank BVR adherent number must contain exactly seven' \ |
1835 | 'digits!\nPlease check your company ' \ |
1836 | - 'information for the invoice:\n' + \ |
1837 | - invoice_obj.name_get(cr, uid, [invoice.id], |
1838 | - context=context)[0][1]) |
1839 | + 'information for the invoice:\n%s') % \ |
1840 | + invoice_obj.name_get(cr, uid, [invoice.id], context=context)[0][1]) |
1841 | return {} |
1842 | |
1843 | class wizard_report(wizard.interface): |
1844 | @@ -80,3 +80,4 @@ |
1845 | } |
1846 | ReportInvoiceBVRCheck('l10n_ch.invoice.bvr.check') |
1847 | |
1848 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1849 | |
1850 | === modified file 'l10n_ch_chart_c2c_pcg/__init__.py' |
1851 | --- l10n_ch_chart_c2c_pcg/__init__.py 2009-02-13 15:53:46 +0000 |
1852 | +++ l10n_ch_chart_c2c_pcg/__init__.py 2009-03-06 23:50:10 +0000 |
1853 | @@ -23,3 +23,4 @@ |
1854 | # along with this program; if not, write to the Free Software |
1855 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
1856 | import wizard |
1857 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1858 | |
1859 | === modified file 'l10n_ch_chart_c2c_pcg/__terp__.py' |
1860 | --- l10n_ch_chart_c2c_pcg/__terp__.py 2009-02-13 15:53:46 +0000 |
1861 | +++ l10n_ch_chart_c2c_pcg/__terp__.py 2009-03-06 23:50:10 +0000 |
1862 | @@ -50,3 +50,4 @@ |
1863 | "active": False, |
1864 | "installable": True |
1865 | } |
1866 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1867 | |
1868 | === modified file 'l10n_ch_chart_c2c_pcg/wizard/__init__.py' |
1869 | --- l10n_ch_chart_c2c_pcg/wizard/__init__.py 2009-02-13 15:53:46 +0000 |
1870 | +++ l10n_ch_chart_c2c_pcg/wizard/__init__.py 2009-03-06 23:50:10 +0000 |
1871 | @@ -4,4 +4,6 @@ |
1872 | # Created by Nicolas Bessi on 12.02.09. |
1873 | # Copyright (c) 2009 CamptoCamp. All rights reserved. |
1874 | # |
1875 | -import config |
1876 | \ No newline at end of file |
1877 | +import config |
1878 | + |
1879 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1880 | |
1881 | === modified file 'l10n_ch_chart_c2c_pcg/wizard/config.py' |
1882 | --- l10n_ch_chart_c2c_pcg/wizard/config.py 2009-02-13 15:53:46 +0000 |
1883 | +++ l10n_ch_chart_c2c_pcg/wizard/config.py 2009-03-06 23:50:10 +0000 |
1884 | @@ -140,4 +140,6 @@ |
1885 | } |
1886 | |
1887 | |
1888 | -Tax_template() |
1889 | \ No newline at end of file |
1890 | +Tax_template() |
1891 | + |
1892 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1893 | |
1894 | === modified file 'l10n_lu/__init__.py' |
1895 | --- l10n_lu/__init__.py 2009-01-04 22:12:50 +0000 |
1896 | +++ l10n_lu/__init__.py 2009-03-06 23:50:10 +0000 |
1897 | @@ -20,3 +20,4 @@ |
1898 | # |
1899 | ############################################################################## |
1900 | import wizard |
1901 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1902 | |
1903 | === modified file 'l10n_lu/wizard/__init__.py' |
1904 | --- l10n_lu/wizard/__init__.py 2009-01-04 22:12:50 +0000 |
1905 | +++ l10n_lu/wizard/__init__.py 2009-03-06 23:50:10 +0000 |
1906 | @@ -20,3 +20,4 @@ |
1907 | # |
1908 | ############################################################################## |
1909 | import print_vat |
1910 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1911 | |
1912 | === modified file 'l10n_lu/wizard/print_vat.py' |
1913 | --- l10n_lu/wizard/print_vat.py 2009-01-22 17:28:30 +0000 |
1914 | +++ l10n_lu/wizard/print_vat.py 2009-03-06 23:50:10 +0000 |
1915 | @@ -90,3 +90,4 @@ |
1916 | } |
1917 | wizard_report('l10n_lu.tax.report.wizard') |
1918 | |
1919 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1920 | |
1921 | === modified file 'membership/wizard/invoice_membership.py' |
1922 | --- membership/wizard/invoice_membership.py 2009-02-19 10:41:30 +0000 |
1923 | +++ membership/wizard/invoice_membership.py 2009-03-06 23:50:10 +0000 |
1924 | @@ -23,6 +23,7 @@ |
1925 | import wizard |
1926 | import pooler |
1927 | import time |
1928 | +from tools.translate import _ |
1929 | |
1930 | def _invoice_membership(self, cr, uid, data, context): |
1931 | partner_ids = data['ids'] |
1932 | @@ -37,7 +38,7 @@ |
1933 | ) |
1934 | fetchal = cr.fetchall() |
1935 | if not fetchal: |
1936 | - raise wizard.except_wizard('Error !', 'No Address defined for this partner') |
1937 | + raise wizard.except_wizard(_('Error !'), _('No Address defined for this partner')) |
1938 | partner_address_ids = {} |
1939 | for x in range(len(fetchal)): |
1940 | pid = fetchal[x][0] |
1941 | @@ -138,4 +139,4 @@ |
1942 | |
1943 | wizard_invoice_membership("wizard_invoice_membership") |
1944 | |
1945 | -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1946 | \ No newline at end of file |
1947 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1948 | |
1949 | === modified file 'mrp/__init__.py' |
1950 | --- mrp/__init__.py 2009-01-04 22:12:50 +0000 |
1951 | +++ mrp/__init__.py 2009-03-06 23:50:10 +0000 |
1952 | @@ -25,3 +25,4 @@ |
1953 | import report |
1954 | import company |
1955 | import schedulers |
1956 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1957 | |
1958 | === modified file 'mrp/company.py' |
1959 | --- mrp/company.py 2009-01-04 22:12:50 +0000 |
1960 | +++ mrp/company.py 2009-03-06 23:50:10 +0000 |
1961 | @@ -46,3 +46,4 @@ |
1962 | company() |
1963 | |
1964 | |
1965 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1966 | |
1967 | === modified file 'mrp/mrp.py' |
1968 | --- mrp/mrp.py 2009-03-06 09:35:35 +0000 |
1969 | +++ mrp/mrp.py 2009-03-06 23:50:10 +0000 |
1970 | @@ -27,6 +27,7 @@ |
1971 | import netsvc |
1972 | import time |
1973 | from mx import DateTime |
1974 | +from tools.translate import _ |
1975 | |
1976 | #---------------------------------------------------------- |
1977 | # Workcenters |
1978 | @@ -492,7 +493,7 @@ |
1979 | self.write(cr, uid, [production.id], {'bom_id': bom_id, 'routing_id': routing_id}) |
1980 | |
1981 | if not bom_id: |
1982 | - raise osv.except_osv('Error', "Couldn't find bill of material for product") |
1983 | + raise osv.except_osv(_('Error'), _("Couldn't find bill of material for product")) |
1984 | |
1985 | #if bom_point.routing_id and bom_point.routing_id.location_id: |
1986 | # self.write(cr, uid, [production.id], {'location_src_id': bom_point.routing_id.location_id.id}) |
1987 | |
1988 | === modified file 'mrp/report/order.py' |
1989 | --- mrp/report/order.py 2009-01-04 22:12:50 +0000 |
1990 | +++ mrp/report/order.py 2009-03-06 23:50:10 +0000 |
1991 | @@ -37,3 +37,4 @@ |
1992 | report_sxw.report_sxw('report.mrp.production.order','mrp.production','addons/mrp/report/order.rml',parser=order,header=1) |
1993 | |
1994 | |
1995 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
1996 | |
1997 | === modified file 'mrp/schedulers.py' |
1998 | --- mrp/schedulers.py 2009-01-27 11:15:46 +0000 |
1999 | +++ mrp/schedulers.py 2009-03-06 23:50:10 +0000 |
2000 | @@ -237,3 +237,4 @@ |
2001 | cr.close() |
2002 | return {} |
2003 | mrp_procurement() |
2004 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2005 | |
2006 | === modified file 'mrp/wizard/wizard_change_production_qty.py' |
2007 | --- mrp/wizard/wizard_change_production_qty.py 2009-01-04 22:12:50 +0000 |
2008 | +++ mrp/wizard/wizard_change_production_qty.py 2009-03-06 23:50:10 +0000 |
2009 | @@ -27,6 +27,7 @@ |
2010 | from osv.osv import except_osv |
2011 | from osv import fields,osv |
2012 | import netsvc |
2013 | +from tools.translate import _ |
2014 | |
2015 | |
2016 | form1 = '''<?xml version="1.0"?> |
2017 | @@ -47,7 +48,7 @@ |
2018 | prod_obj = pooler.get_pool(cr.dbname).get('mrp.production') |
2019 | prod = prod_obj.browse(cr, uid,data['ids'])[0] |
2020 | if prod.state in ('cancel', 'done'): |
2021 | - raise wizard.except_wizard('Warning !', 'The production is in "%s" state. You can not change the production quantity anymore' % (prod.state).upper() ) |
2022 | + raise wizard.except_wizard(_('Warning !'), _('The production is in "%s" state. You can not change the production quantity anymore') % (prod.state).upper() ) |
2023 | return 'end' |
2024 | if prod.state in ('draft'): |
2025 | #raise wizard.except_wizard('Warning !', 'The production is in "%s" state. You can change the production quantity directly...!!!' % (prod.state).upper() ) |
2026 | @@ -69,12 +70,12 @@ |
2027 | if not bom_point: |
2028 | bom_id = pool.get('mrp.bom')._bom_find(cr, uid, prod.product_id.id, prod.product_uom.id) |
2029 | if not bom_id: |
2030 | - raise osv.except_osv('Error', "Couldn't find bill of material for product") |
2031 | + raise osv.except_osv(_('Error'), _("Couldn't find bill of material for product")) |
2032 | self.write(cr, uid, [prod.id], {'bom_id': bom_id}) |
2033 | bom_point = pool.get('mrp.bom').browse(cr, uid, [bom_id])[0] |
2034 | |
2035 | if not bom_id: |
2036 | - raise osv.except_osv('Error', "Couldn't find bill of material for product") |
2037 | + raise osv.except_osv(_('Error'), _("Couldn't find bill of material for product")) |
2038 | |
2039 | factor = prod.product_qty * prod.product_uom.factor / bom_point.product_uom.factor |
2040 | res = pool.get('mrp.bom')._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, []) |
2041 | @@ -114,3 +115,4 @@ |
2042 | |
2043 | change_production_qty('change_production_qty') |
2044 | |
2045 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2046 | |
2047 | === modified file 'mrp_operations/mrp_operations.py' |
2048 | --- mrp_operations/mrp_operations.py 2009-01-26 22:57:42 +0000 |
2049 | +++ mrp_operations/mrp_operations.py 2009-03-06 23:50:10 +0000 |
2050 | @@ -27,6 +27,7 @@ |
2051 | import netsvc |
2052 | import time |
2053 | from mx import DateTime |
2054 | +from tools.translate import _ |
2055 | |
2056 | #---------------------------------------------------------- |
2057 | # Workcenters |
2058 | @@ -69,7 +70,7 @@ |
2059 | elif prod_obj.state =='in_production': |
2060 | return |
2061 | else: |
2062 | - raise osv.except_osv(_('Error!'),_('Production Order Cannot start in [%s] state')%(prod_obj.state,)) |
2063 | + raise osv.except_osv(_('Error!'),_('Production Order Cannot start in [%s] state') % (prod_obj.state,)) |
2064 | else: |
2065 | oper_ids=self.search(cr,uid,[('production_id','=',prod_obj.id)]) |
2066 | obj=self.browse(cr,uid,oper_ids) |
2067 | |
2068 | === modified file 'mrp_repair/mrp_repair.py' |
2069 | --- mrp_repair/mrp_repair.py 2009-02-11 13:32:54 +0000 |
2070 | +++ mrp_repair/mrp_repair.py 2009-03-06 23:50:10 +0000 |
2071 | @@ -26,6 +26,8 @@ |
2072 | import mx.DateTime |
2073 | from mx.DateTime import RelativeDateTime, today, DateTime, localtime |
2074 | from tools import config |
2075 | +from tools.translate import _ |
2076 | + |
2077 | class mrp_repair(osv.osv): |
2078 | _name = 'mrp.repair' |
2079 | _description = 'Repairs Order' |
2080 | @@ -258,7 +260,7 @@ |
2081 | if repair.state in ('draft','cancel') or repair.invoice_id: |
2082 | continue |
2083 | if not (repair.partner_id.id and repair.partner_invoice_id.id): |
2084 | - raise osv.except_osv('No partner !','You have to select a partner in the repair form ! ') |
2085 | + raise osv.except_osv(_('No partner !'),_('You have to select a partner in the repair form !')) |
2086 | comment=repair.quotation_notes |
2087 | if (repair.invoice_method != 'none'): |
2088 | if group and repair.partner_invoice_id.id in invoices_group: |
2089 | |
2090 | === modified file 'mrp_subproduct/__init__.py' |
2091 | --- mrp_subproduct/__init__.py 2009-01-04 22:12:50 +0000 |
2092 | +++ mrp_subproduct/__init__.py 2009-03-06 23:50:10 +0000 |
2093 | @@ -20,3 +20,4 @@ |
2094 | # |
2095 | ############################################################################## |
2096 | import mrp_subproduct |
2097 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2098 | |
2099 | === modified file 'mrp_subproduct/mrp_subproduct.py' |
2100 | --- mrp_subproduct/mrp_subproduct.py 2009-01-04 22:12:50 +0000 |
2101 | +++ mrp_subproduct/mrp_subproduct.py 2009-03-06 23:50:10 +0000 |
2102 | @@ -81,3 +81,4 @@ |
2103 | return picking_id |
2104 | |
2105 | mrp_production() |
2106 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2107 | |
2108 | === modified file 'point_of_sale/pos.py' |
2109 | --- point_of_sale/pos.py 2009-01-30 10:37:24 +0000 |
2110 | +++ point_of_sale/pos.py 2009-03-06 23:50:10 +0000 |
2111 | @@ -219,7 +219,7 @@ |
2112 | |
2113 | def test_order_lines(self, cr, uid, order, context={}): |
2114 | if not order.lines: |
2115 | - raise osv.except_osv("Error", "No order lines defined for this sale.") |
2116 | + raise osv.except_osv(_('Error'), _('No order lines defined for this sale.')) |
2117 | |
2118 | wf_service = netsvc.LocalService("workflow") |
2119 | wf_service.trg_validate(uid, 'pos.order', order.id, 'paid', cr) |
2120 | @@ -415,7 +415,7 @@ |
2121 | |
2122 | order = self.browse(cr, uid, order_id, context) |
2123 | if order.invoice_wanted and not order.partner_id: |
2124 | - raise osv.except_osv("Error", "Cannot create invoice without a partner.") |
2125 | + raise osv.except_osv(_('Error'), _('Cannot create invoice without a partner.')) |
2126 | |
2127 | args = { |
2128 | 'order_id': order_id, |
2129 | @@ -495,7 +495,7 @@ |
2130 | continue |
2131 | |
2132 | if not order.partner_id: |
2133 | - raise osv.except_osv('Error', 'Please provide a partner for the sale.') |
2134 | + raise osv.except_osv(_('Error'), _('Please provide a partner for the sale.')) |
2135 | |
2136 | inv = { |
2137 | 'name': 'Invoice from POS: '+order.name, |
2138 | @@ -587,8 +587,8 @@ |
2139 | income_account = line.product_id.categ_id.\ |
2140 | property_account_income_categ.id |
2141 | else: |
2142 | - raise osv.except_osv('Error !', 'There is no income '\ |
2143 | - 'account defined for this product: "%s" (id:%d)'\ |
2144 | + raise osv.except_osv(_('Error !'), _('There is no income '\ |
2145 | + 'account defined for this product: "%s" (id:%d)') \ |
2146 | % (line.product_id.name, line.product_id.id, )) |
2147 | |
2148 | |
2149 | @@ -684,9 +684,9 @@ |
2150 | # search the account receivable for the payments: |
2151 | account_receivable = order.sale_journal.default_credit_account_id.id |
2152 | if not account_receivable: |
2153 | - raise osv.except_osv('Error !', |
2154 | - 'There is no receivable account defined for this journal:'\ |
2155 | - ' "%s" (id:%d)' % (order.sale_journal.name, order.sale_journal.id, )) |
2156 | + raise osv.except_osv(_('Error !'), |
2157 | + _('There is no receivable account defined for this journal:'\ |
2158 | + ' "%s" (id:%d)') % (order.sale_journal.name, order.sale_journal.id, )) |
2159 | |
2160 | for payment in order.payments: |
2161 | |
2162 | @@ -768,17 +768,17 @@ |
2163 | if not product_id: |
2164 | return 0.0 |
2165 | if not pricelist: |
2166 | - raise osv.except_osv('No Pricelist !', |
2167 | - 'You have to select a pricelist in the sale form !\n' |
2168 | - 'Please set one before choosing a product.') |
2169 | + raise osv.except_osv(_('No Pricelist !'), |
2170 | + _('You have to select a pricelist in the sale form !\n' \ |
2171 | + 'Please set one before choosing a product.')) |
2172 | |
2173 | price = self.pool.get('product.pricelist').price_get(cr, uid, |
2174 | [pricelist], product_id, qty or 1.0, partner_id)[pricelist] |
2175 | if price is False: |
2176 | - raise osv.except_osv('No valid pricelist line found !', |
2177 | - "Couldn't find a pricelist line matching this product" |
2178 | - " and quantity.\nYou have to change either the product," |
2179 | - " the quantity or the pricelist.") |
2180 | + raise osv.except_osv(_('No valid pricelist line found !'), |
2181 | + _("Couldn't find a pricelist line matching this product" \ |
2182 | + " and quantity.\nYou have to change either the product," \ |
2183 | + " the quantity or the pricelist.")) |
2184 | return price |
2185 | |
2186 | def onchange_product_id(self, cr, uid, ids, pricelist, product_id, qty=0, partner_id=False): |
2187 | |
2188 | === modified file 'point_of_sale/report/pos_invoice.py' |
2189 | --- point_of_sale/report/pos_invoice.py 2009-01-04 22:12:50 +0000 |
2190 | +++ point_of_sale/report/pos_invoice.py 2009-03-06 23:50:10 +0000 |
2191 | @@ -23,6 +23,7 @@ |
2192 | import time |
2193 | from report import report_sxw |
2194 | from osv import osv |
2195 | +from tools.translate import _ |
2196 | |
2197 | |
2198 | class pos_invoice(report_sxw.rml_parse): |
2199 | @@ -43,7 +44,7 @@ |
2200 | |
2201 | if order.invoice_id and order.invoice_id not in iids: |
2202 | if not order.invoice_id: |
2203 | - raise osv.except_osv('Error !', 'Please create an invoice for this sale.') |
2204 | + raise osv.except_osv(_('Error !'), _('Please create an invoice for this sale.')) |
2205 | iids.append(order.invoice_id) |
2206 | nids.append(order.invoice_id.id) |
2207 | self.cr.commit() |
2208 | |
2209 | === modified file 'point_of_sale/wizard/wizard_default_journal.py' |
2210 | --- point_of_sale/wizard/wizard_default_journal.py 2009-01-15 17:02:57 +0000 |
2211 | +++ point_of_sale/wizard/wizard_default_journal.py 2009-03-06 23:50:10 +0000 |
2212 | @@ -125,3 +125,4 @@ |
2213 | |
2214 | wizard_default_journal('pos.config.journal') |
2215 | |
2216 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2217 | |
2218 | === modified file 'point_of_sale/wizard/wizard_get_sale.py' |
2219 | --- point_of_sale/wizard/wizard_get_sale.py 2009-01-04 22:12:50 +0000 |
2220 | +++ point_of_sale/wizard/wizard_get_sale.py 2009-03-06 23:50:10 +0000 |
2221 | @@ -22,6 +22,7 @@ |
2222 | |
2223 | import pooler |
2224 | import wizard |
2225 | +from tools.translate import _ |
2226 | |
2227 | picking_form = """<?xml version="1.0"?> |
2228 | <form string="Select an Open Sale Order"> |
2229 | @@ -39,7 +40,7 @@ |
2230 | order = pool.get('pos.order').browse(cr, uid, data['id'], context) |
2231 | |
2232 | if order.state in ('paid', 'invoiced'): |
2233 | - raise wizard.except_wizard('UserError', "You can't modify this order. It has already been paid") |
2234 | + raise wizard.except_wizard(_('UserError'), _("You can't modify this order. It has already been paid")) |
2235 | |
2236 | pick = pool.get('stock.picking').browse(cr, uid, data['form']['picking_id'], context) |
2237 | |
2238 | |
2239 | === modified file 'point_of_sale/wizard/wizard_scan_product.py' |
2240 | --- point_of_sale/wizard/wizard_scan_product.py 2009-01-28 08:33:04 +0000 |
2241 | +++ point_of_sale/wizard/wizard_scan_product.py 2009-03-06 23:50:10 +0000 |
2242 | @@ -68,3 +68,4 @@ |
2243 | |
2244 | pos_scan_product('pos.scan_product') |
2245 | |
2246 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2247 | |
2248 | === modified file 'process/process.py' |
2249 | --- process/process.py 2009-02-04 13:12:10 +0000 |
2250 | +++ process/process.py 2009-03-06 23:50:10 +0000 |
2251 | @@ -387,3 +387,4 @@ |
2252 | |
2253 | process_transition_action() |
2254 | |
2255 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2256 | |
2257 | === modified file 'product/product.py' |
2258 | --- product/product.py 2009-02-04 22:02:48 +0000 |
2259 | +++ product/product.py 2009-03-06 23:50:10 +0000 |
2260 | @@ -27,6 +27,7 @@ |
2261 | from _common import rounding |
2262 | |
2263 | from tools import config |
2264 | +from tools.translate import _ |
2265 | |
2266 | def is_pair(x): |
2267 | return not x%2 |
2268 | |
2269 | === modified file 'product_margin/wizard/wizard_product_margin.py' |
2270 | --- product_margin/wizard/wizard_product_margin.py 2009-01-04 22:12:50 +0000 |
2271 | +++ product_margin/wizard/wizard_product_margin.py 2009-03-06 23:50:10 +0000 |
2272 | @@ -86,3 +86,4 @@ |
2273 | } |
2274 | } |
2275 | product_margins('product.margins') |
2276 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2277 | |
2278 | === modified file 'profile_association/profile_association.py' |
2279 | --- profile_association/profile_association.py 2009-01-04 22:12:50 +0000 |
2280 | +++ profile_association/profile_association.py 2009-03-06 23:50:10 +0000 |
2281 | @@ -63,3 +63,4 @@ |
2282 | 'target':'new', |
2283 | } |
2284 | profile_association_config_install_modules_wizard() |
2285 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2286 | |
2287 | === modified file 'project/company.py' |
2288 | --- project/company.py 2009-01-06 11:17:44 +0000 |
2289 | +++ project/company.py 2009-03-06 23:50:10 +0000 |
2290 | @@ -40,3 +40,4 @@ |
2291 | } |
2292 | res_company() |
2293 | |
2294 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2295 | |
2296 | === modified file 'project/project.py' |
2297 | --- project/project.py 2009-02-26 10:33:11 +0000 |
2298 | +++ project/project.py 2009-03-06 23:50:10 +0000 |
2299 | @@ -26,6 +26,7 @@ |
2300 | import time |
2301 | |
2302 | from osv import fields, osv |
2303 | +from tools.translate import _ |
2304 | |
2305 | class project(osv.osv): |
2306 | _name = "project.project" |
2307 | |
2308 | === modified file 'project/wizard/close_task.py' |
2309 | --- project/wizard/close_task.py 2009-01-04 22:12:50 +0000 |
2310 | +++ project/wizard/close_task.py 2009-03-06 23:50:10 +0000 |
2311 | @@ -24,6 +24,7 @@ |
2312 | from tools import email_send as email |
2313 | import pooler |
2314 | from osv import osv |
2315 | +from tools.translate import _ |
2316 | |
2317 | mail_form = """<?xml version="1.0" ?> |
2318 | <form string="Send mail to customer"> |
2319 | |
2320 | === modified file 'project_gtd/wizard/project_gtd_daily.py' |
2321 | --- project_gtd/wizard/project_gtd_daily.py 2009-01-04 22:12:50 +0000 |
2322 | +++ project_gtd/wizard/project_gtd_daily.py 2009-03-06 23:50:10 +0000 |
2323 | @@ -26,6 +26,7 @@ |
2324 | import time |
2325 | import pooler |
2326 | from osv import osv |
2327 | +from tools.translate import _ |
2328 | |
2329 | class wiz_timebox_open(wizard.interface): |
2330 | def _open_timebox(self, cr, uid, data, context): |
2331 | @@ -33,7 +34,7 @@ |
2332 | pool = pooler.get_pool(cr.dbname) |
2333 | ids = pool.get('project.gtd.timebox').search(cr, uid, [('user_id','=',uid),('type','=',tbtype)]) |
2334 | if not len(ids): |
2335 | - raise wizard.except_wizard('Error !', 'No timebox of the type "%s" defined !' % (tbtype,)) |
2336 | + raise wizard.except_wizard(_('Error !'), _('No timebox of the type "%s" defined !') % (tbtype,)) |
2337 | view_type = 'form,tree' |
2338 | if len(ids) >= 1: |
2339 | domain = "[('id','in',["+','.join(map(str,ids))+"])]" |
2340 | |
2341 | === modified file 'project_gtd/wizard/project_gtd_empty.py' |
2342 | --- project_gtd/wizard/project_gtd_empty.py 2009-01-04 22:12:50 +0000 |
2343 | +++ project_gtd/wizard/project_gtd_empty.py 2009-03-06 23:50:10 +0000 |
2344 | @@ -26,13 +26,14 @@ |
2345 | import time |
2346 | import pooler |
2347 | from osv import osv |
2348 | +from tools.translate import _ |
2349 | |
2350 | class wiz_timebox_empty(wizard.interface): |
2351 | def _empty(self, cr, uid, data, context): |
2352 | pool = pooler.get_pool(cr.dbname) |
2353 | ids = pool.get('project.gtd.timebox').search(cr, uid, [('parent_id','=',data['id'])]) |
2354 | if not len(ids): |
2355 | - raise wizard.except_wizard('Error !', 'No timebox child of this one !') |
2356 | + raise wizard.except_wizard(_('Error !'), _('No timebox child of this one !')) |
2357 | tids = pool.get('project.task').search(cr, uid, [('timebox_id','=',data['id'])]) |
2358 | close = [] |
2359 | up = [] |
2360 | |
2361 | === modified file 'project_timesheet/project_timesheet.py' |
2362 | --- project_timesheet/project_timesheet.py 2009-01-23 17:14:29 +0000 |
2363 | +++ project_timesheet/project_timesheet.py 2009-03-06 23:50:10 +0000 |
2364 | @@ -24,6 +24,7 @@ |
2365 | import datetime |
2366 | import pooler |
2367 | import tools |
2368 | +from tools.translate import _ |
2369 | |
2370 | |
2371 | class project_work(osv.osv): |
2372 | @@ -93,7 +94,7 @@ |
2373 | |
2374 | def unlink(self, cr, uid, ids, *args, **kwargs): |
2375 | timesheet_id = self.pool.get('project.task.work').browse(cr, uid, ids)[0].hr_analytic_timesheet_id |
2376 | - # delete entry from timesheet too while deleting entry to task. |
2377 | + delete entry from timesheet too while deleting entry to task. |
2378 | list_avail_ids = self.pool.get('hr.analytic.timesheet').search(cr, uid, []) |
2379 | if timesheet_id in list_avail_ids: |
2380 | obj = self.pool.get('hr.analytic.timesheet').unlink(cr, uid, [timesheet_id], *args, **kwargs) |
2381 | |
2382 | === modified file 'report_intrastat/report/__init__.py' |
2383 | --- report_intrastat/report/__init__.py 2009-01-04 22:12:50 +0000 |
2384 | +++ report_intrastat/report/__init__.py 2009-03-06 23:50:10 +0000 |
2385 | @@ -20,3 +20,4 @@ |
2386 | # |
2387 | ############################################################################## |
2388 | import invoice |
2389 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2390 | |
2391 | === modified file 'report_intrastat/report/invoice.py' |
2392 | --- report_intrastat/report/invoice.py 2009-01-04 22:12:50 +0000 |
2393 | +++ report_intrastat/report/invoice.py 2009-03-06 23:50:10 +0000 |
2394 | @@ -34,3 +34,4 @@ |
2395 | |
2396 | report_sxw.report_sxw('report.account.invoice.intrastat', 'account.invoice', 'addons/report_intrastat/report/invoice.rml', parser=account_invoice_intrastat) |
2397 | |
2398 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2399 | |
2400 | === modified file 'sale/product.py' |
2401 | --- sale/product.py 2009-01-04 22:12:50 +0000 |
2402 | +++ sale/product.py 2009-03-06 23:50:10 +0000 |
2403 | @@ -68,3 +68,4 @@ |
2404 | } |
2405 | |
2406 | product_product() |
2407 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2408 | |
2409 | === modified file 'sale/report/__init__.py' |
2410 | --- sale/report/__init__.py 2009-01-15 17:37:46 +0000 |
2411 | +++ sale/report/__init__.py 2009-03-06 23:50:10 +0000 |
2412 | @@ -22,3 +22,4 @@ |
2413 | |
2414 | import sale_prepare_allot |
2415 | import order |
2416 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2417 | |
2418 | === modified file 'sale/sale.py' |
2419 | --- sale/sale.py 2009-02-11 13:32:54 +0000 |
2420 | +++ sale/sale.py 2009-03-06 23:50:10 +0000 |
2421 | @@ -1057,3 +1057,4 @@ |
2422 | sale_config_picking_policy() |
2423 | |
2424 | |
2425 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2426 | |
2427 | === modified file 'sale/wizard/make_invoice_advance.py' |
2428 | --- sale/wizard/make_invoice_advance.py 2009-02-11 13:32:54 +0000 |
2429 | +++ sale/wizard/make_invoice_advance.py 2009-03-06 23:50:10 +0000 |
2430 | @@ -23,6 +23,7 @@ |
2431 | import wizard |
2432 | import pooler |
2433 | from osv import fields, osv |
2434 | +from tools.translate import _ |
2435 | |
2436 | form = """<?xml version="1.0"?> |
2437 | <form string="Advance Payment"> |
2438 | |
2439 | === modified file 'sale_crm/wizard/makesale.py' |
2440 | --- sale_crm/wizard/makesale.py 2009-02-12 05:49:34 +0000 |
2441 | +++ sale_crm/wizard/makesale.py 2009-03-06 23:50:10 +0000 |
2442 | @@ -141,3 +141,4 @@ |
2443 | |
2444 | make_sale('crm.case.make_order') |
2445 | |
2446 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2447 | |
2448 | === modified file 'sale_delivery_report/__init__.py' |
2449 | --- sale_delivery_report/__init__.py 2009-01-15 17:37:46 +0000 |
2450 | +++ sale_delivery_report/__init__.py 2009-03-06 23:50:10 +0000 |
2451 | @@ -22,3 +22,4 @@ |
2452 | |
2453 | import report |
2454 | |
2455 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2456 | |
2457 | === modified file 'sale_delivery_report/report/__init__.py' |
2458 | --- sale_delivery_report/report/__init__.py 2009-01-15 17:37:46 +0000 |
2459 | +++ sale_delivery_report/report/__init__.py 2009-03-06 23:50:10 +0000 |
2460 | @@ -22,3 +22,4 @@ |
2461 | |
2462 | import shipping |
2463 | |
2464 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2465 | |
2466 | === modified file 'sale_delivery_report/report/shipping.py' |
2467 | --- sale_delivery_report/report/shipping.py 2009-01-15 17:40:22 +0000 |
2468 | +++ sale_delivery_report/report/shipping.py 2009-03-06 23:50:10 +0000 |
2469 | @@ -72,3 +72,4 @@ |
2470 | # return True |
2471 | |
2472 | report_sxw.report_sxw('report.sale.shipping','stock.picking','addons/sale_delivery_report/report/shipping.rml',parser=shipping) |
2473 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2474 | |
2475 | === modified file 'stock/report/picking.py' |
2476 | --- stock/report/picking.py 2009-01-04 22:12:50 +0000 |
2477 | +++ stock/report/picking.py 2009-03-06 23:50:10 +0000 |
2478 | @@ -33,3 +33,4 @@ |
2479 | }) |
2480 | |
2481 | report_sxw.report_sxw('report.stock.picking.list','stock.picking','addons/stock/report/picking.rml',parser=picking) |
2482 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2483 | |
2484 | === modified file 'stock/report_stock.py' |
2485 | --- stock/report_stock.py 2009-01-24 01:14:23 +0000 |
2486 | +++ stock/report_stock.py 2009-03-06 23:50:10 +0000 |
2487 | @@ -21,6 +21,7 @@ |
2488 | ############################################################################## |
2489 | |
2490 | from osv import osv, fields |
2491 | +from tools.translate import _ |
2492 | |
2493 | # |
2494 | # Check if it works with UoM ??? |
2495 | @@ -80,3 +81,4 @@ |
2496 | |
2497 | stock_report_prodlots() |
2498 | |
2499 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2500 | |
2501 | === modified file 'stock/wizard/inventory_merge.py' |
2502 | --- stock/wizard/inventory_merge.py 2009-01-04 22:12:50 +0000 |
2503 | +++ stock/wizard/inventory_merge.py 2009-03-06 23:50:10 +0000 |
2504 | @@ -23,6 +23,7 @@ |
2505 | |
2506 | import wizard |
2507 | import pooler |
2508 | +from tools.translate import _ |
2509 | |
2510 | |
2511 | _form = """<?xml version="1.0"?> |
2512 | @@ -41,15 +42,15 @@ |
2513 | invent_lines = {} |
2514 | |
2515 | if len(data['ids']) < 2: |
2516 | - raise wizard.except_wizard("Warning", |
2517 | - _("Please select at least two inventories.")) |
2518 | + raise wizard.except_wizard(_('Warning'), |
2519 | + _('Please select at least two inventories.')) |
2520 | |
2521 | |
2522 | |
2523 | for inventory in invent_obj.browse(cr, uid, data['ids'], context=context): |
2524 | if inventory.state == "done": |
2525 | - raise wizard.except_wizard("Warning", |
2526 | - _("Merging is only allowed on draft inventories.")) |
2527 | + raise wizard.except_wizard(_('Warning'), |
2528 | + _('Merging is only allowed on draft inventories.')) |
2529 | |
2530 | for line in inventory.inventory_line_id: |
2531 | key = (line.location_id.id, line.product_id.id, line.product_uom.id) |
2532 | |
2533 | === modified file 'stock/wizard/inventory_merge_zero.py' |
2534 | --- stock/wizard/inventory_merge_zero.py 2009-02-04 21:04:04 +0000 |
2535 | +++ stock/wizard/inventory_merge_zero.py 2009-03-06 23:50:10 +0000 |
2536 | @@ -23,6 +23,7 @@ |
2537 | |
2538 | import wizard |
2539 | import pooler |
2540 | +from tools.translate import _ |
2541 | |
2542 | |
2543 | _form = """<?xml version="1.0"?> |
2544 | @@ -49,8 +50,8 @@ |
2545 | prod_obj = pooler.get_pool(cr.dbname).get('product.product') |
2546 | |
2547 | if len(data['ids']) <> 1: |
2548 | - raise wizard.except_wizard("Warning", |
2549 | - "Please select one and only one inventory !") |
2550 | + raise wizard.except_wizard(_('Warning'), |
2551 | + _('Please select one and only one inventory !')) |
2552 | |
2553 | loc = str(data['form']['location_id']) |
2554 | |
2555 | |
2556 | === modified file 'stock/wizard/wizard_inventory.py' |
2557 | --- stock/wizard/wizard_inventory.py 2009-01-28 14:29:42 +0000 |
2558 | +++ stock/wizard/wizard_inventory.py 2009-03-06 23:50:10 +0000 |
2559 | @@ -27,6 +27,7 @@ |
2560 | from osv.osv import except_osv |
2561 | from osv import fields,osv |
2562 | import netsvc |
2563 | +from tools.translate import _ |
2564 | |
2565 | inventory_form = """<?xml version="1.0"?> |
2566 | <form string="Fill Inventory"> |
2567 | @@ -79,13 +80,13 @@ |
2568 | |
2569 | if(amount): |
2570 | line_ids=inventory_line_obj.search(cr,uid,[('inventory_id','=',data['id']),('location_id','=',location),('product_id','=',product_id),('product_uom','=',uom),('product_qty','=',amount)]) |
2571 | - if not len(line_ids): |
2572 | - inventory_line={'inventory_id':data['id'],'location_id':location,'product_id':product_id,'product_uom':uom,'product_qty':amount} |
2573 | + if not len(line_ids): |
2574 | + inventory_line={'inventory_id':data['id'],'location_id':location,'product_id':product_id,'product_uom':uom,'product_qty':amount} |
2575 | inventory_line_obj.create(cr, uid, inventory_line) |
2576 | product_ids.append(product_id) |
2577 | |
2578 | if(len(product_ids)==0): |
2579 | - raise wizard.except_wizard('Message ! ','No product in this location.') |
2580 | + raise wizard.except_wizard(_('Message !'), _('No product in this location.')) |
2581 | return {} |
2582 | |
2583 | |
2584 | @@ -108,3 +109,4 @@ |
2585 | |
2586 | |
2587 | |
2588 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2589 | |
2590 | === modified file 'stock/wizard/wizard_invoice_onshipping.py' |
2591 | --- stock/wizard/wizard_invoice_onshipping.py 2009-02-24 06:42:09 +0000 |
2592 | +++ stock/wizard/wizard_invoice_onshipping.py 2009-03-06 23:50:10 +0000 |
2593 | @@ -26,6 +26,7 @@ |
2594 | import pooler |
2595 | from osv.osv import except_osv |
2596 | import netsvc |
2597 | +from tools.translate import _ |
2598 | |
2599 | invoice_form = """<?xml version="1.0"?> |
2600 | <form string="Create invoices"> |
2601 | @@ -67,9 +68,9 @@ |
2602 | usage = 'customer' |
2603 | pick = picking_obj.browse(cr, uid, data['id'], context) |
2604 | if pick.invoice_state=='invoiced': |
2605 | - raise wizard.except_wizard('UserError','Invoice is already created.') |
2606 | + raise wizard.except_wizard(_('UserError'),_('Invoice is already created.')) |
2607 | if pick.invoice_state=='none': |
2608 | - raise wizard.except_wizard('UserError','Invoice cannot be created from Packing.') |
2609 | + raise wizard.except_wizard(_('UserError'),_('Invoice cannot be created from Packing.')) |
2610 | |
2611 | if pick.move_lines: |
2612 | usage=pick.move_lines[0].location_id.usage |
2613 | @@ -103,7 +104,7 @@ |
2614 | |
2615 | invoice_ids = res.values() |
2616 | if not invoice_ids: |
2617 | - raise wizard.except_wizard('Error','Invoice is not created') |
2618 | + raise wizard.except_wizard(_('Error'),_('Invoice is not created')) |
2619 | |
2620 | if type == 'out_invoice': |
2621 | xml_id = 'action_invoice_tree5' |
2622 | |
2623 | === modified file 'stock/wizard/wizard_location_product.py' |
2624 | --- stock/wizard/wizard_location_product.py 2009-01-04 22:12:50 +0000 |
2625 | +++ stock/wizard/wizard_location_product.py 2009-03-06 23:50:10 +0000 |
2626 | @@ -69,3 +69,4 @@ |
2627 | } |
2628 | } |
2629 | product_by_location('stock.location.products') |
2630 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2631 | |
2632 | === modified file 'stock_location/__init__.py' |
2633 | --- stock_location/__init__.py 2009-01-04 22:12:50 +0000 |
2634 | +++ stock_location/__init__.py 2009-03-06 23:50:10 +0000 |
2635 | @@ -22,3 +22,4 @@ |
2636 | |
2637 | import stock |
2638 | |
2639 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2640 | |
2641 | === modified file 'stock_location/__terp__.py' |
2642 | --- stock_location/__terp__.py 2009-02-03 17:02:20 +0000 |
2643 | +++ stock_location/__terp__.py 2009-03-06 23:50:10 +0000 |
2644 | @@ -47,3 +47,4 @@ |
2645 | 'certificate': '0046505115101', |
2646 | } |
2647 | # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2648 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2649 | |
2650 | === modified file 'stock_location/stock.py' |
2651 | --- stock_location/stock.py 2009-01-04 22:12:50 +0000 |
2652 | +++ stock_location/stock.py 2009-03-06 23:50:10 +0000 |
2653 | @@ -68,3 +68,4 @@ |
2654 | return path.location_dest_id, path.auto, path.delay |
2655 | return super(stock_location, self).chained_location_get(cr, uid, location, partner, product, context) |
2656 | stock_location() |
2657 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2658 | |
2659 | === modified file 'wiki/__init__.py' |
2660 | --- wiki/__init__.py 2008-11-21 16:26:19 +0000 |
2661 | +++ wiki/__init__.py 2009-03-06 23:50:10 +0000 |
2662 | @@ -1,3 +1,5 @@ |
2663 | |
2664 | import wiki |
2665 | -import wizard |
2666 | \ No newline at end of file |
2667 | +import wizard |
2668 | + |
2669 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2670 | |
2671 | === modified file 'wiki/wiki.py' |
2672 | --- wiki/wiki.py 2009-02-04 13:12:10 +0000 |
2673 | +++ wiki/wiki.py 2009-03-06 23:50:10 +0000 |
2674 | @@ -148,3 +148,4 @@ |
2675 | diff = difflib.HtmlDiff() |
2676 | return diff.make_file(line1, line2, "Revision-%s" % (v1), "Revision-%s" % (v2), context=False) |
2677 | History() |
2678 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2679 | |
2680 | === modified file 'wiki/wizard/__init__.py' |
2681 | --- wiki/wizard/__init__.py 2009-02-09 07:47:57 +0000 |
2682 | +++ wiki/wizard/__init__.py 2009-03-06 23:50:10 +0000 |
2683 | @@ -2,3 +2,4 @@ |
2684 | import create_menu |
2685 | import show_diff |
2686 | import make_index |
2687 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2688 | |
2689 | === modified file 'wiki/wizard/create_menu.py' |
2690 | --- wiki/wizard/create_menu.py 2009-01-04 22:12:50 +0000 |
2691 | +++ wiki/wizard/create_menu.py 2009-03-06 23:50:10 +0000 |
2692 | @@ -77,3 +77,4 @@ |
2693 | } |
2694 | wizard_create_menu('wiki.create.menu') |
2695 | |
2696 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2697 | |
2698 | === modified file 'wiki/wizard/make_index.py' |
2699 | --- wiki/wizard/make_index.py 2009-01-04 22:12:50 +0000 |
2700 | +++ wiki/wizard/make_index.py 2009-03-06 23:50:10 +0000 |
2701 | @@ -100,3 +100,4 @@ |
2702 | } |
2703 | make_index('wiki.make.index') |
2704 | |
2705 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2706 | |
2707 | === modified file 'wiki/wizard/show_diff.py' |
2708 | --- wiki/wizard/show_diff.py 2009-01-04 22:12:50 +0000 |
2709 | +++ wiki/wizard/show_diff.py 2009-03-06 23:50:10 +0000 |
2710 | @@ -21,6 +21,7 @@ |
2711 | ############################################################################## |
2712 | |
2713 | from osv import fields,osv |
2714 | +from tools.translate import _ |
2715 | |
2716 | class showdiff(osv.osv_memory): |
2717 | _name = 'wizard.wiki.history.show_diff' |
2718 | @@ -41,7 +42,7 @@ |
2719 | nids.sort() |
2720 | diff = history.getDiff(cr, uid, ids[0], nids[-1]) |
2721 | else: |
2722 | - raise osv.except_osv('Warning', "You need to select minimum 1 or maximum 2 history revision!") |
2723 | + raise osv.except_osv(_('Warning'), _('You need to select minimum 1 or maximum 2 history revision!')) |
2724 | return diff |
2725 | |
2726 | _columns = { |
2727 | @@ -50,4 +51,5 @@ |
2728 | _defaults = { |
2729 | 'diff': _get_diff |
2730 | } |
2731 | -showdiff() |
2732 | \ No newline at end of file |
2733 | +showdiff() |
2734 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
See last commit log