Openerp Venezuela

Merge lp:~vauxoo/openerp-venezuela-localization/rodolfo-bank_management-translation into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

  1. rodolfo-bank_management-translation
  2. Merge into 6.0-trunk
Proposed by Rodolfo Alvarez(Vauxoo)
Status: Rejected
Rejected by: Israel Fermin Montilla
Proposed branch: lp:~vauxoo/openerp-venezuela-localization/rodolfo-bank_management-translation
Merge into: lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk
Diff against target: 366 lines (+71/-71)
12 files modified
bank_management/check/check_book.py (+1/-1)
bank_management/check/check_book_wizard.py (+5/-5)
bank_management/check/check_note.py (+2/-2)
bank_management/check/check_report.xml (+1/-1)
bank_management/check/res_company.py (+2/-2)
bank_management/check/tmp/menu_vouche_view.xml (+1/-1)
bank_management/check/voucher_pay_support.py (+5/-5)
bank_management/check/voucher_pay_support_view.xml (+1/-1)
bank_management/check/wizard/cancel_voucher_pay_support.py (+41/-41)
bank_management/check/wizard/cancel_wizard.xml (+2/-2)
bank_management/check/wizard/chk_book_gral.py (+2/-2)
bank_management/check/wizard/voucher_pay_support_wizard_pay_order.py (+8/-8)
To merge this branch: bzr merge lp:~vauxoo/openerp-venezuela-localization/rodolfo-bank_management-translation
Reviewer Review Type Date Requested Status
Israel Fermin Montilla (community) Disapprove
Review via email: mp+78878@code.launchpad.net

Description of the change

es_VE.po file modified to add the translation option from english to spanish in module ban_management.

To post a comment you must log in.
lp:~vauxoo/openerp-venezuela-localization/rodolfo-bank_management-translation updated
435. By Nhomar Hernandez <nhomar@cl-t076-283cl>

[MERGE] from hbt branch l10n_ve

Revision history for this message
Israel Fermin Montilla (iferminm) wrote :

es_VE.po translation file is missing. You must also translate the keys on the selection fields

review: Disapprove

Unmerged revisions

438. By <email address hidden>

merged last revisions to pull

437. By <email address hidden>

