Merge branch 'SOF-90-Quitar_cantidad_prestaciones' into '12.0-stage'

[MOD] invoice reports

See merge request !59

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-07-12 18:58+0000\n"
-"PO-Revision-Date: 2021-07-12 15:59-0300\n"
+"POT-Creation-Date: 2021-07-19 20:05+0000\n"
+"PO-Revision-Date: 2021-07-19 17:06-0300\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -63,16 +63,19 @@ msgstr "<strong class=\"text-center\">Las informaciones del código QR SEPA no e
 
 #. module: medical_invoicing
 #: model_terms:ir.ui.view,arch_db:medical_invoicing.report_invoice_insurance_template
+#: model_terms:ir.ui.view,arch_db:medical_invoicing.report_pre_invoice_template
 msgid "<strong>Customer Code:</strong>"
 msgstr "<strong>Código del cliente:</strong>"
 
 #. module: medical_invoicing
 #: model_terms:ir.ui.view,arch_db:medical_invoicing.report_invoice_insurance_template
+#: model_terms:ir.ui.view,arch_db:medical_invoicing.report_pre_invoice_template
 msgid "<strong>Description:</strong>"
 msgstr "<strong>Descripción:</strong>"
 
 #. module: medical_invoicing
 #: model_terms:ir.ui.view,arch_db:medical_invoicing.report_invoice_insurance_template
+#: model_terms:ir.ui.view,arch_db:medical_invoicing.report_pre_invoice_template
 msgid "<strong>Due Date:</strong>"
 msgstr "<strong>Fecha de vencimiento:</strong>"
 
@@ -83,6 +86,7 @@ msgstr "<strong>Exento</strong>"
 
 #. module: medical_invoicing
 #: model_terms:ir.ui.view,arch_db:medical_invoicing.report_invoice_insurance_template
+#: model_terms:ir.ui.view,arch_db:medical_invoicing.report_pre_invoice_template
 msgid "<strong>Invoice Date:</strong>"
 msgstr "<strong>Fecha de factura:</strong>"
 
@@ -93,6 +97,7 @@ msgstr "<strong>Neto gravado</strong>"
 
 #. module: medical_invoicing
 #: model_terms:ir.ui.view,arch_db:medical_invoicing.report_invoice_insurance_template
+#: model_terms:ir.ui.view,arch_db:medical_invoicing.report_pre_invoice_template
 msgid "<strong>Reference:</strong>"
 msgstr "<strong>Referencia:</strong>"
 
@@ -103,6 +108,7 @@ msgstr "<strong>Notas de crédito</strong>"
 
 #. module: medical_invoicing
 #: model_terms:ir.ui.view,arch_db:medical_invoicing.report_invoice_insurance_template
+#: model_terms:ir.ui.view,arch_db:medical_invoicing.report_pre_invoice_template
 msgid "<strong>Source:</strong>"
 msgstr "<strong>Origen:</strong>"
 
@@ -195,6 +201,7 @@ msgid "Configuration"
 msgstr "Configuración"
 
 #. module: medical_invoicing
+#: model:ir.model.fields,field_description:medical_invoicing.field_account_invoice_refund_line__create_uid
 #: model:ir.model.fields,field_description:medical_invoicing.field_medical_invoice__create_uid
 #: model:ir.model.fields,field_description:medical_invoicing.field_medical_invoice_config__create_uid
 #: model:ir.model.fields,field_description:medical_invoicing.field_wizard_account_invoice_modify__create_uid
@@ -202,6 +209,7 @@ msgid "Created by"
 msgstr "Creado por"
 
 #. module: medical_invoicing
+#: model:ir.model.fields,field_description:medical_invoicing.field_account_invoice_refund_line__create_date
 #: model:ir.model.fields,field_description:medical_invoicing.field_medical_invoice__create_date
 #: model:ir.model.fields,field_description:medical_invoicing.field_medical_invoice_config__create_date
 #: model:ir.model.fields,field_description:medical_invoicing.field_wizard_account_invoice_modify__create_date
@@ -251,6 +259,7 @@ msgid "Descriptors applied by"
 msgstr "Prácticas efectuadas por "
 
 #. module: medical_invoicing
+#: model:ir.model.fields,field_description:medical_invoicing.field_account_invoice_refund_line__display_name
 #: model:ir.model.fields,field_description:medical_invoicing.field_medical_invoice__display_name
 #: model:ir.model.fields,field_description:medical_invoicing.field_medical_invoice_config__display_name
 #: model:ir.model.fields,field_description:medical_invoicing.field_report_medical_invoicing_report_invoice_detail_template__display_name
@@ -317,6 +326,7 @@ msgid "From"
 msgstr "De"
 
 #. module: medical_invoicing
+#: model:ir.model.fields,field_description:medical_invoicing.field_account_invoice_refund_line__id
 #: model:ir.model.fields,field_description:medical_invoicing.field_medical_invoice__id
 #: model:ir.model.fields,field_description:medical_invoicing.field_medical_invoice_config__id
 #: model:ir.model.fields,field_description:medical_invoicing.field_report_medical_invoicing_report_invoice_detail_template__id
