From 032122484e78819cfa6ac9dc89a8d9dcf02dab01 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Tue, 5 Jul 2016 08:08:19 +0200
Subject: [PATCH] [TYPO] qweb: use the same option attribute for t-esc t-raw
 and t-field

t-options instead of t-field-options
---
 addons/account/views/report_invoice.xml       |  8 +--
 addons/account/views/web_planner_data.xml     |  2 +-
 addons/event/report/event_event_templates.xml |  4 +-
 .../report/report_expense_sheet.xml           |  4 +-
 addons/hr_expense/views/report_expense.xml    |  4 +-
 addons/hr_payroll/views/report_payslip.xml    |  2 +-
 .../views/report_payslipdetails.xml           |  2 +-
 .../views/report_l10nfrfichepaye.xml          |  4 +-
 .../views/report_payslipdetails.xml           |  2 +-
 addons/lunch/report/lunch_order_templates.xml |  4 +-
 .../mrp_repair_templates_repair_order.xml     | 16 ++---
 .../point_of_sale/views/report_statement.xml  |  6 +-
 .../purchase/views/report_purchaseorder.xml   | 14 ++---
 .../views/report_purchasequotation.xml        |  6 +-
 addons/report/views/layouts.xml               |  2 +-
 .../report_intrastat_invoice_template.xml     | 12 ++--
 addons/sale/views/report_invoice_layouted.xml |  8 +--
 addons/sale/views/report_saleorder.xml        | 14 ++---
 addons/stock/report/report_deliveryslip.xml   |  2 +-
 .../report/report_stockpicking_operations.xml |  6 +-
 addons/website/views/website_templates.xml    |  2 +-
 .../views/website_blog_templates.xml          | 16 ++---
 .../website_crm_partner_assign_templates.xml  |  6 +-
 .../views/website_customer.xml                |  8 +--
 .../views/website_event_templates.xml         | 24 ++++----
 .../views/website_event_sale_templates.xml    |  4 +-
 .../views/website_event_track_templates.xml   | 14 ++---
 addons/website_forum/views/website_forum.xml  | 38 ++++++------
 .../views/templates.xml                       |  4 +-
 .../views/website_mail_channel_templates.xml  |  4 +-
 .../views/website_membership.xml              |  2 +-
 .../views/website_partner_templates.xml       |  4 +-
 addons/website_portal/views/templates.xml     |  2 +-
 .../website_portal_sale/views/templates.xml   | 24 ++++----
 .../views/project_issue_templates.xml         |  6 +-
 .../views/project_issue_templates.xml         |  2 +-
 .../website_quote/views/report_saleorder.xml  |  2 +-
 .../website_quote/views/website_quotation.xml | 36 ++++++------
 .../views/report_shop_saleorder.xml           |  2 +-
 addons/website_sale/views/templates.xml       | 58 +++++++++----------
 .../views/website_sale_delivery.xml           |  4 +-
 .../website_sale_options/views/templates.xml  | 12 ++--
 addons/website_sale_stock/views/templates.xml |  2 +-
 addons/website_slides/view/website_slides.xml |  2 +-
 doc/howtos/website/field-format               |  2 +-
 doc/howtos/website/field-widget               |  4 +-
 doc/reference/qweb.rst                        |  2 +-
 doc/reference/reports.rst                     |  2 +-
 openerp/addons/base/ir/ir_qweb.xml            |  2 +-
 49 files changed, 206 insertions(+), 206 deletions(-)

diff --git a/addons/account/views/report_invoice.xml b/addons/account/views/report_invoice.xml
index 9c7365738cb..30ed8c32853 100644
--- a/addons/account/views/report_invoice.xml
+++ b/addons/account/views/report_invoice.xml
@@ -8,7 +8,7 @@
             <div class="row">
                 <div name="invoice_address" class="col-xs-5 col-xs-offset-7">
                     <address t-field="o.partner_id"
-                        t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />
+                        t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />
                     <span t-if="o.partner_id.vat">TIN: <span t-field="o.partner_id.vat"/></span>
                 </div>
             </div>
@@ -85,7 +85,7 @@
                         </td>
                         <td class="text-right">
                             <span t-field="l.price_subtotal" 
-                                t-field-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
+                                t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
                         </td>
                     </tr>
                 </tbody>
@@ -97,7 +97,7 @@
                         <tr class="border-black">
                             <td><strong>Subtotal</strong></td>
                             <td class="text-right">
-                                <span t-field="o.amount_untaxed" t-field-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
+                                <span t-field="o.amount_untaxed" t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
                             </td>
                         </tr>
                         <t t-foreach="o._get_tax_amount_by_group()" t-as="amount_by_group">
@@ -111,7 +111,7 @@
                         <tr class="border-black">
                             <td><strong>Total</strong></td>
                             <td class="text-right">
-                                 <span t-field="o.amount_total" t-field-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
+                                 <span t-field="o.amount_total" t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
                             </td>
                         </tr>
                     </table>
diff --git a/addons/account/views/web_planner_data.xml b/addons/account/views/web_planner_data.xml
index 8a7fec1d501..7f0af5daa35 100644
--- a/addons/account/views/web_planner_data.xml
+++ b/addons/account/views/web_planner_data.xml
@@ -59,7 +59,7 @@
                         <th>Address</th>
                         <td  t-att-class="(not company_id.partner_id.street or not company_id.partner_id.zip) and 'danger'">
                             <span t-field="company_id.partner_id"
-                                t-field-options='{"widget": "contact", "fields": ["address"], "no_marker": True}'/>
+                                t-options='{"widget": "contact", "fields": ["address"], "no_marker": True}'/>
                         </td>
                         <td>
                             <a class="fa fa-arrow-right" t-attf-href="#{prepare_backend_url('base.action_res_company_form', 'form')}&amp;id=#{company_id.id}">
diff --git a/addons/event/report/event_event_templates.xml b/addons/event/report/event_event_templates.xml
index efb46e5ce6f..3720744ce48 100644
--- a/addons/event/report/event_event_templates.xml
+++ b/addons/event/report/event_event_templates.xml
@@ -18,7 +18,7 @@
                                         <img t-att-src="'data:image/png;base64,%s' % o.event_id.organizer_id.company_id.logo_web" style="max-height:1cm; max-width:4cm;"/>
                                     </span>
                                     <h5 t-field="o.event_id.name"/>
-                                    <h5>( <i class="fa fa-clock-o"></i> <span itemprop="startDate" t-field="o.event_id.date_begin" t-field-options='{"hide_seconds": True}'> </span> <i>to</i> <span itemprop="endDate" t-field="o.event_id.date_end" t-field-options='{"hide_seconds": True}'> </span> )</h5>
+                                    <h5>( <i class="fa fa-clock-o"></i> <span itemprop="startDate" t-field="o.event_id.date_begin" t-options='{"hide_seconds": True}'> </span> <i>to</i> <span itemprop="endDate" t-field="o.event_id.date_end" t-options='{"hide_seconds": True}'> </span> )</h5>
                                 </div>
                                 <div class="row">
                                     <div class="col-xs-12 text-center" id="o_event_name">
@@ -69,7 +69,7 @@
                                         </div>
                                     </span>
                                     <h4 t-field="event.name"/>
-                                    <h5>( <i class="fa fa-clock-o"></i> <span itemprop="startDate" t-field="event.date_begin" t-field-options='{"hide_seconds": True}'> </span> <i>to</i> <span itemprop="endDate" t-field="event.date_end" t-field-options='{"hide_seconds": True}'> </span> )</h5>
+                                    <h5>( <i class="fa fa-clock-o"></i> <span itemprop="startDate" t-field="event.date_begin" t-options='{"hide_seconds": True}'> </span> <i>to</i> <span itemprop="endDate" t-field="event.date_end" t-options='{"hide_seconds": True}'> </span> )</h5>
                                 </div>
                             </div>
                             <div class="row" t-ignore="true">
diff --git a/addons/hr_expense/report/report_expense_sheet.xml b/addons/hr_expense/report/report_expense_sheet.xml
index c00f70c23fc..da7e81ad537 100644
--- a/addons/hr_expense/report/report_expense_sheet.xml
+++ b/addons/hr_expense/report/report_expense_sheet.xml
@@ -64,7 +64,7 @@
                                     </td>
                                     <td class="text-right">
                                         <span t-field="line.total_amount"
-                                            t-field-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
+                                            t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
                                     </td>
                                 </tr>
                             </tbody>
@@ -77,7 +77,7 @@
                                         <td><strong>Total</strong></td>
                                         <td class="text-right">
                                             <span t-field="o.total_amount"
-                                                t-field-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
+                                                t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
                                         </td>
                                     </tr>
                                 </table>
diff --git a/addons/hr_expense/views/report_expense.xml b/addons/hr_expense/views/report_expense.xml
index 90c92c05792..f64e5b23714 100644
--- a/addons/hr_expense/views/report_expense.xml
+++ b/addons/hr_expense/views/report_expense.xml
@@ -55,7 +55,7 @@
                                     </td>
                                     <td>
                                         <span t-field="line.unit_amount" 
-                                            t-field-options='{"widget": "monetary", "display_currency": line.currency_id}'/>
+                                            t-options='{"widget": "monetary", "display_currency": line.currency_id}'/>
                                     </td>
                                     <td class="text-center">
                                         <span t-field="line.quantity"/>
@@ -75,7 +75,7 @@
                                     </td>
                                     <td class="text-right">
                                         <span t-field="line.total_amount"
-                                            t-field-options='{"widget": "monetary", "display_currency": line.currency_id}'/>
+                                            t-options='{"widget": "monetary", "display_currency": line.currency_id}'/>
                                     </td>
                                 </tr>
                             </t>
diff --git a/addons/hr_payroll/views/report_payslip.xml b/addons/hr_payroll/views/report_payslip.xml
index 43b329f4107..b0809a6716f 100644
--- a/addons/hr_payroll/views/report_payslip.xml
+++ b/addons/hr_payroll/views/report_payslip.xml
@@ -20,7 +20,7 @@
                             <td><strong>Address</strong></td>
                             <td colspan="3">
                                 <div t-field="o.employee_id.address_home_id"
-                                    t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
+                                    t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
                             </td>
                         </tr>
                         <tr>
diff --git a/addons/hr_payroll/views/report_payslipdetails.xml b/addons/hr_payroll/views/report_payslipdetails.xml
index e72e2bfa620..356b43df714 100644
--- a/addons/hr_payroll/views/report_payslipdetails.xml
+++ b/addons/hr_payroll/views/report_payslipdetails.xml
@@ -20,7 +20,7 @@
                             <td><strong>Address</strong></td>
                             <td colspan="3">
                                 <div t-field="o.employee_id.address_home_id"
-                                    t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
+                                    t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
                             </td>
                         </tr>
                         <tr>
diff --git a/addons/l10n_fr_hr_payroll/views/report_l10nfrfichepaye.xml b/addons/l10n_fr_hr_payroll/views/report_l10nfrfichepaye.xml
index 3970f0cc290..e4c0b06ba87 100644
--- a/addons/l10n_fr_hr_payroll/views/report_l10nfrfichepaye.xml
+++ b/addons/l10n_fr_hr_payroll/views/report_l10nfrfichepaye.xml
@@ -17,7 +17,7 @@
                                 <tr>
                                     <td>
                                         <div t-field="o.employee_id.company_id.partner_id"  
-                                    t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />SIRET:
+                                    t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />SIRET:
                                         <span t-esc="o.employee_id.company_id.siret or '_'"/> APE:
                                         <span t-esc="o.employee_id.company_id.ape or '_'"/>
                                     </td>
@@ -25,7 +25,7 @@
                                 <tr>
                                     <td>
                                         <div t-field="o.employee_id.address_home_id"
-                                          t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'/>
+                                          t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'/>
                                     </td>
                                 </tr>
                             </table>
diff --git a/addons/l10n_in_hr_payroll/views/report_payslipdetails.xml b/addons/l10n_in_hr_payroll/views/report_payslipdetails.xml
index b35cd67b67b..4356519c564 100644
--- a/addons/l10n_in_hr_payroll/views/report_payslipdetails.xml
+++ b/addons/l10n_in_hr_payroll/views/report_payslipdetails.xml
@@ -20,7 +20,7 @@
                             <td><strong>Address</strong></td>
                             <td colspan="3">
                                 <div t-field="o.employee_id.address_home_id"
-                                    t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
+                                    t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
                             </td>
                         </tr>
                         <tr>
diff --git a/addons/lunch/report/lunch_order_templates.xml b/addons/lunch/report/lunch_order_templates.xml
index 1b22bb3dd99..8ff36c6920f 100644
--- a/addons/lunch/report/lunch_order_templates.xml
+++ b/addons/lunch/report/lunch_order_templates.xml
@@ -9,7 +9,7 @@
                         <div class="row">
                             <div class="col-xs-5 col-xs-offset-7">
                                 <div t-field="user.partner_id"
-                                    t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />
+                                    t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />
                             </div>
                         </div>
 
