diff --git a/message.xml b/message.xml
index 0f3c260d69..27997a6bc5 100644
--- a/message.xml
+++ b/message.xml
@@ -116,8 +116,8 @@ because the type does not support moves and location has existing moves.</field>
         <record model="ir.message" id="msg_stock_reporting_margin_trend">
             <field name="text">Margin Trend</field>
         </record>
-        <record model="ir.message" id="msg_stock_reporting_currency_digits">
-            <field name="text">Currency Digits</field>
+        <record model="ir.message" id="msg_stock_reporting_currency">
+            <field name="text">Currency</field>
         </record>
     </data>
 </tryton>
diff --git a/stock_reporting_margin.py b/stock_reporting_margin.py
index f080c7dc92..3e0d81b41c 100644
--- a/stock_reporting_margin.py
+++ b/stock_reporting_margin.py
@@ -21,6 +21,8 @@ from trytond.pyson import Eval, If
 from trytond.tools import grouped_slice, reduce_ids
 from trytond.transaction import Transaction
 
+from trytond.modules.currency.fields import Monetary
+
 
 def pairwise(iterable):
     a, b = tee(iterable)
@@ -32,33 +34,29 @@ class Abstract(ModelSQL, ModelView):
 
     company = fields.Many2One(
         'company.company', lazy_gettext('stock.msg_stock_reporting_company'))
-    cost = fields.Numeric(
+    cost = Monetary(
         lazy_gettext('stock.msg_stock_reporting_cost'),
-        digits=(16, Eval('currency_digits', 2)),
-        depends=['currency_digits'])
-    revenue = fields.Numeric(
+        currency='currency', digits='currency')
+    revenue = Monetary(
         lazy_gettext('stock.msg_stock_reporting_revenue'),
-        digits=(16, Eval('currency_digits', 2)),
-        depends=['currency_digits'])
-    profit = fields.Numeric(
+        currency='currency', digits='currency')
+    profit = Monetary(
         lazy_gettext('stock.msg_stock_reporting_profit'),
-        digits=(16, Eval('currency_digits', 2)),
-        depends=['currency_digits'])
+        currency='currency', digits='currency')
     margin = fields.Numeric(
         lazy_gettext('stock.msg_stock_reporting_margin'),
         digits=(14, 4),
         states={
             'invisible': ~Eval('margin'),
-            },
-        depends=['currency_digits'])
+            })
     margin_trend = fields.Function(fields.Char(
             lazy_gettext('stock.msg_stock_reporting_margin_trend')),
         'get_trend')
     time_series = None
 
-    currency = fields.Many2One('currency.currency', "Currency")
-    currency_digits = fields.Integer(
-        lazy_gettext('stock.msg_stock_reporting_currency_digits'))
+    currency = fields.Many2One(
+        'currency.currency',
+        lazy_gettext('stock.msg_stock_reporting_currency'))
 
     @classmethod
     def table_query(cls):
@@ -145,7 +143,6 @@ class Abstract(ModelSQL, ModelView):
             cls.margin.sql_cast(
                 Round(margin, cls.margin.digits[1])).as_('margin'),
             currency.id.as_('currency'),
-            currency.digits.as_('currency_digits'),
             ]
 
     @classmethod
@@ -502,27 +499,27 @@ class CategoryTree(ModelSQL, ModelView):
     parent = fields.Many2One('stock.reporting.margin.category.tree', "Parent")
     children = fields.One2Many(
         'stock.reporting.margin.category.tree', 'parent', "Children")
