diff --git a/l10n_es_aeat_mod111/data/tax_code_map_mod111_data.xml b/l10n_es_aeat_mod111/data/tax_code_map_mod111_data.xml
index 3fa45cb4a4e..02b166cc1c0 100644
--- a/l10n_es_aeat_mod111/data/tax_code_map_mod111_data.xml
+++ b/l10n_es_aeat_mod111/data/tax_code_map_mod111_data.xml
@@ -74,5 +74,24 @@
              P_IRPF20, P_IRPF21P -->
         <field name="tax_ids" eval="[(6, False, [ref('l10n_es.account_tax_template_p_irpf1'), ref('l10n_es.account_tax_template_p_irpf2'), ref('l10n_es.account_tax_template_p_irpf7'), ref('l10n_es.account_tax_template_p_irpf9'), ref('l10n_es.account_tax_template_p_irpf15'), ref('l10n_es.account_tax_template_p_irpf18'), ref('l10n_es.account_tax_template_p_irpf19'), ref('l10n_es.account_tax_template_p_irpf20'), ref('l10n_es.account_tax_template_p_irpf21p')])]"/>
     </record>
+    <record id="aeat_mod111_map_line_11" model="l10n.es.aeat.map.tax.line">
+        <field name="map_parent_id" ref="aeat_mod111_map" />
+        <field name="field_number">11</field>
+        <field name="name">Rendimientos de actividades económicas (en especie) - Importe de las percepciones</field>
+        <field name="field_type">base</field>
+        <field name="sum_type">both</field>
+        <field name="inverse" eval="True" />
+        <field name="tax_ids" eval="[(6, False, [ref('l10n_es.account_tax_template_p_irpf7'), ref('l10n_es.account_tax_template_p_irpf15')])]"
+        />
+    </record>
+    <record id="aeat_mod111_map_line_12" model="l10n.es.aeat.map.tax.line">
+        <field name="map_parent_id" ref="aeat_mod111_map" />
+        <field name="field_number">12</field>
+        <field name="name">Rendimientos de actividades económicas (en especie) - Importe de los ingresos a cuenta</field>
+        <field name="field_type">amount</field>
+        <field name="sum_type">both</field>
+        <field name="inverse" eval="False" />
+        <field name="tax_ids" eval="[(6, False, [ref('l10n_es.account_tax_template_p_irpf7'), ref('l10n_es.account_tax_template_p_irpf15')])]"/>
+    </record>
 
 </odoo>
diff --git a/l10n_es_aeat_mod111/models/mod111.py b/l10n_es_aeat_mod111/models/mod111.py
index 2143eda014e..f5a7e716f2e 100644
--- a/l10n_es_aeat_mod111/models/mod111.py
+++ b/l10n_es_aeat_mod111/models/mod111.py
@@ -18,40 +18,92 @@ class L10nEsAeatMod111Report(models.Model):
     _aeat_number = '111'
 
     casilla_01 = fields.Integer(
-        string="[01] # Recipients", readonly=True, compute_sudo=True,
+        string="[01] # Recipients", readonly=False, compute_sudo=True,
         compute='_compute_casilla_01', store=True,
         help="Work income - Monetary - Number of recipients")
+    casilla_02 = fields.Monetary(
+        string="[02] Taxable",
+        readonly=True,
+        compute_sudo=True,
+        compute="_compute_casilla_02",
+        store=True,
+        help="Work income - In kind - Base taxable value",
+    )
+    casilla_03 = fields.Monetary(
+        string="[03] Amount retained",
+        readonly=True,
+        compute_sudo=True,
+        compute="_compute_casilla_03",
+        store=True,
+        help="Work income - In kind - Amount retained",
+    )
     casilla_04 = fields.Integer(
-        string="[04] # Recipients", readonly=True, compute_sudo=True,
+        string="[04] # Recipients", readonly=False, compute_sudo=True,
         compute='_compute_casilla_04', store=True,
         help="Work income - In kind - Number of recipients")