@@ -51,7 +51,7 @@
                                         </td>
                                         <td class="text-right">
                                             <span t-field="line.price"
-                                                t-field-options='{"widget": "monetary", "display_currency": user.company_id.currency_id}'/>
+                                                t-options='{"widget": "monetary", "display_currency": user.company_id.currency_id}'/>
                                         </td>
                                     </tr>
                                 </t>
diff --git a/addons/mrp_repair/report/mrp_repair_templates_repair_order.xml b/addons/mrp_repair/report/mrp_repair_templates_repair_order.xml
index 3a12c225066..00e32ef9345 100644
--- a/addons/mrp_repair/report/mrp_repair_templates_repair_order.xml
+++ b/addons/mrp_repair/report/mrp_repair_templates_repair_order.xml
@@ -14,19 +14,19 @@
                             <div t-if="o.partner_invoice_id">
                                 <strong t-if="o.address_id != o.partner_invoice_id">Invoice address: </strong>
                                 <div t-field="o.partner_invoice_id" 
-                                    t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
+                                    t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
                                 <p t-if="o.partner_id.vat">VAT: <span t-field="o.partner_id.vat"/></p>
                             </div>
                             <div t-if="o.address_id != o.partner_invoice_id">
                                 <strong>Shipping address :</strong>
                                 <div t-field="o.address_id" 
-                                    t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
+                                    t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
                                 <p t-if="o.partner_id.vat">VAT: <span t-field="o.partner_id.vat"/></p>
                             </div>                        
                         </div>
                         <div class="col-xs-5 col-xs-offset-1">
                             <div t-field="o.partner_id"
-                                t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />
+                                t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />
                         </div>
                     </div>
 
@@ -88,7 +88,7 @@
                                         </td>
                                         <td class="text-right">
                                             <span t-field="line.price_subtotal" 
-                                                t-field-options='{"widget": "monetary", "display_currency": o.pricelist_id.currency_id}'/>
+                                                t-options='{"widget": "monetary", "display_currency": o.pricelist_id.currency_id}'/>
                                        </td>
                                     </t>
                                 </tr>
@@ -112,7 +112,7 @@
                                         </td>
                                         <td class="text-right">
                                             <span t-field="fees.price_subtotal"
-                                                t-field-options='{"widget": "monetary", "display_currency": o.pricelist_id.currency_id}'/>
+                                                t-options='{"widget": "monetary", "display_currency": o.pricelist_id.currency_id}'/>
                                        </td>
                                    </t>
                                 </tr>
@@ -127,21 +127,21 @@
                                     <td><strong>Total Without Taxes</strong></td>
                                     <td class="text-right">
                                         <span t-field="o.amount_untaxed"
-                                            t-field-options='{"widget": "monetary", "display_currency": o.pricelist_id.currency_id}'/>
+                                            t-options='{"widget": "monetary", "display_currency": o.pricelist_id.currency_id}'/>
                                     </td>
                                 </tr>
                                 <tr>
                                     <td>Taxes</td>
                                     <td class="text-right">
                                         <span t-field="o.amount_tax"
-                                            t-field-options='{"widget": "monetary", "display_currency": o.pricelist_id.currency_id}'/>
+                                            t-options='{"widget": "monetary", "display_currency": o.pricelist_id.currency_id}'/>
                                     </td>
                                 </tr>
                                 <tr class="border-black">
                                     <td><strong>Total</strong></td>
                                     <td class="text-right">
                                         <span t-field="o.amount_total"
-                                            t-field-options='{"widget": "monetary", "display_currency": o.pricelist_id.currency_id}'/>
+                                            t-options='{"widget": "monetary", "display_currency": o.pricelist_id.currency_id}'/>
                                     </td>
                                 </tr>
                             </table>
diff --git a/addons/point_of_sale/views/report_statement.xml b/addons/point_of_sale/views/report_statement.xml
index bff915b4bf4..82fe782d189 100644
--- a/addons/point_of_sale/views/report_statement.xml
+++ b/addons/point_of_sale/views/report_statement.xml
@@ -34,11 +34,11 @@
                         </div>
                         <div class="col-xs-3">
                             <strong>Starting Balance</strong>:<br/>
-                            <span t-field="o.balance_start" t-field-options='{"widget": "monetary", "display_currency": res_company.currency_id}'/>
+                            <span t-field="o.balance_start" t-options='{"widget": "monetary", "display_currency": res_company.currency_id}'/>
                         </div>
                         <div class="col-xs-3">
                             <strong>Ending Balance</strong>:<br/>
-                            <span t-field="o.balance_end_real" t-field-options='{"widget": "monetary", "display_currency": res_company.currency_id}'/>
+                            <span t-field="o.balance_end_real" t-options='{"widget": "monetary", "display_currency": res_company.currency_id}'/>
                         </div>
                     </div>
 
@@ -56,7 +56,7 @@
                                 <td><span t-esc="line.partner_id.name"/></td>
                                 <td class="text-right">
                                     <span t-field="line.amount" 
-                                        t-field-options='{"widget": "monetary", "display_currency": res_company.currency_id}'/>
+                                        t-options='{"widget": "monetary", "display_currency": res_company.currency_id}'/>
                                 </td>
                             </tr>
                         </tbody>
diff --git a/addons/purchase/views/report_purchaseorder.xml b/addons/purchase/views/report_purchaseorder.xml
index 158c411de1e..ad3896dd19d 100644
--- a/addons/purchase/views/report_purchaseorder.xml
+++ b/addons/purchase/views/report_purchaseorder.xml
@@ -11,18 +11,18 @@
                     <strong>Shipping address:</strong>
                     <div t-if="o.dest_address_id">
                         <div t-field="o.dest_address_id"
-                            t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
+                            t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
                     </div>
 
                     <div t-if="not o.dest_address_id and o.picking_type_id and o.picking_type_id.warehouse_id">
                         <span t-field="o.picking_type_id.warehouse_id.name"/>
                         <div t-field="o.picking_type_id.warehouse_id.partner_id"
-                            t-field-options='{"widget": "contact", "fields": ["address", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
+                            t-options='{"widget": "contact", "fields": ["address", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
                     </div>
                 </div>
                 <div class="col-xs-5 col-xs-offset-1">
                     <div t-field="o.partner_id"
-                        t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
+                        t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
                         <p t-if="o.partner_id.vat">VAT: <span t-field="o.partner_id.vat"/></p>
                 </div>
             </div>
@@ -76,7 +76,7 @@
                         </td>
                         <td class="text-right">
                             <span t-field="line.price_subtotal"
-                                t-field-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
+                                t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
                         </td>
                     </tr>
                 </tbody>
@@ -89,21 +89,21 @@
                             <td><strong>Total Without Taxes</strong></td>
                             <td class="text-right">
                                 <span t-field="o.amount_untaxed"
-                                    t-field-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
+                                    t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
                             </td>
                         </tr>
                         <tr>
                             <td>Taxes</td>
                             <td class="text-right">
                                 <span t-field="o.amount_tax"
-                                    t-field-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
+                                    t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
                             </td>
                         </tr>
                         <tr class="border-black">
                             <td><strong>Total</strong></td>
                             <td class="text-right">
                                 <span t-field="o.amount_total"
-                                    t-field-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
+                                    t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
                             </td>
                         </tr>
                     </table>
diff --git a/addons/purchase/views/report_purchasequotation.xml b/addons/purchase/views/report_purchasequotation.xml
index 104f34527e4..765a108f306 100644
--- a/addons/purchase/views/report_purchasequotation.xml
+++ b/addons/purchase/views/report_purchasequotation.xml
@@ -12,17 +12,17 @@
                     <strong>Shipping address:</strong>
                     <div t-if="o.dest_address_id">
                         <div t-field="o.dest_address_id"
-                            t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
+                            t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
                     </div>
                     <div t-if="not o.dest_address_id and o.picking_type_id.warehouse_id">
                         <span t-field="o.picking_type_id.warehouse_id.name"/>
                         <div t-field="o.picking_type_id.warehouse_id.partner_id"
-                            t-field-options='{"widget": "contact", "fields": ["address", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
+                            t-options='{"widget": "contact", "fields": ["address", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
                     </div>
                 </div>
                 <div class="col-xs-5 col-xs-offset-1">
                     <div t-field="o.partner_id"
-                        t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
+                        t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
                         <p t-if="o.partner_id.vat">VAT: <span t-field="o.partner_id.vat"/></p>
                 </div>
             </div>
diff --git a/addons/report/views/layouts.xml b/addons/report/views/layouts.xml
index 39494368b46..f4bebe09cd2 100644
--- a/addons/report/views/layouts.xml
+++ b/addons/report/views/layouts.xml
@@ -108,7 +108,7 @@
         <div class="row">
             <div class="col-xs-3" name="company_address">
                 <div t-field="company.partner_id" 
-                    t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'
+                    t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'
                     style="border-bottom: 1px solid black;"/>
             </div>
         </div>
diff --git a/addons/report_intrastat/report/report_intrastat_invoice_template.xml b/addons/report_intrastat/report/report_intrastat_invoice_template.xml
index c40c3b8661f..5660ad8f816 100644
--- a/addons/report_intrastat/report/report_intrastat_invoice_template.xml
+++ b/addons/report_intrastat/report/report_intrastat_invoice_template.xml
@@ -7,7 +7,7 @@
             <div class="row">
                 <div class="col-xs-5 col-xs-offset-7">
                     <address t-field="o.partner_id"
-                        t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />
+                        t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />
                     <span t-field="o.partner_id.vat"/>
                 </div>
             </div>
@@ -67,7 +67,7 @@
                         <td t-if="display_discount" groups="sale.group_discount_per_so_line"><span t-field="l.discount"/></td>
                         <td class="text-right">
                             <span t-field="l.price_subtotal"
-                                t-field-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
+                                t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
                         </td>
                     </tr>
                 </tbody>
@@ -79,19 +79,19 @@
                         <tr class="border-black">
                             <td><strong>Total Without Taxes</strong></td>
                             <td class="text-right">
-                                <span t-field="o.amount_untaxed" t-field-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
+                                <span t-field="o.amount_untaxed" t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
                             </td>
                         </tr>
                         <tr>
                             <td>Taxes</td>
                             <td class="text-right">
-                                <span t-field="o.amount_tax" t-field-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
+                                <span t-field="o.amount_tax" t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
                             </td>
                         </tr>
                         <tr class="border-black">
                             <td><strong>Total</strong></td>
                             <td class="text-right">
-                                 <span t-field="o.amount_total" t-field-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
+                                 <span t-field="o.amount_total" t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
                             </td>
                         </tr>
                     </table>
@@ -112,7 +112,7 @@
                                 <td><span t-field="t.name"/></td>
                                 <td class="text-right">
                                     <span t-field="t.amount"
-                                        t-field-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
+                                        t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
                                 </td>
                             </tr>
                         </tbody>
diff --git a/addons/sale/views/report_invoice_layouted.xml b/addons/sale/views/report_invoice_layouted.xml
index 2762c1e9532..48094594501 100644
--- a/addons/sale/views/report_invoice_layouted.xml
+++ b/addons/sale/views/report_invoice_layouted.xml
@@ -49,11 +49,11 @@
                                 </td>
                                 <td class="text-right" groups="sale.group_show_price_subtotal">
                                     <span t-field="l.price_subtotal"
-                                        t-field-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
+                                        t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
                                 </td>
                                 <td class="text-right" groups="sale.group_show_price_total">
                                     <span t-field="l.price_total"
-                                        t-field-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
+                                        t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
                                 </td>
                             </tr>
                         </t>
@@ -87,12 +87,12 @@
                 <strong t-if="o.partner_shipping_id == o.partner_id">Invoicing and shipping address:</strong>
                 <strong t-if="o.partner_shipping_id != o.partner_id">Invoicing address:</strong>
                 <div t-field="o.partner_id"
-                    t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'/>
+                    t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'/>
                 <span t-if="o.partner_id.vat">TIN: <span t-field="o.partner_id.vat"/></span>
                 <div t-if="o.partner_shipping_id != o.partner_id" class="mt8">
                     <strong>Shipping address:</strong>
                     <div t-field="o.partner_shipping_id"
-                        t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'/>
+                        t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'/>
                     <span t-if="o.partner_id.vat">TIN: <span t-field="o.partner_id.vat"/></span>
                 </div>
             </div>
diff --git a/addons/sale/views/report_saleorder.xml b/addons/sale/views/report_saleorder.xml
index f62a2d9b72d..1e45bb32385 100644
--- a/addons/sale/views/report_saleorder.xml
+++ b/addons/sale/views/report_saleorder.xml
@@ -11,18 +11,18 @@
                     <strong t-if="doc.partner_shipping_id == doc.partner_invoice_id">Invoicing and shipping address:</strong>
                     <strong t-if="doc.partner_shipping_id != doc.partner_invoice_id">Invoicing address:</strong>
                     <div t-field="doc.partner_invoice_id"
