[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]
+ Shipping address :
[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]
[[ addr.title or '' ]] [[ addr.name ]]
[[ addr.street ]]
@@ -139,79 +142,80 @@
- [[ o.state=='draft' and 'Quotation ' or 'Order ' ]] N° : [[ o.name ]]
+ Request for Quotation [[ (o.state=='draft' or removeParentNode('font')) and '' ]]
+
+ Order [[ (o.state<>'draft' or removeParentNode('font')) and '' ]]
+ N° : [[ o.name ]]
+
+
- Our order reference : [[ o.ref or '' ]]
- Your order reference : [[ o.partner_ref or '' ]]
- Date ordered : [[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]]
- Validated by : [[ o.validator and o.validator.name or '' ]]
+ Project: [[ o.project_id and o.project_id.complete_name ]]
+ Our order reference : [[ o.ref or '' ]]
+ Your order reference : [[ o.partner_ref or '' ]]
+ Date ordered : [[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]]
+ Validated by : [[ o.validator and o.validator.name or '' ]]
-
+
- Product Description
+ Product Description
|
- Applicable Taxes
+ Applicable Taxes
|
- Date Promised
+ Date Requested
|
- Qty
+ Qty
|
- UoM
+ Unit Price
|
- Unit Price
- |
-
- Net Price
+ Net Price
|
- [[ repeatIn(o.order_line,'line') ]]
-
+ [[ repeatIn(o.order_line,'line') ]]
+
- [[ line.name ]]
+ [[ line.code ]]
+ [[ line.name ]]
|
- [[ ', '.join(map(lambda x: x.name, line.taxes_id))]]
+ [[ ', '.join(map(lambda x: x.name, line.taxes_id))]]
|
- [[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d')) ]]
+ [[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d')) ]]
|
- [[ line.product_qty ]]
+ [[ line.product_qty ]] [[ line.product_uom.name ]]
|
- [[ line.product_uom.name ]]
+ [[ '%.2f' % line.price_unit ]]
|
- [[ '%.2f' % line.price_unit ]]
- |
-
- [[ '%.2f' % line.price_subtotal ]]
+ [[ '%.2f' % line.price_subtotal ]]
|
- [[ repeatIn((line.notes and [line.notes]) or [], 'l') ]]
+ [[ repeatIn((line.notes and [line.notes]) or [], 'l') ]]
|
- [[ l or removeParentNode('table') ]]
+ [[ l or removeParentNode('table') ]]
|
-
+
|
@@ -224,57 +228,57 @@
-
+
|
- Net Total :
+ Net Total :
|
- [[ '%.2f' % o.amount_untaxed ]] [[ o.pricelist_id.currency_id.name ]]
+ [[ '%.2f' % o.amount_untaxed ]] [[ o.pricelist_id.currency_id.name ]]
|
-
+
|
- Taxes :
+ Taxes :
|
- [[ '%.2f' % o.amount_tax ]] [[ o.pricelist_id.currency_id.name ]]
+ [[ '%.2f' % o.amount_tax ]] [[ o.pricelist_id.currency_id.name ]]
|
-
+
|
- TOTAL :
+ TOTAL :
|
- [[ '%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]
- |
-
-
-
-
-
-
-
-
- [[ o.notes or '' ]] [[ setTag('para','xpre') ]]
+ [[ '%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]
|
+
+
+
+ [[ o.notes or '' ]] [[ setTag('para','xpre') ]]
+ |
+
+
+
+
+
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index fd63b62d76f..5aca5fbe652 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -25,7 +25,6 @@
-
@@ -84,12 +83,15 @@
- Shipping address :
+
+
+
|
[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]
+ Shipping address :
[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]
[[ addr.title or '' ]] [[ addr.name ]]
[[ addr.street ]]
@@ -139,6 +141,10 @@
|
Request for Quotation [[ o.name ]]
+
+
+
+ Our project: [[ o.project_id and o.project_id.complete_name or '/' ]]
Other reference : [[ o.ref or '' ]]
Printed: [[ time.strftime('%d/%m/%Y') ]]
@@ -148,11 +154,8 @@
-
+
-
- Code
- |
Product
|
@@ -166,13 +169,10 @@
[[ repeatIn(o.order_line,'line') ]]
-
+
- [[ line.product_id and line.product_id.default_code or '' ]]
- |
-
- [[ line.name ]]
+ [[ line.product_id and line.product_id.default_code or '' ]] - [[ line.name ]]
|
[[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d')) ]]
@@ -215,10 +215,10 @@
- [[ user.name ]]
- Tel: [[ user.address_id.phone ]]
- Email: [[ user.address_id.email ]]
- Fax: [[ user.address_id.fax ]]
+ [[ user.signature ]]
+
+
+
| |