-    cost = fields.Function(fields.Numeric(
+    cost = fields.Function(Monetary(
             lazy_gettext('stock.msg_stock_reporting_cost'),
-            digits=(16, Eval('currency_digits', 2)),
-            depends=['currency_digits']), 'get_total')
-    revenue = fields.Function(fields.Numeric(
+            currency='currency', digits='currency'),
+        'get_total')
+    revenue = fields.Function(Monetary(
             lazy_gettext('stock.msg_stock_reporting_revenue'),
-            digits=(16, Eval('currency_digits', 2)),
-            depends=['currency_digits']), 'get_total')
-    profit = fields.Function(fields.Numeric(
+            currency='currency', digits='currency'),
+        'get_total')
+    profit = fields.Function(Monetary(
             lazy_gettext('stock.msg_stock_reporting_profit'),
-            digits=(16, Eval('currency_digits', 2)),
-            depends=['currency_digits']), 'get_total')
-    margin = fields.Function(fields.Numeric(
+            currency='currency', digits='currency'),
+        'get_total')
+    margin = fields.Function(Monetary(
             lazy_gettext('stock.msg_stock_reporting_margin'),
-            digits=(14, 4),
-            depends=['currency_digits']),
+            digits=(14, 4)),
         'get_margin')
 
-    currency_digits = fields.Function(fields.Integer(
-            lazy_gettext('stock.msg_stock_reporting_currency_digits')),
-        'get_currency_digits')
+    currency = fields.Function(fields.Many2One(
+            'currency.currency',
+            lazy_gettext('stock.msg_stock_reporting_currency')),
+        'get_currency')
 
     @classmethod
     def __setup__(cls):
@@ -619,12 +616,12 @@ class CategoryTree(ModelSQL, ModelView):
             return (self.profit / self.revenue).quantize(
                 Decimal(1) / 10 ** digits[1])
 
-    def get_currency_digits(self, name):
+    def get_currency(self, name):
         pool = Pool()
         Company = pool.get('company.company')
         company = Transaction().context.get('company')
         if company:
-            return Company(company).currency.digits
+            return Company(company).currency.id
 
     @classmethod
     def view_attributes(cls):
diff --git a/view/reporting_margin_category_list.xml b/view/reporting_margin_category_list.xml
index 2a1582c70a..b80a28ed45 100644
--- a/view/reporting_margin_category_list.xml
+++ b/view/reporting_margin_category_list.xml
@@ -3,9 +3,9 @@
 this repository contains the full copyright notices and license terms. -->
 <tree keyword_open="1">
     <field name="category" expand="1"/>
-    <field name="cost" symbol="currency"/>
-    <field name="revenue" symbol="currency"/>
-    <field name="profit" symbol="currency"/>
+    <field name="cost"/>
+    <field name="revenue"/>
+    <field name="profit"/>
     <field name="margin" factor="100">
         <suffix string="%" name="margin"/>
     </field>
diff --git a/view/reporting_margin_category_time_series_list.xml b/view/reporting_margin_category_time_series_list.xml
index 8ef602efbb..de3e80909e 100644
--- a/view/reporting_margin_category_time_series_list.xml
+++ b/view/reporting_margin_category_time_series_list.xml
@@ -3,9 +3,9 @@
 this repository contains the full copyright notices and license terms. -->
 <tree>
     <field name="date"/>
-    <field name="cost" symbol="currency"/>
-    <field name="revenue" symbol="currency"/>
-    <field name="profit" symbol="currency"/>
+    <field name="cost"/>
+    <field name="revenue"/>
+    <field name="profit"/>
     <field name="margin" factor="100">
         <suffix string="%" name="margin"/>
     </field>
diff --git a/view/reporting_margin_product_list.xml b/view/reporting_margin_product_list.xml
index 8eb43c1f16..c997ed52bf 100644
--- a/view/reporting_margin_product_list.xml
+++ b/view/reporting_margin_product_list.xml
@@ -4,9 +4,9 @@ this repository contains the full copyright notices and license terms. -->
 <tree keyword_open="1">
     <field name="product" expand="1"/>
     <field name="quantity" symbol="unit"/>
-    <field name="cost" symbol="currency"/>
-    <field name="revenue" symbol="currency"/>
-    <field name="profit" symbol="currency"/>
+    <field name="cost"/>
+    <field name="revenue"/>
+    <field name="profit"/>
     <field name="margin" factor="100">
         <suffix string="%" name="margin"/>
     </field>
diff --git a/view/reporting_margin_product_time_series_list.xml b/view/reporting_margin_product_time_series_list.xml
index 688f41bd62..07fd300c49 100644
--- a/view/reporting_margin_product_time_series_list.xml
+++ b/view/reporting_margin_product_time_series_list.xml
@@ -4,9 +4,9 @@ this repository contains the full copyright notices and license terms. -->
 <tree>
     <field name="date"/>
     <field name="quantity" symbol="unit"/>
-    <field name="cost" symbol="currency"/>
-    <field name="revenue" symbol="currency"/>
-    <field name="profit" symbol="currency"/>
+    <field name="cost"/>
+    <field name="revenue"/>
+    <field name="profit"/>
     <field name="margin" factor="100">
         <suffix string="%" name="margin"/>
     </field>