-                        t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
+                        t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
                     <p t-if="doc.partner_id.vat">VAT: <span t-field="doc.partner_id.vat"/></p>
                     <div t-if="doc.partner_shipping_id != doc.partner_invoice_id" class="mt8">
                         <strong>Shipping address:</strong>
                         <div t-field="doc.partner_shipping_id"
-                            t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
+                            t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
                         <p t-if="doc.partner_id.vat">VAT: <span t-field="doc.partner_id.vat"/></p>
                     </div>
                 </div>
                 <div class="col-xs-5 col-xs-offset-1">
                     <div t-field="doc.partner_id"
-                        t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />
+                        t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />
                 </div>
             </div>
 
@@ -98,11 +98,11 @@
                                     </td>
                                     <td class="text-right" groups="sale.group_show_price_subtotal">
                                         <span t-field="l.price_subtotal"
-                                            t-field-options='{"widget": "monetary", "display_currency": doc.pricelist_id.currency_id}'/>
+                                            t-options='{"widget": "monetary", "display_currency": doc.pricelist_id.currency_id}'/>
                                     </td>
                                     <td class="text-right" groups="sale.group_show_price_total">
                                         <span t-field="l.price_total"
-                                            t-field-options='{"widget": "monetary", "display_currency": doc.pricelist_id.currency_id}'/>
+                                            t-options='{"widget": "monetary", "display_currency": doc.pricelist_id.currency_id}'/>
                                     </td>
                                 </tr>
                             </t>
@@ -133,7 +133,7 @@
                             <td><strong>Total Without Taxes</strong></td>
                             <td class="text-right">
                                 <span t-field="doc.amount_untaxed"
-                                    t-field-options='{"widget": "monetary", "display_currency": doc.pricelist_id.currency_id}'/>
+                                    t-options='{"widget": "monetary", "display_currency": doc.pricelist_id.currency_id}'/>
                             </td>
                         </tr>
                         <t t-foreach="doc._get_tax_amount_by_group()" t-as="amount_by_group">
@@ -148,7 +148,7 @@
                             <td><strong>Total</strong></td>
                             <td class="text-right">
                                 <span t-field="doc.amount_total"
-                                    t-field-options='{"widget": "monetary", "display_currency": doc.pricelist_id.currency_id}'/>
+                                    t-options='{"widget": "monetary", "display_currency": doc.pricelist_id.currency_id}'/>
                             </td>
                         </tr>
                     </table>
diff --git a/addons/stock/report/report_deliveryslip.xml b/addons/stock/report/report_deliveryslip.xml
index fec4e8973af..fe91111ed0d 100644
--- a/addons/stock/report/report_deliveryslip.xml
+++ b/addons/stock/report/report_deliveryslip.xml
@@ -13,7 +13,7 @@
                             </div>
                             <div t-if="o.partner_id" name="partner_header">
                                 <div t-field="o.partner_id"
-                                   t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True}'/>
+                                   t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True}'/>
                             </div>
                         </div>
                     </div>
diff --git a/addons/stock/report/report_stockpicking_operations.xml b/addons/stock/report/report_stockpicking_operations.xml
index bcec910e5f4..bd77df3eaf4 100644
--- a/addons/stock/report/report_stockpicking_operations.xml
+++ b/addons/stock/report/report_stockpicking_operations.xml
@@ -24,12 +24,12 @@
                                     <div t-if="o.move_lines and o.move_lines[0].partner_id and o.move_lines[0].partner_id.id != o.partner_id.id">
                                         <span><strong>Delivery Address:</strong></span>
                                         <div t-field="o.move_lines[0].partner_id"
-                                            t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
+                                            t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
                                     </div>
                                     <div t-if="o.picking_type_id.code != 'internal' and (not o.move_lines or not o.move_lines[0].partner_id) and o.picking_type_id.warehouse_id.partner_id">
                                         <span><strong>Warehouse Address:</strong></span>
                                         <div t-field="o.picking_type_id.warehouse_id.partner_id"
-                                            t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
+                                            t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'/>
                                     </div>
                                 </div>
                                 <div class="col-xs-5 col-xs-offset-1">
@@ -44,7 +44,7 @@
                                     </div>
                                     <div t-if="o.partner_id" name="partner_header">
                                         <div t-field="o.partner_id"
-                                           t-field-options='{"widget": "contact", "fields": ["name", "phone"], "no_marker": True, "phone_icons": True}'/>
+                                           t-options='{"widget": "contact", "fields": ["name", "phone"], "no_marker": True, "phone_icons": True}'/>
                                         <p t-if="o.sudo().partner_id.vat">VAT: <span t-field="o.sudo().partner_id.vat"/></p>
                                     </div>
                                 </div>
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 4091d4cc4d1..fbcbe77aa67 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -904,7 +904,7 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
 <template id="company_description" name="Company Description">
     <address itemscope="itemscope" itemtype="http://schema.org/Organization">
         <!-- TODO widget contact must add itemprop attributes -->
-        <div t-field="res_company.partner_id" t-field-options='{
+        <div t-field="res_company.partner_id" t-options='{
                 "widget": "contact",
                 "fields": ["name", "address", "phone", "mobile", "fax", "email"]}'/>
     </address>
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index 2fa39cef5da..2b93c8280af 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -136,7 +136,7 @@
 
                 <div t-foreach="blog_posts" t-as="blog_post" class="mb32">
                     <t t-if="blog_post.author_avatar">
-                        <span t-field="blog_post.author_avatar" class="o_not_editable" t-field-options='{"widget": "image", "class": "img-circle pull-right mt16 media-object"}' />
+                        <span t-field="blog_post.author_avatar" class="o_not_editable" t-options='{"widget": "image", "class": "img-circle pull-right mt16 media-object"}' />
                     </t>
                     <a t-attf-href="/blog/#{ slug(blog_post.blog_id) }/post/#{ slug(blog_post) }">
                         <h2 t-field="blog_post.name" class="mb4">Untitled Post</h2>
@@ -144,12 +144,12 @@
                     <div class="text-muted">
                             <h4 t-field="blog_post.subtitle" class="mb4 mt4"></h4>
                         <div name='blog_post_data' class='mb0'>
-                            <span t-field="blog_post.author_id" style="display: inline-block;" t-field-options='{
+                            <span t-field="blog_post.author_id" style="display: inline-block;" t-options='{
                                 "widget": "contact",
                                 "fields": ["name"]
                             }'/>
-                            &#5760; <t t-if="blog_post.published_date"><span t-field="blog_post.published_date" t-field-options='{"format": "MMMM yyyy"}'/></t>
-                            <t t-if="not blog_post.published_date"><span t-field="blog_post.create_date" t-field-options='{"format": "MMMM yyyy"}'/></t>
+                            &#5760; <t t-if="blog_post.published_date"><span t-field="blog_post.published_date" t-options='{"format": "MMMM yyyy"}'/></t>
+                            <t t-if="not blog_post.published_date"><span t-field="blog_post.create_date" t-options='{"format": "MMMM yyyy"}'/></t>
                             <span t-if="len(blog_post.message_ids) &gt; 0">
                                 &#5760; <t t-esc="len(blog_post.message_ids)"/>
                                 <t t-if="len(blog_post.message_ids) &lt;= 1" >comment</t>
@@ -211,9 +211,9 @@
                 <p class="post-meta text-muted text-center" name="blog_post_data"/>
                 <div>
                     <t t-if="blog_post.author_avatar">
-                        <span t-field="blog_post.author_avatar" class="o_not_editable" t-field-options='{"widget": "image", "class": "img-circle", "style":"width: 30px; margin-right: 10px; display:inline"}' />
+                        <span t-field="blog_post.author_avatar" class="o_not_editable" t-options='{"widget": "image", "class": "img-circle", "style":"width: 30px; margin-right: 10px; display:inline"}' />
                     </t>
-                    <span t-field="blog_post.author_id" style="display: inline-block;" t-field-options='{
+                    <span t-field="blog_post.author_id" style="display: inline-block;" t-options='{
                         "widget": "contact",
                         "fields": ["name"]
                     }'/>
@@ -236,9 +236,9 @@
                 <h2 t-field="next_post.subtitle" placeholder="Subtitle"/>
                 <div>
                     <t t-if="next_post.author_avatar">
-                        <span t-field="next_post.author_avatar" t-field-options='{"widget": "image", "class": "img-circle", "style":"width: 30px; margin-right: 10px; display:inline"}' />
+                        <span t-field="next_post.author_avatar" t-options='{"widget": "image", "class": "img-circle", "style":"width: 30px; margin-right: 10px; display:inline"}' />
                     </t>
-                    <span t-field="next_post.author_id" style="display: inline-block;" t-field-options='{
+                    <span t-field="next_post.author_id" style="display: inline-block;" t-options='{
                             "widget": "contact",
                             "fields": ["name"]
                         }'/>
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
index 6187e147fc1..86a03328b30 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
@@ -90,7 +90,7 @@
                         <div class="media">
                             <a class="pull-left" t-attf-href="/partners/#{slug(partner)}?#{current_grade and 'grade_id=%s&amp;' % current_grade.id}#{current_country and 'country_id=%s' % current_country.id}"
                                t-field="partner.image"
-                               t-field-options='{"widget": "image", "class": "media-object", "max_width": 128}'
+                               t-options='{"widget": "image", "class": "media-object", "max_width": 128}'
                             ></a>
                             <div class="media-body o_partner_body" style="min-height: 64px;">
                                 <a class="media-heading" t-attf-href="/partners/#{slug(partner)}?#{current_grade and 'grade_id=%s&amp;' % current_grade.id}#{current_country and 'country_id=%s' % current_country.id}">
@@ -171,7 +171,7 @@
         <div t-foreach="partner.implemented_partner_ids" t-as="reference" class="media">
           <t t-if="reference.website_published">
             <a class="pull-left" t-attf-href="/customers/#{slug(reference)}">
-                <span t-field="reference.image_small" t-field-options='{"widget": "image", "class": "center-block"}'/>
+                <span t-field="reference.image_small" t-options='{"widget": "image", "class": "center-block"}'/>
             </a>
             <div class="media-body" style="min-height: 64px;">
                 <a class="media-heading" t-attf-href="/customers/#{slug(reference)}">
@@ -433,7 +433,7 @@
                                     </div>
                                     <div class="row mt16" t-if="lead.partner_assigned_id">
                                         <label class="col-xs-4">Assigned Partner</label>
-                                        <address class="col-xs-8" t-field="lead.partner_assigned_id" t-field-options='{"widget": "contact", "fields": ["name", "email", "phone"], "no_marker": True}'/>
+                                        <address class="col-xs-8" t-field="lead.partner_assigned_id" t-options='{"widget": "contact", "fields": ["name", "email", "phone"], "no_marker": True}'/>
                                     </div>
                                     <div class="row mt16" t-if="lead.campaign_id">
                                         <label class="col-xs-4">Campaign</label>
diff --git a/addons/website_customer/views/website_customer.xml b/addons/website_customer/views/website_customer.xml
index 9feaaa515a7..1a00d4b96b6 100644
--- a/addons/website_customer/views/website_customer.xml
+++ b/addons/website_customer/views/website_customer.xml
@@ -45,7 +45,7 @@
                         <div class="media">
                             <a class="pull-left" t-attf-href="/customers/#{slug(partner)}"
                                t-field="partner.image_small"
-                               t-field-options='{"widget": "image", "class": "media-object"}'
+                               t-options='{"widget": "image", "class": "media-object"}'
                             ></a>
                             <div class="media-body" style="min-height: 64px;">
                                 <a class="media-heading" t-attf-href="/customers/#{slug(partner)}">
@@ -174,11 +174,11 @@
         </h4>
         <div><a t-attf-href="/partners/#{slug(partner.assigned_partner_id)}"
                 t-field="partner.assigned_partner_id.image_medium"
-                t-field-options='{"widget": "image", "class": "center-block"}'
+                t-options='{"widget": "image", "class": "center-block"}'
              />
         </div>
         <address class="well text-left">
-             <div t-field="partner.assigned_partner_id" t-field-options='{
+             <div t-field="partner.assigned_partner_id" t-options='{
                  "widget": "contact",
                  "fields": ["address", "website", "phone", "fax", "email"]
              }'/>
@@ -194,7 +194,7 @@
             <div t-foreach="partner.implemented_partner_ids" t-as="reference" class="media">
               <t t-if="reference.website_published">
                 <a class="pull-left" t-attf-href="/customers/#{slug(reference)}">
-                    <span t-field="reference.image_small" t-field-options='{"widget": "image", "class": "center-block"}'/>
+                    <span t-field="reference.image_small" t-options='{"widget": "image", "class": "center-block"}'/>
                 </a>
                 <div class="media-body" style="min-height: 64px;">
                     <a class="media-heading" t-attf-href="/customers/#{slug(reference)}">
diff --git a/addons/website_event/views/website_event_templates.xml b/addons/website_event/views/website_event_templates.xml
index 4cee5fec02c..92e855004fc 100644
--- a/addons/website_event/views/website_event_templates.xml
+++ b/addons/website_event/views/website_event_templates.xml
@@ -67,9 +67,9 @@
                                     </t>
                                 </div>
                                 <div>