@@ -375,6 +385,11 @@ msgstr "Reporte de detalle de prestaciones"
 msgid "Invoice due days must be greater than zero"
 msgstr "Los días de vencimiento de la factura deben ser mayores a 0"
 
+#. module: medical_invoicing
+#: model:ir.model.fields,field_description:medical_invoicing.field_account_invoice_refund_line__invoice_line_id
+msgid "Invoice lines"
+msgstr ""
+
 #. module: medical_invoicing
 #: model_terms:ir.ui.view,arch_db:medical_invoicing.medical_invoice_form
 #: selection:medical.invoice,state:0
@@ -405,6 +420,7 @@ msgid "Is medical service"
 msgstr "Es servicio médico"
 
 #. module: medical_invoicing
+#: model:ir.model.fields,field_description:medical_invoicing.field_account_invoice_refund_line____last_update
 #: model:ir.model.fields,field_description:medical_invoicing.field_medical_invoice____last_update
 #: model:ir.model.fields,field_description:medical_invoicing.field_medical_invoice_config____last_update
 #: model:ir.model.fields,field_description:medical_invoicing.field_report_medical_invoicing_report_invoice_detail_template____last_update
@@ -415,6 +431,7 @@ msgid "Last Modified on"
 msgstr "Última modificación en"
 
 #. module: medical_invoicing
+#: model:ir.model.fields,field_description:medical_invoicing.field_account_invoice_refund_line__write_uid
 #: model:ir.model.fields,field_description:medical_invoicing.field_medical_invoice__write_uid
 #: model:ir.model.fields,field_description:medical_invoicing.field_medical_invoice_config__write_uid
 #: model:ir.model.fields,field_description:medical_invoicing.field_wizard_account_invoice_modify__write_uid
@@ -422,6 +439,7 @@ msgid "Last Updated by"
 msgstr "Última actualización por"
 
 #. module: medical_invoicing
+#: model:ir.model.fields,field_description:medical_invoicing.field_account_invoice_refund_line__write_date
 #: model:ir.model.fields,field_description:medical_invoicing.field_medical_invoice__write_date
 #: model:ir.model.fields,field_description:medical_invoicing.field_medical_invoice_config__write_date
 #: model:ir.model.fields,field_description:medical_invoicing.field_wizard_account_invoice_modify__write_date
@@ -433,6 +451,11 @@ msgstr "Última actualización el"
 msgid "Line to choose benefits to pay from invoices"
 msgstr ""
 
+#. module: medical_invoicing
+#: model:ir.model,name:medical_invoicing.model_account_invoice_refund_line
+msgid "Lines of refund wizard"
+msgstr ""
+
 #. module: medical_invoicing
 #: model:ir.model,name:medical_invoicing.model_medical_benefit
 msgid "Medical Benefit"
@@ -478,7 +501,7 @@ msgid "Modify Invoice"
 msgstr "Modificar factura"
 
 #. module: medical_invoicing
-#: code:addons/medical_invoicing/models/account_invoice.py:46
+#: code:addons/medical_invoicing/models/account_invoice.py:50
 #: code:addons/medical_invoicing/models/medical_invoice.py:130
 #, python-format
 msgid "Month"
@@ -609,7 +632,7 @@ msgid "The payment amount must be greater than zero"
 msgstr "El monto del pago debe ser mayor que cero"
 
 #. module: medical_invoicing
-#: code:addons/medical_invoicing/wizard/account_invoice_refund.py:110
+#: code:addons/medical_invoicing/wizard/account_invoice_refund.py:118
 #, python-format
 msgid "There must be at least one invoice line selected"
 msgstr "Debe haber por lo menos una línea de factura seleccionada"
@@ -629,6 +652,11 @@ msgstr "Pasar a borrador"
 msgid "Total invoiced by"
 msgstr "Total facturado por"
 
+#. module: medical_invoicing
+#: model_terms:ir.ui.view,arch_db:medical_invoicing.report_pre_invoice_template
+msgid "Total invoiced:"
+msgstr "Total facturado: "
+
 #. module: medical_invoicing
 #: model_terms:ir.ui.view,arch_db:medical_invoicing.report_invoice_insurance_template
 msgid "Vendor Bill"
@@ -675,6 +703,11 @@ msgstr " para "
 msgid "from"
 msgstr "del"
 
+#. module: medical_invoicing
+#: model:ir.model.fields,field_description:medical_invoicing.field_account_invoice_refund_line__price
+msgid "price"
+msgstr "Precio"
+
 #. module: medical_invoicing
 #: model:ir.model,name:medical_invoicing.model_report_medical_invoicing_report_invoice_detail_template
 msgid "report.medical_invoicing.report_invoice_detail_template"

report/invoice_detail_report_template.xml

