@@ -283,4 +287,4 @@
-
+
\ No newline at end of file
diff --git a/addons/point_of_sale/report/pos_payment_report_date.rml b/addons/point_of_sale/report/pos_payment_report_date.rml
index f83d985b6b4..b6b726d127f 100644
--- a/addons/point_of_sale/report/pos_payment_report_date.rml
+++ b/addons/point_of_sale/report/pos_payment_report_date.rml
@@ -2,7 +2,7 @@
-
+
@@ -10,35 +10,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -46,9 +40,8 @@
-
-
+
@@ -56,31 +49,24 @@
-
-
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
+
+
+
+
+
@@ -90,8 +76,8 @@
-
-
+
+
@@ -105,17 +91,18 @@
-
+
-
-
+ [[ repeatIn(objects,'order') ]]
+
-
+ Payment
+
-
+
|
Company
@@ -125,7 +112,7 @@
|
-
+
[[ company.name ]]
@@ -138,32 +125,31 @@
-
+
-
+
|
Product
|
- Qty
+ Qty
|
- Disc. (%)
+ Disc(%)
|
- Unit Price
+ Unit Price
|
- Total
+ Total
|
-
+ |
-
- [[ repeatIn(pos_payment_date(data['form']), 'line_ids') ]]
-
+ [[ repeatIn(pos_payment_date(data['form']), 'line_ids') ]]
+
|
[[ line_ids['name'] ]]
@@ -180,34 +166,36 @@
|
[[ formatLang(line_ids['total']) ]]
|
-
-
-
+
+
|
-
+
|
-
+
|
-
+
|
- Total :
+ Total
|
[[ formatLang(pos_payment_date_total(data['form'])) or removeParentNode('blockTable')]]
|
-
+
+
+
+
-
+
\ No newline at end of file
diff --git a/addons/project_planning/project_planning_report.xml b/addons/project_planning/project_planning_report.xml
index 2b71602f97c..6a60850124b 100644
--- a/addons/project_planning/project_planning_report.xml
+++ b/addons/project_planning/project_planning_report.xml
@@ -1,6 +1,10 @@
-
+
\ No newline at end of file
diff --git a/addons/project_planning/report/__init__.py b/addons/project_planning/report/__init__.py
index 9a6ca02408e..230f7e6a702 100644
--- a/addons/project_planning/report/__init__.py
+++ b/addons/project_planning/report/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,8 +15,8 @@
# 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 .
#
##############################################################################
-
+import report_planning
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_planning/report/report_planning.py b/addons/project_planning/report/report_planning.py
new file mode 100644
index 00000000000..67fd118491f
--- /dev/null
+++ b/addons/project_planning/report/report_planning.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# 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 .
+#
+##############################################################################
+
+import time
+
+from report import report_sxw
+
+class report_planning(report_sxw.rml_parse):
+ def __init__(self, cr, uid, name, context=None):
+ super(report_planning, self).__init__(cr, uid, name, context=context)
+ self.localcontext.update({
+ 'time': time,
+ })
+
+report_sxw.report_sxw('report.report_account_analytic.planning.print','report_account_analytic.planning','addons/project_planning/report/report_planning.rml',parser=report_planning, header='internal')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/project_planning/report/report_planning.rml b/addons/project_planning/report/report_planning.rml
index 976af76e9d6..711ba2f9e47 100644
--- a/addons/project_planning/report/report_planning.rml
+++ b/addons/project_planning/report/report_planning.rml
@@ -1,8 +1,8 @@
-
+
-
+
@@ -12,7 +12,7 @@
-
+
@@ -22,17 +22,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -53,15 +42,22 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
@@ -69,17 +65,10 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
@@ -88,8 +77,8 @@
+
-
[[ repeatIn(objects, 'o') ]]
@@ -98,21 +87,21 @@
- HR Planning
+ HR Planning
-
+
|
- Responsible: [[ o.user_id.name ]]
+ Responsible: [[ o.user_id.name ]]
|
- [[ o.name]]
+ [[ o.name]]
|
- From: [[ o.date_from ]]
- To: [[ o.date_to ]]
+ From: [[ formatLang(o.date_from,date=True) ]]
+ To: [[ formatLang(o.date_to,date=True) ]]
|
@@ -122,17 +111,17 @@
-
+
|
Summary by user
-
-
-
+
+
+
|
-
+
|
User
@@ -153,36 +142,36 @@
|
|
- [[ repeatIn(o.planning_user_ids , 'u') ]] [[ u.user_id.name ]]
+ [[ repeatIn(o.planning_user_ids , 'u') ]] [[ formatLang(u.user_id.name ]]
|
[[ formatLang(u.plan_tasks) ]]
|
- [[ formatLang(u.tasks) ]]
+ [[ formatLang(u.tasks) ]]
|
- [[ formatLang(u.free) ]]
+ [[ formatLang(u.free) ]]
|
- [[ formatLang(u.timesheet) ]]
+ [[ formatLang(u.timesheet) ]]
|
-
+
|
Summary by project
-
-
-
+
+
+
|
-
+
|
Project
@@ -203,7 +192,7 @@
|
|
- [[ repeatIn(o.planning_account , 'l') ]] [ [[ l.account_id.code ]] ] [[ l.account_id.name ]]
+ [[ repeatIn(o.planning_account , 'l') ]] [ [[ l.account_id.code ]] ] [[ l.account_id.name ]]
|
[[ formatLang(l.plan_tasks) ]]
@@ -223,4 +212,4 @@
-
+
\ No newline at end of file
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 3ef7ce2e866..720fb7c863f 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -125,16 +125,11 @@
- |
-
-
-
- |
[[ (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.zip or '' ]] [[ picking.address_id and picking.address_id.city or '']]
-
+
@@ -142,15 +137,7 @@
|
-
-
|
-
-
-
- |
-
- [[ picking.address_id and 'Shipping Address :' or removeParentNode('para') ]]
[[ ( 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.zip) or '' ]] [[ (picking.address_id and picking.address_id.city) or '' ]] [[ (picking.address_id and picking.address_id.state_id and picking.address_id.state_id.name) or '' ]]
@@ -273,8 +260,8 @@
-
-
+
+
[[ ([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting' )]) and 'Non Assigned Products:' or removeParentNode('para') ]]
[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]]
| | |