-                                    <i class="fa fa-clock-o"></i> <span itemprop="startDate" t-field="event.with_context(tz=event.date_tz).date_begin" t-field-options='{"hide_seconds":"True"}'> </span> <i>to</i> <span itemprop="endDate" t-field="event.with_context(tz=event.date_tz).date_end" t-field-options='{"hide_seconds":"True"}'> </span>
+                                    <i class="fa fa-clock-o"></i> <span itemprop="startDate" t-field="event.with_context(tz=event.date_tz).date_begin" t-options='{"hide_seconds":"True"}'> </span> <i>to</i> <span itemprop="endDate" t-field="event.with_context(tz=event.date_tz).date_end" t-options='{"hide_seconds":"True"}'> </span>
                                 </div>
-                                <div itemprop="location" t-field="event.address_id" t-field-options='{
+                                <div itemprop="location" t-field="event.address_id" t-options='{
                                     "widget": "contact",
                                     "fields": ["city"]
                                     }'/>
@@ -241,7 +241,7 @@
             <h1 class="text-center">Event Location</h1>
         </section>
         <h4 class="text-center text-muted"
-            t-field="event.address_id" t-field-options='{
+            t-field="event.address_id" t-options='{
                 "widget": "contact",
                 "fields": ["address", "phone", "mobile", "fax"]
             }'/>
@@ -272,12 +272,12 @@
                 <small t-if="event.is_participating" class="label label-info">Participating</small>
             </div>
             <h4 class="text-center text-muted">
-                <i class="fa fa-clock-o"></i> <span itemprop="startDate" t-field="event.with_context(tz=event.date_tz).date_begin" t-field-options='{"hide_seconds":"True"}'/> to
-                <span itemprop="endDate" t-field="event.with_context(tz=event.date_tz).date_end" t-field-options='{"hide_seconds":"True"}'/>
+                <i class="fa fa-clock-o"></i> <span itemprop="startDate" t-field="event.with_context(tz=event.date_tz).date_begin" t-options='{"hide_seconds":"True"}'/> to
+                <span itemprop="endDate" t-field="event.with_context(tz=event.date_tz).date_end" t-options='{"hide_seconds":"True"}'/>
                 <t t-if="event.date_tz">(<span t-field="event.date_tz"/>)</t>
             </h4>
             <h4 class="text-center text-muted"
-                t-field="event.address_id" t-field-options='{
+                t-field="event.address_id" t-options='{
                 "widget": "contact",
                 "fields": ["city"]
                 }'/>
@@ -320,7 +320,7 @@
                         <t t-raw="comment.body"/>
                         <small class="pull-right muted text-right">
                             <div t-field="comment.author_id"/>
-                            <div t-field="comment.date" t-field-options='{"hide_seconds":"True"}'/>
+                            <div t-field="comment.date" t-options='{"hide_seconds":"True"}'/>
                         </small>
                     </div>
                 </li>
@@ -337,7 +337,7 @@
                     <a t-att-href="event.google_map_link()" target="_BLANK">
                         <img t-att-src="event.google_map_img()" width="100%%"/>
                     </a>
-                    <div itemprop="location" class="mt16 mb8" t-field="event.address_id" t-field-options='{
+                    <div itemprop="location" class="mt16 mb8" t-field="event.address_id" t-options='{
                         "widget": "contact",
                         "fields": ["address", "phone", "mobile", "fax", "email"]
                         }'/>
@@ -349,8 +349,8 @@
                     <h4>When</h4>
                 </div>
                 <div class="panel-body">
-                    <i class="fa fa-clock-o"></i> From <span t-field="event.with_context(tz=event.date_tz).date_begin" t-field-options='{"hide_seconds":"True"}'> </span><br/>
-                    <i class="fa fa-clock-o"></i> To <span t-field="event.with_context(tz=event.date_tz).date_end" t-field-options='{"hide_seconds":"True"}'> </span>
+                    <i class="fa fa-clock-o"></i> From <span t-field="event.with_context(tz=event.date_tz).date_begin" t-options='{"hide_seconds":"True"}'> </span><br/>
+                    <i class="fa fa-clock-o"></i> To <span t-field="event.with_context(tz=event.date_tz).date_end" t-options='{"hide_seconds":"True"}'> </span>
                 </div>
             </div>
 
@@ -358,7 +358,7 @@
                 <div class="panel-heading">
                     <h4>Organizer</h4>
                 </div>
-                <div class="panel-body" t-field="event.organizer_id" t-field-options='{
+                <div class="panel-body" t-field="event.organizer_id" t-options='{
                     "widget": "contact",
                     "fields": ["name", "phone", "mobile", "fax", "email"]
                     }'/>
@@ -507,7 +507,7 @@
                 <div class="col-md-9 mt16">
                     <h4><a t-attf-href="/event/#{slug(event)}"><t t-esc="event.name"/></a></h4>
                     <i class="fa fa-clock-o"/> <span itemprop="startDate" t-esc="event.date_begin_located[:-3]"> </span> <i>to</i> <span itemprop="endDate" t-esc="event.date_end_located[:-3]"> </span>
-                    <div itemprop="location" class="mt16 mb8" t-field="event.address_id" t-field-options='{
+                    <div itemprop="location" class="mt16 mb8" t-field="event.address_id" t-options='{
                             "widget": "contact",
                             "fields": ["address", "phone", "mobile", "fax", "email"]
                             }'/>
diff --git a/addons/website_event_sale/views/website_event_sale_templates.xml b/addons/website_event_sale/views/website_event_sale_templates.xml
index f4f628bd501..42dcba2a5cf 100644
--- a/addons/website_event_sale/views/website_event_sale_templates.xml
+++ b/addons/website_event_sale/views/website_event_sale_templates.xml
@@ -38,13 +38,13 @@
                     <td>
                             <t t-if="ticket.price or editable">
                               <t t-if="(ticket.price-ticket.price_reduce) &gt; 1">
-                                <del class="text-danger mr4" style="white-space: nowrap;" t-field="ticket.price" t-field-options='{
+                                <del class="text-danger mr4" style="white-space: nowrap;" t-field="ticket.price" t-options='{
                                   "widget": "monetary",
                                   "from_currency": website.currency_id,
                                   "display_currency": user_id.partner_id.property_product_pricelist.currency_id
                                 }'/>
                               </t>
-                              <span t-field="ticket.price_reduce" t-field-options='{
+                              <span t-field="ticket.price_reduce" t-options='{
                                "widget": "monetary",
                                "display_currency": website.pricelist_id.currency_id
                           }'/>
diff --git a/addons/website_event_track/views/website_event_track_templates.xml b/addons/website_event_track/views/website_event_track_templates.xml
index cb90dfb474c..6c29823959d 100644
--- a/addons/website_event_track/views/website_event_track_templates.xml
+++ b/addons/website_event_track/views/website_event_track_templates.xml
@@ -19,7 +19,7 @@
                     <t t-if="sponsor.url">
                         <a t-att-href="sponsor.url" style="position: relative; display: inline-block;">
                             <span t-field="sponsor.image_medium"
-                                t-field-options='{"widget": "image", "class": "shadow"}'/>
+                                t-options='{"widget": "image", "class": "shadow"}'/>
                             <div class="ribbon-wrapper">
                                 <div t-field="sponsor.sponsor_type_id" t-attf-class="ribbon ribbon_#{sponsor.sponsor_type_id.name}"/>
                             </div>
@@ -28,7 +28,7 @@
                     <t t-if="not sponsor.url">
                         <span style="position: relative; display: inline-block;">
                             <span t-field="sponsor.image_medium"
-                                t-field-options='{"widget": "image", "class": "shadow"}'/>
+                                t-options='{"widget": "image", "class": "shadow"}'/>
                             <div class="ribbon-wrapper">
                                 <div t-field="sponsor.sponsor_type_id" t-attf-class="ribbon ribbon_#{sponsor.sponsor_type_id.name}"/>
                             </div>
@@ -120,7 +120,7 @@
                 <div class="col-sm-2">
                     <t t-if="track.image">
                         <span t-field="track.image"
-                            t-field-options='{"widget": "image", "class": "img-circle"}'/>
+                            t-options='{"widget": "image", "class": "img-circle"}'/>
                     </t>
                 </div>
                 <div class="col-sm-10">
@@ -132,7 +132,7 @@
                         <li t-if="track.speaker_ids" class="text-muted fa fa-user">
                             <t t-esc="', '.join([speaker.name for speaker in track.speaker_ids])"></t>
                         </li>
-                        <li t-if="track.date" class="text-muted fa fa-calendar"> <span t-field="track.date" t-field-options='{"hide_seconds":"True"}'/></li>
+                        <li t-if="track.date" class="text-muted fa fa-calendar"> <span t-field="track.date" t-options='{"hide_seconds":"True"}'/></li>
                         <li class="text-muted fa fa-map-marker" t-if="track.location_id">
                             <span t-field="track.location_id"/>
                         </li>
@@ -228,7 +228,7 @@
                         <div class="row">
                             <div class="col-sm-2">
                                 <span t-field="speaker.sudo().image_medium"
-                                    t-field-options='{"widget": "image", "class": "img-circle"}'/>
+                                    t-options='{"widget": "image", "class": "img-circle"}'/>
                             </div><div class="col-sm-10">
                                <h4 t-field="speaker.name" class="mb4"/>
                                <div class="fa fa-home mb16" t-if="speaker.website">
@@ -246,9 +246,9 @@
                         </div>
                         <div class="panel-body">
                             <b>Date</b><br/>
-                            <span t-field="track.date" t-field-options='{"hide_seconds":"True"}'/><br/>
+                            <span t-field="track.date" t-options='{"hide_seconds":"True"}'/><br/>
                             <b>Duration</b><br/>
-                            <span t-field="track.duration" t-field-options='{"widget": "duration", "unit": "hour"}'/><br/>
+                            <span t-field="track.duration" t-options='{"widget": "duration", "unit": "hour"}'/><br/>
                             <b>Location</b><br/>
                             <span t-field="track.location_id"/><br/>
                         </div>
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 8319bc60c39..0b82bb9019c 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -201,12 +201,12 @@
                             </div>
                             <div class="panel-body">
                                 <table class="table">
-                                    <thead><tr><td> Asked: <strong><span t-field="question.create_date" t-field-options='{"format":"short"}'/></strong></td></tr></thead>
+                                    <thead><tr><td> Asked: <strong><span t-field="question.create_date" t-options='{"format":"short"}'/></strong></td></tr></thead>
                                     <tr><td> Seen: <strong><t t-raw="question.views"/></strong>
                                         <span t-if="question.views&gt;1"> times</span>
                                         <span t-if="question.views&lt;=1"> time</span>
                                     </td></tr>
-                                    <tr><td> Last updated: <strong><span t-field="question.write_date" t-field-options='{"format":"short"}'/></strong></td></tr>
+                                    <tr><td> Last updated: <strong><span t-field="question.write_date" t-options='{"format":"short"}'/></strong></td></tr>
                                 </table>
                             </div>
                         </div>
@@ -252,8 +252,8 @@
             <i t-if="question.post_type == 'question'" t-attf-class="fa fa-question-circle" t-att-title="question.post_type.capitalize()" />
             <i t-if="question.post_type == 'discussion'" t-attf-class="fa fa-comments-o" t-att-title="question.post_type.capitalize()" />
             <i t-if="question.post_type == 'link'" t-attf-class="fa fa-link" t-att-title="question.post_type.capitalize()" />
-            <span>By </span><span t-field="question.create_uid" t-field-options='{"widget": "contact", "country_image": True, "fields": ["name", "country_id"]}' style="display: inline-block;"/>
-            <span> • </span><span t-field="question.write_date" t-field-options='{"format":"short"}'/>
+            <span>By </span><span t-field="question.create_uid" t-options='{"widget": "contact", "country_image": True, "fields": ["name", "country_id"]}' style="display: inline-block;"/>
+            <span> • </span><span t-field="question.write_date" t-options='{"format":"short"}'/>
             <span> • </span><span t-field="question.views" /> View<t t-if="question.views&gt;1">s</t>
             <span> • </span><a t-attf-href="/forum/#{ slug(forum) }/question/#{ slug(question) }">
 
@@ -782,9 +782,9 @@
                     <span>By </span>
                     <a t-att-href="(question.create_uid.id == request.session.uid or question.create_uid.sudo().website_published) and '/forum/%s/user/%s' % (slug(forum), question.create_uid.id) or None"
                         t-field="question.create_uid"
-                        t-field-options='{"widget": "contact", "country_image": True, "fields": ["name", "country_id"]}'
+                        t-options='{"widget": "contact", "country_image": True, "fields": ["name", "country_id"]}'
                         style="display: inline-block;"/>
-                    <span> on </span><span t-field="question.create_date" t-field-options='{"format":"short"}'/>
+                    <span> on </span><span t-field="question.create_date" t-options='{"format":"short"}'/>
                     <span> • </span><span t-field="question.views"/> views
                 </div>
 
