Skip to content
Snippets Groups Projects
Commit 6e55e74b authored by Marco Folco's avatar Marco Folco
Browse files

Merge branch 'SOF-38-Modificacion-formulario-prestaciones' into '12.0-stage' 

[MOD] medical benefit and res users preferences

See merge request !35
parents 462ca4fd 4460ce2d
No related branches found
No related tags found
1 merge request!35[MOD] medical benefit and res users preferences
Hide whitespace changes
Inline Side-by-side
i18n/es_AR.mo
+ 0
− 0
View file @ 6e55e74b
No preview for this file type
i18n/es_AR.po
+ 44
− 6
View file @ 6e55e74b
......@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 12.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-29 20:31+0000\n"
"PO-Revision-Date: 2020-06-29 17:32-0300\n"
"POT-Creation-Date: 2020-07-08 18:12+0000\n"
"PO-Revision-Date: 2020-07-08 15:14-0300\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
......@@ -81,7 +81,6 @@ msgid "Both eyes"
msgstr "Ambos ojos"
#. module: medical_benefit
#: model:ir.model.fields,field_description:medical_benefit.field_medical_benefit__code
#: model:ir.model.fields,field_description:medical_benefit.field_medical_benefit_descriptor_type__code
msgid "Code"
msgstr "Código"
......@@ -92,6 +91,11 @@ msgstr "Código"
msgid "Code %s already exists!"
msgstr "¡Código %s ya existe!"
#. module: medical_benefit
#: model:ir.model,name:medical_benefit.model_res_partner
msgid "Contact"
msgstr "Contacto"
#. module: medical_benefit
#: model:ir.model.fields,field_description:medical_benefit.field_medical_benefit__create_uid
#: model:ir.model.fields,field_description:medical_benefit.field_medical_benefit_descriptor__create_uid
......@@ -122,7 +126,7 @@ msgstr "Obra social por defecto"
#. module: medical_benefit
#: model:ir.model.fields,field_description:medical_benefit.field_res_users__default_insurance_plan_id
msgid "Default Insurance Plan"
msgid "Default Plan"
msgstr "Plan por defecto"
#. module: medical_benefit
......@@ -155,7 +159,7 @@ msgid "Draft"
msgstr "Borrador"
#. module: medical_benefit
#: code:addons/medical_benefit/models/medical_benefit.py:254
#: code:addons/medical_benefit/models/medical_benefit.py:276
#, python-format
msgid ""
"Error!\n"
......@@ -163,7 +167,7 @@ msgid ""
msgstr "Error: la fecha de la presentación debe estar en el mismo mes y año en que fue realizada la prestación"
#. module: medical_benefit
#: code:addons/medical_benefit/models/medical_benefit.py:249
#: code:addons/medical_benefit/models/medical_benefit.py:271
#, python-format
msgid ""
"Error!\n"
......@@ -256,6 +260,17 @@ msgstr "Última actualización por"
msgid "Last Updated on"
msgstr "Última actualización el"
#. module: medical_benefit
#: model:ir.model.fields,field_description:medical_benefit.field_medical_benefit__lens_code
msgid "Lens Code"
msgstr "Código de lente"
#. module: medical_benefit
#: code:addons/medical_benefit/models/medical_benefit.py:284
#, python-format
msgid "Lens code already present in benefit with order number {}"
msgstr "El código de lente ya se encuentra presente en la prestación con número de orden {}"
#. module: medical_benefit
#: model:ir.model.fields,field_description:medical_benefit.field_medical_benefit_descriptor__max_limit_benefit
msgid "Maximum benefit level"
......@@ -312,6 +327,17 @@ msgstr "Nomenclador"
msgid "Nomenclators"
msgstr "Nomencladores"
#. module: medical_benefit
#: model:ir.model.fields,field_description:medical_benefit.field_medical_benefit__order_number
msgid "Order Number"
msgstr "Número de orden"
#. module: medical_benefit
#: code:addons/medical_benefit/models/medical_benefit.py:314
#, python-format
msgid "Order number cannot be empty"
msgstr "El número de orden no puede estar vacío"
#. module: medical_benefit
#: model:ir.model.fields,field_description:medical_benefit.field_medical_benefit__partner_type
msgid "Partner type"
......@@ -319,6 +345,7 @@ msgstr "Tipo"
#. module: medical_benefit
#: model:ir.model.fields,field_description:medical_benefit.field_medical_benefit__patient_id
#: model_terms:ir.ui.view,arch_db:medical_benefit.view_res_partner_patient_medical_benefit
msgid "Patient"
msgstr "Paciente"
......@@ -410,6 +437,12 @@ msgstr "Descripción Corta"
msgid "Tariffs"
msgstr "Aranceles"
#. module: medical_benefit
#: code:addons/medical_benefit/models/medical_benefit.py:312
#, python-format
msgid "There is another benefit with that order number"
msgstr "Existe otra prestación con ese número de orden"
#. module: medical_benefit
#: model:ir.model.fields,field_description:medical_benefit.field_medical_benefit_descriptor__type_id
msgid "Type"
......@@ -440,6 +473,11 @@ msgstr "Validador"
msgid "control"
msgstr "Control"
#. module: medical_benefit
#: model_terms:ir.ui.view,arch_db:medical_benefit.view_res_partner_patient_medical_benefit
msgid "e.g. BE0477472701"
msgstr "Por ejemplo, ESA00000000"
#. module: medical_benefit
#: model:ir.model.fields,field_description:medical_benefit.field_medical_benefit_descriptor_validator__period
msgid "period"
......
models/medical_benefit.py
+ 20
− 1
View file @ 6e55e74b
......@@ -212,7 +212,9 @@ class MedicalBenefit(models.Model):
patient_id = fields.Many2one(
'res.partner', 'Patient', required=True, ondelete='restrict')
insurance_plan_id = fields.Many2one(
'health.insurance.plan', 'Plan', ondelete='restrict', default=lambda x: x.get_default_insurance_plan_id())
'health.insurance.plan', 'Plan', ondelete='restrict',
default=lambda x: x.get_default_insurance_plan_id(),
domain=lambda x: x.get_domain_insurance_plan_id())
descriptor_id = fields.Many2one(
'medical.benefit.descriptor', 'Benefit', required=True, ondelete='restrict')
benefit_date = fields.Date('Date', required=True)
......@@ -231,6 +233,23 @@ class MedicalBenefit(models.Model):
error_notes = fields.Text(string="Reason of invalidity")
lens_code = fields.Char('Lens Code')
@api.multi
def get_domain_insurance_plan_id(self):
plan_ids = []
partner = self.env.user.partner_id
if partner.partner_type == 'professional':
for insurance in partner.attended_insurance_ids:
plan_ids.extend(self.env['health.insurance.plan'].search([('partner_id','=',insurance.id)]).ids)
return [('id','in',plan_ids)]
@api.onchange('professional_id')
def onchange_professional_id(self):
plan_ids = []
if self.professional_id:
for insurance in self.professional_id.attended_insurance_ids:
plan_ids.extend(self.env['health.insurance.plan'].search([('partner_id','=',insurance.id)]).ids)
return {'domain': {'insurance_plan_id': [('id','in',plan_ids)]}}
@api.onchange('insurance_plan_id')
def onchange_insurance_plan_id(self):
rp = self.env['res.partner']
......
views/benefit_view.xml
+ 2
− 2
View file @ 6e55e74b
......@@ -31,9 +31,9 @@
<field name="benefit_date" required="1"/>
<field name="presentation_date"/>
</group>
<group>
<group name="misc">
<field name="eye" required="1" attrs="{'invisible': [('requires_eye', '=', False)]}"/>
<field name="lens_code"/>
<field name="lens_code" invisible="1"/>
<field name="error_notes" attrs="{'invisible': [('state','!=','invalid')]}"/>
</group>
</sheet>
......
views/res_users_views.xml
+ 6
− 4
View file @ 6e55e74b
......@@ -9,8 +9,9 @@
<field name="inherit_id" ref="base.view_users_form"/>
<field name="arch" type="xml">
<xpath expr="//group[@name='messaging']" position="after">
<group string="Benefit Preferences" name="benefit_preferences">
<field name="default_insurance_id" domain="[('partner_type','=','insurance')]" options='{"no_open": True, "no_create": True}'/>
<field name="partner_type" invisible="1"/>
<group string="Benefit Preferences" name="benefit_preferences" attrs="{'invisible': [('partner_type','!=','sofsa_user')]}">
<field name="default_insurance_id" domain="[('partner_type','=','insurance')]" attrs="{'invisible': [('partner_type','!=','sofsa_user')]}" options='{"no_open": True, "no_create": True}'/>
<field name="default_insurance_plan_id" attrs="{'invisible': [('default_insurance_id','=',False)],'required': [('default_insurance_id','!=',False)]}" options='{"no_open": True, "no_create": True}'/>
</group>
</xpath>
......@@ -23,9 +24,10 @@
<field name="inherit_id" ref="base.view_users_form_simple_modif"/>
<field name="arch" type="xml">
<xpath expr="//group[@name='preferences']" position="after">
<group string="Benefit Preferences" name="benefit_preferences">
<field name="partner_type" invisible="1"/>
<group string="Benefit Preferences" name="benefit_preferences" attrs="{'invisible': [('partner_type','!=','sofsa_user')]}">
<group name="insurance">
<field name="default_insurance_id" domain="[('partner_type','=','insurance')]" options='{"no_open": True, "no_create": True}'/>
<field name="default_insurance_id" domain="[('partner_type','=','insurance')]" attrs="{'invisible': [('partner_type','!=','sofsa_user')]}" options='{"no_open": True, "no_create": True}'/>
<field name="default_insurance_plan_id" attrs="{'invisible': [('default_insurance_id','=',False)],'required': [('default_insurance_id','!=',False)]}" options='{"no_open": True, "no_create": True}'/>
</group>
</group>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment