odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] account,payment,auction,base_setup,hr_payroll,l10n_ch,mrp,report_intrastate:currency code replace with currency symbol 

bzr revid: ara@tinyerp.com-20101015105757-d3ta729on08q3czm
This commit is contained in:
ARA (OpenERP) 2010-10-15 16:27:57 +05:30
parent b94c27993c
commit 300f2ac79c
12 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/account/report/account_central_journal.py
View File

@ -72,15 +72,15 @@ class journal_print(report_sxw.rml_parse, common_report_header):
if self.target_move == 'posted':
move_state = ['posted']
self.cr.execute('SELECT a.currency_id, a.code, a.name, c.code AS currency_code, l.currency_id, l.amount_currency, SUM(debit) AS debit, SUM(credit) AS credit \
self.cr.execute('SELECT a.currency_id, a.code, a.name, c.symbol AS currency_code, l.currency_id, l.amount_currency, SUM(debit) AS debit, SUM(credit) AS credit \
from account_move_line l \
LEFT JOIN account_move am ON (l.move_id=am.id) \
LEFT JOIN account_account a ON (l.account_id=a.id) \
LEFT JOIN res_currency c on (l.currency_id=c.id) WHERE am.state IN %s AND l.period_id=%s AND l.journal_id=%s '+self.query_get_clause+' GROUP BY a.id, a.code, a.name,l.amount_currency,c.code, a.currency_id,l.currency_id', (tuple(move_state), period_id, journal_id))
LEFT JOIN res_currency c on (l.currency_id=c.id) WHERE am.state IN %s AND l.period_id=%s AND l.journal_id=%s '+self.query_get_clause+' GROUP BY a.id, a.code, a.name,l.amount_currency,c.symbol, a.currency_id,l.currency_id', (tuple(move_state), period_id, journal_id))
return self.cr.dictfetchall()
def _set_get_account_currency_code(self, account_id):
self.cr.execute("SELECT c.code as code "\
self.cr.execute("SELECT c.symbol as code "\
"FROM res_currency c,account_account as ac "\
"WHERE ac.id = %s AND ac.currency_id = c.id"%(account_id))
result = self.cr.fetchone()

6
addons/account/report/account_general_journal.py
View File

@ -87,19 +87,19 @@ class journal_print(report_sxw.rml_parse, common_report_header):
move_state = ['draft','posted']
if self.target_move == 'posted':
move_state = ['posted']
self.cr.execute('SELECT j.code, j.name, l.amount_currency,c.code AS currency_code,l.currency_id, '
self.cr.execute('SELECT j.code, j.name, l.amount_currency,c.symbol AS currency_code,l.currency_id, '
'SUM(l.debit) AS debit, SUM(l.credit) AS credit '
'FROM account_move_line l '
'LEFT JOIN account_move am ON (l.move_id=am.id) '
'LEFT JOIN account_journal j ON (l.journal_id=j.id) '
'LEFT JOIN res_currency c on (l.currency_id=c.id)'
'WHERE am.state IN %s AND l.period_id=%s AND l.journal_id IN %s ' + self.query_get_clause + ' '
'GROUP BY j.id, j.code, j.name, l.amount_currency, c.code, l.currency_id ',
'GROUP BY j.id, j.code, j.name, l.amount_currency, c.symbol, l.currency_id ',
(tuple(move_state), period_id, tuple(self.journal_ids)))
return self.cr.dictfetchall()
def _set_get_account_currency_code(self, account_id):
self.cr.execute("SELECT c.code AS code "\
self.cr.execute("SELECT c.symbol AS code "\
"FROM res_currency c, account_account AS ac "\
"WHERE ac.id = %s AND ac.currency_id = c.id" % (account_id))
result = self.cr.fetchone()

2
addons/account/report/account_journal.py
View File

@ -126,7 +126,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
return obj_mline.browse(self.cr, self.uid, ids)
def _set_get_account_currency_code(self, account_id):
self.cr.execute("SELECT c.code AS code "\
self.cr.execute("SELECT c.symbol AS code "\
"FROM res_currency c,account_account AS ac "\
"WHERE ac.id = %s AND ac.currency_id = c.id" % (account_id))
result = self.cr.fetchone()

2
addons/account_payment/report/payment_order.py
View File

@ -70,7 +70,7 @@ class payment_order(report_sxw.rml_parse):
def _get_company_currency(self):
pool = pooler.get_pool(self.cr.dbname)
user = pool.get('res.users').browse(self.cr, self.uid, self.uid)
return user.company_id and user.company_id.currency_id and user.company_id.currency_id.code or False
return user.company_id and user.company_id.currency_id and user.company_id.currency_id.symbol or False
def _get_company_currency_symbol(self):
pool = pooler.get_pool(self.cr.dbname)

4
addons/auction/report/buyer_list.rml
View File

@ -75,13 +75,13 @@
<para style="P5">Lot</para>
</td>
<td>
<para style="P5">Adj.([[ company.currency_id.code ]])</para>
<para style="P5">Adj.([[ company.currency_id.symbol ]])</para>
</td>
<td>
<para style="P5">Buyer costs([[ o['amount' ]*100 ]]%)</para>
</td>
<td>
<para style="P5">To pay ([[ company.currency_id.code ]])</para>
<para style="P5">To pay ([[ company.currency_id.symbol ]])</para>
</td>
</tr>
<tr>

4
addons/base_setup/todo.py
View File

@ -164,8 +164,8 @@ class res_currency(osv.osv):
return []
if isinstance(ids, (int, long)):
ids = [ids]
reads = self.read(cr, uid, ids, ['name','code'], context, load='_classic_write')
return [(x['id'], tools.ustr(x['name']) + ' (' + tools.ustr(x['code']) + ')') for x in reads]
reads = self.read(cr, uid, ids, ['name','symbol'], context, load='_classic_write')
return [(x['id'], tools.ustr(x['name']) + ' (' + tools.ustr(x['symbol']) + ')') for x in reads]
res_currency()

6
addons/hr_payroll/report/payslip.rml
View File

@ -505,13 +505,13 @@
<blockTable colWidths="181.0,88.0,177.0,93.0" style="Table4">
<tr>
<td>
<para style="terp_tblheader_Details">Total Earnings<font face="Helvetica" size="7.0">([[ o.company_id and o.company_id.currency_id.code or '' ]])</font></para>
<para style="terp_tblheader_Details">Total Earnings<font face="Helvetica" size="7.0">([[ o.company_id and o.company_id.currency_id.symbol or '' ]])</font></para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(o.allounce + o.basic) ]] [[ o.company_id and o.company_id.currency_id.symbol ]] </para>
</td>
<td>
<para style="terp_tblheader_Details">Total Deductions<font face="Helvetica" size="7.0">([[ o.company_id and o.company_id.currency_id.code or '' ]])</font></para>
<para style="terp_tblheader_Details">Total Deductions<font face="Helvetica" size="7.0">([[ o.company_id and o.company_id.currency_id.symbol or '' ]])</font></para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(o.deduction) ]] [[ o.company_id and o.company_id.currency_id.symbol or '' ]]</para>
@ -558,7 +558,7 @@
</para>
</td>
<td>
<para style="terp_tblheader_Details">Net Amount<font face="Helvetica" size="7.0">([[ o.company_id and o.company_id.currency_id.code or '' ]])</font></para>
<para style="terp_tblheader_Details">Net Amount<font face="Helvetica" size="7.0">([[ o.company_id and o.company_id.currency_id.symbol or '' ]])</font></para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(o.net) ]] [[ o.company_id and o.company_id.currency_id.symbol or '' ]]</para>