@@ -795,7 +795,7 @@
                     <t t-if="question.closed_uid">
                         <b> by <a t-attf-href="/forum/#{ slug(forum) }/user/#{ question.closed_uid.id }"
                             t-field="question.closed_uid"
-                            t-field-options='{"widget": "contact", "fields": ["name"]}'
+                            t-options='{"widget": "contact", "fields": ["name"]}'
                             style="display: inline-block;"/></b>
                     </t>
                     <b> on <span t-field="question.closed_date"/></b>
@@ -940,11 +940,11 @@
                 </a>
                 <a t-att-href="user_profile_url"
                     t-field="answer.create_uid"
-                    t-field-options='{"widget": "contact", "country_image": True, "fields": ["name", "country_id"]}'
+                    t-options='{"widget": "contact", "country_image": True, "fields": ["name", "country_id"]}'
                     style="display: inline-block;"/>
                 <div class="text-muted">
                     <a t-attf-href="/forum/#{slug(question.forum_id)}/question/#{slug(question)}#answer_#{answer.id}">On</a>
-                    <span t-field="answer.create_date" t-field-options='{"format":"short"}'/>
+                    <span t-field="answer.create_date" t-options='{"format":"short"}'/>
                 </div>
             </div>
             <div class="clearfix"><span t-field="answer.content" class="oe_no_empty"/></div>
@@ -1028,12 +1028,12 @@
         <div class="o_forum_tooltip_header">
             <h4 class="o_forum_tooltip_heading"><a t-att-href="user_profile_url"
                 t-field="answer.create_uid"
-                t-field-options='{"widget": "contact", "country_image": True, "fields": ["name", "country_id"]}'
+                t-options='{"widget": "contact", "country_image": True, "fields": ["name", "country_id"]}'
                 style="display: inline-block;"/>
             </h4>
-            <span t-field="answer.create_uid" t-field-options='{"widget": "contact", "UserBio": True, "badges": True, "fields": ["karma"]}'/>
+            <span t-field="answer.create_uid" t-options='{"widget": "contact", "UserBio": True, "badges": True, "fields": ["karma"]}'/>
         </div>
-        <div t-field="answer.create_uid" t-field-options='{"widget": "contact", "website_description": True, "fields": ["partner_id"]}'/>
+        <div t-field="answer.create_uid" t-options='{"widget": "contact", "website_description": True, "fields": ["partner_id"]}'/>
     </div>
 </template>
 
@@ -1065,9 +1065,9 @@
                         </t>
                     </t>
                     <a t-attf-href="/forum/#{slug(forum)}/partner/#{message.author_id.id}"
-                        t-field="message.author_id" t-field-options='{"widget": "contact", "country_image": True, "fields": ["name", "country_id"]}'
+                        t-field="message.author_id" t-options='{"widget": "contact", "country_image": True, "fields": ["name", "country_id"]}'
                         style="display: inline-block;"/>
-                    on <span t-field="message.date" t-field-options='{"format":"short"}'/>
+                    on <span t-field="message.date" t-options='{"format":"short"}'/>
                 </small>
             </div>
             <div class="css_editable_mode_hidden">
@@ -1214,7 +1214,7 @@
                 <div>
                     <a t-attf-href="/forum/#{slug(forum)}/user/#{user.id}" t-field="user.name"/>
                     <t t-if="user.country_id">
-                        <span t-field="user.country_id.image" t-field-options='{"widget": "image", "class": "country_flag"}' class='ml4'/>
+                        <span t-field="user.country_id.image" t-options='{"widget": "image", "class": "country_flag"}' class='ml4'/>
                     </t>
                     <b class='ml8'><t t-esc="user.karma"/></b>
                     <t t-raw="separator"/>
@@ -1355,10 +1355,10 @@
                 </tr>
                 <tr>
                     <td>member since</td>
-                    <td><span t-field="user.create_date" t-field-options='{"format": "short"}'/></td>
+                    <td><span t-field="user.create_date" t-options='{"format": "short"}'/></td>
                 </tr><tr>
                     <td>last connection</td>
-                    <td><span t-field="user.login_date" t-field-options='{"format": "short"}'/></td>
+                    <td><span t-field="user.login_date" t-options='{"format": "short"}'/></td>
                 </tr>
                 <tr>
                     <td rowspan="2" valign="top"><span class="text-muted">bio</span></td>
@@ -1374,7 +1374,7 @@
                         <span t-field="user.city"/>
                         <span t-if="user.city and user.country_id">, </span>
                         <span t-field="user.country_id"/>
-                        <t t-if="user.country_id"> <span t-field="user.country_id.image" t-field-options='{"widget": "image", "class": "country_flag"}'/></t>
+                        <t t-if="user.country_id"> <span t-field="user.country_id.image" t-options='{"widget": "image", "class": "country_flag"}'/></t>
 
                     </td>
                 </tr>
@@ -1443,7 +1443,7 @@
             <div class="tab-pane" id="activity" t-if="uid == user.id">
                 <ul class="list-unstyled">
                     <li t-foreach="activities" t-as="activity">
-                        <span t-field="activity.date" t-field-options='{"format": "short"}'/>
+                        <span t-field="activity.date" t-options='{"format": "short"}'/>
                         <span t-esc="activity.subtype_id.name" class="label label-info"/>
                         <t t-set="post" t-value="posts[activity.res_id]"/>
                         <span t-if="post[1]">
diff --git a/addons/website_hr_recruitment/views/templates.xml b/addons/website_hr_recruitment/views/templates.xml
index 5adf0751c79..09ac1c2f3ad 100644
--- a/addons/website_hr_recruitment/views/templates.xml
+++ b/addons/website_hr_recruitment/views/templates.xml
@@ -67,7 +67,7 @@
                                         </small>
                                     </h3>
 
-                                    <span t-field="job.address_id" t-field-options='{
+                                    <span t-field="job.address_id" t-options='{
                                         "widget": "contact",
                                         "fields": ["address"],
                                         "no_tag_br": True
@@ -110,7 +110,7 @@
 
         <div class="oe_structure" style="clear:both;">
             <h1 class="text-center" t-field="job.name"/>
-            <h5 class="text-center" t-field="job.address_id" t-field-options='{
+            <h5 class="text-center" t-field="job.address_id" t-options='{
                 "widget": "contact",
                 "fields": ["address"],
                 "no_tag_br": True
diff --git a/addons/website_mail_channel/views/website_mail_channel_templates.xml b/addons/website_mail_channel/views/website_mail_channel_templates.xml
index dfbebe1f4fe..f773dfe3623 100644
--- a/addons/website_mail_channel/views/website_mail_channel_templates.xml
+++ b/addons/website_mail_channel/views/website_mail_channel_templates.xml
@@ -209,7 +209,7 @@
                             <small>
                                 by
                                 <t t-if="message.author_id">
-                                    <span t-field="message.author_id" style="display: inline-block;" t-field-options='{
+                                    <span t-field="message.author_id" style="display: inline-block;" t-options='{
                                         "widget": "contact",
                                         "fields": ["name"]
                                     }'/>
@@ -272,7 +272,7 @@
                     <small>
                         by
                         <t t-if="thread.author_id">
-                            <span t-field="thread.author_id" style="display: inline-block;" t-field-options='{
+                            <span t-field="thread.author_id" style="display: inline-block;" t-options='{
                                 "widget": "contact",
                                 "fields": ["name"]
                             }'/>
diff --git a/addons/website_membership/views/website_membership.xml b/addons/website_membership/views/website_membership.xml
index cd34d1214bf..40e84628b2f 100644
--- a/addons/website_membership/views/website_membership.xml
+++ b/addons/website_membership/views/website_membership.xml
@@ -62,7 +62,7 @@
                                 <div class="media">
                                     <a class="pull-left" t-attf-href="/members/#{slug(partner)}"
                                        t-field="partner.image_small"
-                                       t-field-options='{"widget": "image", "class": "media-object"}'
+                                       t-options='{"widget": "image", "class": "media-object"}'
                                     ></a>
                                     <div class="media-body" style="min-height: 64px;">
                                         <a class="media-heading" t-attf-href="/members/#{slug(partner)}">
diff --git a/addons/website_partner/views/website_partner_templates.xml b/addons/website_partner/views/website_partner_templates.xml
index 0bcdc93396d..2d975074dff 100644
--- a/addons/website_partner/views/website_partner_templates.xml
+++ b/addons/website_partner/views/website_partner_templates.xml
@@ -21,9 +21,9 @@
     </t>
     <h1 class="col-md-12 text-center" id="partner_name" t-field="partner.display_name"/>
     <div class="col-md-4">
-        <div t-field="partner.image" t-field-options='{"widget": "image", "class": "center-block mb16"}'/>
+        <div t-field="partner.image" t-options='{"widget": "image", "class": "center-block mb16"}'/>
         <address class="well">
-             <div t-field="partner.self" t-field-options='{
+             <div t-field="partner.self" t-options='{
                  "widget": "contact",
                  "fields": ["address", "website", "phone", "fax", "email"]
              }'/>
diff --git a/addons/website_portal/views/templates.xml b/addons/website_portal/views/templates.xml
index 3c6e70b78aa..517a75d29e0 100644
--- a/addons/website_portal/views/templates.xml
+++ b/addons/website_portal/views/templates.xml
@@ -57,7 +57,7 @@
                         </div>
                         <div class="o_my_details">
                             <h3 class="page-header">Your Details <a href="/my/account" class="btn btn-default btn-xs">Change</a></h3>
-                            <div t-field="user.partner_id" t-field-options='{"widget": "contact", "fields": ["email", "phone", "address", "name"]}'/>
+                            <div t-field="user.partner_id" t-options='{"widget": "contact", "fields": ["email", "phone", "address", "name"]}'/>
                         </div>
                         <div class="o_my_archives" t-if="archive_groups">
                             <t t-call="website_portal.portal_archive_groups"/>
diff --git a/addons/website_portal_sale/views/templates.xml b/addons/website_portal_sale/views/templates.xml
index 9ca9608d840..de449b76de8 100644
--- a/addons/website_portal_sale/views/templates.xml
+++ b/addons/website_portal_sale/views/templates.xml
@@ -91,7 +91,7 @@
                             <span class="label label-default"><i class="fa fa-fw fa-clock-o"/> Expired</span>
                           </t>
                         </td>
-                        <td><span t-field="quotation.amount_total" t-field-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'/>
+                        <td><span t-field="quotation.amount_total" t-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'/>
                         </td>
                     </tr>
                 </t>
@@ -136,7 +136,7 @@
                                 <span class="label label-default"><i class="fa fa-fw fa-check"/> Done</span>
                             </t>
                         </td>
-                        <td><span t-field="order.amount_total" t-field-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/></td>
+                        <td><span t-field="order.amount_total" t-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/></td>
                     </tr>
                 </t>
             </table>
@@ -186,7 +186,7 @@
                         <td>
                           <a t-if="invoice.state == 'open'" t-attf-href="/website_payment/pay?reference=#{invoice.number}&amp;amount=#{invoice.residual}&amp;currency_id=#{invoice.currency_id.id}&amp;country_id=#{invoice.partner_id.country_id.id}" alt="Pay Now" class="btn btn-xs btn-primary"><i class="fa fa-arrow-circle-right"/> Pay Now</a>
                         </td>
-                        <td><span t-field="invoice.residual" t-field-options='{"widget": "monetary", "display_currency": invoice.currency_id}'/></td>
+                        <td><span t-field="invoice.residual" t-options='{"widget": "monetary", "display_currency": invoice.currency_id}'/></td>
                     </tr>
                 </t>
             </table>
@@ -251,7 +251,7 @@
                     <div class="panel-body">
                       <!-- <hr/> -->
                       <div class="mb8">
-                          <strong>Date:</strong> <span t-field="order.create_date" t-field-options='{"widget": "date"}'/>
+                          <strong>Date:</strong> <span t-field="order.create_date" t-options='{"widget": "date"}'/>
                       </div>
                       <div class='row'>
                         <div class="col-md-6">
@@ -259,7 +259,7 @@
                             <strong>Invoicing Address</strong>
                           </div>
                           <div>
-                            <address t-field="order.partner_invoice_id" t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'/>
+                            <address t-field="order.partner_invoice_id" t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'/>
                           </div>
                           <t t-set="invoices" t-value="[i for i in order.invoice_ids if i.state not in ['draft', 'cancel']]"/>
                           <t t-if="invoices">
@@ -289,7 +289,7 @@
                             <strong>Shipping Address</strong>
                           </div>
                           <div>
-                            <address t-field="order.partner_shipping_id" t-field-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'/>
+                            <address t-field="order.partner_shipping_id" t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'/>
                           </div>
                         </div>
                       </div>
@@ -319,7 +319,7 @@
                               <span t-esc="ol.product_id.name"/>
                             </div>
                           <div class="col-md-2 text-right">
-                            <span t-field="ol.price_unit" t-field-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
+                            <span t-field="ol.price_unit" t-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
                           </div>
                           <div class="col-md-2 text-right">
                             <t t-if="ol._name == 'sale.order.line'">
