|
[[ formatLang(o.date_planned, date_time = True) ]]
@@ -261,7 +235,7 @@
- Work Orders [[ o.workcenter_lines ==[] and removeParentNode('para')]]
+ Work Orders [[ o.workcenter_lines ==[] and removeParentNode('para')]]
@@ -271,7 +245,7 @@
Sequence
|
- Name [[ o.workcenter_lines ==[] and removeParentNode('blockTable')]]
+ Name [[ o.workcenter_lines ==[] and removeParentNode('blockTable')]]
|
WorkCenter
@@ -316,7 +290,7 @@
-
+
Product
@@ -336,16 +310,13 @@
Products to Consume [[ o.move_lines ==[] and removeParentNode('section')]]
[[ repeatIn(o.move_lines,'line') ]]
-
+
|
[[ line.product_id.code ]] [[ line.product_id.name ]]
|
- [[ formatLang( line.product_qty) ]]
- |
-
- [[line.product_uom.name]]
+ [[ formatLang( line.product_qty) ]] [[ line.product_uom.name]]
|
[[ line.location_id.name ]]
@@ -361,16 +332,13 @@
Consumed Products [[ o.move_lines2 ==[] and removeParentNode('section')]]
[[ repeatIn(o.move_lines2,'line2') ]]
-
+
|
[[ line2.product_id.code ]] [[ line2.product_id.name ]]
|
- [[ formatLang( line2.product_qty) ]]
- |
-
- [[line2.product_uom.name]]
+ [[ formatLang( line2.product_qty) ]] [[ line2.product_uom.name]]
|
[[ line2.location_id.name ]]
@@ -386,4 +354,4 @@
-
+
\ No newline at end of file
diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 8890ed533d7..b639edb18ea 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -130,7 +130,7 @@ class report_custom(report_rml):
%s
%s
- """ % (_('Componet'), _('Componet suppliers'), _('Quantity'), _('Uom'), _('Cost Price per Uom'), _('Supplier Price per Uom'))
+ """ % (_('Component'), _('Component suppliers'), _('Quantity'), _('Uom'), _('Cost Price per Uom'), _('Supplier Price per Uom'))
company_currency = user_pool.browse(cr, uid, uid).company_id.currency_id.id
for product in product_pool.browse(cr, uid, ids, context=context):
diff --git a/addons/mrp_operations/report/mrp_code_barcode.rml b/addons/mrp_operations/report/mrp_code_barcode.rml
index 10440a45e11..bcc4fc54870 100755
--- a/addons/mrp_operations/report/mrp_code_barcode.rml
+++ b/addons/mrp_operations/report/mrp_code_barcode.rml
@@ -1,6 +1,6 @@
-
+
diff --git a/addons/mrp_operations/report/mrp_wc_barcode.rml b/addons/mrp_operations/report/mrp_wc_barcode.rml
index af0352ac80d..6d52cbcd070 100755
--- a/addons/mrp_operations/report/mrp_wc_barcode.rml
+++ b/addons/mrp_operations/report/mrp_wc_barcode.rml
@@ -1,6 +1,6 @@
-
+
diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index bb3e61ab4e7..c02ee80d816 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -1,6 +1,6 @@
-
+
diff --git a/addons/point_of_sale/report/account_statement.py b/addons/point_of_sale/report/account_statement.py
index fbfd72115ad..391adb7569f 100644
--- a/addons/point_of_sale/report/account_statement.py
+++ b/addons/point_of_sale/report/account_statement.py
@@ -37,4 +37,4 @@ class account_statement(report_sxw.rml_parse):
for line in statement_line_ids:
total += line.amount
return total
-report_sxw.report_sxw('report.account.statement', 'account.bank.statement', 'addons/statement/report/account_statement.rml', parser=account_statement)
+report_sxw.report_sxw('report.account.statement', 'account.bank.statement', 'addons/statement/report/account_statement.rml', parser=account_statement,header='internal')
diff --git a/addons/point_of_sale/report/account_statement.rml b/addons/point_of_sale/report/account_statement.rml
index 90d3fcf7d78..180e9d6a97b 100644
--- a/addons/point_of_sale/report/account_statement.rml
+++ b/addons/point_of_sale/report/account_statement.rml
@@ -1,6 +1,6 @@
-
+
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
index 137a46c4b45..dcbba147b59 100644
--- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
@@ -138,4 +138,4 @@ class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
res = self.cr.dictfetchall()
return res[0]['net_total'] or 0.0
-report_sxw.report_sxw('report.all.closed.cashbox.of.the.day', 'account.bank.statement', 'addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml', parser=all_closed_cashbox_of_the_day)
+report_sxw.report_sxw('report.all.closed.cashbox.of.the.day', 'account.bank.statement', 'addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml', parser=all_closed_cashbox_of_the_day,header='internal')
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
index 63bae7c798f..f75c08dbadb 100644
--- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
@@ -1,6 +1,6 @@
-
+
diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index 7715f1b78be..fd0eb54bc3f 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='internal')
# 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..1aaac4dbe3a 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
diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py
index 04e460ec6e5..2d1fd0b98c7 100644
--- a/addons/point_of_sale/report/pos_details_summary.py
+++ b/addons/point_of_sale/report/pos_details_summary.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 .
#
##############################################################################
@@ -128,7 +128,7 @@ report_sxw.report_sxw('report.pos.details_summary',
'pos.order',
'addons/point_of_sale/report/pos_details_summary.rml',
parser=pos_details_summary,
- header=None)
+ header='internal')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index 254f397b6b6..3981f389166 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -1,6 +1,6 @@
-
+
diff --git a/addons/point_of_sale/report/pos_lines.py b/addons/point_of_sale/report/pos_lines.py
index 3076e1b6741..ad855087cad 100644
--- a/addons/point_of_sale/report/pos_lines.py
+++ b/addons/point_of_sale/report/pos_lines.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,7 +52,7 @@ class pos_lines(report_sxw.rml_parse):
return res
-report_sxw.report_sxw('report.pos.lines', 'pos.order', 'addons/point_of_sale/report/pos_lines.rml', parser=pos_lines)
+report_sxw.report_sxw('report.pos.lines', 'pos.order', 'addons/point_of_sale/report/pos_lines.rml', parser=pos_lines,header='internal')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index 5ff85f5afd1..0cc1c43520a 100644
--- a/addons/point_of_sale/report/pos_lines.rml
+++ b/addons/point_of_sale/report/pos_lines.rml
@@ -1,6 +1,6 @@
-
+
@@ -73,14 +73,14 @@
-
-
+
+
-
-
-
-
-
+
+
+
+
+
@@ -90,8 +90,8 @@
-
-
+
+
@@ -106,14 +106,18 @@
+
-
[[repeatIn(objects,'o')]]
[[ setLang(o.partner_id.lang) ]]
+ Sales lines
+
+
+
@@ -283,4 +287,4 @@
-
+
\ No newline at end of file
diff --git a/addons/point_of_sale/report/pos_payment_report.py b/addons/point_of_sale/report/pos_payment_report.py
index d2f05f85a06..3d82025da89 100644
--- a/addons/point_of_sale/report/pos_payment_report.py
+++ b/addons/point_of_sale/report/pos_payment_report.py
@@ -61,7 +61,7 @@ class pos_payment_report(report_sxw.rml_parse):
return self.total
-report_sxw.report_sxw('report.pos.payment.report', 'pos.order', 'addons/point_of_sale/report/pos_payment_report.rml', parser=pos_payment_report)
+report_sxw.report_sxw('report.pos.payment.report', 'pos.order', 'addons/point_of_sale/report/pos_payment_report.rml', parser=pos_payment_report,header='internal')
diff --git a/addons/point_of_sale/report/pos_payment_report.rml b/addons/point_of_sale/report/pos_payment_report.rml
index ebe30bdf3bc..c1980e9e209 100644
--- a/addons/point_of_sale/report/pos_payment_report.rml
+++ b/addons/point_of_sale/report/pos_payment_report.rml
@@ -1,6 +1,6 @@
-
+
diff --git a/addons/point_of_sale/report/pos_payment_report_date.py b/addons/point_of_sale/report/pos_payment_report_date.py
index af64e45cff4..38f87d533f2 100644
--- a/addons/point_of_sale/report/pos_payment_report_date.py
+++ b/addons/point_of_sale/report/pos_payment_report_date.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 .
#
##############################################################################
import time
@@ -59,7 +59,7 @@ class pos_payment_report_date(report_sxw.rml_parse):
return res
-report_sxw.report_sxw('report.pos.payment.report.date', 'pos.order', 'addons/point_of_sale/report/pos_payment_report_date.rml', parser=pos_payment_report_date)
+report_sxw.report_sxw('report.pos.payment.report.date', 'pos.order', 'addons/point_of_sale/report/pos_payment_report_date.rml', parser=pos_payment_report_date,header='internal')
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..1f220e253ca 100644
--- a/addons/point_of_sale/report/pos_payment_report_date.rml
+++ b/addons/point_of_sale/report/pos_payment_report_date.rml
@@ -1,8 +1,8 @@
-
+
-
+
@@ -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/point_of_sale/report/pos_payment_report_user.py b/addons/point_of_sale/report/pos_payment_report_user.py
index e84b3b792cc..48ea148d8d1 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.py
+++ b/addons/point_of_sale/report/pos_payment_report_user.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 .
#
##############################################################################
import time
@@ -58,7 +58,7 @@ class pos_payment_report_user(report_sxw.rml_parse):
return res
-report_sxw.report_sxw('report.pos.payment.report.user', 'pos.order', 'addons/point_of_sale/report/pos_payment_report_user.rml', parser=pos_payment_report_user)
+report_sxw.report_sxw('report.pos.payment.report.user', 'pos.order', 'addons/point_of_sale/report/pos_payment_report_user.rml', parser=pos_payment_report_user,header='internal')
diff --git a/addons/point_of_sale/report/pos_payment_report_user.rml b/addons/point_of_sale/report/pos_payment_report_user.rml
index f3a9311e186..fc874e52dac 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.rml
+++ b/addons/point_of_sale/report/pos_payment_report_user.rml
@@ -1,6 +1,6 @@
-
+
diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index 313ba8cdb61..e722687f094 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -1,6 +1,6 @@
-
+
@@ -136,7 +136,7 @@
|
[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.f' % line.qty ]]
-
+
|
[[o.state=='cancel' and o.statement_ids and '-' or '']][[ '%.2f' % net(line.id) ]] [[ line and line.discount == 0.0 and removeParentNode('font') ]] ([[ '%.2f' % line.discount ]]%)
diff --git a/addons/point_of_sale/report/pos_receipt_bis.rml b/addons/point_of_sale/report/pos_receipt_bis.rml
index 1080a69ea65..ab8af5ca999 100644
--- a/addons/point_of_sale/report/pos_receipt_bis.rml
+++ b/addons/point_of_sale/report/pos_receipt_bis.rml
@@ -1,6 +1,6 @@
-
+
diff --git a/addons/point_of_sale/report/pos_receipt_with_remboursment.rml b/addons/point_of_sale/report/pos_receipt_with_remboursment.rml
index 01fa0e4ac1e..32dea8dcd48 100644
--- a/addons/point_of_sale/report/pos_receipt_with_remboursment.rml
+++ b/addons/point_of_sale/report/pos_receipt_with_remboursment.rml
@@ -1,6 +1,6 @@
-
+
diff --git a/addons/point_of_sale/report/pos_receipt_without_remboursment.rml b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
index 0eb0dba773a..4e3b8ec64e1 100644
--- a/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
+++ b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
@@ -1,6 +1,6 @@
-
+
diff --git a/addons/point_of_sale/report/pos_sales_user.py b/addons/point_of_sale/report/pos_sales_user.py
index b110e4e2d00..4032f035bdf 100644
--- a/addons/point_of_sale/report/pos_sales_user.py
+++ b/addons/point_of_sale/report/pos_sales_user.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 .
#
##############################################################################
import time
@@ -46,7 +46,7 @@ class pos_sales_user(report_sxw.rml_parse):
data = self.cr.dictfetchall()
return data
-report_sxw.report_sxw('report.pos.sales.user', 'pos.order', 'addons/point_of_sale/report/pos_sales_user.rml', parser=pos_sales_user)
+report_sxw.report_sxw('report.pos.sales.user', 'pos.order', 'addons/point_of_sale/report/pos_sales_user.rml', parser=pos_sales_user,header='internal')
diff --git a/addons/point_of_sale/report/pos_sales_user.rml b/addons/point_of_sale/report/pos_sales_user.rml
index b6a3dae9685..cb817035a46 100644
--- a/addons/point_of_sale/report/pos_sales_user.rml
+++ b/addons/point_of_sale/report/pos_sales_user.rml
@@ -1,6 +1,6 @@
-
+
diff --git a/addons/point_of_sale/report/pos_sales_user_today.py b/addons/point_of_sale/report/pos_sales_user_today.py
index 4362cc8928c..7c9b9b5a563 100644
--- a/addons/point_of_sale/report/pos_sales_user_today.py
+++ b/addons/point_of_sale/report/pos_sales_user_today.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 .
#
##############################################################################
import time
@@ -45,7 +45,7 @@ class pos_sales_user_today(report_sxw.rml_parse):
data = self.cr.dictfetchall()
return data
-report_sxw.report_sxw('report.pos.sales.user.today', 'pos.order', 'addons/point_of_sale/report/pos_sales_user_today.rml', parser=pos_sales_user_today)
+report_sxw.report_sxw('report.pos.sales.user.today', 'pos.order', 'addons/point_of_sale/report/pos_sales_user_today.rml', parser=pos_sales_user_today,header='internal')
diff --git a/addons/point_of_sale/report/pos_sales_user_today.rml b/addons/point_of_sale/report/pos_sales_user_today.rml
index 7db76e33ff4..39f6ddacb4c 100644
--- a/addons/point_of_sale/report/pos_sales_user_today.rml
+++ b/addons/point_of_sale/report/pos_sales_user_today.rml
@@ -1,6 +1,6 @@
-
+
diff --git a/addons/point_of_sale/report/pos_sales_user_today_current_user.py b/addons/point_of_sale/report/pos_sales_user_today_current_user.py
index bd728441be2..7f4a8f827f5 100644
--- a/addons/point_of_sale/report/pos_sales_user_today_current_user.py
+++ b/addons/point_of_sale/report/pos_sales_user_today_current_user.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 .
#
##############################################################################
import time
@@ -63,7 +63,7 @@ class pos_sales_user_today_current_user(report_sxw.rml_parse):
def _get_data_current_user_qty(self, user):
return self.qty
-report_sxw.report_sxw('report.pos.sales.user.today.current.user', 'pos.order', 'addons/point_of_sale/report/pos_sales_user_today_current_user.rml', parser=pos_sales_user_today_current_user)
+report_sxw.report_sxw('report.pos.sales.user.today.current.user', 'pos.order', 'addons/point_of_sale/report/pos_sales_user_today_current_user.rml', parser=pos_sales_user_today_current_user,header='internal')
diff --git a/addons/point_of_sale/report/pos_sales_user_today_current_user.rml b/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
index 469fc5cdd33..475d045252b 100644
--- a/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
+++ b/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
@@ -1,6 +1,6 @@
-
+
diff --git a/addons/point_of_sale/report/pos_users_product.py b/addons/point_of_sale/report/pos_users_product.py
index a61f753ce7d..3a284f1957f 100644
--- a/addons/point_of_sale/report/pos_users_product.py
+++ b/addons/point_of_sale/report/pos_users_product.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 .
#
##############################################################################
import time
@@ -61,4 +61,4 @@ class pos_user_product(report_sxw.rml_parse):
def _get_total(self):
return self.total
-report_sxw.report_sxw('report.pos.user.product', 'account.bank.statement', 'addons/statement/report/pos_users_product.rml', parser=pos_user_product)
+report_sxw.report_sxw('report.pos.user.product', 'account.bank.statement', 'addons/statement/report/pos_users_product.rml', parser=pos_user_product,header='internal')
diff --git a/addons/point_of_sale/report/pos_users_product.rml b/addons/point_of_sale/report/pos_users_product.rml
index cbb309ceef2..ef911861d85 100644
--- a/addons/point_of_sale/report/pos_users_product.rml
+++ b/addons/point_of_sale/report/pos_users_product.rml
@@ -1,6 +1,6 @@
-
+
diff --git a/addons/product/product_report.xml b/addons/product/product_report.xml
index ca4c3f4f356..6135fe64bca 100644
--- a/addons/product/product_report.xml
+++ b/addons/product/product_report.xml
@@ -4,7 +4,7 @@
).
#
@@ -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 .
#
##############################################################################
@@ -44,7 +44,8 @@ class product_pricelist(report_sxw.rml_parse):
qtys = 1
for i in range(1,6):
- vals['qty'+str(qtys)] = form['qty'+str(i)]
+ if form['qty'+str(i)]!=0:
+ vals['qty'+str(qtys)] = str(form['qty'+str(i)]) + ' units'
qtys += 1
lst.append(vals)
return lst
diff --git a/addons/product/report/product_pricelist.rml b/addons/product/report/product_pricelist.rml
index 7ce4ca4e19d..65d0c671fa8 100644
--- a/addons/product/report/product_pricelist.rml
+++ b/addons/product/report/product_pricelist.rml
@@ -1,6 +1,6 @@
-
+
@@ -13,10 +13,30 @@
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
@@ -27,26 +47,31 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
@@ -99,85 +124,68 @@
+
-
+
-
+ Price List
+
-
-
-
-
-
-
-
-
-
-
+
|
- Products Price List
+ Price List Name
+ |
+
+ Currency
+ |
+
+ Printing Date
|
-
-
-
-
+
|
- Price List Name:
+ [[ get_pricelist(data['form']['price_list']) ]]
|
- [[ get_pricelist(data['form']['price_list']) ]]
- |
-
-
- |
- Currency :
+ [[ get_currency ( data['form']['price_list']) ]]
|
- [[ get_currency ( data['form']['price_list']) ]]
- |
-
-
- |
- Printing Date :
- |
-
- [[ formatLang(time.strftime('%Y-%m-%d'), date=True) ]]
+ [[ formatLang(time.strftime('%Y-%m-%d'), date=True) ]]
|
-
+
-
+
-
+
|
Description
- [[repeatIn(get_titles(data['form']), 'k')]]
+ [[repeatIn(get_titles(data['form']), 'k')]]
|
- [[ k['qty1'] or removeParentNode('font') ]] units
+ [[ (k.has_key('qty1') and k['qty1']) or '' ]]
|
- [[ k['qty2'] or removeParentNode('font') ]] units
+ [[ (k.has_key('qty2') and k['qty2']) or '' ]]
|
- [[ k['qty3'] or removeParentNode('font') ]] units
+ [[ (k.has_key('qty3') and k['qty3']) or '' ]]
|
- [[ k['qty4'] or removeParentNode('font') ]] units
+ [[ (k.has_key('qty4') and k['qty4']) or '' ]]
|
- [[ k['qty5'] or removeParentNode('font') ]] units
+ [[ (k.has_key('qty5') and k['qty5']) or '' ]]
|
@@ -199,26 +207,26 @@
- [[repeatIn(c['products'], 'p')]]
-
+ [[repeatIn(c['products'], 'p')]]
+
|
[[ p['code'] and '[' + p['code'] + '] ' or '' ]] [[ p['name'] ]]
|
- [[ p['qty1'] or removeParentNode('font') ]]
+ [[ (p.has_key('qty1') and p['qty1']) or '' ]]
|
- [[ p['qty2'] or removeParentNode('font') ]]
+ [[ (p.has_key('qty2') and p['qty2']) or '' ]]
|
- [[ p['qty3'] or removeParentNode('font') ]]
+ [[ (p.has_key('qty3') and p['qty3']) or '' ]]
|
- [[ p['qty4'] or removeParentNode('font') ]]
+ [[ (p.has_key('qty4') and p['qty4']) or '' ]]
|
- [[ p['qty5'] or removeParentNode('font') ]]
+ [[ (p.has_key('qty5') and p['qty5']) or '' ]]
|
@@ -226,9 +234,6 @@
-
-
-
\ No newline at end of file
diff --git a/addons/product/wizard/product_price.py b/addons/product/wizard/product_price.py
index efca2fb6cc1..4681f28d71b 100644
--- a/addons/product/wizard/product_price.py
+++ b/addons/product/wizard/product_price.py
@@ -21,11 +21,11 @@
from osv import osv, fields
from tools.translate import _
-
+
class product_price_list(osv.osv_memory):
_name = 'product.price_list'
- _description = 'Product Price List'
+ _description = 'Price List'
_columns = {
'price_list': fields.many2one('product.pricelist', 'PriceList', required=True),
@@ -36,11 +36,11 @@ class product_price_list(osv.osv_memory):
'qty5': fields.integer('Quantity-5'),
}
_defaults = {
- 'qty1': lambda *a: 0,
- 'qty2': lambda *a: 0,
- 'qty3': lambda *a: 0,
- 'qty4': lambda *a: 0,
- 'qty5': lambda *a: 0,
+ 'qty1': 1,
+ 'qty2': 5,
+ 'qty3': 10,
+ 'qty4': 0,
+ 'qty5': 0,
}
def print_report(self, cr, uid, ids, context=None):
@@ -58,6 +58,6 @@ class product_price_list(osv.osv_memory):
'report_name': 'product.pricelist',
'datas': datas,
}
-product_price_list()
+product_price_list()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml
index bd5b06e30a1..91fb931b6fa 100644
--- a/addons/product/wizard/product_price_view.xml
+++ b/addons/product/wizard/product_price_view.xml
@@ -9,7 +9,7 @@
product.price_list
form
- |
[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]
- [[ o.partner_address_id.title or '' ]] [[ o.partner_address_id.name ]]
[[ o.partner_address_id.street ]]
- [[ o.partner_address_id.street2 or '' ]]
+ [[ o.partner_address_id.street2 or removeParentNode('para') ]]
[[ o.partner_address_id.zip or '' ]] [[ o.partner_address_id.city or '' ]]
- [[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or '' ]]
+ [[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or removeParentNode('para')]]
[[ o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]]
@@ -264,7 +256,7 @@
[[repeatIn(o.order_line,'line')]]
-
+
|
[[ line.name ]]
@@ -273,22 +265,16 @@
[[ ', '.join(map(lambda x: x.name, line.taxes_id)) ]]
|
- [[ formatLang( line.date_planned, date_time=True) ]]
+ [[ formatLang( line.date_planned, date=True) ]]
|
- [[ formatLang(line.product_qty ) ]]
- |
-
- [[ line.product_uom.name ]]
+ [[ formatLang(line.product_qty ) ]] [[ line.product_uom.name ]]
|
[[ formatLang(line.price_unit ) ]]
|
- [[ formatLang(line.price_subtotal ) ]]
- |
-
- [[ o.pricelist_id.currency_id.name ]]
+ [[ formatLang(line.price_subtotal ) ]] [[ o.pricelist_id.currency_id.symbol ]]
|
@@ -320,20 +306,10 @@
- |
-
-
-
- |
-
-
-
-
- |
-
+
|
@@ -344,10 +320,7 @@
Net Total :
|
- [[ formatLang(o.amount_untaxed ) ]]
- |
-
- [[ o.pricelist_id.currency_id.name ]]
+ [[ formatLang(o.amount_untaxed ) ]] [[ o.pricelist_id.currency_id. symbol ]]
|
@@ -360,10 +333,7 @@
Taxes :
|
- [[ formatLang(o.amount_tax) ]]
- |
-
- [[ o.pricelist_id.currency_id.name ]]
+ [[ formatLang(o.amount_tax) ]] [[ o.pricelist_id.currency_id. symbol ]]
|
@@ -376,10 +346,7 @@
Total :
|
- [[ formatLang(o.amount_total ) ]]
- |
-
- [[ o.pricelist_id.currency_id.name ]]
+ [[ formatLang(o.amount_total ) ]] [[ o.pricelist_id.currency_id. symbol ]]
|
@@ -397,4 +364,4 @@
-
+
\ No newline at end of file
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index 961ce8239b4..ed2f1859f79 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -1,6 +1,6 @@
-
+
@@ -33,16 +33,16 @@
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -66,8 +66,8 @@
+
-
[[repeatIn(objects,'order')]]
[[ setLang(order.partner_id.lang) ]]
@@ -80,7 +80,7 @@
[[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.street) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.street) or '']]
[[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.street2) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.street2) or '']]
[[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.zip) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.zip) or '' ]] [[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.city) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.city) or '' ]]
- [[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.state_id and order.dest_address_id.state_id.name) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.state_id and order.warehouse_id.partner_address_id.state_id.name) or '']] [[(order.dest_address_id and order.dest_address_id and order.dest_address_id.country_id and order.dest_address_id.country_id.name) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.country_id and order.warehouse_id.partner_address_id.country_id.name) or '' ]]
+ [[(order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.state_id and order.warehouse_id.partner_address_id.state_id.name) or order.partner_address_id and order.partner_address_id.state_id and order.partner_address_id.state_id.name]] [[(order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.country_id and order.warehouse_id.partner_address_id.country_id.name) or order.partner_address_id.country_id.name ]]
|
@@ -88,7 +88,7 @@
|
- [[ order.partner_id.name ]] [[ order.partner_id.title or '' ]]
+ [[ (order.partner_id and order.partner_id.title) or '' ]] [[ order.partner_id.name ]]
[[ (order.partner_address_id and order.partner_address_id.title) or '' ]] [[ order.partner_address_id.name ]]
[[ (order.partner_address_id and order.partner_address_id.street) or '']] [[ order.partner_address_id.street2 ]]
[[ (order.partner_address_id and order.partner_address_id.zip) or '' ]] [[ (order.partner_address_id and order.partner_address_id.city) or '' ]]
@@ -124,13 +124,13 @@
[[repeatIn(order.order_line,'order_line')]]
-
+
|
[[ order_line.name ]]
|
- [[ formatLang(order_line.date_planned, date_time = True) ]]
+ [[ formatLang(order_line.date_planned, date = True) ]]
|
[[ formatLang(order_line.product_qty )]]
@@ -146,9 +146,7 @@
|
-
-
-
+
[[ format(order.notes or '') ]]
@@ -162,4 +160,4 @@
[[ user.signature or '' ]]
-
+
\ No newline at end of file
diff --git a/addons/report_intrastat/report/invoice.rml b/addons/report_intrastat/report/invoice.rml
index 4c3bfd5d2c4..8e4f92da708 100644
--- a/addons/report_intrastat/report/invoice.rml
+++ b/addons/report_intrastat/report/invoice.rml
@@ -1,6 +1,6 @@
-
+
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 5f535a05371..4dc61188e19 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -1,6 +1,6 @@
-
+
@@ -68,7 +68,6 @@
-
@@ -76,14 +75,12 @@
-
-
@@ -136,19 +133,21 @@
Shipping address :
[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]
- [[ o.partner_shipping_id.title or '' ]] [[ o.partner_shipping_id.name ]]
[[ o.partner_shipping_id.street ]]
- [[ o.partner_shipping_id.street2 or '' ]]
+ [[ o.partner_shipping_id.street2 or removeParentNode('para') ]]
[[ o.partner_shipping_id.zip or '' ]] [[ o.partner_shipping_id.city or '' ]]
- [[ o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name or '' ]] [[ o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name or '' ]]
+ [[ (o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name) or removeParentNode('para') ]]
+ [[ (o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name) or '' ]]
Invoice address :
[[ o.partner_invoice_id.title or '' ]] [[ o.partner_invoice_id.name or '' ]]
- [[ o.partner_invoice_id.street ]] [[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]]
+ [[ o.partner_invoice_id.street ]]
+ [[ (o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2)) or removeParentNode('para') ]]
[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]]
- [[ o.partner_invoice_id.state_id and o.partner_invoice_id.state_id.name or '' ]][[ o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '' ]]
+ [[ (o.partner_invoice_id.state_id and o.partner_invoice_id.state_id.name) or removeParentNode('para') ]]
+ [[ o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '' ]]
|
@@ -157,11 +156,10 @@
|
[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]
- [[ o.partner_order_id.title or '' ]] [[ o.partner_order_id.name ]]
[[ o.partner_order_id.street ]]
- [[ o.partner_order_id.street2 or '' ]]
+ [[ o.partner_order_id.street2 or removeParentNode('para') ]]
[[ o.partner_order_id.zip or '' ]] [[ o.partner_order_id.city or '' ]]
- [[ o.partner_order_id.state_id and o.partner_order_id.state_id.name or '' ]] [[ o.partner_order_id.country_id and o.partner_order_id.country_id.name or '' ]]
+ [[ (o.partner_order_id.state_id and o.partner_order_id.state_id.name) or removeParentNode('para')]] [[ (o.partner_order_id.country_id and o.partner_order_id.country_id.name) or '' ]]
@@ -218,7 +216,7 @@
-
+
|
Description
@@ -236,13 +234,13 @@
Disc.(%)
|
- Price
+ Price
|
[[repeatIn(o.order_line,'line')]]
-
+
|
[[ line.name ]]
@@ -263,10 +261,7 @@
[[ formatLang(line.discount) ]]
|
- [[ formatLang(line.price_subtotal ) ]]
- |
-
- [[ o.pricelist_id.currency_id.name ]]
+ [[ formatLang(line.price_subtotal ) ]] [[ o.pricelist_id.currency_id.symbol ]]
|
@@ -303,15 +298,10 @@
- |
-
-
-
- |
-
+
|
@@ -322,10 +312,7 @@
Net Total :
|
- [[ formatLang(o.amount_untaxed ) ]]
- |
-
- [[ o.pricelist_id.currency_id.name ]]
+ [[ formatLang(o.amount_untaxed ) ]] [[ o.pricelist_id.currency_id. symbol ]]
|
@@ -338,10 +325,7 @@
Taxes :
|
- [[ formatLang(o.amount_tax ) ]]
- |
-
- [[ o.pricelist_id.currency_id.name ]]
+ [[ formatLang(o.amount_tax ) ]] [[ o.pricelist_id.currency_id. symbol ]]
|
@@ -354,10 +338,7 @@
Total :
|
- [[ formatLang(o.amount_total ) ]]
- |
-
- [[ o.pricelist_id.currency_id.name ]]
+ [[ formatLang(o.amount_total ) ]] [[ o.pricelist_id.currency_id. symbol ]]
|
diff --git a/addons/sale/report/sale_prepare_allot.rml b/addons/sale/report/sale_prepare_allot.rml
index 97ee442fd7a..e39bf0674fa 100644
--- a/addons/sale/report/sale_prepare_allot.rml
+++ b/addons/sale/report/sale_prepare_allot.rml
@@ -1,6 +1,6 @@
-
+
diff --git a/addons/sale_layout/report/order.rml b/addons/sale_layout/report/order.rml
index 8c7cfaa0d2d..cde59d18e02 100755
--- a/addons/sale_layout/report/order.rml
+++ b/addons/sale_layout/report/order.rml
@@ -1,6 +1,6 @@
-
+
diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml
index fe2f15ebf42..e98edd38d99 100755
--- a/addons/sale_layout/report/report_sale_layout.rml
+++ b/addons/sale_layout/report/report_sale_layout.rml
@@ -1,6 +1,6 @@
-
+
@@ -292,7 +292,7 @@
|
|
-
+
[[ repeatIn(sale_order_lines(o),'a') ]]
@@ -336,7 +336,7 @@
|
-
+
[[ a['note']=='' and removeParentNode('blockTable') ]][[ repeatIn(( a['note'] and a['note'].splitlines()) or [], 'note') ]]
|
diff --git a/addons/stock/report/lot_location.rml b/addons/stock/report/lot_location.rml
index c7524d13691..ecbe9fec9fa 100644
--- a/addons/stock/report/lot_location.rml
+++ b/addons/stock/report/lot_location.rml
@@ -1,6 +1,6 @@
-
+
diff --git a/addons/stock/report/lot_overview.rml b/addons/stock/report/lot_overview.rml
index b26c9842636..f0495ba99ee 100644
--- a/addons/stock/report/lot_overview.rml
+++ b/addons/stock/report/lot_overview.rml
@@ -1,6 +1,6 @@
-
+
diff --git a/addons/stock/report/lot_overview_all.py b/addons/stock/report/lot_overview_all.py
index 5e6bba84d23..c523b9775d1 100644
--- a/addons/stock/report/lot_overview_all.py
+++ b/addons/stock/report/lot_overview_all.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 .
#
##############################################################################
import pooler
@@ -44,12 +44,12 @@ class lot_overview_all(report_sxw.rml_parse):
return [data]
def _price_total(self):
- return str( self.price_total)
+ return self.price_total
def _grand_total(self):
- return str( self.grand_total)
+ return self.grand_total
-report_sxw.report_sxw('report.lot.stock.overview_all', 'stock.location', 'addons/stock/report/lot_overview_all.rml', parser=lot_overview_all)
+report_sxw.report_sxw('report.lot.stock.overview_all', 'stock.location', 'addons/stock/report/lot_overview_all.rml', parser=lot_overview_all,header='internal')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report/lot_overview_all.rml b/addons/stock/report/lot_overview_all.rml
index 80c40590164..5fb67ca24c1 100644
--- a/addons/stock/report/lot_overview_all.rml
+++ b/addons/stock/report/lot_overview_all.rml
@@ -1,6 +1,6 @@
-
+
@@ -10,7 +10,7 @@
-
+
@@ -18,36 +18,27 @@
-
-
-
-
+
-
-
-
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
@@ -58,38 +49,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -105,221 +78,137 @@
-
+
+
-
+
+
+
+ Location Content
+
+
+
+
+
+ |
+ Location / Product
+ |
+
+ Variants
+ |
+
+ Quantity
+ |
+
+ Unit Price
+ |
+
+ Value([[ company.currency_id.name ]])
+ |
+
+
[[ repeatIn(objects,'o') ]]
[[ repeatIn(process(o.id),'ob') ]]
-
+
|
- [[ (not ob['product']) and removeParentNode('blockTable') ]] Location
+ [[ ob['location_name'] ]]
|
- Code
- |
-
- Product
- |
-
- Variants
- |
-
- Amount
- |
-
- UoM
- |
-
- Unit Price
- |
-
- Value
- |
-
-
-
-
-
-
-
- |
- [[ (not ob['product']) and removeParentNode('blockTable') ]] [[ ob['location_name'] ]]
- |
-
-
+
|
-
+
|
-
+
|
-
+
|
-
-
-
- |
-
-
-
-
- |
-
-
+
|
-
-
-
[[ repeatIn(ob['product'],'p') ]]
-
+
|
-
+
|
- [[ p['code'] ]]
+ [ [[ p['code'] ]] ] [[ p['prod_name'] ]]
|
- [[ p['prod_name'] ]]
+ [[ p['variants'] ]]
|
- [[ p['variants'] ]]
+ [[formatLang( p['prod_qty']) ]] [[ p['uom'] ]]
|
- [[ p['prod_qty'] ]]
+ [[ formatLang(p['price']) ]]
|
- [[ p['uom'] ]]
- |
-
- [[ p['price'] ]]
- |
-
- [[ p['price_value'] ]]
+ [[ formatLang(p['price_value']) ]] [[ o.company_id.currency_id.symbol]]
|
-
-
-
-
+
|
- [[ (not ob['product']) and removeParentNode('blockTable') ]]
- |
-
- Total:
- |
-
-
+
|
-
-
-
+ Total:
|
-
-
-
- |
-
-
-
-
- |
-
-
-
-
- |
-
- [[ price_total() ]]
+ [[ formatLang(price_total()) ]] [[ o.company_id.currency_id.symbol ]]
|
-
-
-
-
-
-
-
-
-
-
+
|
- Grand Total:
+ Grand Total:
|
-
+
|
-
-
-
- |
-
-
-
-
- |
-
-
-
-
- |
-
-
-
-
- |
-
-
-
-
- |
-
- [[ grand_total_price() ]]
+ [[ formatLang(grand_total_price()) ]] [[ o.company_id.currency_id.symbol ]]
|
-
+
-
+
\ No newline at end of file
diff --git a/addons/stock/report/packing.rml b/addons/stock/report/packing.rml
index 7288615da6d..15fa35e07e9 100644
--- a/addons/stock/report/packing.rml
+++ b/addons/stock/report/packing.rml
@@ -1,6 +1,6 @@
-
+
@@ -136,7 +136,7 @@
[[ (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 '']]
-
+
@@ -276,7 +276,7 @@
-
+
[[ ([line for line in picking.move_lines if (line.state == 'draft' )]) and 'Non Assigned Products:' or removeParentNode('para') ]]
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 3ef7ce2e866..3b837f51844 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -1,6 +1,6 @@
-
+
@@ -97,7 +97,7 @@
-
+
@@ -125,35 +125,20 @@
- |
-
-
-
- |
[[ (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') ]]
[[ 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 removeParentNode('para') ]]
+ [[ (picking.address_id and picking.address_id.country_id and picking.address_id.country_id.name) or '' ]]
|
- [[ 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.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 '' ]]
+ [[ (picking.address_id and picking.address_id.street2) or removeParentNode('para') ]]
+ [[ (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 removeParentNode('para') ]]
[[ (picking.address_id and picking.address_id.country_id and picking.address_id.country_id.name) or '' ]]
|
@@ -208,14 +193,14 @@
[[ formatLang(picking.min_date,date_time = True) ]]
|
- [[ 'weight' in picking._columns.keys() and picking.weight or '']]
+ [[ 'weight' in picking._columns.keys() and picking.weight or '']]
|
-
+
|
Description
@@ -227,22 +212,16 @@
State
|
- Quantity
+ Quantity
|
Location
|
-
-
-
-
-
-
[[ repeatIn([line for line in picking.move_lines if (line.state == 'confirmed' or line.state=='done' or line.state=='assigned')],'move_lines') ]]
- [[ picking.move_lines or removeParentNode('blockTable')]]
+ [[ picking.move_lines or removeParentNode('blockTable')]]
|
[ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ] [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']]
@@ -257,28 +236,20 @@
[[ move_lines.product_qty ]]
|
- [[ move_lines.product_uom.name ]]
+ [[ move_lines.product_uom.name ]]
|
- [[ (move_lines.location_id and move_lines.location_id.name) or '' ]]
+ [[ (move_lines.location_id and move_lines.location_id.name) or '' ]]
|
-
-
-
-
-
-
-
-
-
-
-
+
+
+
[[ ([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') ]]
- [[ picking.move_lines or removeParentNode('blockTable')]]
+ [[ picking.move_lines or removeParentNode('blockTable')]]
|
[ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ] [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']]
@@ -293,16 +264,13 @@
[[ move_lines.product_qty ]]
|
- [[ move_lines.product_uom.name ]]
+ [[ move_lines.product_uom.name ]]
|
- [[ (move_lines.location_id and move_lines.location_id.name) or '' ]]
+ [[ (move_lines.location_id and move_lines.location_id.name) or '' ]]
|
-
-
-
diff --git a/addons/stock/report/stock_inventory_move.rml b/addons/stock/report/stock_inventory_move.rml
index cd82cc4312a..285c9bf3a86 100755
--- a/addons/stock/report/stock_inventory_move.rml
+++ b/addons/stock/report/stock_inventory_move.rml
@@ -1,6 +1,6 @@
-
+
@@ -18,20 +18,27 @@
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -61,7 +68,7 @@
-
+
@@ -98,9 +105,6 @@
-
-
-
@@ -113,35 +117,45 @@
|
|
-
+
|
-
+
|
- Inventory
- |
-
- Date
- |
-
-
- |
- [[ o.name ]] |
- [[ formatLang(o.date,date=True) ]]
+
+
+
|
-
+
+
+ |
+ Inventory
+ |
+
+ Date
+ |
+
+
+
+
+ |
+ [[ o.name ]]
+ |
+
+ [[ formatLang(o.date,date_time=True) ]]
+ |
+
+
+
-
-
-
-
+
Location
@@ -165,7 +179,7 @@
[[ repeatIn(o.inventory_line_id, 'p') ]]
-
+
[[ p.location_id.name ]]
@@ -208,4 +222,4 @@
-
+
\ No newline at end of file
diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py
index da724586a4f..560212ccb09 100644
--- a/addons/survey/report/survey_analysis_report.py
+++ b/addons/survey/report/survey_analysis_report.py
@@ -24,14 +24,35 @@ import pooler
from report.interface import report_rml
from tools import to_xml
import tools
+import time
+from report import report_sxw
class survey_analysis(report_rml):
def create(self, cr, uid, ids, datas, context):
+
+ surv_obj = pooler.get_pool(cr.dbname).get('survey')
+ user_obj = pooler.get_pool(cr.dbname).get('res.users')
+ rml_obj=report_sxw.rml_parse(cr, uid, surv_obj._name,context)
+ company=user_obj.browse(cr,uid,[uid],context)[0].company_id
+
rml ="""
-
-
-
-
+
+
+
+
+
+
+
+ """+to_xml(rml_obj.formatLang(time.strftime("%Y-%m-%d %H:%M:%S"),date_time=True))+"""
+
+ """+ to_xml(company.name) +"""
+
+ /
+
+
+ 1.3cm 28.1cm 20cm 28.1cm
+
+
@@ -95,15 +116,15 @@ class survey_analysis(report_rml):
- Answer Summary
+ Answer Summary
"""
- surv_obj = pooler.get_pool(cr.dbname).get('survey')
+
if datas.has_key('form') and datas['form']['survey_ids']:
ids = datas['form']['survey_ids']
-
+
for survey in surv_obj.browse(cr, uid, ids):
rml += """
@@ -130,13 +151,16 @@ class survey_analysis(report_rml):
""" + str(survey.tot_comp_survey) + """
- """
+
+
+
+ """
for page in survey.page_ids:
rml += """
-#
-# | Page :- """ + to_xml(tools.ustr(page.title)) + """ |
-#
-# """
+
+ | Page :- """ + to_xml(tools.ustr(page.title)) + """ |
+
+ """
for que in page.question_ids:
rml +="""
| | | | |