Merge branch 'SOF-44-Agrupador_prestaciones' into '12.0-stage'

[MOD] report template and medical invoice

See merge request !24

i18n/es_AR.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-13 19:20+0000\n"
-"PO-Revision-Date: 2021-01-13 16:21-0300\n"
+"POT-Creation-Date: 2021-01-14 19:39+0000\n"
+"PO-Revision-Date: 2021-01-14 16:40-0300\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -71,11 +71,21 @@ msgstr "<strong>Descripción:</strong>"
 msgid "<strong>Due Date:</strong>"
 msgstr "<strong>Fecha de vencimiento:</strong>"
 
+#. module: medical_invoicing
+#: model_terms:ir.ui.view,arch_db:medical_invoicing.report_invoice_insurance_template
+msgid "<strong>Exempt</strong>"
+msgstr "<strong>Exento</strong>"
+
 #. module: medical_invoicing
 #: model_terms:ir.ui.view,arch_db:medical_invoicing.report_invoice_insurance_template
 msgid "<strong>Invoice Date:</strong>"
 msgstr "<strong>Fecha de factura:</strong>"
 
+#. module: medical_invoicing
+#: model_terms:ir.ui.view,arch_db:medical_invoicing.report_invoice_insurance_template
+msgid "<strong>Net taxed</strong>"
+msgstr "<strong>Neto gravado</strong>"
+
 #. module: medical_invoicing
 #: model_terms:ir.ui.view,arch_db:medical_invoicing.report_invoice_insurance_template
 msgid "<strong>Reference:</strong>"

models/medical_invoice.py

@@ -154,8 +154,8 @@ class MedicalInvoice(models.Model):
                 taxes = invoice_line.product_id.taxes_id.filtered(
                     lambda r: r.company_id == company_id
                 ) or invoice_line.account_id.tax_ids or invoice_line.invoice_id.company_id.account_sale_tax_id
-                invoice_line.invoice_line_tax_ids = invoice_line.invoice_id.fiscal_position_id.map_tax(
-                    taxes, invoice_line.product_id, invoice_line.invoice_id.partner_id
+                invoice_line.invoice_line_tax_ids = invoice_line.professional_id.property_account_position_id.map_tax(
+                    taxes, invoice_line.product_id, invoice_line.professional_id
                 )
             invoice._onchange_invoice_line_ids()
         self.state = 'draft_invoice'

report/invoice_insurance_report_template.xml

@@ -83,6 +83,18 @@
                         <div id="total" class="row">
                             <div t-attf-class="#{'col-4' if report_type != 'html' else 'col-sm-7 col-md-5'} ml-auto">
                                 <table class="table table-sm" style="page-break-inside: avoid;">
+                                    <tr class="border-black o_subtotal" style="">
+                                        <td><strong>Net taxed</strong></td>
+                                        <td class="text-right">
+                                            <span t-field="o.amount_taxed"/>
+                                        </td>
+                                    </tr>
+                                    <tr class="border-black o_subtotal" style="">
+                                        <td><strong>Exempt</strong></td>
+                                        <td class="text-right">
+                                            <span t-field="o.amount_exempt"/>
+                                        </td>
+                                    </tr>
                                     <tr class="border-black o_subtotal" style="">
                                         <td><strong>Subtotal</strong></td>
                                         <td class="text-right">