Amit Dodiya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.1-opw-575624-ado into
lp:openobject-addons/6.1.
Requested reviews:
Olivier Dony (OpenERP) (odo-openerp)
Naresh(OpenERP) (nch-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-575624-ado/+merge/109360
Hello,
"[FIX] Currency symbol position is not changed as per currency(after/before)
configuration"
Steps:
1). Change the Symbol position in currency.
2). now goto product form select any product and print pricelist report
You will get the currency symbol always at left side.
3). Same issue in Payment Order report also.
Regards,
Amit
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-575624-ado/+merge/109360
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.1-opw-575624-ado.
=== modified file 'account_payment/report/order.rml'
--- account_payment/report/order.rml 2011-12-21 09:08:11 +0000
+++ account_payment/report/order.rml 2012-06-08 13:22:45 +0000
@@ -256,10 +256,10 @@
<para style="terp_default_Centre_9">[[line.date=='False' and '-' or formatLang(line.date,date=True) ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[formatLang(line.amount) or '-' ]] [[get_company_currency_symbol()]] </para>
+ <para style="terp_default_Right_9">[[ formatLang((line.amount) or '-', currency_obj=line.currency) ]] </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(line.amount_currency) ]] [[ line.currency.symbol]] </para>
+ <para style="terp_default_Right_9">[[ formatLang(line.amount_currency, currency_obj=line.currency) ]] </para>
</td>
</tr>
</blockTable>
@@ -275,10 +275,10 @@
<para style="terp_default_Bold_9">Total:</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(get_amount_total(o)) or '' ]] [[get_company_currency_symbol()]] </para>
+ <para style="terp_default_Right_9">[[ formatLang(get_amount_total(o), currency_obj=o.company_id.currency_id) ]] </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(get_amount_total_in_currency(o)) or '' ]] [[get_company_currency_symbol()]] </para>
+ <para style="terp_default_Right_9">[[ formatLang(get_amount_total_in_currency(o), currency_obj=o.company_id.currency_id)]] </para>
</td>
</tr>
</blockTable>
=== modified file 'product/report/product_pricelist.py'
--- product/report/product_pricelist.py 2011-01-17 08:00:48 +0000
+++ product/report/product_pricelist.py 2012-06-08 13:22:45 +0000
@@ -114,12 +114,13 @@
def _get_price(self,pricelist_id, product_id,qty):
sale_price_digits = self.get_digits(dp='Sale Price')
pool = pooler.get_pool(self.cr.dbname)
+ currency_record = self.pool.get('product.pricelist').browse(self.cr, self.uid, [pricelist_id], context=self.localcontext)[0]
price_dict = pool.get('product.pricelist').price_get(self.cr, self.uid, [pricelist_id], product_id, qty, context=self.localcontext)
if price_dict[pricelist_id]:
- price = self.formatLang(price_dict[pricelist_id], digits=sale_price_digits)
+ price = self.formatLang(price_dict[pricelist_id], digits=sale_price_digits, currency_obj=currency_record.currency_id)
else:
res = pool.get('product.product').read(self.cr, self.uid, [product_id])
- price = self.formatLang(res[0]['list_price'], digits=sale_price_digits)
+ price = self.formatLang(res[0]['list_price'], digits=sale_price_digits, currency_obj=currency_record.currency_id)
return price
report_sxw.report_sxw('report.product.pricelist','product.product','addons/product/report/product_pricelist.rml',parser=product_pricelist)
=== modified file 'product/report/product_pricelist.rml'
--- product/report/product_pricelist.rml 2011-12-21 09:08:11 +0000
+++ product/report/product_pricelist.rml 2012-06-08 13:22:45 +0000
@@ -240,19 +240,19 @@
<para style="terp_default_9">[[ p['code'] and '[' + p['code'] + '] ' or '' ]] [[ p['name'] ]]</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold">[[ (p.has_key('qty1') and p['qty1']) or '' ]] [[ (k.has_key('qty1') and get_currency_symbol ( data['form']['price_list'])) or '' ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9_Bold">[[ (p.has_key('qty2') and p['qty2']) or '' ]] [[ (k.has_key('qty2') and get_currency_symbol ( data['form']['price_list'])) or '' ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9_Bold">[[ (p.has_key('qty3') and p['qty3']) or '' ]] [[ (k.has_key('qty3') and get_currency_symbol ( data['form']['price_list'])) or '' ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9_Bold">[[ (p.has_key('qty4') and p['qty4']) or '' ]] [[ (k.has_key('qty4') and get_currency_symbol ( data['form']['price_list'])) or '' ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9_Bold">[[ (p.has_key('qty5') and p['qty5']) or '' ]] [[ (k.has_key('qty5') and get_currency_symbol ( data['form']['price_list'])) or '' ]]</para>
+ <para style="terp_default_Right_9_Bold">[[ (p.has_key('qty1') and p['qty1']) or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9_Bold">[[ (p.has_key('qty2') and p['qty2']) or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9_Bold">[[ (p.has_key('qty3') and p['qty3']) or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9_Bold">[[ (p.has_key('qty4') and p['qty4']) or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Right_9_Bold">[[ (p.has_key('qty5') and p['qty5']) or '' ]]</para>
</td>
</tr>
</blockTable>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