@@ -330,7 +330,7 @@
                             </t>
                           </div>
                           <div class="col-md-2 text-right">
-                            <span t-field="ol.price_subtotal" t-field-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
+                            <span t-field="ol.price_subtotal" t-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
                           </div>
                         </div>
                       </t>
@@ -342,7 +342,7 @@
                           <div>
                             <strong>Contact</strong>
                           </div>
-                          <div t-field="order.user_id.partner_id" t-field-options='{"widget": "contact", "fields": ["email", "phone"]}'/>
+                          <div t-field="order.user_id.partner_id" t-options='{"widget": "contact", "fields": ["email", "phone"]}'/>
                         </div>
                         <div class="col-md-6">
                           <div class="row">
@@ -350,7 +350,7 @@
                               Untaxed Amount:
                             </div>
                             <div class="col-md-2 text-right">
-                              <span t-field="order.amount_untaxed" t-field-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
+                              <span t-field="order.amount_untaxed" t-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
                             </div>
                           </div>
                           <div class="row">
@@ -358,7 +358,7 @@
                               Taxes:
                             </div>
                             <div class="col-md-2 text-right">
-                              <span t-field="order.amount_tax" t-field-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
+                              <span t-field="order.amount_tax" t-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
                             </div>
                           </div>
                           <div class="row">
@@ -366,7 +366,7 @@
                               <strong>Total:</strong>
                             </div>
                             <div class="col-md-2 text-right">
-                              <strong><span t-field="order.amount_total" t-field-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/></strong>
+                              <strong><span t-field="order.amount_total" t-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/></strong>
                             </div>
                           </div>
                         </div>
diff --git a/addons/website_project_issue/views/project_issue_templates.xml b/addons/website_project_issue/views/project_issue_templates.xml
index e7e88b05930..a0bdc8338a1 100644
--- a/addons/website_project_issue/views/project_issue_templates.xml
+++ b/addons/website_project_issue/views/project_issue_templates.xml
@@ -88,19 +88,19 @@
                             </div>
                             <div class="panel-body">
                                 <div class="mb8">
-                                    <strong>Date:</strong> <span t-field="issue.create_date" t-field-options='{"widget": "date"}'/>
+                                    <strong>Date:</strong> <span t-field="issue.create_date" t-options='{"widget": "date"}'/>
                                 </div>
                                 <div class='row'>
                                     <div class="col-md-6" t-if="issue.user_id">
                                         <strong>Assigned to</strong>
                                         <div>
-                                            <address t-field="issue.user_id" t-field-options='{"widget": "contact", "fields": ["name", "email", "phone"], "no_marker": True}'/>
+                                            <address t-field="issue.user_id" t-options='{"widget": "contact", "fields": ["name", "email", "phone"], "no_marker": True}'/>
                                         </div>
                                     </div>
                                     <div class="col-md-6">
                                         <strong>Reported by</strong>
                                         <div t-if="issue.partner_id">
-                                            <address t-field="issue.partner_id" t-field-options='{"widget": "contact", "fields": ["name", "email"], "no_marker": True}'/>
+                                            <address t-field="issue.partner_id" t-options='{"widget": "contact", "fields": ["name", "email"], "no_marker": True}'/>
                                         </div>
                                     </div>
                                 </div>
diff --git a/addons/website_project_issue_sheet/views/project_issue_templates.xml b/addons/website_project_issue_sheet/views/project_issue_templates.xml
index 4c27cd4b171..b3ff8ec7c4b 100644
--- a/addons/website_project_issue_sheet/views/project_issue_templates.xml
+++ b/addons/website_project_issue_sheet/views/project_issue_templates.xml
@@ -17,7 +17,7 @@
                         <td><span t-esc="timesheet.date"/></td>
                         <td><span t-esc="timesheet.name"/></td>
                         <td><span t-esc="timesheet.user_id.name"/></td>
-                        <td><span t-field="timesheet.unit_amount" t-field-options='{"widget": "duration", "unit": "hour"}'/></td>
+                        <td><span t-field="timesheet.unit_amount" t-options='{"widget": "duration", "unit": "hour"}'/></td>
                     </tr>
                 </table>
             </t>
diff --git a/addons/website_quote/views/report_saleorder.xml b/addons/website_quote/views/report_saleorder.xml
index 1a2ad2606b5..b0bfcbdb5a1 100644
--- a/addons/website_quote/views/report_saleorder.xml
+++ b/addons/website_quote/views/report_saleorder.xml
@@ -38,7 +38,7 @@
                         <td>
                             <strong class="text-right">
                                 <div t-field="option.price_unit"
-                                    t-field-options='{"widget": "monetary", "display_currency": doc.pricelist_id.currency_id}'
+                                    t-options='{"widget": "monetary", "display_currency": doc.pricelist_id.currency_id}'
                                     t-att-style="option.discount and 'text-decoration: line-through' or None"
                                     t-att-class="option.discount and 'text-danger' or None"/>
                                 <div t-if="option.discount">
diff --git a/addons/website_quote/views/website_quotation.xml b/addons/website_quote/views/website_quotation.xml
index 15865b78ad7..343e737a734 100644
--- a/addons/website_quote/views/website_quotation.xml
+++ b/addons/website_quote/views/website_quotation.xml
@@ -62,7 +62,7 @@
                               </td>
                               <td class="text-right">
                                     <div t-field="line.price_unit"
-                                        t-field-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'
+                                        t-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'
                                         t-att-style="line.discount and 'text-decoration: line-through' or None"
                                         t-att-class="(line.discount and 'text-danger' or '') + ' text-right'"/>
                                     <!-- TODO: apply monetary widget formating -->
@@ -72,11 +72,11 @@
                               </td>
                               <td class="text-right" groups="sale.group_show_price_subtotal">
                                   <span t-field="line.price_subtotal"
-                                        t-field-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'/>
+                                        t-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'/>
                               </td>
                               <td class="text-right" groups="sale.group_show_price_total">
                                   <span t-field="line.price_total"
-                                        t-field-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'/>
+                                        t-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'/>
                               </td>
                               <td class="text-center">
                                   <a t-attf-href="./update_line/#{ line.id }/?order_id=#{ quotation.id }&amp;unlink=True&amp;token=#{ quotation.access_token }" class="mb8 js_update_line_json hidden-print" t-if="line.option_line_id">
@@ -103,7 +103,7 @@
                             <td></td><td></td><td></td><td></td>
                             <td class="text-right"><strong>Subtotal:</strong></td>
                             <td class="text-right">
-                                <strong data-id="total_amount" t-field="quotation.amount_untaxed" t-field-options='{"widget": "monetary","display_currency": quotation.pricelist_id.currency_id}'/>
+                                <strong data-id="total_amount" t-field="quotation.amount_untaxed" t-options='{"widget": "monetary","display_currency": quotation.pricelist_id.currency_id}'/>
                             </td>
                             <td></td>
                         </tr>
@@ -112,7 +112,7 @@
                             <td></td><td></td><td></td><td></td>
                             <td class="text-right">Taxes:</td>
                             <td class="text-right">
-                                <span data-id="total_amount" t-field="quotation.amount_tax" t-field-options='{"widget": "monetary","display_currency": quotation.pricelist_id.currency_id}'/>
+                                <span data-id="total_amount" t-field="quotation.amount_tax" t-options='{"widget": "monetary","display_currency": quotation.pricelist_id.currency_id}'/>
                             </td>
                             <td></td>
                         </tr>
@@ -120,7 +120,7 @@
                             <td></td><td></td><td></td><td></td>
                             <td class="text-right"><strong>Total:</strong></td>
                             <td class="text-right">
-                                <strong data-id="total_amount" t-field="quotation.amount_total" t-field-options='{"widget": "monetary","display_currency": quotation.pricelist_id.currency_id}'/>
+                                <strong data-id="total_amount" t-field="quotation.amount_total" t-options='{"widget": "monetary","display_currency": quotation.pricelist_id.currency_id}'/>
                             </td>
                             <td></td>
                         </tr>
@@ -224,22 +224,22 @@
                                   <p class="text-muted mb8">Your advantage:</p>
                                   <t t-if="quotation.amount_untaxed == quotation.amount_total">
                                       <strong t-field="quotation.amount_total"
-                                          t-field-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'/>
+                                          t-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'/>
                                       <strong t-field="quotation.amount_undiscounted"
-                                          t-field-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'
+                                          t-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'
                                           style="text-decoration: line-through"
                                           class="text-danger"/>
                                   </t>
                                   <t t-if="quotation.amount_untaxed != quotation.amount_total">
                                       <strong t-field="quotation.amount_untaxed"
-                                          t-field-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'/>
+                                          t-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'/>
                                       <strong t-field="quotation.amount_undiscounted"
-                                          t-field-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'
+                                          t-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'
                                           style="text-decoration: line-through"
                                           class="text-danger"/>
                                       <br />
                                       (<span t-field="quotation.amount_total"
-                                          t-field-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'/> Incl. tax)
+                                          t-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'/> Incl. tax)
                                   </t>
                               </div>
                          </div>
@@ -296,7 +296,7 @@
                                   <span>I agree that by signing this proposal, I
                                   accept it on the behalf of </span><b t-field="quotation.company_id"/><span>, for an amount of </span>
                                   <b data-id="total_amount" t-field="quotation.amount_total"
-                                    t-field-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'/>
+                                    t-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'/>
                                   <span>with payment terms: </span><b t-field="quotation.payment_term_id"/>.
                               </p>
                               <div id="signer" class="form-group">
@@ -323,7 +323,7 @@
                                 <span>I agree that by paying this proposal, I
                                 accept it on the behalf of </span><b t-field="quotation.company_id"/><span>, for an amount of </span>
                                 <b data-id="total_amount" t-field="quotation.amount_total"
-                                  t-field-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'/>
+                                  t-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'/>
                                 <span>with payment terms: </span><b t-field="quotation.payment_term_id"/>.
                             </p>
                           </div>
@@ -474,7 +474,7 @@
               <div class="row">
                   <label class="col-sm-4 col-xs-4 text-right">Bill To:</label>
                   <div class="col-sm-8 col-xs-8">
-                      <div t-field="quotation.partner_invoice_id" t-field-options='{
+                      <div t-field="quotation.partner_invoice_id" t-options='{
                           "widget": "contact",
                           "fields": ["address", "name", "phone", "email"]
                           }'/>
@@ -483,7 +483,7 @@
               <div t-if="quotation.partner_shipping_id.id != quotation.partner_invoice_id.id" class="row">
                   <label class="col-sm-4 col-xs-4 text-right">Ship To:</label>
                   <div class="col-sm-8 col-xs-8">
-                      <div t-field="quotation.partner_shipping_id" t-field-options='{
+                      <div t-field="quotation.partner_shipping_id" t-options='{
                         "widget": "contact",
                         "fields": ["address", "name", "phone"]
                         }'/>
@@ -494,7 +494,7 @@
               <div class="row">
                   <label class="col-sm-5 col-xs-5 text-right">Your Contact:</label>
                   <div class="col-sm-7 col-xs-7">
-                      <div t-field="quotation.user_id" t-field-options='{
+                      <div t-field="quotation.user_id" t-options='{
                           "widget": "contact",
                           "fields": ["name", "phone", "email"]
                           }'/>
@@ -591,7 +591,7 @@
                             <td>
                                 <strong class="text-right">
                                     <div t-field="option.price_unit"
-                                    t-field-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'
+                                    t-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'
                                     t-att-style="option.discount and 'text-decoration: line-through' or None"
                                     t-att-class="option.discount and 'text-danger' or None"/>
                                     <div t-if="option.discount">
@@ -703,7 +703,7 @@
                           <span class="label label-default"><i class="fa fa-fw fa-clock-o"/> Expired</span>
                         </t>
                       </td>
-                      <td><span t-field="quotation.amount_total" t-field-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'/>
+                      <td><span t-field="quotation.amount_total" t-options='{"widget": "monetary", "display_currency": quotation.pricelist_id.currency_id}'/>
                       </td>
               </tr>
           </t>
diff --git a/addons/website_sale/views/report_shop_saleorder.xml b/addons/website_sale/views/report_shop_saleorder.xml
index 6c0954f6c20..e6ea9306f0d 100644
--- a/addons/website_sale/views/report_shop_saleorder.xml
+++ b/addons/website_sale/views/report_shop_saleorder.xml
@@ -35,7 +35,7 @@
                             </td>
                             <td class="text-right">
                                 <span t-field="doc.amount_total"
-                                    t-field-options='{"widget": "monetary", "display_currency": doc.pricelist_id.currency_id}'/>
+                                    t-options='{"widget": "monetary", "display_currency": doc.pricelist_id.currency_id}'/>
                             </td>
                         </tr>
                     </tbody>
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 04256896248..ee64dadd3aa 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -76,7 +76,7 @@
                 </div>
                 <div class="oe_product_image">
                     <a itemprop="url" t-att-href="keep('/shop/product/%s' % slug(product), page=(pager['page']['num'] if pager['page']['num']&gt;1 else None))">
