summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsve-openerp <sve@odoo.com>2014-11-13 13:54:49 +0100
committerMartin Trigaux <mat@odoo.com>2014-12-10 14:28:20 +0100
commit182adcdcd6e7d1646f7386c872dfd63dc8bf861a (patch)
tree3590a690afd7613af349b2bc4e8e71e9499b7e94
parent52fe671e6162b1a353f1b969d8684b0ca5450b88 (diff)
[FIX] account,sale: show payment term & fiscal position notes in reports
Complete commit 3d88a60 Display payment terms or fiscal position note instead of simple the name. Fixes #3635
-rw-r--r--addons/account/views/report_invoice.xml6
-rw-r--r--addons/sale/views/report_saleorder.xml4
2 files changed, 5 insertions, 5 deletions
diff --git a/addons/account/views/report_invoice.xml b/addons/account/views/report_invoice.xml
index 3c369ce7daa..9b3111f0b84 100644
--- a/addons/account/views/report_invoice.xml
+++ b/addons/account/views/report_invoice.xml
@@ -139,9 +139,9 @@
<strong>Payment Term:</strong>
<span t-field="o.payment_term.note"/>
</p>
- <p t-if="o.fiscal_position">
- <strong>Fiscal Position:</strong>
- <span t-field="o.fiscal_position"/>
+ <p t-if="o.fiscal_position.note">
+ <strong>Fiscal Position Remark:</strong>
+ <span t-field="o.fiscal_position.note"/>
</p>
</div>
</t>
diff --git a/addons/sale/views/report_saleorder.xml b/addons/sale/views/report_saleorder.xml
index 9464a130ef9..ca2e3a45b71 100644
--- a/addons/sale/views/report_saleorder.xml
+++ b/addons/sale/views/report_saleorder.xml
@@ -117,9 +117,9 @@
</div>
<p t-field="o.note" />
- <p t-if="o.payment_term">
+ <p t-if="o.payment_term.note">
<strong>Payment Term:</strong>
- <span t-field="o.payment_term"/>
+ <span t-field="o.payment_term.note"/>
</p>
<div class="oe_structure"/>
</div>