+    casilla_05 = fields.Monetary(
+        string="[05] Taxable",
+        readonly=True,
+        compute_sudo=True,
+        compute="_compute_casilla_05",
+        store=True,
+        help="Work income - In kind - Base taxable value",
+    )
+    casilla_06 = fields.Monetary(
+        string="[06] Amount retained",
+        readonly=True,
+        compute_sudo=True,
+        compute="_compute_casilla_06",
+        store=True,
+        help="Work income - In kind - Amount retained",
+    )
     casilla_07 = fields.Integer(
-        string="[07] # Recipients", readonly=True, compute_sudo=True,
+        string="[07] # Recipients", readonly=False, compute_sudo=True,
         compute='_compute_casilla_07', store=True,
         help="Business income - Monetary - Number of recipients")
+    casilla_08 = fields.Monetary(
+        string="[08] Taxable",
+        readonly=True,
+        compute_sudo=True,
+        compute="_compute_casilla_08",
+        store=True,
+        help="Business income - In kind - Base taxable value",
+    )
+    casilla_09 = fields.Monetary(
+        string="[09] Amount retained",
+        readonly=True,
+        compute_sudo=True,
+        compute="_compute_casilla_09",
+        store=True,
+        help="Business income - In kind - Amount retained",
+    )
     casilla_10 = fields.Integer(
-        string="[10] # Recipients", readonly=True,
+        string="[10] # Recipients", readonly=False,
         states={'calculated': [('readonly', False)]},
         help="Business income - In kind - Number of recipients")