2
addons/hr_payroll/report/report_payroll_advice.rml
View File

@ -257,7 +257,7 @@
</para>
</td>
<td>
<para style="terp_tblheader_Details">Total([[ company.currency_id.code ]]):</para>
<para style="terp_tblheader_Details">Total([[ company.currency_id.symbol ]]):</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(get_total()) ]] [[ company.currency_id.symbol ]]</para>

8
addons/l10n_ch/report/bvr_invoice_report.rml
View File

@ -241,7 +241,7 @@
<para style="P7">[[ round(l.discount) ]]</para>
</td>
<td>
<para style="P7">[[ comma_me(l.price_subtotal) ]] [[o.currency_id.code ]]</para>
<para style="P7">[[ comma_me(l.price_subtotal) ]] [[o.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@ -293,7 +293,7 @@
<para style="P13">Total (excl. taxes):</para>
</td>
<td>
<para style="P13">[[ comma_me(o.amount_untaxed) ]] [[o.currency_id.code ]]</para>
<para style="P13">[[ comma_me(o.amount_untaxed) ]] [[o.currency_id.symbol ]]</para>
</td>
</tr>
<tr>
@ -301,7 +301,7 @@
<para style="P13">Taxes:</para>
</td>
<td>
<para style="P13">[[ comma_me(o.amount_tax) ]] [[o.currency_id.code ]]</para>
<para style="P13">[[ comma_me(o.amount_tax) ]] [[o.currency_id.symbol ]]</para>
</td>
</tr>
<tr>
@ -309,7 +309,7 @@
<para style="P14">Total <font face="Helvetica">(incl. taxes):</font></para>
</td>
<td>
<para style="P17">[[ comma_me(o.amount_total) ]] [[o.currency_id.code ]]</para>
<para style="P17">[[ comma_me(o.amount_total) ]] [[o.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>

2
addons/l10n_ch/wizard/create_dta.py
View File

@ -405,7 +405,7 @@ def _create_dta(obj, cr, uid, data, context=None):
v['sequence'] = str(seq).rjust(5).replace(' ', '0')
v['amount_to_pay']= str(pline.amount_currency).replace('.', ',')
v['number'] = pline.name
v['currency'] = pline.currency.code
v['currency'] = pline.currency.symbol
v['partner_bank_name'] = pline.bank_id.bank.name or False
v['partner_bank_clearing'] = pline.bank_id.bank.clearing or False

12
addons/mrp/report/price.py
View File

@ -120,7 +120,7 @@ class report_custom(report_rml):
<col t='yes'>%s</col>
</row>
</lines>
""" % (_('Work Center name'), _('Cycles Cost')+'('+company_currency.code+')', _('Hourly Cost')+'('+company_currency.code+')',_('Work Cost')+'('+company_currency.code+')')
""" % (_('Work Center name'), _('Cycles Cost')+'('+company_currency.symbol+')', _('Hourly Cost')+'('+company_currency.symbol+')',_('Work Cost')+'('+company_currency.symbol+')')
prod_header = """
<row>
<col>%s</col>
@ -129,7 +129,7 @@ class report_custom(report_rml):
<col t='yes'>%s</col>
<col t='yes'>%s</col>
</row>
""" % (_('Component'), _('Component suppliers'), _('Quantity'),_('Cost Price per Uom')+'('+company_currency.code+')', _('Supplier Price per Uom')+'('+company_currency.code+')')
""" % (_('Component'), _('Component suppliers'), _('Quantity'),_('Cost Price per Uom')+'('+company_currency.symbol+')', _('Supplier Price per Uom')+'('+company_currency.symbol+')')
purchase_price_digits = rml_obj.get_digits(dp='Purchase Price')
@ -149,7 +149,7 @@ class report_custom(report_rml):
<col para='yes'>-</col>
</row></lines>"""
xml += """<lines style='total'> <row>
<col> """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.code+')'+ """: </col>
<col> """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.symbol+')'+ """: </col>
<col/>
<col f='yes'/>
<col t='yes'>"""+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
@ -176,7 +176,7 @@ class report_custom(report_rml):
xml += "<lines style='lines'>" + xml_tmp + '</lines>'
xml += """<lines style='sub_total'> <row>
<col> """ + _('Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'(' + company_currency.code +')'+ """: </col>
<col> """ + _('Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'(' + company_currency.symbol +')'+ """: </col>
<col/>
<col t='yes'/>
<col t='yes'>"""+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
@ -193,14 +193,14 @@ class report_custom(report_rml):
xml += workcenter_header
xml += "<lines style='lines'>" + xml_tmp + '</lines>'
xml += """<lines style='sub_total'> <row>
<col> """ + _('Work Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.code+')'+""": </col>
<col> """ + _('Work Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.symbol+')'+""": </col>
<col/>
<col/>
<col/>
<col t='yes'>"""+ rml_obj.formatLang(total2, digits=purchase_price_digits) +' '+ company_currency.symbol +"""</col>
</row></lines>'"""
xml += """<lines style='total'> <row>
<col> """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.code+')'+ """: </col>
<col> """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.symbol+')'+ """: </col>
<col/>
<col t='yes'/>
<col t='yes'>"""+ rml_obj.formatLang(total_strd+total2, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>

16
addons/report_intrastat/report/invoice.rml
View File

@ -330,7 +330,7 @@
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(o.invoice_line,'l') ]]</para>
<blockTable colWidths="170.0,50.0,50.0,50.0,29.0,22.0,51.0,29.0,50.0,21.0" style="Table_Invoice_Line_Content">
<blockTable colWidths="170.0,50.0,50.0,50.0,29.0,22.0,51.0,29.0,50.0,8.0" style="Table_Invoice_Line_Content">
<tr>
<td>
<para style="terp_default_9">[[ l.name ]]</para>
@ -360,7 +360,7 @@
<para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
<para style="terp_default_Right_9">[[ o.currency_id.symbol ]]</para>
</td>
</tr>
<tr>
@ -437,7 +437,7 @@
</blockTable>
</td>
<td>
<blockTable colWidths="120.0,91.0,29.0" style="Table_eclu_Taxes_Total">
<blockTable colWidths="120.0,91.0,8.0" style="Table_eclu_Taxes_Total">
<tr>
<td>
<para style="terp_default_Bold_9">Total (excl. taxes):</para>
@ -446,14 +446,14 @@
<para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
<para style="terp_default_Right_9">[[ o.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<blockTable colWidths="120.0,92.0,28.0" style="Table_Taxes_Total">
<blockTable colWidths="120.0,92.0,8.0" style="Table_Taxes_Total">
<tr>
<td>
<para style="terp_default_Bold_9">Taxes:</para>
@ -462,14 +462,14 @@
<para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
<para style="terp_default_Right_9">[[ o.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
<blockTable colWidths="119.0,93.0,28.0" style="Table_Total_Include_Taxes">
<blockTable colWidths="119.0,93.0,8.0" style="Table_Total_Include_Taxes">
<tr>
<td>
<para style="terp_default_Bold_9">Total (inclu. taxes):</para>
@ -478,7 +478,7 @@
<para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
<para style="terp_default_Right_9">[[ o.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>