diff --git a/addons/hr_attendance/report/attendance_errors.rml b/addons/hr_attendance/report/attendance_errors.rml
index 6df3084b862..1275677ee19 100644
--- a/addons/hr_attendance/report/attendance_errors.rml
+++ b/addons/hr_attendance/report/attendance_errors.rml
@@ -121,10 +121,10 @@
[[ att['action'] ]]
|
- [[ att['date'] ]]
+ [[ formatLang(att['date'],date_time=True) ]]
|
- [[ att['create_date'] ]]
+ [[ formatLang(att['create_date'],date_time=True) ]]
|
[[ att['delay'] ]]
diff --git a/addons/hr_payroll/report/payslip.rml b/addons/hr_payroll/report/payslip.rml
index 30f20d167c6..f07c1109ac6 100755
--- a/addons/hr_payroll/report/payslip.rml
+++ b/addons/hr_payroll/report/payslip.rml
@@ -1,6 +1,6 @@
-
+
@@ -270,8 +270,7 @@
|
- Pay Slip
- For the month of [[ get_month(o) ]]
+ Pay Slip
|
diff --git a/addons/mrp/report/bom_structure.py b/addons/mrp/report/bom_structure.py
index fa2f5835ae4..b38f2499c40 100644
--- a/addons/mrp/report/bom_structure.py
+++ b/addons/mrp/report/bom_structure.py
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
@@ -52,12 +52,12 @@ class bom_structure(report_sxw.rml_parse):
if level>0 and level<6:
level -= 1
return result
-
+
children = _get_rec(object,level)
-
+
return children
-report_sxw.report_sxw('report.bom.structure','mrp.bom','mrp/report/bom_structure.rml',parser=bom_structure)
+report_sxw.report_sxw('report.bom.structure','mrp.bom','mrp/report/bom_structure.rml',parser=bom_structure,header='internal')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/mrp/report/bom_structure.rml b/addons/mrp/report/bom_structure.rml
index 527c26d1581..93f2db207bc 100644
--- a/addons/mrp/report/bom_structure.rml
+++ b/addons/mrp/report/bom_structure.rml
@@ -1,8 +1,8 @@
-
+
-
+
diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml
index 5ed1af444f1..b394394bb31 100644
--- a/addons/mrp/report/order.rml
+++ b/addons/mrp/report/order.rml
@@ -20,12 +20,9 @@
+
-
-
-
-
@@ -37,12 +34,9 @@
+
-
-
-
-
@@ -189,7 +183,7 @@
-
+
|
Product
@@ -197,24 +191,18 @@
|
Quantity
|
-
- Priority
- |
Note
|
-
+
|
[[ o.product_id.code ]] [[ o.product_id.name ]]
|
- [[formatLang(o.product_qty) ]]
- |
-
- [[o.priority or '']]
+ [[formatLang(o.product_qty) ]] [[ o.product_uom.name ]]
|
[[ o.product_id.description or '' ]]
@@ -224,7 +212,7 @@
-
+
|
Planned Date
@@ -241,7 +229,7 @@
|
-
+
[[ formatLang(o.date_planned, date_time = True) ]]
@@ -386,4 +374,4 @@
-
+
\ No newline at end of file
diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index 7715f1b78be..44b73be6570 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
@@ -207,7 +207,7 @@ class pos_details(report_sxw.rml_parse):
'getinvoice':self._get_invoice,
})
-report_sxw.report_sxw('report.pos.details', 'pos.order', 'addons/point_of_sale_singer/report/pos_details.rml', parser=pos_details, header=None)
+report_sxw.report_sxw('report.pos.details', 'pos.order', 'addons/point_of_sale_singer/report/pos_details.rml', parser=pos_details, header='external')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index 10bfb2435dc..a86460116da 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -1,53 +1,57 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
@@ -55,342 +59,298 @@
-
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Detail of Sales
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Details of Sales
+
|
- Company
+ Company
|
- Print Date
+ Print Date
|
- Period
+ Period
|
-
+
|
[[ company.name ]]
|
- [[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]]
+ [[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]
|
[[ formatLang(getperiod(data['form']),date = True) ]] - [[ formatLang(getperiod2(data['form']),date = True) ]]
|
-
-
+
+
+
+
+
+ |
+ Date
+ |
+
+ Code
+ |
+
+ Product
+ |
+
+ Price
+ |
+
+ Qty
+ |
+
+ Disc
+ |
+
+ Invoiced
+ |
+
+
+
+
+ |
+ [[ pos_sales_details(data['form'],user) and '' or removeParentNode('blockTable') ]]
+ [[ repeatIn(pos_sales_details(data['form'],user), 'line_ids') ]] [[ formatLang(line_ids['date_order'],date_time = True) ]]
+ |
+
+ [[ line_ids['pos_name'] ]]
+ |
+
+ [[ line_ids['name'] ]]
+ |
+
+ [[ formatLang(line_ids['price_unit']) ]]
+ |
+
+ [[ formatLang(line_ids['qty']) ]]
+ |
+
+ [[ formatLang(line_ids['discount']) ]]
+ |
+
+ [[ getinvoice(line_ids['invoice_id'],user) or removeParentNode('font') ]]
+ |
+
+
+
+
+
+
+
+ |
+ Mode of Taxes
+ |
+
+
-
+ |
+
+
+ |
+ [[ repeatIn(gettaxamount(data['form'],user), 'p') ]][[ p['name'] or removeParentNode('tr') ]]
+ |
+
+ [[ formatLang(p['amount']) or removeParentNode('font') ]]
+ |
+
+
+
+
+ |
+ Mode of Payment
+ |
+
+
-
-
-
-
-
- | Date |
- Code |
- Product |
- Price |
- Qty |
- Disc |
- Invoiced |
-
-
-
- [[ repeatIn(pos_sales_details(data['form'],user), 'line_ids') ]]
-
-
- |
- [[ formatLang(line_ids['date_order'],date_time = True) ]]
- |
-
- [[ line_ids['pos_name'] ]]
- |
-
- [[ line_ids['name'] ]]
- |
-
- [[ formatLang(line_ids['price_unit']) ]]
- |
-
- [[ formatLang(line_ids['qty']) ]]
- |
-
- [[ formatLang(line_ids['discount']) ]]
- |
-
- [[ getinvoice(line_ids['invoice_id'],user) or removeParentNode('font') ]]
-
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
- |
-
- Mode of Taxes
-
- |
- |
-
- [[ repeatIn(gettaxamount(data['form'],user), 'p') ]]
- | [[ p['name'] or removeParentNode('tr') ]] |
- [[ formatLang(p['amount']) or removeParentNode('font') ]] |
-
-
-
-
-
- |
-
- Mode of payment
-
- |
- |
-
- [[ repeatIn(getpayments(data['form'],user), 'p') ]]
- | [[ p['name'] or removeParentNode('tr') ]] |
- [[ formatLang(p['sum']) or removeParentNode('tr') ]] |
-
-
-
-
-
-
-
-
+ |
+
+
+ |
+ [[ repeatIn(getpayments(data['form'],user), 'p') ]] [[ p['name'] or removeParentNode('tr') ]]
+ |
+
+ [[ formatLang(p['sum']) or removeParentNode('tr') ]]
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Summary
+ |
+
+
-
-
-
-
- |
- Summary |
-
-
- | Sales total |
-
- [[ formatLang(getsalestotal2(data['form'],user)) ]] |
-
-
- | Qty of product |
- [[ formatLang(getqtytotal2(data['form'],user)) ]] |
-
-
- | Total invoiced |
- [[ formatLang(getsuminvoice2(data['form'],user)) ]] |
-
-
-
- | Total paid |
- [[ formatLang(getpaidtotal2(data['form'],user)) ]] |
-
-
- | Total of the day |
- [[ formatLang(gettotalofthaday(data['form'])) ]] |
-
-
-
-
-
-
-
+ |
+
+
+
+
+ |
+ Sales total
+ |
+
+ [[ formatLang(getsalestotal2(data['form'],user)) ]]
+ |
+
+
+ |
+ Qty of product
+ |
+
+ [[ formatLang(getqtytotal2(data['form'],user)) ]]
+ |
+
+
+ |
+ Total invoiced
+ |
+
+ [[ formatLang(getsuminvoice2(data['form'],user)) ]]
+ |
+
+
+ |
+ Total discount
+ |
+
+ [[ formatLang(getsumdisc(objects)) ]]
+ |
+
+
+ |
+ Total paid
+ |
+
+ [[ formatLang(getpaidtotal2(data['form'],user)) ]]
+ |
+
+
+ |
+ Total of the day
+ |
+
+ [[ formatLang(gettotalofthaday(data['form'])) ]]
+ |
+
+
+
+
+
+
+
\ No newline at end of file
| | |