@@ -24,8 +24,8 @@
                                         <td style="width:30%;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;"><span t-esc="professional"/></td>
                                         <td style="width:30%;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;"><span t-esc="line['patient']"/></td>
                                         <td style="width:10%;"><span t-esc="descriptor"/></td>
-                                        <td style="width:15%;"><span t-esc="line['price_unit']"/></td>
-                                        <td style="width:15%;"><span t-esc="line['price_total']"/></td>
+                                        <td style="width:15%;">$ <span t-esc="line['price_unit']"/></td>
+                                        <td style="width:15%;">$ <span t-esc="line['price_total']"/></td>
                                     </tr>
                                 </table>
                             </t>
@@ -33,7 +33,7 @@
                             <p style="text-align:right;font-size:0.8em;">Descriptors applied by <strong t-esc="professional"/> for <strong t-esc="descriptor"/> = <strong t-esc="len(records[professional][descriptor])"/></p>
                             <hr style="height:1px;border-width:0;color:black;background-color:black;"/>
                         </t>
-                        <p style="text-align:right;font-size:0.8em;">Total invoiced by <strong t-esc="professional"/>: $<strong t-esc="total"/></p>
+                        <p style="text-align:right;font-size:0.8em;">Total invoiced by <strong t-esc="professional"/>: $ <strong t-esc="total"/></p>
                         <hr style="height:1px;border-width:0;color:black;background-color:black;"/>
                     </t>
                 </div>

report/invoice_insurance_report_template.xml

@@ -160,7 +160,7 @@
         <template id="report_invoice_insurance">
             <t t-call="web.html_container">
                 <t t-foreach="docs" t-as="o">
-                    <t t-set="lang" t-value="o.user_id.sudo().lang if o.type in ('in_invoice', 'in_refund') else o.partner_id.lang"/>
+                    <t t-set="lang" t-value="o.user_id.sudo().lang"/>
                     <t t-call="medical_invoicing.report_invoice_insurance_template" t-lang="lang"/>
                 </t>
             </t>

report/pre_invoice_report.py

@@ -68,6 +68,7 @@ class ReportPreInvoice(models.AbstractModel):
         return {
             'doc_ids': docids,
             'doc_model': 'account.invoice',
+            'doc': invoice,
             'records': records,
         }
 

report/pre_invoice_report_template.xml

@@ -4,6 +4,33 @@
         <t t-call="web.html_container">
             <t t-call="web.basic_layout" t-lang="user.lang">
                 <div class="page">
+                    <div id="informations" class="row mt32 mb32">
+                        <div class="col-auto mw-100 mb-2" t-if="doc.name" name="description">
+                            <strong>Description:</strong>
+                            <p class="m-0" t-field="doc.name"/>
+                        </div>
+                        <div class="col-auto mw-100 mb-2" t-if="doc.date_invoice" name="invoice_date">
+                            <strong>Invoice Date:</strong>
+                            <p class="m-0" t-field="doc.date_invoice"/>
+                        </div>
+                        <div class="col-auto mw-100 mb-2" t-if="doc.date_due and doc.type == 'out_invoice' and doc.state in ('open', 'in_payment', 'paid')" name="due_date">
+                            <strong>Due Date:</strong>
+                            <p class="m-0" t-field="doc.date_due"/>
+                        </div>
+                        <div class="col-auto mw-100 mb-2" t-if="doc.origin" name="origin">
+                            <strong>Source:</strong>
+                            <p class="m-0" t-field="doc.origin"/>
+                        </div>
+                        <div class="col-auto mw-100 mb-2" t-if="doc.partner_id.ref" name="customer_code">
+                            <strong>Customer Code:</strong>
+                            <p class="m-0" t-field="doc.partner_id.ref"/>
+                        </div>
+                        <div name="reference" class="col-auto mw-100 mb-2" t-if="doc.reference">
+                            <strong>Reference:</strong>
+                            <p class="m-0" t-field="doc.reference"/>
+                        </div>
+                    </div>
+
                     <div style="text-align:left;color:black!important;"><strong><h1>Pre Invoice report</h1></strong></div><br/>
                     <table class="table table-sm o_main_table" style="table-layout:fixed;font-size:0.8em;">
                         <tr>
@@ -11,13 +38,20 @@
                             <td>Professional</td>
                             <td>Price Total</td>
                         </tr>
+                        <t t-set="total" t-value="0"/>
                         <t t-foreach="records" t-as="record">
+                            <t t-set="total" t-value="total+record['price_total']"/>
                             <tr>
                                 <td><span t-esc="record['benefit_count']"/></td>
                                 <td><span t-esc="record['professional']"/></td>
-                                <td><span t-esc="record['price_total']"/></td>
+                                <td>$ <span t-esc="record['price_total']"/></td>
                             </tr>
                         </t>
+                        <tr>
+                            <td/>
+                            <td/>
+                            <td>Total invoiced: <strong>$ <span t-esc="total"/></strong></td>
+                        </tr>
                     </table>
                     <div class="footer">
                         <div class="text-center">