diff --git a/opportunity.py b/opportunity.py
index 5362f9bf43..ce57af490f 100644
--- a/opportunity.py
+++ b/opportunity.py
@@ -19,6 +19,7 @@ from trytond.pool import Pool
 from trytond.ir.attachment import AttachmentCopyMixin
 from trytond.ir.note import NoteCopyMixin
 from trytond.modules.company.model import employee_field, set_employee
+from trytond.modules.currency.fields import Monetary
 
 
 class SaleOpportunity(
@@ -74,12 +75,12 @@ class SaleOpportunity(
                 Get(Eval('context', {}), 'company', 0)),
             ],
         depends=_depends_stop)
-    currency = fields.Function(fields.Many2One('currency.currency',
-        'Currency'), 'get_currency')
-    currency_digits = fields.Function(fields.Integer('Currency Digits'),
-            'get_currency_digits')
-    amount = fields.Numeric('Amount', digits=(16, Eval('currency_digits', 2)),
-        states=_states_stop, depends=_depends_stop + ['currency_digits'],
+    currency = fields.Function(fields.Many2One(
+            'currency.currency', "Currency"),
+        'on_change_with_currency')
+    amount = Monetary(
+        "Amount", currency='currency', digits='currency',
+        states=_states_stop, depends=_depends_stop,
         help='Estimated revenue amount.')
     payment_term = fields.Many2One('account.invoice.payment_term',
         'Payment Term', states={
@@ -294,17 +295,10 @@ class SaleOpportunity(
         default.setdefault('converted_by')
         return super(SaleOpportunity, cls).copy(opportunities, default=default)
 
-    def get_currency(self, name):
-        return self.company.currency.id
-
-    def get_currency_digits(self, name):
-        return self.company.currency.digits
-
     @fields.depends('company')
-    def on_change_company(self):
+    def on_change_with_currency(self, name=None):
         if self.company:
-            self.currency = self.company.currency
-            self.currency_digits = self.company.currency.digits
+            return self.company.currency.id
 
     @fields.depends('party')
     def on_change_party(self):
@@ -588,18 +582,12 @@ class SaleOpportunityReportMixin:
     company = fields.Many2One('company.company', 'Company')
     currency = fields.Function(fields.Many2One('currency.currency',
         'Currency'), 'get_currency')
-    currency_digits = fields.Function(fields.Integer('Currency Digits'),
-            'get_currency_digits')
-    amount = fields.Numeric('Amount', digits=(16, Eval('currency_digits', 2)),
-            depends=['currency_digits'])
-    converted_amount = fields.Numeric('Converted Amount',
-            digits=(16, Eval('currency_digits', 2)),
-            depends=['currency_digits'])
+    amount = Monetary("Amount", currency='currency', digits='currency')
+    converted_amount = Monetary(
+        "Converted Amount", currency='currency', digits='currency')
     conversion_amount_rate = fields.Function(fields.Float(
         'Conversion Amount Rate', digits=(1, 4)), 'get_conversion_amount_rate')
-    won_amount = fields.Numeric('Won Amount',
-        digits=(16, Eval('currency_digits', 2)),
-        depends=['currency_digits'])
+    won_amount = Monetary("Won Amount", currency='currency', digits='currency')
     winning_amount_rate = fields.Function(fields.Float(
             'Winning Amount Rate', digits=(1, 4)), 'get_winning_amount_rate')
 
@@ -632,9 +620,6 @@ class SaleOpportunityReportMixin:
     def get_currency(self, name):
         return self.company.currency.id
 
-    def get_currency_digits(self, name):
-        return self.company.currency.digits
-
     def get_conversion_amount_rate(self, name):
         if self.amount:
             digits = getattr(self.__class__, name).digits[1]
diff --git a/view/opportunity_employee_monthly_tree.xml b/view/opportunity_employee_monthly_tree.xml
index 0cf92116c8..e6b519ae7f 100644
--- a/view/opportunity_employee_monthly_tree.xml
+++ b/view/opportunity_employee_monthly_tree.xml
@@ -15,9 +15,9 @@ this repository contains the full copyright notices and license terms. -->
     <field name="winning_rate" factor="100">
         <suffix string="%" name="winning_rate"/>
     </field>
-    <field name="amount" symbol="currency"/>
-    <field name="converted_amount" symbol="currency"/>
-    <field name="won_amount" symbol="currency"/>
+    <field name="amount"/>
+    <field name="converted_amount"/>
+    <field name="won_amount"/>
     <field name="conversion_amount_rate" factor="100">
         <suffix string="%" name="conversion_amount_rate"/>
     </field>
diff --git a/view/opportunity_employee_tree.xml b/view/opportunity_employee_tree.xml
index e489d7e19b..769b4078c2 100644
--- a/view/opportunity_employee_tree.xml
+++ b/view/opportunity_employee_tree.xml
@@ -13,9 +13,9 @@ this repository contains the full copyright notices and license terms. -->
     <field name="winning_rate" factor="100">
         <suffix string="%" name="winning_rate"/>
     </field>
-    <field name="amount" symbol="currency"/>
-    <field name="converted_amount" symbol="currency"/>
-    <field name="won_amount" symbol="currency"/>
+    <field name="amount"/>
+    <field name="converted_amount"/>
+    <field name="won_amount"/>
     <field name="conversion_amount_rate" factor="100">
         <suffix string="%" name="conversion_amount_rate"/>
     </field>
diff --git a/view/opportunity_form.xml b/view/opportunity_form.xml
index 846285fd50..799a3406f3 100644
--- a/view/opportunity_form.xml
+++ b/view/opportunity_form.xml
@@ -19,7 +19,7 @@ this repository contains the full copyright notices and license terms. -->
     <field name="reference"/>
 
     <label name="amount"/>
-    <field name="amount" symbol="currency"/>
+    <field name="amount"/>
     <label name="conversion_probability"/>
     <group id="conversion_probability">
         <field name="conversion_probability" factor="100" xexpand="0"/>
diff --git a/view/opportunity_tree.xml b/view/opportunity_tree.xml
index 81b5b146ac..ed14addae7 100644
--- a/view/opportunity_tree.xml
+++ b/view/opportunity_tree.xml
@@ -9,7 +9,7 @@ this repository contains the full copyright notices and license terms. -->
     <field name="employee" expand="1"/>
     <field name="description" expand="1"/>
     <field name="party" expand="1"/>
-    <field name="amount" symbol="currency"/>
+    <field name="amount"/>
     <field name="state"/>
     <field name="conversion_probability" factor="100">
         <suffix name="conversion_probability" string="%"/>