[ADD]Added the file es_VE.po to the module bank_management to provide de translation from english to spanish option

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bank_management/check/check_book.py'
2--- bank_management/check/check_book.py 2011-09-25 23:55:38 +0000
3+++ bank_management/check/check_book.py 2011-10-10 18:51:25 +0000
4@@ -208,7 +208,7 @@
5 return False
6
7 def copy(self, cr, uid, id, default=None, context=None):
8- raise osv.except_osv(_('Atencion !'), _('you can not duplicate this document!!!'))
9+ raise osv.except_osv(_('Atention !'), _('you can not duplicate this document!!!'))
10 return super(check_book, self).copy(cr, uid, id, {}, context)
11
12 _constraints = [
13
14=== modified file 'bank_management/check/check_book_wizard.py'
15--- bank_management/check/check_book_wizard.py 2011-09-25 23:55:38 +0000
16+++ bank_management/check/check_book_wizard.py 2011-10-10 18:51:25 +0000
17@@ -35,13 +35,13 @@
18 _columns = {
19 'check_book_id': fields.many2one('check.book', 'Check Book', required=False) ,
20 'state_check_note': fields.selection([
21- ('sin_filtro','Sin Filtro') ,
22- ('cobrado','Cobrado') ,
23- ('emitido','Emitido') ,
24+ ('sin_filtro','Without Filter') ,
25+ ('cobrado','Charged') ,
26+ ('emitido','Emited') ,
27 ],'Check Note State', select=True, required=False) ,
28 'tiempo': fields.selection([
29- ('mes','Periodo Fiscal') ,
30- ('fecha','Fecha') ,
31+ ('mes','Fiscal Period') ,
32+ ('fecha','DAte') ,
33 ],'Time', select=True) ,
34 'desde': fields.date('From', required=False) ,
35 'hasta': fields.date('To', required=False) ,
36
37=== modified file 'bank_management/check/check_note.py'
38--- bank_management/check/check_note.py 2011-10-03 22:39:59 +0000
39+++ bank_management/check/check_note.py 2011-10-10 18:51:25 +0000
40@@ -101,9 +101,9 @@
41 note_books = self.browse(cr,uid,ids)
42 for note in note_books:
43 if note.cancel_check_note=='otros' and note.notes==False:
44- raise osv.except_osv(_('Atencion !'), _('Enter the Reason for Cancellation in other information field'))
45+ raise osv.except_osv(_('Atention !'), _('Enter the Reason for Cancellation in other information field'))
46 if note.cancel_check_note==False and note.notes==False:
47- raise osv.except_osv(_('Atencion !'), _('Enter the Reason for Cancellation in other information field'))
48+ raise osv.except_osv(_('Atention !'), _('Enter the Reason for Cancellation in other information field'))
49 else:
50 self.write(cr,uid,note.id,{'state' : 'cancel'})
51
52
53=== modified file 'bank_management/check/check_report.xml'
54--- bank_management/check/check_report.xml 2011-10-03 22:39:59 +0000
55+++ bank_management/check/check_report.xml 2011-10-10 18:51:25 +0000
56@@ -26,7 +26,7 @@
57 model="check.book.wizard"
58 name="wizard.general.book"
59 rml="bank_management/check/report/reporte_wizard_general.rml"
60- string="Reporte Gral. de Chequeras"
61+ string="General Checkbooks Report"
62 auto="False"
63 menu="False"
64 groups="account.group_account_manager"
65
66=== modified file 'bank_management/check/res_company.py'
67--- bank_management/check/res_company.py 2011-10-10 01:22:44 +0000
68+++ bank_management/check/res_company.py 2011-10-10 18:51:25 +0000
69@@ -38,8 +38,8 @@
70 _inherit = "res.company"
71
72 _columns = {
73- 'expiry':fields.integer('Dias de Caducidad', readonly=False, required=True),
74- 'transitory': fields.boolean('Cuenta Transitoria', help="Manejo de Cuentas Transitorias"),
75+ 'expiry':fields.integer('Expiration Days', readonly=False, required=True),
76+ 'transitory': fields.boolean('Transitory Account', help="Transitory Accounts Management"),
77 }
78 _defaults = {
79 'expiry': lambda *a: 30,
80
81=== modified file 'bank_management/check/tmp/menu_vouche_view.xml'
82--- bank_management/check/tmp/menu_vouche_view.xml 2011-09-05 17:51:53 +0000
83+++ bank_management/check/tmp/menu_vouche_view.xml 2011-10-10 18:51:25 +0000
84@@ -59,7 +59,7 @@
85 <menuitem name="Nuevo Pago en Efectivo"
86 id="menu_action_view_cash_pay_voucher_form" parent='menu_action_payments_cashpay_voucher_list' /><!---action="action_view_cash_pay_voucher_form"-->
87
88- <menuitem name="Otros Pagos"
89+ <menuitem name="Other Payments"
90 id="menu_action_other_voucher_list" parent='menu_general_comprobante_pago' /><!---action="action_other_voucher_list"-->
91
92 <menuitem name="Contra Voucher"
93
94=== modified file 'bank_management/check/voucher_pay_support.py'
95--- bank_management/check/voucher_pay_support.py 2011-10-04 21:52:36 +0000
96+++ bank_management/check/voucher_pay_support.py 2011-10-10 18:51:25 +0000
97@@ -69,7 +69,7 @@
98 'company_id': fields.many2one('res.company', 'Company', required=True , readonly=True),
99 'expiry':fields.related('company_id','expiry', type='integer',relation='res.company',string='Expiry Days',readonly=True,store=True),
100 'payee_id':fields.many2one('res.partner.address','Beneficiary',required=False, readonly=True),
101- 'partner_id':fields.many2one('res.partner','Contrapartida',required=True, readonly=True),
102+ 'partner_id':fields.many2one('res.partner','Counterpart',required=True, readonly=True),
103 'state': fields.selection([
104 ('draft','Draft'),
105 ('open','Open'),
106@@ -78,8 +78,8 @@
107 ],'State', select=True, readonly=True, help="State Voucher Check Note"),
108 'wire':fields.char('Transfer',size=26),
109 'type': fields.selection([
110- ('check','Cheque'),
111- ('wire','Transferencia'),
112+ ('check','Check'),
113+ ('wire','Transfer'),
114 ],'Type', required=True, select=True , readonly=True),
115 'amount':fields.float('Amount', readonly=True, digits_compute= dp.get_precision('Bank')),
116 'date':fields.date('Issued Date', readonly=True),
117@@ -164,8 +164,8 @@
118 account_voucher=self.pool.get('account.voucher')
119 account_voucher_line=self.pool.get('account.voucher.line')
120 obj_acount_voucher=soporte.account_voucher_id
121- name="COBRO DEL CHEQUE POR CONCEPTO %s"%(obj_acount_voucher.name)
122- narration="COBRO DEL CHEQUE POR CONCEPTO %s"%(obj_acount_voucher.narration)
123+ name="CASH THE CHECK FOR CONCEPT %s"%(obj_acount_voucher.name)
124+ narration="CASH THE CHECK FOR CONCEPT %s"%(obj_acount_voucher.narration)
125
126
127 #se crea el nuevo documento de comprobante diario
128
129=== modified file 'bank_management/check/voucher_pay_support_view.xml'
130--- bank_management/check/voucher_pay_support_view.xml 2011-09-05 15:59:05 +0000
131+++ bank_management/check/voucher_pay_support_view.xml 2011-10-10 18:51:25 +0000
132@@ -32,7 +32,7 @@
133 </group>
134 <newline/>
135 <group expand="0" string="Group By...">
136- <filter string="Contrapartida" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
137+ <filter string="Counterpart" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
138 <separator orientation="vertical"/>
139 <filter string="Beneficiary" icon="terp-personal" domain="[]" context="{'group_by':'payee_id'}"/>
140 <filter string="Bank" icon="terp-folder-green" domain="[]" context="{'group_by':'bank_id'}"/>
141
142=== modified file 'bank_management/check/wizard/cancel_voucher_pay_support.py'
143--- bank_management/check/wizard/cancel_voucher_pay_support.py 2011-09-25 23:55:38 +0000
144+++ bank_management/check/wizard/cancel_voucher_pay_support.py 2011-10-10 18:51:25 +0000
145@@ -1,4 +1,4 @@
146-#!/usr/bin/python
147+
148 # -*- encoding: utf-8 -*-
149 ###########################################################################
150 # Module Writen to OpenERP, Open Source Management Solution
151@@ -35,41 +35,41 @@
152 class cancel_voucher_pay_support(osv.osv_memory):
153 _name = "cancel.voucher.pay.support"
154 _columns = {
155- 'name':fields.char('Nombre', 64),
156- 'accounting_bank_id':fields.many2one('res.bank','Cuenta Bancaria', readonly=False , required=True),
157+ 'name':fields.char('Name', 64),
158+ 'accounting_bank_id':fields.many2one('res.bank','Bank Account', readonly=False , required=True),
159 'check_note_id': fields.many2one('check.note', 'Non. Cheque', required=True, readonly=True, domain="[('accounting_bank_id','=',accounting_bank_id)]"),
160- 'bank_id':fields.related('check_note_id','bank_id',type='many2one',relation='res.bank.entity',string='Banco', store=True, readonly=True),
161- 'min_lim':fields.related('bank_id','min_lim',type='integer',relation='res.bank.entity',string='Limite minimo (Bs.)',readonly=True,store=False),
162- 'max_lim':fields.related('bank_id','max_lim',type='integer',relation='res.bank.entity',string='Limite maximo (Bs.)',readonly=True,store=False),
163+ 'bank_id':fields.related('check_note_id','bank_id',type='many2one',relation='res.bank.entity',string='Bank', store=True, readonly=True),
164+ 'min_lim':fields.related('bank_id','min_lim',type='integer',relation='res.bank.entity',string='Minimal Limit (Bs.)',readonly=True,store=False),
165+ 'max_lim':fields.related('bank_id','max_lim',type='integer',relation='res.bank.entity',string='Maximal Limit (Bs.)',readonly=True,store=False),
166 'company_id': fields.many2one('res.company', 'Company', required=True),
167- 'expiry':fields.related('company_id','expiry', type='integer',relation='res.company',string='Dias de Caducidad',readonly=True,store=True),
168- 'payee_id':fields.many2one('res.partner.address','Beneficiario',required=False, readonly=True),
169- 'partner_id':fields.many2one('res.partner','Contrapartida',required=True, readonly=True),
170+ 'expiry':fields.related('company_id','expiry', type='integer',relation='res.company',string='Expiration Days',readonly=True,store=True),
171+ 'payee_id':fields.many2one('res.partner.address','Beneficiary',required=False, readonly=True),
172+ 'partner_id':fields.many2one('res.partner','Counterpart',required=True, readonly=True),
173 'state': fields.selection([
174 ('draft','Draft'),
175 ('open','Open'),
176 ('done','Done'),
177 ('cancel','Cancel'),
178- ],'Estado', select=True, readonly=True, help="Estado del Cheque Voucher"),
179- 'wire':fields.char('Transferencia',size=26),
180+ ],'State', select=True, readonly=True, help="State of the check in voucher"),
181+ 'wire':fields.char('Transfer',size=26),
182 'type': fields.selection([
183- ('check','Cheque'),
184- ('wire','Transferencia'),
185+ ('check','Check'),
186+ ('wire','Transfer'),
187 ],'Type', required=True, select=True),
188- 'bool_good': fields.boolean('Si se imprimio'),
189- 'bool_bad': fields.boolean('No se imprimio'),
190- 'bool_sure': fields.boolean('¿Estas Seguro?'),
191- 'notes':fields.char('Motivo',size=256, required=False, readonly=False ),
192+ 'bool_good': fields.boolean('If printed'),
193+ 'bool_bad': fields.boolean('If not printed'),
194+ 'bool_sure': fields.boolean('¿Are you sure?'),
195+ 'notes':fields.char('Motive',size=256, required=False, readonly=False ),
196 'cancel_check_note': fields.selection([
197- ('print','Error de Impresion') ,
198- ('perdida','Perdida o extravio') ,
199- ('dan_fis','Dano fisico') ,
200- ('pago','Pago no realizado') ,
201- ('devuelto','Cheque Devuelto') ,
202- ('caduco','Caduco') ,
203- ('otros','Otros') ,
204- ],'Motivo de Cancelacion', select=True, required=True),
205- 'amount':fields.float('Total a Pagar', readonly=True),
206+ ('print','Printing Error') ,
207+ ('perdida','Loss') ,
208+ ('dan_fis','Physical Damage') ,
209+ ('pago','Payment not realized') ,
210+ ('devuelto','Returned Check') ,
211+ ('caduco','Expired') ,
212+ ('otros','Others') ,
213+ ],'Cancellation Motive', select=True, required=True),
214+ 'amount':fields.float('Total amount', readonly=True),
215 'date':fields.date('Fecha', required=True),
216 'period_id': fields.many2one('account.period', 'Periodo', required=True),
217 }
218@@ -95,22 +95,22 @@
219 if nota==False:
220 cancelar1=" "
221 if cancelar=="print":
222- cancelar1="Error de Impresion"
223- if cancelar=="perdida":
224- cancelar1="Perdida o extravio"
225+ cancelar1="Printing Error"
226+ if cancelar=="Loss":
227+ cancelar1="Loss or missing"
228 if cancelar=="dan_fis":
229- cancelar1="Dano fisico"
230- if cancelar=="pago":
231- cancelar1="Pago no realizado"
232- if cancelar=="devuelto":
233- cancelar1="Cheque Devuelto"
234- if cancelar=="caduco":
235- cancelar1="Caduco"
236- name="ANULACION DE CHEQUE POR CONCEPTO %s - MOTIVO: %s"%(obj_acount_voucher.name,cancelar1)
237- narration="ANULACION DE CHEQUE DE PAGO NUMERO %s - %s POR MOTIVO: %s"%(obj_acount_voucher.number,obj_acount_voucher.name,cancelar1)
238+ cancelar1="Physical Damage"
239+ if cancelar=="Payment":
240+ cancelar1="Payment not realized"
241+ if cancelar=="Returned":
242+ cancelar1="Returned Check"
243+ if cancelar=="Expired":
244+ cancelar1="Expired"
245+ name="CHECK CANCELLATION FOR CONCEPT %s - REASON: %s"%(obj_acount_voucher.name,cancelar1)
246+ narration="PAYMENT CHECK CANCELLATIONA OF NUMBER %s - %s REASON: %s"%(obj_acount_voucher.number,obj_acount_voucher.name,cancelar1)
247 else:
248- name="ANULACION DE CHEQUE POR CONCEPRO %s - MOTIVO: %s"%(obj_acount_voucher.name,nota)
249- narration="ANULACION DE CHEQUE DE PAGO NUMERO %s - %s POR MOTIVO: %s"%(obj_acount_voucher.number,obj_acount_voucher.name,nota)
250+ name="CHECK CANCELLATION FOR CONCEPT %s - REASON: %s"%(obj_acount_voucher.name,nota)
251+ narration="PAYMENT CHECK CANCELLATION OF NUMBER %s - %s REASON: %s"%(obj_acount_voucher.number,obj_acount_voucher.name,nota)
252
253
254
255@@ -150,7 +150,7 @@
256 #xml_id = 'action_view_cont_voucher_form'
257 xml_id = 'action_view_jour_voucher_form'
258 else:
259- raise osv.except_osv(_('Atencion !'), _('Debe de Ingresar la Cuenta Transitoria para el Banco: %s')%(obj_voucher_pay_support.accounting_bank_id.bank_id.name))
260+ raise osv.except_osv(_('Atention !'), _('You ust provide the transitory account for the bank: %s')%(obj_voucher_pay_support.accounting_bank_id.bank_id.name))
261
262
263
264
265=== modified file 'bank_management/check/wizard/cancel_wizard.xml'
266--- bank_management/check/wizard/cancel_wizard.xml 2011-09-05 17:51:53 +0000
267+++ bank_management/check/wizard/cancel_wizard.xml 2011-10-10 18:51:25 +0000
268@@ -6,14 +6,14 @@
269 <field name="model">cancel.voucher.pay.support</field>
270 <field name="type">form</field>
271 <field name="arch" type="xml">
272- <form string="Anulacion de Soporte de Pago" >
273+ <form string="Cancellation of Payment Support" >
274 <group colspan="4" col="4">
275 <field name="date"/>
276 <field name="period_id"/>
277 <field name="cancel_check_note"/>
278 </group>
279 <group attrs="{'invisible':[('cancel_check_note','!=','otros')]}" colspan="6" col='1'>
280- <field name="notes" string="Motivo de Anulación"/>
281+ <field name="notes" string="Cancellation reason"/>
282 </group>
283 <newline/>
284 <newline/>
285
286=== modified file 'bank_management/check/wizard/chk_book_gral.py'
287--- bank_management/check/wizard/chk_book_gral.py 2011-09-01 01:24:16 +0000
288+++ bank_management/check/wizard/chk_book_gral.py 2011-10-10 18:51:25 +0000
289@@ -40,8 +40,8 @@
290 ('sin_filtro','Unfiltered'),
291 ('cobrado','Charged'),
292 ('emitido','Issued')
293- ],'Check Note State', readonly=False, help="Estado del Cheque en Voucher"),
294- 'tiempo': fields.selection([('mes','Period'), ('fecha','Date')],'Time', readonly=False, help="Estado del Cheque en Voucher"),
295+ ],'Check Note State', readonly=False, help="State of the check in voucher"),
296+ 'tiempo': fields.selection([('mes','Period'), ('fecha','Date')],'Time', readonly=False, help="State of the check in voucher"),
297 'desde': fields.date('Starting Date', required=False),
298 'hasta': fields.date('Ending Date', required=False),
299 'mes': fields.many2one('account.period', 'Period', required=False),
300
301=== modified file 'bank_management/check/wizard/voucher_pay_support_wizard_pay_order.py'
302--- bank_management/check/wizard/voucher_pay_support_wizard_pay_order.py 2011-10-05 00:08:13 +0000
303+++ bank_management/check/wizard/voucher_pay_support_wizard_pay_order.py 2011-10-10 18:51:25 +0000
304@@ -35,7 +35,7 @@
305 class voucher_pay_support_wizard(osv.osv_memory):
306 _name = "voucher.pay.support.wizard"
307 _columns = {
308- 'name':fields.char('Nombre', 64),
309+ 'name':fields.char('Name', 64),
310 'accounting_bank_id':fields.many2one('res.partner.bank','Bank Account', readonly=False , required=True),
311 'check_note_id': fields.many2one('check.note', 'Check No', required=True, readonly=False, domain="[('accounting_bank_id','=',accounting_bank_id)]"),
312 'bank_id':fields.related('check_note_id','bank_id',type='many2one',relation='res.bank',string='Bank', store=True, readonly=False),
313@@ -44,14 +44,14 @@
314 'company_id': fields.many2one('res.company', 'Company', required=True),
315 'expiry':fields.related('company_id','expiry', type='integer',relation='res.company',string='expiration days',readonly=False,store=True),
316 'payee_id':fields.many2one('res.partner.address','Beneficiary',required=False, readonly=False),
317- 'partner_id':fields.many2one('res.partner','Contrapartida',required=True, readonly=False),
318+ 'partner_id':fields.many2one('res.partner','Counterpart',required=True, readonly=False),
319 'state': fields.selection([
320 ('draft','Draft'),
321 ('open','Open'),
322 ('done','Done'),
323 ('cancel','Cancel'),
324- ],'Estado', select=True, readonly=True, help="Chech note state"),
325- 'wire':fields.char('Transferencia',size=26),
326+ ],'Estate', select=True, readonly=True, help="Chech note state"),
327+ 'wire':fields.char('Transfer',size=26),
328 'type': fields.selection([
329 ('check','Check'),
330 ('wire','Transfer'),
331@@ -61,7 +61,7 @@
332 'bool_sure': fields.boolean('Are you sure?'),
333 'notes':fields.char('Reason',size=256, required=False, readonly=False ),
334 'cancel_check_note': fields.selection([
335- ('print','Error de Impresion'),
336+ ('print','Printing Error'),
337 ('perdida','Loss or misplacement'),
338 ('dan_fis','Physical damage'),
339 ('pago','Payment is not made'),
340@@ -104,7 +104,7 @@
341 if che_b:
342 che_n= check_note.search(cr, uid, [('check_book_id','=',che_b[0]), ('state','=',"active")], limit = 1)
343 else:
344- raise osv.except_osv(_('Atencion !'), _('No existen cheques en esta cuenta, ingrese otra!!!'))
345+ raise osv.except_osv(_('Atention !'), _('There are no checks in this account, please, provide another one!!!'))
346 id=context["active_id"]
347 a_v=self.pool.get('account.voucher')
348 obj_account_v=a_v.browse(cr, uid, id, context=None)
349@@ -159,7 +159,7 @@
350 vista="view_voucher_pay_support_wizard_escribir_nota" #muestra la interface para escribir la razon en la nota
351 else: #si el cheque esta bien
352 if obj.bool_bad==False and obj.bool_good == False: #no selecciono ninguna opcion
353- raise osv.except_osv(_('Atencion !'), _('Ingrese al menos una opcion!!!'))
354+ raise osv.except_osv(_('Atention !'), _('Select at least one option!!!'))
355 check_note = self.pool.get('check.note')
356 payee_id = self.pool.get('res.partner.address')
357 accounting_bank_id = self.pool.get('res.partner.bank')
358@@ -207,7 +207,7 @@
359 if cuenta_transitoria:
360 obj_account_voucher.write({'account_id':obj_accounting_bank_id.trans_account_id.id, 'journal_id': obj_accounting_bank_id.journal_id.id })
361 else:
362- raise osv.except_osv(_('Atencion !'), _('Debe de Ingresar la Cuenta Transitoria para el Banco: %s')%(obj_accounting_bank_id.bank.name))
363+ raise osv.except_osv(_('Atention !'), _('You must provide the transitory account for the bank: %s')%(obj_accounting_bank_id.bank.name))
364
365 #Se hace un write de check_note el campo account_voucher_id
366 obj_check_note.write({'account_voucher_id':obj_account_voucher.id})