-                        <span itemprop="image" t-field="product.image" t-field-options="{'widget': 'image', 'resize': None if product_image_big else '300x300'}" t-att-alt="product.name" />
+                        <span itemprop="image" t-field="product.image" t-options="{'widget': 'image', 'resize': None if product_image_big else '300x300'}" t-att-alt="product.name" />
                     </a>
                 </div>
                 <t t-if="show_publish">
@@ -366,7 +366,7 @@
                     </div>
                     <div class="row">
                         <div class="col-sm-7 col-md-7 col-lg-7">
-                            <span itemprop="image" t-field="product.image" t-field-options="{'widget': 'image', 'class': 'product_detail_img', 'alt-field': 'name'}" />
+                            <span itemprop="image" t-field="product.image" t-options="{'widget': 'image', 'class': 'product_detail_img', 'alt-field': 'name'}" />
                         </div>
                         <div class="col-sm-5 col-md-5 col-lg-4 col-lg-offset-1" id="product_details">
                             <h1 itemprop="name" t-field="product.name">Product Name</h1>
@@ -420,7 +420,7 @@
                     <t t-foreach="product.alternative_product_ids" t-as="alt_product">
                         <div class="col-md-2 thumbnail" style="width: 170px; height:130px; float:left; display:inline; margin-right: 10px; overflow:hidden;">
                             <div class="mt16 text-center" style="height: 100%;">
-                                <div t-field="alt_product.image_small" t-field-options="{'widget': 'image', 'class': 'img-rounded shadow o_alternative_product' }" />
+                                <div t-field="alt_product.image_small" t-options="{'widget': 'image', 'class': 'img-rounded shadow o_alternative_product' }" />
                                 <h5>
                                     <a t-attf-href="/shop/product/#{ slug(alt_product) }" style="display: block">
                                         <span t-att-title="alt_product.name" t-field="alt_product.name" style="display: block;" />
@@ -504,7 +504,7 @@
           <h4 class="css_non_editable_mode_hidden">
             <!-- keep field for editor -->
             <span t-field="product.lst_price"
-                t-field-options='{
+                t-options='{
                    "widget": "monetary",
                    "display_currency": product.currency_id
                }'/>
@@ -524,7 +524,7 @@
             <input type="radio" name="product_id" class="js_product_change" t-att-checked="'checked' if variant_id_index == 0 else None" t-att-value="variant_id.id" t-att-data-lst_price="variant_id.lst_price" t-att-data-price="variant_id.price"/>
             <span t-esc="variant_id.name_get()[0][1]"/>
             <span class="badge" t-if="variant_id.price_extra">
-              <t t-esc="variant_id.price_extra > 0 and '+' or ''"/><span t-field="variant_id.price_extra" style="white-space: nowrap;" t-field-options='{
+              <t t-esc="variant_id.price_extra > 0 and '+' or ''"/><span t-field="variant_id.price_extra" style="white-space: nowrap;" t-options='{
                     "widget": "monetary",
                     "from_currency": product.currency_id,
                     "display_currency": website.currency_id
@@ -549,7 +549,7 @@
                   <option t-att-value="value_id.id">
                       <span t-field="value_id.name"/>
                       <span t-if="value_id.price_extra">
-                          <t t-esc="value_id.price_extra > 0 and '+' or ''"/><span t-field="value_id.price_extra" style="white-space: nowrap;" t-field-options='{
+                          <t t-esc="value_id.price_extra > 0 and '+' or ''"/><span t-field="value_id.price_extra" style="white-space: nowrap;" t-options='{
                                    "widget": "monetary",
                                     "from_currency": product.currency_id,
                                    "display_currency": website.currency_id
@@ -569,7 +569,7 @@
                               <input type="radio" class="js_variant_change" t-att-checked="'checked' if not inc else None" t-att-name="'attribute-%s-%s' % (product.id, variant_id.attribute_id.id)" t-att-value="value_id.id" style="vertical-align: top; margin-right: 10px;"/>
                               <span t-field="value_id.name"/>
                               <span class="badge" t-if="value_id.price_extra">
-                                  <t t-esc="value_id.price_extra > 0 and '+' or ''"/><span t-field="value_id.price_extra" style="white-space: nowrap;" t-field-options='{
+                                  <t t-esc="value_id.price_extra > 0 and '+' or ''"/><span t-field="value_id.price_extra" style="white-space: nowrap;" t-options='{
                                           "widget": "monetary",
                                           "from_currency": product.currency_id,
                                           "display_currency": website.currency_id
@@ -762,7 +762,7 @@
                     <tr>
                         <td colspan="2" t-if="not line.product_id.product_tmpl_id"></td>
                         <td align="center" t-if="line.product_id.product_tmpl_id">
-                            <span t-field="line.product_id.image_small" t-field-options="{'widget': 'image', 'class': 'img-rounded'}" />
+                            <span t-field="line.product_id.image_small" t-options="{'widget': 'image', 'class': 'img-rounded'}" />
                         </td>
                         <td t-if="line.product_id.product_tmpl_id">
                             <div>
@@ -788,8 +788,8 @@
                             <t t-if="(compute_currency(line.product_id.lst_price)  - line.price_reduce ) &gt; 0.1">
                                 <del class="text-danger mr8" style="white-space: nowrap;" t-esc="compute_currency(website.get_product_price(line.product_id, public=True))" t-options="{'widget': 'monetary', 'display_currency': website.get_current_pricelist().currency_id, 'from_currency': website.currency_id}" />
                             </t>
-                            <span t-field="line.price_reduce_taxexcl" style="white-space: nowrap;" t-field-options="{'widget': 'monetary', 'from_currency': line.company_id.currency_id, 'display_currency': website.currency_id}" groups="sale.group_show_price_subtotal" />
-                            <span t-field="line.price_reduce_taxinc" style="white-space: nowrap;" t-field-options="{'widget': 'monetary', 'from_currency': line.company_id.currency_id, 'display_currency': website.currency_id}" groups="sale.group_show_price_total" />
+                            <span t-field="line.price_reduce_taxexcl" style="white-space: nowrap;" t-options="{'widget': 'monetary', 'from_currency': line.company_id.currency_id, 'display_currency': website.currency_id}" groups="sale.group_show_price_subtotal" />
+                            <span t-field="line.price_reduce_taxinc" style="white-space: nowrap;" t-options="{'widget': 'monetary', 'from_currency': line.company_id.currency_id, 'display_currency': website.currency_id}" groups="sale.group_show_price_total" />
                         </td>
                     </tr>
                 </t>
@@ -846,7 +846,7 @@
             <t t-foreach="website_sale_order.website_order_line" t-as="line">
                 <div class="row mb8 cart_line">
                     <div class="col-xs-3">
-                        <span t-field="line.product_id.image_small" t-field-options="{'widget': 'image', 'class': 'img-rounded'}" />
+                        <span t-field="line.product_id.image_small" t-options="{'widget': 'image', 'class': 'img-rounded'}" />
                     </div>
                     <div class="col-xs-9">
                         <a t-attf-href="/shop/product/#{ slug(line.product_id.product_tmpl_id) }">
@@ -886,7 +886,7 @@
                     <tr t-foreach="suggested_products" t-as="product">
                         <td>
                             <a t-attf-href="/shop/product/#{ slug(product.product_tmpl_id) }">
-                                <span t-field="product.image_small" t-field-options="{'widget': 'image', 'class': 'img-rounded'}" />
+                                <span t-field="product.image_small" t-options="{'widget': 'image', 'class': 'img-rounded'}" />
                             </a>
                         </td>
                         <td>
@@ -899,9 +899,9 @@
                         </td>
                         <td>
                             <t t-if="(compute_currency(product.lst_price) - product.price) &gt; 0.1">
-                                <del class="text-danger mr8" style="white-space: nowrap;" t-field="product.lst_price" t-field-options="{'widget': 'monetary','from_currency': product.currency_id, 'display_currency': website.currency_id}" />
+                                <del class="text-danger mr8" style="white-space: nowrap;" t-field="product.lst_price" t-options="{'widget': 'monetary','from_currency': product.currency_id, 'display_currency': website.currency_id}" />
                             </t>
-                            <span t-field="product.price" style="white-space: nowrap;" t-field-options="{'widget': 'monetary','display_currency': website.currency_id}" />
+                            <span t-field="product.price" style="white-space: nowrap;" t-options="{'widget': 'monetary','display_currency': website.currency_id}" />
                         </td>
                         <td class="text-center">
                             <input class="js_quantity" name="product_id" t-att-data-product-id="product.id" type="hidden" />
@@ -1199,7 +1199,7 @@
                                         <td colspan="2" t-if="not line.product_id.product_tmpl_id"></td>
                                         <td t-if="line.product_id.product_tmpl_id">
                                             <a t-attf-href="/shop/product/#{ slug(line.product_id.product_tmpl_id) }">
-                                                <span t-field="line.product_id.image_small" t-field-options="{'widget': 'image', 'class': 'img-rounded'}" />
+                                                <span t-field="line.product_id.image_small" t-options="{'widget': 'image', 'class': 'img-rounded'}" />
                                             </a>
                                         </td>
                                         <td t-if="line.product_id.product_tmpl_id">
@@ -1209,7 +1209,7 @@
                                             <div t-esc="line.product_uom_qty" />
                                         </td>
                                         <td class="text-center">
-                                            <span t-field="line.price_unit" style="white-space: nowrap;" t-field-options="{'widget': 'monetary','from_currency': website_sale_order.pricelist_id.currency_id,'display_currency': website.currency_id}" />
+                                            <span t-field="line.price_unit" style="white-space: nowrap;" t-options="{'widget': 'monetary','from_currency': website_sale_order.pricelist_id.currency_id,'display_currency': website.currency_id}" />
                                         </td>
                                     </tr>
                                 </tbody>
@@ -1224,14 +1224,14 @@
                             <div class="panel panel-info">
                               <div class="panel-heading">Bill To:</div>
                               <div class="panel-body">
-                                <div t-field="order.partner_invoice_id" t-field-options="{'widget': 'contact','fields': ['address', 'name', 'phone', 'email']}" />
+                                <div t-field="order.partner_invoice_id" t-options="{'widget': 'contact','fields': ['address', 'name', 'phone', 'email']}" />
                               </div>
                             </div>                            
                             <t t-if="website_sale_order and not website_sale_order.only_services">
                                 <div class="panel panel-info">
                                     <div class="panel-heading">Ship To:</div>
                                     <div class="panel-body">
-                                            <div t-field="order.partner_shipping_id" t-field-options="{'widget': 'contact', 'fields': ['address', 'name', 'phone']}" />
+                                            <div t-field="order.partner_shipping_id" t-options="{'widget': 'contact', 'fields': ['address', 'name', 'phone']}" />
                                         
                                     </div>
                                 </div>
@@ -1341,13 +1341,13 @@
                                           <td>
                                               <span class="text-right">
                                                   <div t-field="line.price_unit"
-                                                      t-field-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
+                                                      t-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
                                               </span>
                                           </td>
                                           <td>
                                               <div class="text-right"
                                                   t-field="line.price_subtotal"
-                                                  t-field-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
+                                                  t-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
                                           </td>
                                       </tr>
                                     </tbody>
@@ -1356,14 +1356,14 @@
                                           <td colspan="2"></td>
                                           <td class="text-right">Subtotal:</td>
                                           <td class="text-right">
-                                              <span t-field="order.amount_untaxed" style="white-space: nowrap;" t-field-options="{'widget': 'monetary','from_currency': order.pricelist_id.currency_id,'display_currency': website.currency_id}" />
+                                              <span t-field="order.amount_untaxed" style="white-space: nowrap;" t-options="{'widget': 'monetary','from_currency': order.pricelist_id.currency_id,'display_currency': website.currency_id}" />
                                           </td>
                                       </tr>
                                       <tr>
                                           <td class='noborder' colspan="2"></td>
                                           <td class="text-right noborder">Taxes:</td>
                                           <td class="text-right noborder">
-                                               <span t-field="order.amount_tax" style="white-space: nowrap;" t-field-options="{'widget': 'monetary', 'from_currency': order.pricelist_id.currency_id, 'display_currency': website.currency_id}" />
+                                               <span t-field="order.amount_tax" style="white-space: nowrap;" t-options="{'widget': 'monetary', 'from_currency': order.pricelist_id.currency_id, 'display_currency': website.currency_id}" />
                                           </td>
                                       </tr>
                                       <tr>
@@ -1371,7 +1371,7 @@
                                           <td class="text-right"><strong>Total:</strong></td>
                                           <td class="text-right">
                                               <strong t-field="order.amount_total"
-                                                  t-field-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
+                                                  t-options='{"widget": "monetary", "display_currency": order.pricelist_id.currency_id}'/>
                                           </td>
                                       </tr>
                                   </tfooter>
@@ -1392,7 +1392,7 @@
                                                 <strong>Total:</strong>
                                             </td>
                                             <td class="text-right" width="100">
