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

[MOD] medical benefit and view

See merge request !109

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-02-19 13:50+0000\n"
-"PO-Revision-Date: 2021-02-19 10:56-0300\n"
+"POT-Creation-Date: 2021-03-17 20:45+0000\n"
+"PO-Revision-Date: 2021-03-17 17:46-0300\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgid "<strong>Lot Number: </strong>"
 msgstr "<strong>Número de lote: </strong>"
 
 #. module: medical_benefit
-#: code:addons/medical_benefit/models/medical_benefit.py:396
+#: code:addons/medical_benefit/models/medical_benefit.py:397
 #, python-format
 msgid "A benefit with that order number already exists"
 msgstr "Ya existe una prestación con ese número de orden"
@@ -112,13 +112,13 @@ msgid "Benefit Tariff"
 msgstr "Arancel de prestación"
 
 #. module: medical_benefit
-#: code:addons/medical_benefit/models/medical_benefit.py:314
+#: code:addons/medical_benefit/models/medical_benefit.py:315
 #, python-format
 msgid "Benefit date can not be Sunday"
 msgstr "La fecha de prestación no puede ser un Domingo"
 
 #. module: medical_benefit
-#: code:addons/medical_benefit/models/medical_benefit.py:316
+#: code:addons/medical_benefit/models/medical_benefit.py:317
 #, python-format
 msgid "Benefit date can not be greater than current date"
 msgstr "La fecha de prestación no puede ser mayor que la fecha actual"
@@ -306,7 +306,7 @@ msgstr "Descripción"
 #: model:ir.model.fields,field_description:medical_benefit.field_tariff__benefit_descriptor_id
 #: model_terms:ir.ui.view,arch_db:medical_benefit.report_group_benefits_template
 msgid "Descriptor"
-msgstr "Práctica"
+msgstr "Practica"
 
 #. module: medical_benefit
 #: model_terms:ir.ui.view,arch_db:medical_benefit.report_group_benefits_template
@@ -376,6 +376,11 @@ msgstr "Nombre de archivo"
 msgid "For Invoicing"
 msgstr "Para facturar"
 
+#. module: medical_benefit
+#: selection:medical.benefit,state:0
+msgid "For Reinvoicing"
+msgstr "Para refacturar"
+
 #. module: medical_benefit
 #: model_terms:ir.ui.view,arch_db:medical_benefit.view_wizard_group_benefits_form
 msgid "Generate report"
@@ -790,7 +795,7 @@ msgid "Quantity"
 msgstr "Cantidad"
 
 #. module: medical_benefit
-#: code:addons/medical_benefit/models/medical_benefit.py:326
+#: code:addons/medical_benefit/models/medical_benefit.py:327
 #, python-format
 msgid "Quantity must be greater than 0"
 msgstr "La cantidad debe ser mayor que 0"
@@ -908,19 +913,19 @@ msgid "Tariffs"
 msgstr "Aranceles"
 
 #. module: medical_benefit
-#: code:addons/medical_benefit/models/medical_benefit.py:390
+#: code:addons/medical_benefit/models/medical_benefit.py:391
 #, python-format
 msgid "That descriptor cannot be applied in both eyes (bilateral)"
 msgstr "La práctica no puede ser aplicada en ambos ojos (bilateral)"
 
 #. module: medical_benefit
-#: code:addons/medical_benefit/models/medical_benefit.py:628
+#: code:addons/medical_benefit/models/medical_benefit.py:629
 #, python-format
 msgid "That order number is already in use"
 msgstr "Ese número de orden ya está en uso"
 
 #. module: medical_benefit
-#: code:addons/medical_benefit/models/medical_benefit.py:530
+#: code:addons/medical_benefit/models/medical_benefit.py:531
 #, python-format
 msgid "The lens code is already in use"
 msgstr "Ese código de lente ya está en uso"
@@ -1022,7 +1027,7 @@ msgid "Value"
 msgstr "Valor"
 
 #. module: medical_benefit
-#: code:addons/medical_benefit/models/medical_benefit.py:396
+#: code:addons/medical_benefit/models/medical_benefit.py:397
 #, python-format
 msgid "Warning"
 msgstr "Advertencia"
@@ -1053,13 +1058,13 @@ msgid "Would you like to generate a view or a report?"
 msgstr "¿Desea generar una vista o un reporte?"
 
 #. module: medical_benefit
-#: code:addons/medical_benefit/models/medical_benefit.py:666
+#: code:addons/medical_benefit/models/medical_benefit.py:667
 #, python-format
 msgid "You have more than %d benefits with descriptor %s in the last %s days for this patient.\n"
 msgstr "Existen más de %d prestaciones con la práctica %s en los últimos %s días para este paciente.\n"
 
 #. module: medical_benefit
-#: code:addons/medical_benefit/models/medical_benefit.py:668
+#: code:addons/medical_benefit/models/medical_benefit.py:669
 #, python-format
 msgid "You have more than %d benefits with descriptor %s in total for this patient.\n"
 msgstr "Existen más de %d prestaciones con la práctica %s en total para este paciente.\n"

models/medical_benefit.py

@@ -264,6 +264,7 @@ class MedicalBenefit(models.Model):
                 ('draft_clinic', 'Draft Clinic'),
                 ('invalid', 'Invalid'),
                 ('for_invoicing', 'For Invoicing'),
+                ('for_reinvoicing', 'For Reinvoicing'),
                 ('invoiced', 'Invoiced'),
                 ('pending', 'Pending'),
                 ('charged', 'Charged'),

views/benefit_view.xml

@@ -27,7 +27,6 @@
                                 <button class="oe_stat_button" name="action_charge_lot_benefits" type="object" style="text-align:center;margin-right:10px;">
                                     <field name="lot_benefits_qty" widget="statinfo" class="mr4"/>
                                 </button>
-                                <button class="oe_stat_button" name="action_charge_related_benefit" string="Bilateral benefit" type="object" style="text-align:center;margin-right:10px;" attrs="{'invisible': [('related_benefit_id','=',False)]}"/>
                                 <button class="oe_stat_button" name="action_change_lot_date" type="object" style="text-align:center;margin-right:10px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">
                                     <field name="presentation_date" widget="statinfo" class="mr4"/><br/>Presentation date
                                 </button>
@@ -60,7 +59,11 @@
                             <field name="price"/>
                         </group>
                         <group name="misc">
-                            <field name="eye" attrs="{'invisible': [('requires_eye','=', False)],'required': [('requires_eye','=',True)]}"/>
+                            <label for="eye" attrs="{'invisible': [('requires_eye','=',False)]}"/>
+                            <div class="o_row" attrs="{'invisible': [('requires_eye','=',False)]}">
+                                <field name="eye" attrs="{'invisible': [('requires_eye','=', False)],'required': [('requires_eye','=',True)]}"/>
+                                <button class="oe_stat_button" name="action_charge_related_benefit" string="Bilateral benefit" type="object" style="text-align:center;margin-right:10px;" attrs="{'invisible': [('related_benefit_id','=',False)]}"/>
+                            </div>
                             <field name="show_lens" invisible="1"/>
                             <field name="lens_code" attrs="{'invisible': [('show_lens','=',False)],'required': [('show_lens','=',True)]}"/>
                         </group>