[FIX] account: added missing _()
lp bug: https://launchpad.net/bugs/667166 fixed bzr revid: openerp@vmt-hp4520s-20101222101615-sppzak8r8b313s1f
This commit is contained in:
parent
aeb1f667ed
commit
5311423522
|
@ -879,7 +879,7 @@ class account_move_line(osv.osv):
|
||||||
fld = []
|
fld = []
|
||||||
fields = {}
|
fields = {}
|
||||||
flds = []
|
flds = []
|
||||||
title = "Accounting Entries" #self.view_header_get(cr, uid, view_id, view_type, context)
|
title = _("Accounting Entries") #self.view_header_get(cr, uid, view_id, view_type, context)
|
||||||
xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="on_create_write" colors="red:state==\'draft\';black:state==\'valid\'">\n\t''' % (title)
|
xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="on_create_write" colors="red:state==\'draft\';black:state==\'valid\'">\n\t''' % (title)
|
||||||
|
|
||||||
ids = journal_pool.search(cr, uid, [])
|
ids = journal_pool.search(cr, uid, [])
|
||||||
|
@ -898,8 +898,8 @@ class account_move_line(osv.osv):
|
||||||
else:
|
else:
|
||||||
fields.get(field.field).append(journal.id)
|
fields.get(field.field).append(journal.id)
|
||||||
common_fields[field.field] = common_fields[field.field] + 1
|
common_fields[field.field] = common_fields[field.field] + 1
|
||||||
fld.append(('period_id', 3, 'Period'))
|
fld.append(('period_id', 3, _('Period')))
|
||||||
fld.append(('journal_id', 10, 'Journal'))
|
fld.append(('journal_id', 10, _('Journal')))
|
||||||
flds.append('period_id')
|
flds.append('period_id')
|
||||||
flds.append('journal_id')
|
flds.append('journal_id')
|
||||||
fields['period_id'] = all_journal
|
fields['period_id'] = all_journal
|
||||||
|
@ -919,10 +919,10 @@ class account_move_line(osv.osv):
|
||||||
# state = 'colors="red:state==\'draft\'"'
|
# state = 'colors="red:state==\'draft\'"'
|
||||||
attrs = []
|
attrs = []
|
||||||
if field == 'debit':
|
if field == 'debit':
|
||||||
attrs.append('sum = "Total debit"')
|
attrs.append('sum = "%s"' % _("Total debit"))
|
||||||
|
|
||||||
elif field == 'credit':
|
elif field == 'credit':
|
||||||
attrs.append('sum = "Total credit"')
|
attrs.append('sum = "%s"' % _("Total credit"))
|
||||||
|
|
||||||
elif field == 'move_id':
|
elif field == 'move_id':
|
||||||
attrs.append('required = "False"')
|
attrs.append('required = "False"')
|
||||||
|
|
|
@ -92,12 +92,14 @@ class account_move_journal(osv.osv_memory):
|
||||||
journal = False
|
journal = False
|
||||||
if journal_id:
|
if journal_id:
|
||||||
journal = journal_pool.read(cr, uid, [journal_id], ['name'])[0]['name']
|
journal = journal_pool.read(cr, uid, [journal_id], ['name'])[0]['name']
|
||||||
|
journal_string = _("Journal: %s") % tools.ustr(journal)
|
||||||
else:
|
else:
|
||||||
journal = "All"
|
journal_string = _("Journal: All")
|
||||||
|
|
||||||
period = False
|
period = False
|
||||||
if period_id:
|
if period_id:
|
||||||
period = period_pool.browse(cr, uid, [period_id], ['name'])[0]['name']
|
period = period_pool.browse(cr, uid, [period_id], ['name'])[0]['name']
|
||||||
|
period_string = _("Period: %s") % tools.ustr(period)
|
||||||
|
|
||||||
view = """<?xml version="1.0" encoding="utf-8"?>
|
view = """<?xml version="1.0" encoding="utf-8"?>
|
||||||
<form string="Standard entries">
|
<form string="Standard entries">
|
||||||
|
@ -105,16 +107,16 @@ class account_move_journal(osv.osv_memory):
|
||||||
<field name="target_move" />
|
<field name="target_move" />
|
||||||
<newline/>
|
<newline/>
|
||||||
<group colspan="4" >
|
<group colspan="4" >
|
||||||
<label width="300" string="Journal: %s"/>
|
<label width="300" string="%s"/>
|
||||||
<newline/>
|
<newline/>
|
||||||
<label width="300" string="Period: %s"/>
|
<label width="300" string="%s"/>
|
||||||
</group>
|
</group>
|
||||||
<group colspan="4" col="4">
|
<group colspan="4" col="4">
|
||||||
<label string ="" colspan="2"/>
|
<label string ="" colspan="2"/>
|
||||||
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
|
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
|
||||||
<button icon="terp-gtk-go-back-rtl" string="Open" name="action_open_window" default_focus="1" type="object"/>
|
<button icon="terp-gtk-go-back-rtl" string="Open" name="action_open_window" default_focus="1" type="object"/>
|
||||||
</group>
|
</group>
|
||||||
</form>""" % (tools.ustr(journal), tools.ustr(period))
|
</form>""" % (journal_string, period_string)
|
||||||
|
|
||||||
view = etree.fromstring(view.encode('utf8'))
|
view = etree.fromstring(view.encode('utf8'))
|
||||||
xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context)
|
xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context)
|
||||||
|
@ -190,4 +192,4 @@ class account_move_journal(osv.osv_memory):
|
||||||
|
|
||||||
account_move_journal()
|
account_move_journal()
|
||||||
|
|
||||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||||
|
|
Loading…
Reference in New Issue