-                                                <strong t-field="order.amount_total" t-field-options="{'widget': 'monetary', 'display_currency': order.pricelist_id.currency_id}" />
+                                                <strong t-field="order.amount_total" t-options="{'widget': 'monetary', 'display_currency': order.pricelist_id.currency_id}" />
                                             </td>
                                         </tr>
                                     </tbody>
@@ -1404,14 +1404,14 @@
                             <div class="panel panel-info">
                               <div class="panel-heading">Bill To:</div>
                               <div class="panel-body">
-                                <div t-field="order.partner_invoice_id" t-field-options="{'widget': 'contact','fields': ['address', 'name', 'phone', 'email']}" />
+                                <div t-field="order.partner_invoice_id" t-options="{'widget': 'contact','fields': ['address', 'name', 'phone', 'email']}" />
                               </div>
                             </div>
                             <t t-if="not order.only_services">
                                 <div class="panel panel-info">
                                   <div class="panel-heading">Ship To:</div>
                                   <div class="panel-body">
-                                    <div t-field="order.partner_shipping_id" t-field-options="{'widget': 'contact','fields': ['address', 'name', 'phone']}" />
+                                    <div t-field="order.partner_shipping_id" t-options="{'widget': 'contact','fields': ['address', 'name', 'phone']}" />
                                   </div>
                                 </div>
                             </t>
@@ -1459,19 +1459,19 @@
             <div class="row" id="order_total_untaxed">
                 <span class="col-xs-6 text-right text-muted">Subtotal:</span>
                 <span class="col-xs-6 text-left text-muted">
-                    <span t-field="website_sale_order.amount_untaxed" style="white-space: nowrap;" t-field-options="{'widget': 'monetary','from_currency': website_sale_order.pricelist_id.currency_id,'display_currency': website.currency_id}" />
+                    <span t-field="website_sale_order.amount_untaxed" style="white-space: nowrap;" t-options="{'widget': 'monetary','from_currency': website_sale_order.pricelist_id.currency_id,'display_currency': website.currency_id}" />
                 </span>
             </div>
             <div class="row" id="order_total_taxes">
                 <span class="col-xs-6 text-right text-muted" title="Taxes may be updated after providing shipping address"> Taxes:</span>
                 <span class="col-xs-6 text-left text-muted">
-                    <span t-field="website_sale_order.amount_tax" style="white-space: nowrap;" t-field-options="{'widget': 'monetary', 'from_currency': website_sale_order.pricelist_id.currency_id, 'display_currency': website.currency_id}" />
+                    <span t-field="website_sale_order.amount_tax" style="white-space: nowrap;" t-options="{'widget': 'monetary', 'from_currency': website_sale_order.pricelist_id.currency_id, 'display_currency': website.currency_id}" />
                 </span>
             </div>
             <div class="row" id="order_total">
                 <span class="col-xs-6 text-right h4">Total:</span>
                 <span class="col-xs-6 text-left h4" style="white-space: nowrap;">
-                    <span t-field="website_sale_order.amount_total" style="white-space: nowrap;" t-field-options="{'widget': 'monetary','from_currency': website_sale_order.pricelist_id.currency_id,'display_currency': website.currency_id}" />
+                    <span t-field="website_sale_order.amount_total" style="white-space: nowrap;" t-options="{'widget': 'monetary','from_currency': website_sale_order.pricelist_id.currency_id,'display_currency': website.currency_id}" />
                 </span>
             </div>
         </div>
diff --git a/addons/website_sale_delivery/views/website_sale_delivery.xml b/addons/website_sale_delivery/views/website_sale_delivery.xml
index 78443297289..ec89155d21d 100644
--- a/addons/website_sale_delivery/views/website_sale_delivery.xml
+++ b/addons/website_sale_delivery/views/website_sale_delivery.xml
@@ -7,7 +7,7 @@
             <div class="row" id="order_delivery" t-if="website_sale_order and website_sale_order.has_delivery">
                   <span class="col-xs-6 text-right text-muted" title="Delivery will be updated after choosing a new delivery method"> Delivery:</span>
                   <span class="col-xs-6 text-left text-muted">
-                      <span t-field="website_sale_order.amount_delivery" style="white-space: nowrap;" t-field-options='{
+                      <span t-field="website_sale_order.amount_delivery" style="white-space: nowrap;" t-options='{
                               "widget": "monetary",
                               "from_currency": website_sale_order.currency_id,
                               "display_currency": user_id.partner_id.property_product_pricelist.currency_id
@@ -36,7 +36,7 @@
                                         t-att-checked="order.carrier_id and order.carrier_id.id == delivery.id and 'checked' or False"/>
                                     <abbr t-att-title="delivery.website_description"><span t-field="delivery.name"/></abbr>
                                     <span class="badge" t-field="delivery.price"
-                                        t-field-options='{
+                                        t-options='{
                                             "widget": "monetary",
                                             "from_currency": delivery.product_id.company_id.currency_id,
                                             "display_currency": website_sale_order.currency_id
diff --git a/addons/website_sale_options/views/templates.xml b/addons/website_sale_options/views/templates.xml
index b36e1eb7cb9..7b15d4ba663 100644
--- a/addons/website_sale_options/views/templates.xml
+++ b/addons/website_sale_options/views/templates.xml
@@ -45,7 +45,7 @@
           <tbody>
               <tr id="product_confirmation">
                 <td width="100">
-                  <span t-field="product.image_medium" t-field-options='{"widget": "image" }'/>
+                  <span t-field="product.image_medium" t-options='{"widget": "image" }'/>
                 </td>
                 <td colspan="2">
                   <strong t-field="product.display_name"/>
@@ -57,7 +57,7 @@
                 <td>
                   <span t-attf-class="text-danger oe_default_price" t-att-style="'' if (compute_currency(product.lst_price) - product.price) &gt; 0.1 else 'display: none;'" style="text-decoration: line-through; white-space: nowrap;"
                     t-field="product.lst_price"
-                    t-field-options='{
+                    t-options='{
                       "widget": "monetary",
                       "from_currency": product.currency_id,
                       "display_currency": website.currency_id
@@ -65,7 +65,7 @@
                   <span class="oe_price" style="white-space: nowrap;"
                     t-att-data-product-id="product.id"
                     t-field="product.price"
-                    t-field-options='{
+                    t-options='{
                        "widget": "monetary",
                        "display_currency": website.currency_id
                    }'/>
@@ -88,7 +88,7 @@
               <tr class="js_product" t-foreach="product.optional_product_ids" t-as="product">
                 <td width="100">
                   <input type="hidden" class="product_id" t-attf-name="optional-product-#{option_inc}" t-att-value="int(product.product_variant_ids[0]) if len(product.product_variant_ids) == 1 else '0'"/>
-                  <span t-field="product.image_small" t-field-options='{"widget": "image"}'/>
+                  <span t-field="product.image_small" t-options='{"widget": "image"}'/>
                 </td>
                 <td>
                   <div class="pull-left">
@@ -104,14 +104,14 @@
                 <td>
                   <span class="text-danger oe_optional" t-att-style="'' if (compute_currency(product.lst_price) - product.price) &gt; 0.1 else 'display: none;'" style="text-decoration: line-through; white-space: nowrap;"
                     t-field="product.lst_price"
-                    t-field-options='{
+                    t-options='{
                       "widget": "monetary",
                       "from_currency": product.currency_id,
                       "display_currency": website.currency_id
                    }'/><br/>
                   <span class="oe_price" style="white-space: nowrap;"
                     t-field="product.price"
-                    t-field-options='{
+                    t-options='{
                        "widget": "monetary",
                        "display_currency": website.currency_id
                    }'/>
diff --git a/addons/website_sale_stock/views/templates.xml b/addons/website_sale_stock/views/templates.xml
index fb8965e9c32..a8b72aaeb3e 100644
--- a/addons/website_sale_stock/views/templates.xml
+++ b/addons/website_sale_stock/views/templates.xml
@@ -12,7 +12,7 @@
             <div id='picking_info'>
               <a t-att-href="report_url"><span class="fa fa-download"/></a>
               <a t-att-href="report_url"><span t-field="i.name"/></a>
-              <span class="text-muted" t-field="i.date" t-field-options='{"widget": "date"}'/>
+              <span class="text-muted" t-field="i.date" t-options='{"widget": "date"}'/>
               <t t-if="i.state == 'done'">
                 <span class="label label-success label-text-align"><i class="fa fa-fw fa-truck"/> Shipped</span>
               </t>
diff --git a/addons/website_slides/view/website_slides.xml b/addons/website_slides/view/website_slides.xml
index 47e572c0eaa..5f924f59a06 100644
--- a/addons/website_slides/view/website_slides.xml
+++ b/addons/website_slides/view/website_slides.xml
@@ -580,7 +580,7 @@
                                                 <t t-call="website.publish_short">
                                                     <t t-set="object" t-value="message"/>
                                                 </t>
-                                                <span t-field="message.author_id" style="display: inline-block;" t-field-options='{"widget": "contact", "fields": ["name"]}'/>
+                                                <span t-field="message.author_id" style="display: inline-block;" t-options='{"widget": "contact", "fields": ["name"]}'/>
                                                 <span class="text-muted">on<span t-field="message.date"/></span>
                                                 <div t-field="message.body" class="discussion_scroll_post"></div>
                                             </div>
diff --git a/doc/howtos/website/field-format b/doc/howtos/website/field-format
index 2fbaa541f8c..930ccfa0fa6 100644
--- a/doc/howtos/website/field-format
+++ b/doc/howtos/website/field-format
@@ -10,7 +10,7 @@ diff --git a/academy/templates.xml b/academy/templates.xml
                      <div class="container">
                          <h3 t-field="person.name"/>
 -                        <p>Last modified: <i t-field="person.write_date"/></p>
-+                        <p>Last modified: <i t-field="person.write_date" t-field-options='{"format": "long"}'/></p>
++                        <p>Last modified: <i t-field="person.write_date" t-options='{"format": "long"}'/></p>
                          <div t-field="person.biography"/>
                      </div>
                  </div>
diff --git a/doc/howtos/website/field-widget b/doc/howtos/website/field-widget
index 667cb8a65f1..ea3ddce562a 100644
--- a/doc/howtos/website/field-widget
+++ b/doc/howtos/website/field-widget
@@ -9,8 +9,8 @@ diff --git a/academy/templates.xml b/academy/templates.xml
                  <div class="oe_structure">
                      <div class="container">
                          <h3 t-field="person.name"/>
--                        <p>Last modified: <i t-field="person.write_date" t-field-options='{"format": "long"}'/></p>
-+                        <p>Last modified: <i t-field="person.write_date" t-field-options='{"widget": "relative"}'/></p>
+-                        <p>Last modified: <i t-field="person.write_date" t-options='{"format": "long"}'/></p>
++                        <p>Last modified: <i t-field="person.write_date" t-options='{"widget": "relative"}'/></p>
                          <div t-field="person.biography"/>
                      </div>
                  </div>
diff --git a/doc/reference/qweb.rst b/doc/reference/qweb.rst
index fc4ecd43aca..1fa29212998 100644
--- a/doc/reference/qweb.rst
+++ b/doc/reference/qweb.rst
@@ -334,7 +334,7 @@ The ``t-field`` directive can only be used when performing field access
 to automatically format based on field type, and is integrated in the
 website's rich text edition.
 
-``t-field-options`` can be used to customize fields, the most common option
+``t-options`` can be used to customize fields, the most common option
 is ``widget``, other options are field- or widget-dependent.
 
 debugging
diff --git a/doc/reference/reports.rst b/doc/reference/reports.rst
index f1b4acfd479..64545fd5729 100644
--- a/doc/reference/reports.rst
+++ b/doc/reference/reports.rst
@@ -161,7 +161,7 @@ For example, let's look at the Sale Order report from the Sale module::
                     <div class="col-xs-6">
                         <strong t-if="doc.partner_shipping_id == doc.partner_invoice_id">Invoice and shipping address:</strong>
                         <strong t-if="doc.partner_shipping_id != doc.partner_invoice_id">Invoice address:</strong>
-                        <div t-field="doc.partner_invoice_id" t-field-options="{&quot;no_marker&quot;: True}"/>
+                        <div t-field="doc.partner_invoice_id" t-options="{&quot;no_marker&quot;: True}"/>
                     <...>
                 <div class="oe_structure"/>
             </div>
diff --git a/openerp/addons/base/ir/ir_qweb.xml b/openerp/addons/base/ir/ir_qweb.xml
index e4d135119c0..b882a847d30 100644
--- a/openerp/addons/base/ir/ir_qweb.xml
+++ b/openerp/addons/base/ir/ir_qweb.xml
@@ -12,7 +12,7 @@
                 <span itemprop="name" t-esc="object.parent_name"/>
             </t>
             <t t-if="options.get('country_image') and 'country_id' in fields and object.country_id and object.country_id.image">
-                <span t-field="object.country_id.image" t-field-options='{"widget": "image", "class": "country_flag"}'/>
+                <span t-field="object.country_id.image" t-options='{"widget": "image", "class": "country_flag"}'/>
             </t>
         </div>
         <div itemprop="address" itemscope="itemscope" itemtype="http://schema.org/PostalAddress">