diff --git a/addons/account/report/account_tax_code.rml b/addons/account/report/account_tax_code.rml
index 35205440993..9c495dd4834 100644
--- a/addons/account/report/account_tax_code.rml
+++ b/addons/account/report/account_tax_code.rml
@@ -1,32 +1,8 @@
-
+
-
-
-
-
-
-
-
- [[ company.name ]]
- Accounting Entries-[[ company.currency_id.name ]]
-
-
-
-
-
- [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]
- Page
-
-
-
-
- 1cm 27.7cm 20cm 27.7cm
-
-
-
-
+
@@ -34,28 +10,20 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -71,19 +39,19 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
-
@@ -95,59 +63,82 @@
-
+
+
-
- [[ repeatIn(objects, 'o') ]]
-
-
-
-
+ [[ repeatIn(objects, 'o') ]]
+
- | [[ o.company_id.name ]] |
- |
- Accounting Entries-[[ o.company_id.currency_id.name ]] |
+
+ Accounting Entries-[[ company.currency_id.name ]]
+ |
-
-
-
- [[ o.name ]]
-
-
-
-
-
-
- | Date |
- Voucher Nb |
- Account Number |
- Third party (Country) |
- Entry label |
- Debit |
- Credit |
-
-
- | [[ repeatIn(get_line(o),'line') ]][[ not line and removeParentNode('tr') ]][[ formatLang(line['date'],date=True) ]] |
- [[ line['ref'] ]] |
- [[ line['acode'] ]] |
- [[ line['pname'] ]]([[ line['country'] ]] ) |
- [[ line['name'] ]] |
- [[ formatLang(line['debit']) ]] |
- [[ formatLang(line['credit']) ]] |
-
-
-
-
+
+
+
+ |
+ Date
+ |
+
+ Voucher No
+ |
+
+ A/c Code
+ |
+
+ Third Party (Country)
+ |
+
+ Entry Label
+ |
+
+ Debit([[ company.currency_id.name ]])
+ |
+
+ Credit([[ company.currency_id.name ]])
+ |
+
+
+
+ [[ repeatIn(get_line(o),'line') ]]
+
+
+ |
+ [[ not line and removeParentNode('blockTable') ]] [[ formatLang(line['date'],date=True) ]]
+ |
+
+ [[ line['ref'] ]]
+ |
+
+ [[ line['acode'] ]]
+ |
+
+ [[ line['pname'] ]] ([[ line['country'] ]] )
+ |
+
+ [[ line['name'] ]]
+ |
+
+ [[ formatLang(line['debit']) ]] [[ company.currency_id.symbol]]
+ |
+
+ [[ formatLang(line['credit']) ]] [[ company.currency_id.symbol]]
+ |
+
+
+
+
+
+
-
-
+
\ No newline at end of file
diff --git a/addons/account/report/overdue.rml b/addons/account/report/overdue.rml
index 5f461cd9768..fad5c27ec79 100644
--- a/addons/account/report/overdue.rml
+++ b/addons/account/report/overdue.rml
@@ -187,7 +187,7 @@
[[ (line['account_id']['type'] == 'receivable' and formatLang(line['credit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['debit'] * -1) or 0) ]] [[ company.currency_id.symbol ]]
- [[ formatLang((line['date_maturity'] < time.strftime('%Y-%m-%d'))) and (line['debit'] - line['credit']) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang((line['date_maturity'] < time.strftime('%Y-%m-%d'))) and formatLang(line['debit'] - line['credit']) ]] [[ company.currency_id.symbol ]]
|
[[ line['blocked'] and 'X' or '' ]]
diff --git a/addons/account_reporting/report/account_report_bs.rml b/addons/account_reporting/report/account_report_bs.rml
index 59caba5ab76..b33ebb4bcc8 100644
--- a/addons/account_reporting/report/account_report_bs.rml
+++ b/addons/account_reporting/report/account_report_bs.rml
@@ -10,14 +10,52 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -25,7 +63,7 @@
-
+
@@ -41,26 +79,32 @@
-
-
+
+
+
-
+
-
+
+
-
+
+
+
+
+
@@ -69,63 +113,49 @@
-
-
- |
- [[ company.name ]]
- |
-
-
-
-
- |
-
- Currency: [[ company.currency_id.name ]]
- |
-
-
- Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]]
[[repeatIn(objects,'o') ]]
-
+
+
+
+
|
-
-
-
- |
-
- [[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[o.name]]
- |
-
-
-
-
+ Account Balance
|
-
+
+
+
+
|
- Code
+ Company Name
|
- Account Name
+ Printing date
|
- Balance
+ Currency
+ |
+
+ Name
|
-
-
+
+
|
- [[ repeatIn(lines(data['form'],object=o), 'a') ]][[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[ a['code'] ]]
+ [[ company.name ]]
|
- [[ '..'*(a['level']-1) ]][[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[ a['name'] ]]
+ [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'), date_time = True) ]]
|
- [[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]][[ '%.2f'% a['balance'] ]]
+ [[ company.currency_id.name ]]
+ |
+
+ [[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[o.name]]
|
@@ -135,6 +165,27 @@
+
+
+ |
+ Code
+ |
+
+ Account Name
+ |
+
+ Balance([[company.currency_id.code]])
+ |
+
+
+ |
+ [[ repeatIn(lines(data['form']), 'a') ]][[ (a['level']>4 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]][[ a['code'] or removeParentNode('tr')]]
+ |
+ [[ (a['level']>4 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]][[ '..'*(a['level']-1) ]][[ a['name'] ]] |
+
+ [[ (a['level']>4 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]][[ formatLang(a['balance']) ]] [[company.currency_id.symbol]]
+ |
+
+
-
diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index a551e3a0a5d..a14970b31e5 100644
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -87,7 +87,8 @@ class report_custom(report_rml):
depts=[]
emp_id={}
# done={}
-
+ rpt_obj = pooler.get_pool(cr.dbname).get('hr.holidays')
+ rml_obj=report_sxw.rml_parse(cr, uid, rpt_obj._name,context)
cr.execute("SELECT name FROM res_company")
res=cr.fetchone()[0]
date_xml=[]
@@ -113,8 +114,8 @@ class report_custom(report_rml):
else:
type="Confirmed and Validated"
holiday_type=('confirm','validate')
- date_xml.append('%s\n'% (som))
- date_xml.append('%s\n' %(eom))
+ date_xml.append('%s\n'% (str(rml_obj.formatLang(som.strftime("%Y-%m-%d"),date=True))))
+ date_xml.append('%s\n' %(str(rml_obj.formatLang(eom.strftime("%Y-%m-%d"),date=True))))
date_xml.append('%s'%(type))
# date_xml=[]
@@ -229,8 +230,6 @@ class report_custom(report_rml):
emp_xml += emp_create_xml(self, cr, uid, 0, holiday_type, row_id, item['id'], item['name'], som, eom)
row_id = row_id +1
- rpt_obj = pooler.get_pool(cr.dbname).get('hr.holidays')
- rml_obj=report_sxw.rml_parse(cr, uid, rpt_obj._name,context)
header_xml = '''
%s
diff --git a/addons/hr_payroll/report/payroll_register.rml b/addons/hr_payroll/report/payroll_register.rml
index 178695d2d9c..d7df0ada7cc 100644
--- a/addons/hr_payroll/report/payroll_register.rml
+++ b/addons/hr_payroll/report/payroll_register.rml
@@ -22,7 +22,7 @@
-
+
@@ -34,7 +34,7 @@
-
+
@@ -65,6 +65,7 @@
+
@@ -131,11 +132,11 @@
-
-
-
-
+
+
+
+
|
#
@@ -163,14 +164,18 @@
|
-
+
+
+
+
+
+ [[repeatIn(o.line_ids, 'l')]]
+
|
[[ get_no() ]]
|
- [[ repeatIn(o.line_ids, 'l') ]]
- [[add_line(l)]]
[[ l.employee_id.name ]]
|
@@ -193,40 +198,46 @@
|
-
-
- |
-
-
-
- |
-
- Total SAL([[ company.currency_id.code]])
- |
-
- [[formatLang(get_basic())]][[ company.currency_id.symbol]]
- |
-
- [[formatLang(get_other())]] [[ company.currency_id.symbol]]
- |
-
- [[formatLang(get_allow())]] [[ company.currency_id.symbol]]
- |
-
- [[formatLang(get_grows())]] [[ company.currency_id.symbol]]
- |
-
- [[formatLang(get_deduct())]] [[ company.currency_id.symbol]]
- |
-
- [[formatLang(get_net())]] [[ company.currency_id.symbol]]
- |
-
-
-
+
+
+
+ |
+
+
+
+ |
+
+ Total SAL([[ company.currency_id.code]])
+ |
+
+ [[formatLang(get_basic())]][[ company.currency_id.symbol]]
+ |
+
+ [[formatLang(get_other())]] [[ company.currency_id.symbol]]
+ |
+
+ [[formatLang(get_allow())]] [[ company.currency_id.symbol]]
+ |
+
+ [[formatLang(get_grows())]] [[ company.currency_id.symbol]]
+ |
+
+ [[formatLang(get_deduct())]] [[ company.currency_id.symbol]]
+ |
+
+ [[formatLang(get_net())]] [[ company.currency_id.symbol]]
+ |
+
+
+
+
+
+
+
+
|
diff --git a/addons/hr_payroll/report/report_emp_salary_structure.py b/addons/hr_payroll/report/report_emp_salary_structure.py
index 0c63f446c38..d4365a8423b 100644
--- a/addons/hr_payroll/report/report_emp_salary_structure.py
+++ b/addons/hr_payroll/report/report_emp_salary_structure.py
@@ -36,7 +36,8 @@ class salary_structure_report(report_sxw.rml_parse):
'get_type':self.get_type,
'get_contract':self.get_contract,
'get_line_amount_type':self.get_line_amount_type,
- 'get_line_type':self.get_line_type
+ 'get_line_type':self.get_line_type,
+ 'get_line_amount_symbol':self.get_line_amount_symbol
})
def get_contract(self,emp):
@@ -69,6 +70,10 @@ class salary_structure_report(report_sxw.rml_parse):
else:
return 'Fixed'
+ def get_line_amount_symbol(self,amount_type):
+ if amount_type != 'per':
+ return self.pool.get('res.users').browse(self.cr, self.uid,self.uid).company_id.currency_id.symbol
+
def get_line_type(self,type):
if type == 'allounce':
return 'Allowance'
diff --git a/addons/hr_payroll/report/report_emp_salary_structure.rml b/addons/hr_payroll/report/report_emp_salary_structure.rml
index 11bfee609f0..ee564052af3 100644
--- a/addons/hr_payroll/report/report_emp_salary_structure.rml
+++ b/addons/hr_payroll/report/report_emp_salary_structure.rml
@@ -441,7 +441,7 @@
[[ get_line_amount_type(line.amount_type) ]]
|
- [[ formatLang(line.amount) or '']][[ employee.company_id.currency_id.symbol]]
+ [[ formatLang(line.amount) or '']][[ get_line_amount_symbol(line.amount_type) ]]
|
[[ get_line_type(line.type) ]]
diff --git a/addons/hr_payroll/report/report_employees_detail.rml b/addons/hr_payroll/report/report_employees_detail.rml
index 8a9689b45c6..3b032af3409 100644
--- a/addons/hr_payroll/report/report_employees_detail.rml
+++ b/addons/hr_payroll/report/report_employees_detail.rml
@@ -172,19 +172,19 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -194,13 +194,13 @@
-
-
-
-
+
+
+
+
-
-
+
+
@@ -210,8 +210,8 @@
-
-
+
+
@@ -225,10 +225,10 @@
+
-
- [[ repeatIn(get_employee(data['form']), 'o') ]]
+ [[ repeatIn(get_employee(data['form']), 'o') ]] [[ get_employee_detail(o) ]]
Employees Salary Details
For [[ get_fiscalyear(data['form']['fiscalyear_id']) ]]
@@ -284,7 +284,7 @@
Designation
|
- [[ o.contract_ids and o.contract_ids[0].function.name or '' ]]
+ [[ o.contract_ids and o.contract_ids[0].job_id.name or '' ]]
|
Phone No.
@@ -355,7 +355,9 @@
- [[ get_employee_detail(o) ]]
+
+
+
Allowances with Basic:
[[ repeatIn(get_allow(),'e1') ]]
@@ -528,43 +530,43 @@
[[ get_monthly_total()[0] ]]
|
- [[ formatLang(get_monthly_total()[1]) ]]
+ [[ formatLang(get_monthly_total()[1]) ]][[ company.currency_id.symbol ]]
|
- [[ formatLang(get_monthly_total()[2]) ]]
+ [[ formatLang(get_monthly_total()[2]) ]][[ company.currency_id.symbol ]]
|
- [[ formatLang(get_monthly_total()[3]) ]]
+ [[ formatLang(get_monthly_total()[3]) ]][[ company.currency_id.symbol ]]
|
- [[ formatLang(get_monthly_total()[4]) ]]
+ [[ formatLang(get_monthly_total()[4]) ]][[ company.currency_id.symbol ]]
|
- [[ formatLang(get_monthly_total()[5]) ]]
+ [[ formatLang(get_monthly_total()[5]) ]][[ company.currency_id.symbol ]]
|
- [[ formatLang(get_monthly_total()[6]) ]]
+ [[ formatLang(get_monthly_total()[6]) ]][[ company.currency_id.symbol ]]
|
- [[ formatLang(get_monthly_total()[7]) ]]
+ [[ formatLang(get_monthly_total()[7]) ]][[ company.currency_id.symbol ]]
|
- [[ formatLang(get_monthly_total()[8]) ]]
+ [[ formatLang(get_monthly_total()[8]) ]][[ company.currency_id.symbol ]]
|
- [[ formatLang(get_monthly_total()[9]) ]]
+ [[ formatLang(get_monthly_total()[9]) ]][[ company.currency_id.symbol ]]
|
- [[ formatLang(get_monthly_total()[10]) ]]
+ [[ formatLang(get_monthly_total()[10]) ]][[ company.currency_id.symbol ]]
|
- [[ formatLang(get_monthly_total()[11]) ]]
+ [[ formatLang(get_monthly_total()[11]) ]][[ company.currency_id.symbol ]]
|
- [[ formatLang(get_monthly_total()[12]) ]]
+ [[ formatLang(get_monthly_total()[12]) ]][[ company.currency_id.symbol ]]
|
- [[ formatLang(get_total()) ]]
+ [[ formatLang(get_total()) ]][[ company.currency_id.symbol ]]
|
@@ -579,4 +581,4 @@
-
+
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/report/account_analytic_profit.rml b/addons/hr_timesheet_invoice/report/account_analytic_profit.rml
index 0e6a12030f2..3cb4b150395 100644
--- a/addons/hr_timesheet_invoice/report/account_analytic_profit.rml
+++ b/addons/hr_timesheet_invoice/report/account_analytic_profit.rml
@@ -157,10 +157,12 @@
|
- [[ data['form']['date_from'] ]]
+ [[ formatLang (data['form']['date_from'],date=True)
+]]
|
- [[ data['form']['date_to'] ]]
+ [[ formatLang (data['form']['date_to'],date=True)
+ ]]
|
[[ company.currency_id.name ]]
diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 762d1e4b2a6..3a6ab81a308 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -23,7 +23,9 @@ import ir
import pooler
from report.interface import report_rml
from report.interface import toxml
-
+from tools import to_xml
+from report import report_sxw
+from datetime import datetime
from tools.translate import _
@@ -38,6 +40,9 @@ class report_custom(report_rml):
workcenter_pool = pool.get('mrp.workcenter')
user_pool = pool.get('res.users')
bom_pool = pool.get('mrp.bom')
+ rml_obj=report_sxw.rml_parse(cr, uid, product_pool._name,context)
+ rml_obj.localcontext.update({'lang':context.get('lang',False)})
+ company_currency = user_pool.browse(cr, uid, uid).company_id.currency_id
def process_bom(bom, currency_id, factor=1):
xml = ''
sum = 0
@@ -55,7 +60,7 @@ class report_custom(report_rml):
main_sp_name = "%s\r\n" %(prod.seller_id.name)
price = supplier_info_pool.price_get(cr, uid, prod.seller_id.id, prod.id, number*prod_qtty)[prod.seller_id.id]
price = product_uom_pool._compute_price(cr, uid, prod.uom_id.id, price, to_uom_id=product_uom.id)
- main_sp_price = '%.2f\r\n' %(price)
+ main_sp_price = """"""+rml_obj.formatLang(price)+' '+ company_currency.symbol+"""\r\n"""
sum += prod_qtty*price
std_price = product_uom_pool._compute_price(cr, uid, prod.uom_id.id, prod.standard_price, to_uom_id=product_uom.id)
main_strd_price = str(std_price) + '\r\n'
@@ -64,13 +69,12 @@ class report_custom(report_rml):
sellers += '- '+ seller_id.name.name +'\r\n'
price = supplier_info_pool.price_get(cr, uid, seller_id.name.id, prod.id, number*prod_qtty)[seller_id.name.id]
price = product_uom_pool._compute_price(cr, uid, prod.uom_id.id, price, to_uom_id=product_uom.id)
- sellers_price += """%.2f\r\n"""%(price)
- xml += """ %s
- %s
- %.2f
- %s
- %.2f
- %s'"""%(prod_name,main_sp_name + sellers ,prod_qtty, product_uom.name,float(main_strd_price),main_sp_price + sellers_price)
+ sellers_price += """"""+rml_obj.formatLang(price) +' '+ company_currency.symbol +"""\r\n"""
+ xml += """ """+ prod_name +"""
+ """+ main_sp_name + sellers + """
+ """+ rml_obj.formatLang(prod_qtty) +' '+ product_uom.name +"""
+ """+ rml_obj.formatLang(float(main_strd_price)) +' '+ company_currency.symbol +"""
+ """ + main_sp_price + sellers_price + """'"""
xml += ' '
return xml, sum, sum_strd
@@ -83,10 +87,9 @@ class report_custom(report_rml):
xml = ''
xml += "" + workcenter.name + ''
xml += ""
- xml += ""
- xml += """%.2f"""%(cost_cycle)
- xml += """%.2f"""%(cost_hour)
- xml += """%.2f"""%(cost_hour + cost_cycle)
+ xml += """"""+rml_obj.formatLang(cost_cycle)+' '+ company_currency.symbol + """"""
+ xml += """"""+rml_obj.formatLang(cost_hour)+' '+ company_currency.symbol + """"""
+ xml += """"""+rml_obj.formatLang(cost_hour + cost_cycle)+' '+ company_currency.symbol + """"""
xml += ' '
return xml, total
@@ -95,13 +98,13 @@ class report_custom(report_rml):
xml = ''
config_start = """
- %s
+ """ + to_xml(rml_obj.formatLang(datetime.now().strftime('%Y-%m-%d %H:%M:%S'),date_time=True)) + """
%s
210.00mm,297.00mm
595.27
841.88
- 55.00mm,55.00mm, 20.00mm, 22.00mm, 22.00mm, 25.00mm
- """ % (time.strftime('%m/%d/%Y %H:%M'),user_pool.browse(cr, uid, uid).company_id.name)
+ 55.00mm,58.00mm,29.00mm,29.00mm,29.00mm
+ """ % (user_pool.browse(cr, uid, uid).company_id.name)
config_stop = """
Generated by OpenERP
@@ -111,14 +114,13 @@ class report_custom(report_rml):
%s
-
%s
%s
%s
- """ % (_('Work Center name'), _('Cycles Cost'), _('Hourly Cost'),_('Work Cost'))
+ """ % (_('Work Center name'), _('Cycles Cost')+'('+company_currency.code+')', _('Hourly Cost')+'('+company_currency.code+')',_('Work Cost')+'('+company_currency.code+')')
prod_header = """
%s
@@ -126,11 +128,9 @@ class report_custom(report_rml):
%s
%s
%s
- %s
- """ % (_('Component'), _('Component suppliers'), _('Quantity'), _('Uom'), _('Cost Price per Uom'), _('Supplier Price per Uom'))
+ """ % (_('Component'), _('Component suppliers'), _('Quantity'),_('Cost Price per Uom')+'('+company_currency.code+')', _('Supplier Price per Uom')+'('+company_currency.code+')')
- company_currency = user_pool.browse(cr, uid, uid).company_id.currency_id.id
for product in product_pool.browse(cr, uid, ids, context=context):
bom_id = bom_pool._bom_find(cr, uid, product.id, product.uom_id.id)
title = "%s" %(_("Cost Structure"))
@@ -145,16 +145,14 @@ class report_custom(report_rml):
-
-
-
- -
"""
xml += """
- %s %s %s %s :
-
+ """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.code+')'+ """:
- %.2f
- %.2f
- '"""%(_('Total Cost'), _('of'), str(number), product.uom_id.name, total_strd, total)
+ """+ rml_obj.formatLang(total_strd) +' '+ company_currency.symbol + """
+ """+ rml_obj.formatLang(total) +' '+ company_currency.symbol + """
+ '"""
else:
bom = bom_pool.browse(cr, uid, bom_id, context=context)
factor = number * product.uom_id.factor / bom.product_uom.factor
@@ -169,20 +167,19 @@ class report_custom(report_rml):
}
xml_tmp = ''
for sub_bom in (sub_boms and sub_boms[0]) or [parent_bom]:
- txt, sum, sum_strd = process_bom(sub_bom, company_currency)
+ txt, sum, sum_strd = process_bom(sub_bom, company_currency.id)
xml_tmp += txt
total += sum
total_strd += sum_strd
xml += "" + xml_tmp + ''
xml += """
- %s %s %s %s :
-
+ """ + _('Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'(' + company_currency.code +')'+ """:
- %.2f
- %.2f
- '"""%(_('Cost'), _('of'), str(number), product.uom_id.name, total_strd, total)
+ """+ rml_obj.formatLang(total_strd) +' '+ company_currency.symbol + """
+ """+ rml_obj.formatLang(total) +' '+ company_currency.symbol + """
+ '"""
total2 = 0
xml_tmp = ''
@@ -194,27 +191,22 @@ class report_custom(report_rml):
xml += workcenter_header
xml += "" + xml_tmp + ''
xml += """
- %s %s %s %s :
+ """ + _('Work Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.code+')'+""":
-
- %.2f
- '"""%(_('Work Cost'), _('of'), str(number), product.uom_id.name, total2)
+ """+ rml_obj.formatLang(total2) +' '+ company_currency.symbol +"""
+ '"""
xml += """
- %s %s %s %s :
-
+ """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.code+')'+ """:
- %.2f
- %.2f
- '"""%(_('Total Cost'), _('of'), str(number), product.uom_id.name, total_strd+total2, total+total2)
+ """+ rml_obj.formatLang(total_strd+total2) +' '+ company_currency.symbol + """
+ """+ rml_obj.formatLang(total+total2) +' '+ company_currency.symbol + """
+ '"""
xml = '' + config_start + config_stop + xml + ''
return xml
report_custom('report.product.price', 'product.product', '', 'addons/mrp/report/price.xsl')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index 21ac0dec954..c71abb614cf 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -277,7 +277,7 @@
Unit Price
|
- Price([[ o.pricelist_id.currency_id. name ]])
+ Price([[ o.pricelist_id.currency_id. name ]])
|
@@ -307,9 +307,6 @@
-
-
-
Fees Line(s) [[ (o.fees_lines ==[] and removeParentNode('para') ) ]]
[[ repeatIn(o.fees_lines,'fees') ]]
diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index 0cc1c43520a..28f240c1070 100644
--- a/addons/point_of_sale/report/pos_lines.rml
+++ b/addons/point_of_sale/report/pos_lines.rml
@@ -186,13 +186,13 @@
[[ formatLang(l.qty) ]]
|
- [[ formatLang(l.price_unit) ]]
+ [[ formatLang(l.price_unit) ]][[o.pricelist_id.currency_id. symbol ]]
|
[[ formatLang(l.discount) ]]
|
- [[ formatLang(l.price_subtotal) ]]
+ [[ formatLang(l.price_subtotal) ]][[o.pricelist_id.currency_id. symbol ]]
|
@@ -223,7 +223,7 @@
Net Total
- [[ formatLang(o.amount_total) ]] [[o.pricelist_id.currency_id.code ]]
+ [[ formatLang(o.amount_total) ]] [[o.pricelist_id.currency_id.symbol ]]
|
@@ -251,7 +251,7 @@
Taxes
|
- [[ formatLang(o.amount_tax) ]] [[o.pricelist_id.currency_id.code ]]
+ [[ formatLang(o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]
|
@@ -279,7 +279,7 @@
Total
|
- [[ formatLang(o.amount_total + o.amount_tax) ]] [[o.pricelist_id.currency_id.code ]]
+ [[ formatLang(o.amount_total + o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]
|
diff --git a/addons/project_planning/report/report_planning.rml b/addons/project_planning/report/report_planning.rml
index 8a6fe372661..43dab8eb5b4 100644
--- a/addons/project_planning/report/report_planning.rml
+++ b/addons/project_planning/report/report_planning.rml
@@ -142,7 +142,7 @@
|
- [[ repeatIn(o.planning_user_ids , 'u') ]] [[ formatLang(u.user_id.name ]]
+ [[ repeatIn(o.planning_user_ids , 'u') ]] [[ u.user_id.name ]]
|
[[ formatLang(u.plan_tasks) ]]
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 0cf3111781a..317180c7209 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -1,6 +1,6 @@
-
+
@@ -124,6 +124,7 @@
|
+ Shipping Address :
[[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title) or '' ]] [[ picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.name ]]
[[ picking.address_id and picking.address_id.street or '' ]]
[[ (picking.address_id and picking.address_id.street2) or removeParentNode('para') ]]
@@ -132,6 +133,7 @@
[[ (picking.address_id and picking.address_id.country_id and picking.address_id.country_id.name) or '' ]]
|
+ Contact Address :
[[ picking.address_id and picking.address_id.title or '' ]] [[ picking.address_id and picking.address_id.name or '' ]]
[[ picking.address_id and picking.address_id.street or '' ]]
[[ (picking.address_id and picking.address_id.street2) or removeParentNode('para') ]]
@@ -147,9 +149,6 @@
-
-
-
@@ -160,9 +159,6 @@
-
-
-
|
| | | |