-    casilla_11 = fields.Float(
+    casilla_11 = fields.Monetary(
         string="[11] Taxable", readonly=True,
-        states={'calculated': [('readonly', False)]},
+        compute_sudo=True,
+        compute="_compute_casilla_11",
+        store=True,
         help="Business income - In kind - Base taxable value")
-    casilla_12 = fields.Float(
+    casilla_12 = fields.Monetary(
         string="[12] Amount retained", readonly=True,
-        states={'calculated': [('readonly', False)]},
+        compute_sudo=True,
+        compute="_compute_casilla_12",
+        store=True,
         help="Business income - In kind - Amount retained")
     casilla_13 = fields.Integer(
         string="[13] # Recipients", readonly=True,
         states={'calculated': [('readonly', False)]},
         help="Awards for participation in games, contests, raffles or "
              "random combinations - Monetary - Number of recipients")
-    casilla_14 = fields.Float(
+    casilla_14 = fields.Monetary(
         string="[14] Taxable", readonly=True,
         states={'calculated': [('readonly', False)]},
         help="Awards for participation in games, contests, raffles or "
              "random combinations - Monetary - Base taxable value")
-    casilla_15 = fields.Float(
+    casilla_15 = fields.Monetary(
         string="[15] Amount retained", readonly=True,
         states={'calculated': [('readonly', False)]},
         help="Awards for participation in games, contests, raffles or "
@@ -61,12 +113,12 @@ class L10nEsAeatMod111Report(models.Model):
         states={'calculated': [('readonly', False)]},
         help="Awards for participation in games, contests, raffles or "
              "random combinations - In kind - Number of recipients")
-    casilla_17 = fields.Float(
+    casilla_17 = fields.Monetary(
         string="[17] Taxable", readonly=True,
         states={'calculated': [('readonly', False)]},
         help="Awards for participation in games, contests, raffles or "
              "random combinations - In kind - Base taxable value")
-    casilla_18 = fields.Float(
+    casilla_18 = fields.Monetary(
         string="[18] Amount retained", readonly=True,
         states={'calculated': [('readonly', False)]},
         help="Awards for participation in games, contests, raffles or "
@@ -76,12 +128,12 @@ class L10nEsAeatMod111Report(models.Model):
         states={'calculated': [('readonly', False)]},
         help="Capital gains derived from the forest exploitation of "
              "residents in public forests - Monetary - Number of recipients")
-    casilla_20 = fields.Float(
+    casilla_20 = fields.Monetary(
         string="[20] Taxable", readonly=True,
         states={'calculated': [('readonly', False)]},
         help="Capital gains derived from the forest exploitation of "
              "residents in public forests - Monetary - Base taxable value")
-    casilla_21 = fields.Float(
+    casilla_21 = fields.Monetary(
         string="[21] Amount retained", readonly=True,
         states={'calculated': [('readonly', False)]},
         help="Capital gains derived from the forest exploitation of "
@@ -91,12 +143,12 @@ class L10nEsAeatMod111Report(models.Model):
         states={'calculated': [('readonly', False)]},
         help="Capital gains derived from the forest exploitation of "
              "residents in public forests - In kind - Number of recipients")
-    casilla_23 = fields.Float(
+    casilla_23 = fields.Monetary(
         string="[23] Taxable", readonly=True,
         states={'calculated': [('readonly', False)]},
         help="Capital gains derived from the forest exploitation of "
              "residents in public forests - In kind - Base taxable value")
-    casilla_24 = fields.Float(
+    casilla_24 = fields.Monetary(
         string="[24] Amount retained", readonly=True,
         states={'calculated': [('readonly', False)]},
         help="Capital gains derived from the forest exploitation of "
@@ -107,30 +159,30 @@ class L10nEsAeatMod111Report(models.Model):
         help="Consideration for the transfer of image rights: income "
              "account provided in Article 92.8 of the Tax Law - "
              "Monetary or in kind - Number of recipients")
-    casilla_26 = fields.Float(
+    casilla_26 = fields.Monetary(
         string="[26] Taxable", readonly=True,
         states={'calculated': [('readonly', False)]},
         help="Consideration for the transfer of image rights: income "
              "account provided in Article 92.8 of the Tax Law - "
              "Monetary or in kind - Base taxable value")
-    casilla_27 = fields.Float(
+    casilla_27 = fields.Monetary(
         string="[27] Amount retained", readonly=True,
         states={'calculated': [('readonly', False)]},
         help="Consideration for the transfer of image rights: income "
              "account provided in Article 92.8 of the Tax Law - "
              "Monetary or in kind - Amount retained")
-    casilla_28 = fields.Float(
+    casilla_28 = fields.Monetary(
         string="[28] Amount of retentions", compute_sudo=True,
         readonly=True, compute='_compute_casilla_28',
         help="Amount of retentions: "
              "([03] + [06] + [09] + [12] + [15] + [18] + [21] + [24] + [27])")
-    casilla_29 = fields.Float(
+    casilla_29 = fields.Monetary(
         string="[29] Fees to compensate", readonly=True,
         states={'calculated': [('readonly', False)]},
         help="Fee to compensate for prior results with same subject, "
              "fiscal year and period (in which his statement was to return "
              "and compensation back option was chosen).")
-    casilla_30 = fields.Float(
+    casilla_30 = fields.Monetary(
         string="[30] Result",
         readonly=True, compute='_compute_casilla_30',
         help="Result: ([28] - [29])")
@@ -156,6 +208,20 @@ def _compute_casilla_01(self):
             report.casilla_01 = len(
                 tax_lines.mapped('move_line_ids').mapped('partner_id'))
 
+    @api.multi
+    @api.depends('tax_line_ids', 'tax_line_ids.amount')
+    def _compute_casilla_02(self):
+        for report in self:
+            tax_lines = report.tax_line_ids.filtered(lambda x: x.field_number == 2)
+            report.casilla_02 = sum(tax_lines.mapped("amount"))
+
+    @api.multi
+    @api.depends('tax_line_ids', 'tax_line_ids.amount')
+    def _compute_casilla_03(self):
+        for report in self:
+            tax_lines = report.tax_line_ids.filtered(lambda x: x.field_number == 3)
+            report.casilla_03 = sum(tax_lines.mapped("amount"))
+
     @api.multi
     @api.depends('tax_line_ids', 'tax_line_ids.move_line_ids.partner_id')
     def _compute_casilla_04(self):
@@ -166,6 +232,20 @@ def _compute_casilla_04(self):
             report.casilla_04 = len(
                 tax_lines.mapped('move_line_ids').mapped('partner_id'))
 
+    @api.multi
+    @api.depends('tax_line_ids', 'tax_line_ids.amount')
+    def _compute_casilla_05(self):
+        for report in self:
+            tax_lines = report.tax_line_ids.filtered(lambda x: x.field_number == 5)
+            report.casilla_05 = sum(tax_lines.mapped('amount'))
+
+    @api.multi
+    @api.depends('tax_line_ids', 'tax_line_ids.amount')
+    def _compute_casilla_06(self):
+        for report in self:
+            tax_lines = report.tax_line_ids.filtered(lambda x: x.field_number == 6)
+            report.casilla_06 = sum(tax_lines.mapped('amount'))
+
     @api.multi
     @api.depends('tax_line_ids', 'tax_line_ids.move_line_ids.partner_id')
     def _compute_casilla_07(self):
@@ -177,18 +257,67 @@ def _compute_casilla_07(self):
                 tax_lines.mapped('move_line_ids').mapped('partner_id'))
 
     @api.multi
-    @api.depends('tax_line_ids', 'tax_line_ids.amount',
-                 'casilla_12', 'casilla_15', 'casilla_18',
-                 'casilla_21', 'casilla_24', 'casilla_27')
-    def _compute_casilla_28(self):
-        casillas = (3, 6, 9)
+    @api.depends("tax_line_ids", "tax_line_ids.amount")
+    def _compute_casilla_08(self):
+        for report in self:
+            tax_lines = report.tax_line_ids.filtered(lambda x: x.field_number == 8)
+            report.casilla_08 = sum(tax_lines.mapped("amount"))
+
+    @api.multi
+    @api.depends("tax_line_ids", "tax_line_ids.amount")
+    def _compute_casilla_09(self):
+        for report in self:
+            tax_lines = report.tax_line_ids.filtered(lambda x: x.field_number == 9)
+            report.casilla_09 = sum(tax_lines.mapped("amount"))
+
+    @api.multi
+    @api.depends("tax_line_ids", "tax_line_ids.move_line_ids.partner_id")
+    def _compute_casilla_10(self):
+        casillas = {11, 12}
         for report in self:
             tax_lines = report.tax_line_ids.filtered(
-                lambda x: x.field_number in casillas)
+                lambda x: x.field_number in casillas
+            )
+            report.casilla_10 = len(tax_lines.mapped("move_line_ids.partner_id"))
+
+    @api.multi
+    @api.depends("tax_line_ids", "tax_line_ids.amount")
+    def _compute_casilla_11(self):
+        for report in self:
+            tax_lines = report.tax_line_ids.filtered(lambda x: x.field_number == 11)
+            report.casilla_11 = sum(tax_lines.mapped("amount"))
+
+    @api.multi
+    @api.depends("tax_line_ids", "tax_line_ids.amount")
+    def _compute_casilla_12(self):
+        for report in self:
+            tax_lines = report.tax_line_ids.filtered(lambda x: x.field_number == 12)
+            report.casilla_12 = sum(tax_lines.mapped("amount"))
+
+    @api.multi
+    @api.depends(
+        'casilla_03',
+        'casilla_06',
+        'casilla_09',
+        'casilla_12',
+        'casilla_15',
+        'casilla_18',
+        'casilla_21',
+        'casilla_24',
+        'casilla_27',
+    )
+    def _compute_casilla_28(self):
+        for report in self:
             report.casilla_28 = (
-                sum(tax_lines.mapped('amount')) +
-                report.casilla_12 + report.casilla_15 + report.casilla_18 +
-                report.casilla_21 + report.casilla_24 + report.casilla_27
+                report.casilla_03
+                + report.casilla_06
+                + report.casilla_09
+                + report.casilla_12
+                + report.casilla_15
+                + report.casilla_18
+                + report.casilla_21
+                + report.casilla_24
+                + report.casilla_27
             )
 
     @api.multi
diff --git a/l10n_es_aeat_mod111/views/mod111_view.xml b/l10n_es_aeat_mod111/views/mod111_view.xml
index 04fb90c0685..b1c2a891d3a 100644
--- a/l10n_es_aeat_mod111/views/mod111_view.xml
+++ b/l10n_es_aeat_mod111/views/mod111_view.xml
@@ -36,71 +36,75 @@
                     <group string="Work income">
                         <label string="Monetary:"
                                class="oe_force_bold" colspan="2"/>
-                        <field name="casilla_01"/>
+                        <field
+                            name="casilla_01"
+                            attrs="{'readonly': [('state', '!=', 'calculated')]}"
+                        />
+                        <field name="casilla_02" />
+                        <field name="casilla_03" />
                         <separator/>
                         <label string="In kind:"
                                class="oe_force_bold" colspan="2"/>
-                        <field name="casilla_04"/>
+                        <field
+                            name="casilla_04"
+                            attrs="{'readonly': [('state', '!=', 'calculated')]}"
+                        />
+                        <field name="casilla_05" />
+                        <field name="casilla_06" />
                     </group>
                     <group string="Business income">
                         <label string="Monetary:"
                                class="oe_force_bold" colspan="2"/>
-                        <field name="casilla_07"/>
+                        <field
+                            name="casilla_07"
+                            attrs="{'readonly': [('state', '!=', 'calculated')]}"
+                        />
+                        <field name="casilla_08" />
+                        <field name="casilla_09" />
                         <separator/>
                         <label string="In kind:"
                                class="oe_force_bold" colspan="2"/>
-                        <field name="casilla_10"/>
-                        <field name="casilla_11" widget="monetary"
-                               options="{'currency_field': 'currency_id'}"/>
-                        <field name="casilla_12" widget="monetary"
-                               options="{'currency_field': 'currency_id'}"/>
+                        <field name="casilla_10"
+                            attrs="{'readonly': [('state', '!=', 'calculated')]}"
+                        />
+                        <field name="casilla_11" />
+                        <field name="casilla_12" />
                     </group>
                     <group string="Awards">
                         <label string="Monetary:"
                                class="oe_force_bold" colspan="2"/>
                         <field name="casilla_13"/>
-                        <field name="casilla_14" widget="monetary"
-                               options="{'currency_field': 'currency_id'}"/>
-                        <field name="casilla_15" widget="monetary"
-                               options="{'currency_field': 'currency_id'}"/>
+                        <field name="casilla_14" />
+                        <field name="casilla_15" />
+                        <separator />
                         <label string="In kind:"
                                class="oe_force_bold" colspan="2"/>
                         <field name="casilla_16"/>
-                        <field name="casilla_17" widget="monetary"
-                               options="{'currency_field': 'currency_id'}"/>
-                        <field name="casilla_18" widget="monetary"
-                               options="{'currency_field': 'currency_id'}"/>
+                        <field name="casilla_17" />
+                        <field name="casilla_18" />
                     </group>
                     <group string="Capital gains derived from the forest exploitation">
                         <label string="Monetary:"
                                class="oe_force_bold" colspan="2"/>
                         <field name="casilla_19"/>
-                        <field name="casilla_20" widget="monetary"
-                               options="{'currency_field': 'currency_id'}"/>
-                        <field name="casilla_21" widget="monetary"
-                               options="{'currency_field': 'currency_id'}"/>
+                        <field name="casilla_20" />
+                        <field name="casilla_21" />
+                        <separator />
                         <label string="In kind:"
                                class="oe_force_bold" colspan="2"/>
                         <field name="casilla_22"/>
-                        <field name="casilla_23" widget="monetary"
-                               options="{'currency_field': 'currency_id'}"/>
-                        <field name="casilla_24" widget="monetary"
-                               options="{'currency_field': 'currency_id'}"/>
+                        <field name="casilla_23" />
+                        <field name="casilla_24" />
                     </group>
                     <group string="Consideration for the transfer of image rights">
                         <field name="casilla_25"/>
-                        <field name="casilla_26" widget="monetary"
-                               options="{'currency_field': 'currency_id'}"/>
-                        <field name="casilla_27" widget="monetary"
-                               options="{'currency_field': 'currency_id'}"/>
+                        <field name="casilla_26" />
+                        <field name="casilla_27" />
                     </group>
                     <group string="Totals">
-                        <field name="casilla_28" widget="monetary"
-                               options="{'currency_field': 'currency_id'}"/>
-                        <field name="casilla_29" widget="monetary"
-                               options="{'currency_field': 'currency_id'}"/>
-                        <field name="casilla_30" widget="monetary"
-                               options="{'currency_field': 'currency_id'}"/>
+                        <field name="casilla_28" />
+                        <field name="casilla_29" />
+                        <field name="casilla_30" />
                     </group>
                     <group string="Tax lines"
                            name="group_tax_lines"