diff --git a/academic/__manifest__.py b/academic/__manifest__.py
index a0809303..bf8f6967 100644
--- a/academic/__manifest__.py
+++ b/academic/__manifest__.py
@@ -19,7 +19,7 @@
 ##############################################################################
 {
     'name': 'Academic',
-    'version': "16.0.1.5.0",
+    'version': "16.0.1.8.0",
     'sequence': 14,
     'summary': '',
     'author': 'ADHOC SA',
@@ -35,6 +35,7 @@
         'board',
         'sale_management',
         'account',
+        'contacts',
     ],
     'data': [
         'security/academic_security.xml',
@@ -52,10 +53,16 @@
         'views/res_users_views.xml',
         'views/res_company_views.xml',
         'views/login_page.xml',
+        'views/sale_order_views.xml',
+        'views/res_partner_link_views.xml',
+        'views/res_partner_relationship_views.xml',
         'data/res_users_data.xml',
         'wizards/portal_wizard_views.xml',
+        'data/res_partner_role_data.xml',
+        'views/account_move_views.xml',
     ],
     'demo': [
+        'demo/res_partner_relationship_demo.xml',
         'demo/res_partner_demo.xml',
         'demo/academic.subject.csv',
         'demo/academic.section.csv',
@@ -65,6 +72,7 @@
         'demo/res_company_demo.xml',
         'demo/res_users_demo.xml',
         'demo/academic.group.csv',
+        'demo/res.partner.link.csv',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/academic/data/res_partner_role_data.xml b/academic/data/res_partner_role_data.xml
new file mode 100644
index 00000000..e6c07bfb
--- /dev/null
+++ b/academic/data/res_partner_role_data.xml
@@ -0,0 +1,29 @@
+<odoo noupdate="1">
+
+    <record id="emergency_contact_role" model="res.partner.role">
+        <field name="name">Contacto de Emergencia</field>
+        <field name="color">1</field>
+    </record>
+
+    <record id="emergency_institution_role" model="res.partner.role">
+        <field name="name">Institución de Emergencia</field>
+        <field name="color">2</field>
+    </record>
+
+    <!-- la idea de este rol es que se use tanto para seleccionar en suscripcion a quien se va a facturar como tambien para definir quienes pueden acceder al portal, ver facturas, pagarlas, etc. -->
+    <record id="paying_role" model="res.partner.role">
+        <field name="name">Responsable de Pago</field>
+        <field name="color">3</field>
+    </record>
+
+    <record id="withdraw_role" model="res.partner.role">
+        <field name="name">Puede Retirar</field>
+        <field name="color">4</field>
+    </record>
+
+    <record id="communications_role" model="res.partner.role">
+        <field name="name">Comunicaciones</field>
+        <field name="color">5</field>
+    </record>
+
+</odoo>
diff --git a/academic/demo/res.partner.csv b/academic/demo/res.partner.csv
index b7c4bd1f..78a6c9f5 100644
--- a/academic/demo/res.partner.csv
+++ b/academic/demo/res.partner.csv
@@ -1,9 +1,32 @@
-id,name,partner_type,is_company,active,section_id/id,promotion_id/id
-res_partner_ignacio_rodriguez,Ignacio Rodriguez,teacher,False,True,,
-res_partner_laura_sali,Laura Sali,teacher,False,True,,
-res_partner_alvaro_diaz,Alvaro Diaz,student,False,True,,academic_promotion_1
-res_partner_jose_martin_rodriguez,José Martín Rodriguez,student,False,True,,academic_promotion_1
-res_partner_martin_perez,Martin Perez,student,False,True,,academic_promotion_2
-res_partner_juan_gomez,Juan Gomez,administrator,False,True,academic_section_1,
-res_partner_roberto_martin,Roberto Martin,administrator,False,True,academic_section_1,
-res_partner_malena_apdes,Malena Apdes,,False,True,,
+id,name,partner_type,is_company,section_id/id,promotion_id/id,sex,parent_id/id,links_by_student
+res_partner_flia_mufaza,Flia. Mufaza,family,False,,,,,
+res_partner_flia_frias,Flia. Frias,family,False,,,,,True
+res_partner_flia_pampa,Flia. Pampa,family,False,,,,,
+res_partner_ignacio_rodriguez,Ignacio Rodriguez,teacher,False,,,M,,
+res_partner_laura_sali,Laura Sali,teacher,False,,,F,,
+res_partner_alvaro_diaz,Alvaro Diaz,student,False,,academic_promotion_1,M,,
+res_partner_jose_martin_rodriguez,José Martín Rodriguez,student,False,,academic_promotion_1,M,,
+res_partner_martin_perez,Martin Perez,student,False,,academic_promotion_2,M,,
+res_partner_juan_gomez,Juan Gomez,administrator,False,academic_section_1,,M,,
+res_partner_roberto_martin,Roberto Martin,administrator,False,academic_section_1,,M,,
+res_partner_malena_apdes,Malena Apdes,,False,,,F,,
+res_partner_luz,Luz Mufaza,student,False,,academic_promotion_2,F,res_partner_flia_mufaza,
+res_partner_bautista,Bautista Mufaza,student,False,,academic_promotion_2,M,res_partner_flia_mufaza,
+res_partner_mateo,Mateo Frias,student,False,,academic_promotion_2,M,res_partner_flia_frias,
+res_partner_amalia,Amalia Frias,student,False,,academic_promotion_2,F,res_partner_flia_frias,
+res_partner_ignacio,Ignacio Frias,student,False,,academic_promotion_2,M,res_partner_flia_frias,
+res_partner_martina,Martina Pampa,student,False,,academic_promotion_2,M,res_partner_flia_pampa,
+res_partner_gonzalo,Gonzalo Mufaza,relative,False,,,M,,
+res_partner_teresa,Teresa Ciudadela,relative,False,,,F,,
+res_partner_marina,Marina Priti,relative,False,,,F,,
+res_partner_juan,Juan Frias,relative,False,,,M,,
+res_partner_manuel,Manuel Pampa,relative,False,,,M,,
+res_partner_cecilia,Cecilia Todi,relative,False,,,F,,
+res_partner_marcelo,Marcelo Pampa,relative,False,,,M,,
+res_partner_laura,Laura Perez,relative,False,,,F,,
+res_partner_cristina,Cristina Garcia,relative,False,,,F,,
+res_partner_rosa,Rosa Roma,relative,False,,,F,,
+res_partner_daniel,Daniel Priti,relative,False,,,M,,
+res_partner_jose_luis,Jose Luis Mufaza,relative,False,,,M,,
+res_partner_hospital_espanol,Hospital Español,,True,,,,,
+res_partner_sanatorio_amercano,Sanatorio Americano,,True,,,,,
diff --git a/academic/demo/res.partner.link.csv b/academic/demo/res.partner.link.csv
new file mode 100644
index 00000000..d43fb562
--- /dev/null
+++ b/academic/demo/res.partner.link.csv
@@ -0,0 +1,26 @@
+id,student_id/id,partner_id/id,relationship_id/id,role_ids/id,note
+res_partner_amalia_juan,res_partner_amalia,res_partner_juan,parent_relationship,,
+res_partner_amalia_marina,res_partner_amalia,res_partner_marina,parent_relationship,,
+res_partner_amalia_daniel,res_partner_amalia,res_partner_daniel,grandfather_mother_relationship,"emergency_contact_role,withdraw_role,paying_role",
+res_partner_amalia_rosa,res_partner_amalia,res_partner_rosa,grandfather_mother_relationship,"emergency_contact_role,withdraw_role",
+res_partner_amalia_americano,res_partner_amalia,res_partner_sanatorio_amercano,other_relationship,emergency_institution_role,
+res_partner_ignacio_juan,res_partner_ignacio,res_partner_juan,parent_relationship,"emergency_contact_role,withdraw_role,paying_role",
+res_partner_ignacio_marina,res_partner_ignacio,res_partner_marina,parent_relationship,"emergency_contact_role,withdraw_role,paying_role",
+res_partner_ignacio_daniel,res_partner_ignacio,res_partner_daniel,grandfather_mother_relationship,,
+res_partner_ignacio_rosa,res_partner_ignacio,res_partner_rosa,grandfather_mother_relationship,,
+res_partner_ignacio_americano,res_partner_ignacio,res_partner_sanatorio_amercano,other_relationship,emergency_institution_role,
+res_partner_mufaza_gonzalo,res_partner_flia_mufaza,res_partner_gonzalo,parent_relationship,"emergency_contact_role,withdraw_role,paying_role",
+res_partner_mufaza_teresa,res_partner_flia_mufaza,res_partner_teresa,parent_relationship,"emergency_contact_role,withdraw_role,paying_role",
+res_partner_mufaza_jose_luis,res_partner_flia_mufaza,res_partner_jose_luis,grandfather_mother_relationship,withdraw_role,
+res_partner_mufaza_cristina,res_partner_flia_mufaza,res_partner_cristina,grandfather_mother_relationship,withdraw_role,
+res_partner_mufaza_espanol,res_partner_flia_mufaza,res_partner_hospital_espanol,other_relationship,emergency_institution_role,
+res_partner_pampa_manuel,res_partner_flia_pampa,res_partner_manuel,parent_relationship,"emergency_contact_role,withdraw_role,paying_role",
+res_partner_pampa_cecilia,res_partner_flia_pampa,res_partner_cecilia,parent_relationship,"emergency_contact_role,withdraw_role,paying_role",
+res_partner_pampa_marcelo,res_partner_flia_pampa,res_partner_marcelo,grandfather_mother_relationship,withdraw_role,
+res_partner_pampa_laura,res_partner_flia_pampa,res_partner_laura,grandfather_mother_relationship,withdraw_role,
+res_partner_pampa_espanol,res_partner_flia_pampa,res_partner_hospital_espanol,other_relationship,emergency_institution_role,
+res_partner_mateo_juan,res_partner_mateo,res_partner_juan,parent_relationship,"emergency_contact_role,withdraw_role,paying_role",
+res_partner_mateo_marina,res_partner_mateo,res_partner_marina,parent_relationship,"emergency_contact_role,withdraw_role,paying_role",
+res_partner_mateo_daniel,res_partner_mateo,res_partner_daniel,grandfather_mother_relationship,"emergency_contact_role,withdraw_role,paying_role",
+res_partner_mateo_rosa,res_partner_mateo,res_partner_rosa,grandfather_mother_relationship,withdraw_role,
+res_partner_mateo_americano,res_partner_mateo,res_partner_sanatorio_amercano,other_relationship,emergency_institution_role,
diff --git a/academic/demo/res_company_demo.xml b/academic/demo/res_company_demo.xml
index b4287703..e285ea79 100644
--- a/academic/demo/res_company_demo.xml
+++ b/academic/demo/res_company_demo.xml
@@ -22,6 +22,8 @@
         <field name="partner_id" ref="res_partner_los_arroyos"/>
         <field name="parent_id" ref="base.main_company"/>
         <field name="currency_id" ref="base.ARS"/>
+        <!-- para hacerlo requerido deberiamos cambiar la data demo de algunos partners -->
+        <!-- <field name="family_required" eval="True"/> -->
         <field name="fiscalyear_last_day">31</field>
         <field name="name">Colegio Los Arroyos</field>
     </record>
@@ -29,6 +31,8 @@
     <record id="res_company_los_molinos" model="res.company">
         <field name="partner_id" ref="res_partner_los_molinos"/>
         <field name="parent_id" ref="base.main_company"/>
+        <!-- para hacerlo requerido deberiamos cambiar la data demo de algunos partners -->
+        <!-- <field name="family_required" eval="True"/> -->
         <field name="currency_id" ref="base.ARS"/>
         <!-- <field name="fiscalyear_last_day">31</field> -->
         <field name="name">Colegio Los Molinos</field>
diff --git a/academic/demo/res_partner_relationship_demo.xml b/academic/demo/res_partner_relationship_demo.xml
new file mode 100644
index 00000000..67a4668a
--- /dev/null
+++ b/academic/demo/res_partner_relationship_demo.xml
@@ -0,0 +1,24 @@
+<odoo>
+
+    <!-- <record id="father_relationship" model="res.partner.relationship"> -->
+    <record id="parent_relationship" model="res.partner.relationship">
+        <field name="name">Padre/Madre</field>
+    </record>
+
+    <!-- <record id="mather_relationship" model="res.partner.relationship">
+        <field name="name">Madre</field>
+    </record> -->
+
+    <record id="relative_relationship" model="res.partner.relationship">
+        <field name="name">Pariente</field>
+    </record>
+
+    <record id="grandfather_mother_relationship" model="res.partner.relationship">
+        <field name="name">Abuelo/a</field>
+    </record>
+
+    <record id="other_relationship" model="res.partner.relationship">
+        <field name="name">Otro</field>
+    </record>
+
+</odoo>
diff --git a/academic/demo/res_users_demo.xml b/academic/demo/res_users_demo.xml
index fac52ef7..bca85fc3 100644
--- a/academic/demo/res_users_demo.xml
+++ b/academic/demo/res_users_demo.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo noupdate="1">
 
+
+    <record id="base.user_root" model="res.users">
+        <field name="company_ids" eval="[(6, 0, [ref('base.main_company'), ref('academic.res_company_los_molinos'), ref('academic.res_company_los_arroyos')])]"/>
+    </record>
+
+    <record id="base.user_admin" model="res.users">
+        <field name="company_ids" eval="[(6, 0, [ref('base.main_company'), ref('academic.res_company_los_molinos'), ref('academic.res_company_los_arroyos')])]"/>
+    </record>
+
+    <record id="base.user_demo" model="res.users">
+        <field name="company_ids" eval="[(6, 0, [ref('base.main_company'), ref('academic.res_company_los_molinos'), ref('academic.res_company_los_arroyos')])]"/>
+    </record>
+
     <!-- Apdes Manger -->
     <record id="user_malena_apdes" model="res.users" context="{'no_reset_password': True}">
         <field name="partner_id" ref="res_partner_malena_apdes"/>
@@ -8,7 +21,7 @@
         <field name="password">mapdes@academic.com</field>
         <field name="email">mapdes@academic.com</field>
         <field name="company_id" ref="base.main_company"/>
-        <field name="company_ids" eval="[(4, ref('base.main_company'))]"/>
+        <field name="company_ids" eval="[(6, 0, [ref('base.main_company'), ref('academic.res_company_los_molinos'), ref('academic.res_company_los_arroyos')])]"/>
         <field name="groups_id" eval="[(6,0,[ref('base.group_user'), ref('base.group_partner_manager'),ref('group_manager'),ref('base.group_multi_company')])]"/>
     </record>
 
diff --git a/academic/i18n/es.po b/academic/i18n/es.po
index 99bdcaba..908a3cc7 100644
--- a/academic/i18n/es.po
+++ b/academic/i18n/es.po
@@ -423,8 +423,8 @@ msgstr "Otro"
 #. module: academic
 #: model:ir.model.fields.selection,name:academic.selection__academic_group__type__parent
 #: model:ir.model.fields.selection,name:academic.selection__res_partner__partner_type__parent
-msgid "Parent"
-msgstr "Padre"
+msgid "Relative"
+msgstr "Pariente"
 
 #. module: academic
 #: model:res.groups,name:academic.group_portal_parent
@@ -742,3 +742,8 @@ msgstr "asignatura"
 #: model:ir.model.fields,help:academic.field_res_users__disabled_person
 msgid "¿Alumno/a con Dificultades de aprendizaje?"
 msgstr "¿Alumno/a con Dificultades de aprendizaje?"
+
+#. module: academic
+#: model_terms:ir.ui.view,arch_db:academic.view_academic_partner_form
+msgid "A partner with the same dni already exists ("
+msgstr "Ya existe un contacto con el mismo dni ("
diff --git a/academic/models/__init__.py b/academic/models/__init__.py
index 7753998b..bf86bf01 100644
--- a/academic/models/__init__.py
+++ b/academic/models/__init__.py
@@ -14,3 +14,7 @@
 from . import res_partner_relationship
 from . import res_partner
 from . import res_users
+from . import res_partner_role
+from . import res_partner_link
+from . import sale_order
+from . import account_move
diff --git a/academic/models/academic_group.py b/academic/models/academic_group.py
index 14e0d941..536f0ffe 100644
--- a/academic/models/academic_group.py
+++ b/academic/models/academic_group.py
@@ -18,7 +18,7 @@ class AcademicGroup(models.Model):
         ('teacher', 'Teacher'),
         ('administrator', 'Administrator'),
         ('gral_administrator', 'gral_administrator'),
-        ('parent', 'Parent')]
+        ('parent', 'Relative')]
     )
     year = fields.Integer(
         required=True,
@@ -71,7 +71,7 @@ class AcademicGroup(models.Model):
          'unique(subject_id, company_id, level_id, year, division_id)',
          'Group should be unique per Institution, Subject,'
          ' Course-Division and Year')]
-    
+
     sequence = fields.Integer(help='Used to order Groups', default=10)
 
     def name_get(self):
diff --git a/academic/models/account_move.py b/academic/models/account_move.py
new file mode 100644
index 00000000..f1446978
--- /dev/null
+++ b/academic/models/account_move.py
@@ -0,0 +1,19 @@
+from odoo import models, fields, api
+
+
+class AccountMove(models.Model):
+    _inherit = 'account.move'
+
+    student_ids = fields.Many2many('res.partner', compute="_compute_student_ids")
+    partner_shipping_id = fields.Many2one(domain="[('id', 'in', student_ids), ('partner_type', '=', 'student')]")
+
+    @api.depends('partner_id')
+    def _compute_student_ids(self):
+        for rec in self:
+            if rec.partner_id:
+                student_ids = self.env['res.partner.link'].search(
+                    [('partner_id', '=', rec.partner_id.id), ('role_ids', 'in', self.env.ref('academic.paying_role').id)]
+                ).mapped('student_id.id')
+                rec.student_ids = [(6, 0, student_ids)]
+            else:
+                rec.student_ids = [(5, 0, 0)]
diff --git a/academic/models/account_move_line.py b/academic/models/account_move_line.py
new file mode 100644
index 00000000..3a7842c9
--- /dev/null
+++ b/academic/models/account_move_line.py
@@ -0,0 +1,7 @@
+from odoo import models, fields
+
+
+class AccountMoveLine(models.Model):
+    _inherit = 'account.move.line'
+
+    student_id = fields.Many2one(related="move_id.student_id", store=True)
diff --git a/academic/models/res_company.py b/academic/models/res_company.py
index 0b0e9053..1f7d2428 100644
--- a/academic/models/res_company.py
+++ b/academic/models/res_company.py
@@ -14,8 +14,8 @@ class ResCompany(models.Model):
         'company_id',
         string='Groups',
     )
-
     study_plan_id = fields.Many2one(
         comodel_name='academic.study.plan',
         string='Plan de Estudio'
     )
+    family_required = fields.Boolean()
diff --git a/academic/models/res_partner.py b/academic/models/res_partner.py
index 28b7c1c6..16f59a87 100644
--- a/academic/models/res_partner.py
+++ b/academic/models/res_partner.py
@@ -15,10 +15,14 @@ class ResPartner(models.Model):
         ('teacher', 'Teacher'),
         ('administrator', 'Administrator'),
         ('gral_administrator', 'General Administrator'),
-        ('parent', 'Parent'),
+        ('parent', 'Relative'),
         ('other', 'Other'),
+        ('family', 'Family'),
     ],
         change_default=True,
+        compute='_compute_partner_type',
+        readonly=False,
+        store=True,
     )
     section_id = fields.Many2one(
         'academic.section',
@@ -61,12 +65,6 @@ class ResPartner(models.Model):
     medical_insurance = fields.Char(
         copy=False,
     )
-    relationship_id = fields.Many2one(
-        'res.partner.relationship',
-    )
-    withdraw = fields.Boolean(
-    )
-
     dni = fields.Integer(
         'DNI',
     )
@@ -74,15 +72,64 @@ class ResPartner(models.Model):
         'res.users',
         compute='_compute_related_user_id',
     )
+    student_link_ids = fields.One2many(
+        'res.partner.link', 'student_id', string='Contactos y Roles', copy=True,
+        compute='_compute_student_links', readonly=False, store=True, recursive=True)
+
+    @api.depends('parent_links_by_student', 'parent_id.student_link_ids')
+    def _compute_student_links(self):
+        """ Si se confirugan los contactos en la flia, los propagamos a los hijos. Lo hacemos así para que:
+        a) en todo el codigo solo miremos siempre hijos, lo de la familia es un asistente
+        b) si se marca llevar en estudiantes ya van a tener toda la data que tenía la familia """
+        for rec in self.filtered(lambda x: x.partner_type == 'student' and x.parent_id and not x.parent_links_by_student):
+            rec.student_link_ids = [(5, 0, 0)] + [(0, 0, {
+                'relationship_id': x.relationship_id.id,
+                'role_ids': x.role_ids,
+                'partner_id': x.partner_id.id,
+                'note': x.note}) for x in rec.parent_id.student_link_ids]
+
+    partner_link_ids = fields.One2many('res.partner.link', 'partner_id', string='Roles', copy=True)
+    links_by_student = fields.Boolean(string='Contactos y Roles por Estudiante')
+    company_family_required = fields.Boolean(related='company_id.family_required')
+    parent_links_by_student = fields.Boolean(related='parent_id.links_by_student', string="La familia define Contactos y Roles por Estudiante")
+    # creamos nuevo campo porque el child_ids como ya esta en la vista nos propaga el mode kanban
+    # al hacerlo con mode tree nos simplfica bastante la herencia de vista porque no tenemos que agregar en el quick
+    # create tantas cosas
+    student_ids = fields.One2many('res.partner', 'parent_id')
+    company_id = fields.Many2one(compute='_compute_company_id', store=True, readonly=False)
+    # company_type = fields.Selection(selection_add=[('family', 'Family')])
+    # is_family = fields.Boolean()
+
+    # @api.depends('is_family')
+    # def _compute_company_type(self):
+    #     families = self.filtered(lambda x: x.is_company and x.is_family)
+    #     families.company_type = 'family'
+    #     return super(ResPartner, self - families)._compute_company_type()
+
+    # def _write_company_type(self):
+    #     families = self.filtered(lambda x: x.company_type == 'family')
+    #     families.is_company = True
+    #     families.is_family = True
+    #     return super(ResPartner, self - families)._write_company_type()
+
+    @api.constrains('company_id', 'partner_type', 'parent_id')
+    def _check_family_configured(self):
+        if self.filtered(lambda x: x.partner_type == 'student' and x.company_id.family_required and x.parent_id.partner_type != 'family'):
+            raise UserError('En la institucion, los estudiantes deben estar vinculados a una familia')
+
+    @api.constrains('parent_id', 'partner_type')
+    def _check_family_student_relation(self):
+        if self.filtered(lambda x: x.partner_type != 'student' and x.parent_id.partner_type == 'family'):
+            raise UserError('Los contactos de una familia solo pueden ser estudiantes')
+    same_dni_partner_id = fields.Many2one('res.partner', string='Partner with same DNI', compute='_compute_same_dni_partner_id', store=False)
 
     def _compute_related_user_id(self):
         for rec in self:
             rec.related_user_id = rec.user_ids and rec.user_ids[0]
 
-    @api.onchange('is_company')
-    def _check_partner_type(self):
-        for record in self.filtered(lambda x: x.is_company and x.partner_type):
-            record.partner_type = False
+    @api.depends('is_company')
+    def _compute_partner_type(self):
+        self.filtered(lambda x: x.is_company and x.partner_type).partner_type = False
 
     def write(self, vals):
         if 'is_company' in vals and vals.get('is_company'):
@@ -95,14 +142,39 @@ def quickly_create_portal_user(self):
         """
         # TODO: el metodo onchange_portal_id no existe.
         # Esto dejo de usarse pero queda el codigo por posible implementacion a futuro
-        raise UserError(
-            _(
-                "Esta función se encuentra en desarrollo!"
-            )
-        )
+        raise UserError(_("Esta función se encuentra en desarrollo!"))
         wizard = self.env['portal.wizard'].with_context(
             default_active_ids=self.ids, active_ids=self.ids,
             active_id=self.ids and self.ids[0] or False,
             active_model='res.partner').create({})
         wizard.user_ids.write({'in_portal': True})
         wizard.action_apply()
+
+    @api.depends('parent_id')
+    def _compute_company_id(self):
+        """
+        Si soy parte de una compañía (o familia, es campo "parent_id"), queremos que todos los childs tengan misma company
+        Ahora bien, si la compañía está compartida (parent_id = False) matenemos fleixibilidad con los hijos.
+        Por defecto ponemos la company donde está parado el usuario pero permitimos sacarla o cambiarla.
+        Un padre, madre o estudiante podrían en algunos casos de uso estar compartidos entre varias instituciones
+        """
+        for rec in self:
+            rec.company_id = rec.parent_id.company_id or rec.env.company
+
+    def _onchange_company_id(self):
+        # anulamos el onchange nativo de odoo porque ahora lo hicimos compute
+        return
+
+    @api.depends('dni')
+    def _compute_same_dni_partner_id(self):
+        filtered_partners = self.filtered('dni')
+        for partner in filtered_partners:
+            partner_id = partner._origin.id
+            Partner = self.with_context(active_test=False).sudo()
+            domain = [
+                ('dni', '=', partner.dni),
+            ]
+            if partner_id:
+                domain += [('id', '!=', partner_id)]
+            partner.same_dni_partner_id = Partner.search(domain, limit=1)
+        (self - filtered_partners).same_dni_partner_id = False
diff --git a/academic/models/res_partner_family.py b/academic/models/res_partner_family.py
new file mode 100644
index 00000000..584cdd3a
--- /dev/null
+++ b/academic/models/res_partner_family.py
@@ -0,0 +1,20 @@
+##############################################################################
+# For copyright and license notices, see __manifest__.py file in module root
+# directory
+##############################################################################
+from odoo import models, fields
+
+
+class ResPartner(models.Model):
+
+    _name = 'res.partner.family'
+    _description = 'res.partner.family'
+
+    name = fields.Char(required=True)
+    student_ids = fields.One2many('res.partner', 'family_id', 'Students')
+    contact_ids = fields.One2many('res.partner', 'family_id', 'Students')
+    student_link_ids = fields.One2many('res.partner.link', 'student_id', string='Contactos y Roles')
+
+    # TODO tal vez agregar un selection de los tipos fuertes y permitir abm? por ahora vamos con los
+    # external ids
+    # name = fields.Char(required=True)
diff --git a/academic/models/res_partner_link.py b/academic/models/res_partner_link.py
new file mode 100644
index 00000000..12b9c38c
--- /dev/null
+++ b/academic/models/res_partner_link.py
@@ -0,0 +1,31 @@
+##############################################################################
+# For copyright and license notices, see __manifest__.py file in module root
+# directory
+##############################################################################
+from odoo import models, fields, api
+from odoo.exceptions import UserError
+
+
+class ResPartner(models.Model):
+
+    _name = 'res.partner.link'
+    _description = 'res.partner.link'
+
+    student_id = fields.Many2one('res.partner', 'Student or Family', required=True, ondelete='cascade')
+    # student_id = fields.Many2one('res.partner', 'Student', ondelete='cascade')
+    # family_id = fields.Many2one('res.partner', 'Family', ondelete='cascade')
+    relationship_id = fields.Many2one('res.partner.relationship', required=True, ondelete='restrict')
+    role_ids = fields.Many2many('res.partner.role', string='Roles')
+    partner_id = fields.Many2one('res.partner', required=True, ondelete='restrict')
+    note = fields.Text(string="Notas")
+
+    # @api.constrains('student_id', 'family_id')
+    # def _check_student_or_family(self):
+    #     recs = self.filtered(lambda x: not x.student_id and not x.family_id)
+    #     if recs:
+    #         raise UserError('Los contactos y roles deben estar vinculados a una famila o a un estudiante')
+
+    _sql_constraints = [
+        ('link_unique',
+         'unique(student_id, partner_id)',
+         'El contacto debe ser agregado por unica vez en cada familia o estudiante')]
diff --git a/academic/models/res_partner_role.py b/academic/models/res_partner_role.py
new file mode 100644
index 00000000..c6e574ce
--- /dev/null
+++ b/academic/models/res_partner_role.py
@@ -0,0 +1,17 @@
+##############################################################################
+# For copyright and license notices, see __manifest__.py file in module root
+# directory
+##############################################################################
+from odoo import models, fields
+
+
+class ResPartner(models.Model):
+
+    _name = 'res.partner.role'
+    _description = 'res.partner.role'
+
+    name = fields.Char(required=True)
+    # TODO tal vez agregar un selection de los tipos fuertes y permitir abm? por ahora vamos con los
+    # external ids
+    # name = fields.Char(required=True)
+    color = fields.Integer('Color Index',)
diff --git a/academic/models/sale_order.py b/academic/models/sale_order.py
new file mode 100644
index 00000000..0de5fd66
--- /dev/null
+++ b/academic/models/sale_order.py
@@ -0,0 +1,26 @@
+##############################################################################
+# For copyright and license notices, see __manifest__.py file in module root
+# directory
+##############################################################################
+from odoo import api, models, fields, _
+
+
+class SaleOrder(models.Model):
+
+    _inherit = 'sale.order'
+
+    partner_id = fields.Many2one(
+        domain="[('type', '!=', 'private'), ('company_id', 'in', (False, company_id)), ('partner_type', '=', 'student')]")
+    partner_invoice_ids = fields.Many2many('res.partner', compute='_compute_partner_invoice')
+
+    # dejamos solo depends a partner_id para que si cambia algo de la asignación no se re-calculen todas las ventas existentes
+    @api.depends('partner_id')
+    def _compute_partner_invoice(self):
+        for rec in self:
+            rec.partner_invoice_ids = rec.partner_id.student_link_ids.filtered(
+                lambda x: self.env.ref('academic.paying_role') in x.role_ids).mapped('partner_id') if rec.partner_id else False
+
+    @api.depends('partner_invoice_ids')
+    def _compute_partner_invoice_id(self):
+        for order in self:
+            order.partner_invoice_id = order.partner_invoice_ids[:1]
diff --git a/academic/security/academic_security.xml b/academic/security/academic_security.xml
index 27c90204..87e2bce7 100644
--- a/academic/security/academic_security.xml
+++ b/academic/security/academic_security.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
+    <!-- activamos la opción de multiples direcciones ya que la usamos en academic -->
+    <record id="base.group_user" model="res.groups">
+        <field name="implied_ids" eval="[(4, ref('account.group_delivery_invoice_address'))]"/>
+    </record>
+
     <record model="ir.module.category" id="module_category_academic">
         <field name="name">Academic</field>
         <field name="description">Academic</field>
@@ -7,12 +12,11 @@
     </record>
     <record id="group_user" model="res.groups">
         <field name="name">User</field>
-        <field name="users" eval="[(4, ref('base.user_root'))]"/>
         <field name="category_id" ref="module_category_academic"/>
     </record>
     <record id="group_manager" model="res.groups">
         <field name="name">Manager</field>
-        <field name="users" eval="[(4, ref('base.user_root'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"/>
         <field name="category_id" ref="module_category_academic"/>
         <field name="implied_ids" eval="[(4,ref('group_user'))]"/>
     </record>
@@ -24,9 +28,6 @@
         <field name="domain_force">['|',('company_id', 'in', company_ids),('company_id','=',False)]</field>
     </record>
 
-
-
-
     <!-- We deactivate multicompany rule over multicompany to aboid errors -->
     <!-- <record model="ir.rule" id="base.res_company_rule">
         <field name="active" eval="False"/>
@@ -51,7 +52,8 @@
     </record>
 
     <record id="group_portal_parent" model="res.groups">
-        <field name="name">Parent's Portal</field>
+        <field name="name">Relative's Portal</field>
+        <field name="implied_ids" eval="[(4, ref('base.group_portal'))]"/>
         <field name="category_id" ref="category_portal_academic"/>
         <field name="comment">Parent's Portal members have specific access rights (such as record rules and restricted menus).
             They usually do not belong to the usual OpenERP groups.</field>
diff --git a/academic/security/ir.model.access.csv b/academic/security/ir.model.access.csv
index 8bd154eb..a0f9c11a 100644
--- a/academic/security/ir.model.access.csv
+++ b/academic/security/ir.model.access.csv
@@ -29,3 +29,6 @@ access_res_partner_relationship_user,access_res_partner_relationship_user,model_
 access_res_partner_relationship_manager,access_res_partner_relationship_manager,model_res_partner_relationship,base.group_system,1,1,1,1
 access_hr_employee_asignatures_user,hr.employee.asignatures user,model_hr_employee_asignatures,hr.group_hr_user,1,1,1,1
 access_hr_employee_asignatures_system_user,hr.employee.asignatures system user,model_hr_employee_asignatures,base.group_user,1,0,0,0
+academic.access_res_partner_role,access_res_partner_role,academic.model_res_partner_role,base.group_user,1,0,0,0
+academic.access_res_partner_link_all,access_res_partner_link_all,academic.model_res_partner_link,base.group_user,1,0,0,0
+academic.access_res_partner_link_user,access_res_partner_link_user,academic.model_res_partner_link,group_user,1,1,1,1
diff --git a/academic/views/account_move_views.xml b/academic/views/account_move_views.xml
new file mode 100644
index 00000000..63f974f9
--- /dev/null
+++ b/academic/views/account_move_views.xml
@@ -0,0 +1,12 @@
+<odoo>
+    <record id="academic_view_move_form" model="ir.ui.view">
+        <field name="name">academic.account.move.form</field>
+        <field name="model">account.move</field>
+        <field name="inherit_id" ref="account.view_move_form"/>
+        <field name="arch" type="xml">
+            <field name="partner_id" position="after">
+                <field name="student_ids" invisible="1"/>
+            </field>
+        </field>
+    </record>
+</odoo>
diff --git a/academic/views/res_company_views.xml b/academic/views/res_company_views.xml
index acb01e89..cf5f19f9 100644
--- a/academic/views/res_company_views.xml
+++ b/academic/views/res_company_views.xml
@@ -33,6 +33,7 @@
             </div>
             <div class="o_address_format"  position='after'>
                 <field name="study_plan_id"/>
+                <field name="family_required"/>
             </div>
         </field>
     </record>
diff --git a/academic/views/res_partner_link_views.xml b/academic/views/res_partner_link_views.xml
new file mode 100644
index 00000000..55b74450
--- /dev/null
+++ b/academic/views/res_partner_link_views.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- SEARCH VIEW -->
+    <record id="view_res_partner_link_filter" model="ir.ui.view">
+        <field name="name">res.partner.link.select</field>
+        <field name="model">res.partner.link</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="student_id"/>
+                <field name="partner_id"/>
+                <field name="relationship_id"/>
+                <field name="role_ids"/>
+            </search>
+        </field>
+    </record>
+
+    <!-- FORMVIEW -->
+    <record id="view_res_partner_link_form" model="ir.ui.view">
+        <field name="name">res.partner.link.form</field>
+        <field name="model">res.partner.link</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <field name="student_id"/>
+                        <field name="partner_id"/>
+                        <field name="relationship_id"/>
+                        <field name="role_ids" widget="many2many_tags"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <!-- TREEVIEW -->
+
+    <record id="view_res_partner_link_tree" model="ir.ui.view">
+        <field name="name">res.partner.link.tree</field>
+        <field name="model">res.partner.link</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="student_id"/>
+                <field name="partner_id"/>
+                <field name="relationship_id"/>
+                <field name="role_ids" widget="many2many_tags"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="action_academic_partner_link" model="ir.actions.act_window">
+        <field name="name">Contactos y Roles</field>
+        <field name="res_model">res.partner.link</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem name="Contactos y Roles" id="menu_partner_link" sequence="3" action="action_academic_partner_link" parent="contacts.res_partner_menu_config" groups="base.group_no_one" />
+
+</odoo>
diff --git a/academic/views/res_partner_relationship_views.xml b/academic/views/res_partner_relationship_views.xml
new file mode 100644
index 00000000..e72bfbf4
--- /dev/null
+++ b/academic/views/res_partner_relationship_views.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- SEARCH VIEW -->
+    <record id="view_res_partner_relationship_filter" model="ir.ui.view">
+        <field name="name">res.partner.relationship.select</field>
+        <field name="model">res.partner.relationship</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="name" />
+            </search>
+        </field>
+    </record>
+
+    <!-- FORMVIEW -->
+    <record id="view_res_partner_relationship_form" model="ir.ui.view">
+        <field name="name">res.partner.relationship.form</field>
+        <field name="model">res.partner.relationship</field>
+        <field name="arch" type="xml">
+            <form>
+                <header>
+                </header>
+                <sheet>
+                    <group>
+                        <field name="name" />
+                    </group>
+                </sheet>
+
+            </form>
+        </field>
+    </record>
+
+    <!-- TREEVIEW -->
+
+    <record id="view_res_partner_relationship_tree" model="ir.ui.view">
+        <field name="name">res.partner.relationship.tree</field>
+        <field name="model">res.partner.relationship</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="action_res_partner_relationship_levels" model="ir.actions.act_window">
+        <field name="name">Relationships</field>
+        <field name="res_model">res.partner.relationship</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem id="menu_relationships" sequence="3" action="action_res_partner_relationship_levels" parent="contacts.res_partner_menu_config" groups="group_manager" />
+
+</odoo>
diff --git a/academic/views/res_partner_views.xml b/academic/views/res_partner_views.xml
index b3ef7e0f..64c8eaf5 100644
--- a/academic/views/res_partner_views.xml
+++ b/academic/views/res_partner_views.xml
@@ -25,22 +25,91 @@
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="base.view_partner_form"/>
         <field name="arch" type="xml">
+            <form>
+                <field name="parent_links_by_student" invisible="True"/>
+            </form>
+
+            <!-- oculamos seleccion de compañía si es estudiante (tal vez en otros tmb lo queremos?) -->
+            <!-- <div class="o_row" position="attributes">
+                <attribute name="attrs">{'invisible':[('partner_type','!=',False)]}</attribute>
+            </div> -->
+            <xpath expr="//sheet" position="before">
+                <div class="alert alert-warning oe_edit_only" role="alert" attrs="{'invisible': [('same_dni_partner_id', '=', False)]}">
+                  A partner with the same dni already exists (<field name="same_dni_partner_id"/>)
+                </div>
+            </xpath>
 
             <!-- ocultamos pagina de contactos si no es compania -->
-            <page position="attributes">
+            <page name="contact_addresses" position="attributes">
                 <attribute name="attrs">{'invisible':[('is_company','=',False)]}</attribute>
             </page>
 
-            <page position="before">
-                <page string="Individual Information" attrs="{'invisible':[('partner_type','=',False)]}">
+            <xpath expr="//group/group" position="after">
+                <group attrs="{'invisible':[('partner_type','not in',['student', 'family'])]}">
+                    <field name="company_id" groups="base.group_multi_company" placeholder="Institution..." attrs="{'required':[('partner_type','in',['teacher','student','administrator', 'gral_administrator'])]}"/>
+                    <field name="company_family_required" invisible="1"/>
+                    <field name="parent_id" string="Family" attrs="{'invisible': [('partner_type', '!=', 'student')], 'required':[('partner_type', '=', 'student'), ('company_family_required', '=', True)]}" domain="[('partner_type', '=', 'family'), ('company_id', 'in', [company_id, False])] if partner_type == 'student' else [('is_company', '=', True)]" context="{'default_partner_type': 'family', 'default_company_id': company_id}"/>
+                    <field name="links_by_student" attrs="{'invisible': [('partner_type', '!=', 'family')]}"/>
+                </group>
+            </xpath>
+            <field name="parent_id" position="attributes">
+                <attribute name="attrs">{'invisible':[('partner_type','in',['student', 'family'])]}</attribute>
+            </field>
+            <xpath expr="//group/group" position="attributes">
+                <attribute name="attrs">{'invisible':[('partner_type','in',['student', 'family'])]}</attribute>
+            </xpath>
+            <field name="website" position="attributes">
+                <attribute name="attrs">{'invisible':[('partner_type','in',['student', 'parent'])]}</attribute>
+            </field>
+
+            <field name="title" position="attributes">
+                <attribute name="attrs">{'invisible':[('partner_type','in',['student', 'parent'])]}</attribute>
+            </field>
+
+            <field name="function" position="attributes">
+                <attribute name="attrs">{'invisible':[('partner_type','=','student')]}</attribute>
+            </field>
+
+            <xpath expr="//group/group[3]" position="attributes">
+                <attribute name="attrs">{'invisible':[('partner_type','in',['family'])]}</attribute>
+            </xpath>
+
+            <!-- ocultamos paginas y campos que no queremos si es familia o estudiante de contactos si no es compania -->
+            <!-- <field name="vat" position="attributes">
+                <attribute name="attrs">{'invisible':[('partner_type','in',['student', 'family'])]}</attribute>
+            </field> -->
+            <!-- '|',('is_company','=',True),('parent_id','=',False) -->
+            <page name="accounting_disabled" position="attributes">
+                <attribute name="attrs">{'invisible':['|','|',('is_company','=',True),('parent_id','=',False),('partner_type','in',['student', 'family'])]}</attribute>
+            </page>
+            <page name="sales_purchases" position="attributes">
+                <attribute name="attrs">{'invisible':[('partner_type','in',['student', 'family'])]}</attribute>
+            </page>
+            <page name="accounting" position="attributes">
+            <!-- 'invisible': [('is_company','=',False),('parent_id','!=',False)]} -->
+                <attribute name="attrs">{'invisible':['|', ('partner_type','in',['student', 'family']), '&amp;', ('is_company','=',False),('parent_id','!=',False)]}</attribute>
+            </page>
+
+            <page name="contact_addresses" position="before">
+                <page string="Estudiantes" attrs="{'invisible':[('partner_type','!=', 'family')]}">
+                    <!-- context="{'default_parent_id': active_id, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id, 'default_lang': lang, 'default_user_id': user_id, 'default_type': 'other'}" -->
+                    <field name="student_ids" context="{'default_partner_type': 'student', 'default_type': 'contact', 'default_company_id': company_id}">
+                        <tree>
+                            <field name="name"/>
+                            <field name="promotion_id"/>
+                            <field name="mobile"/>
+                            <field name="email"/>
+                            <button type="object" name="get_formview_action" icon="fa-pencil-square-o" title="Open" help="Open"/>
+                        </tree>
+                    </field>
+                </page>
+                <page string="Individual Information" attrs="{'invisible':[('partner_type','in',[False, 'family'])]}">
                     <group>
                         <group>
                             <field name="dni"/>
-                            <field name="relationship_id" attrs="{'invisible': [('partner_type', '!=', 'other')], 'required': [('partner_type', '=', 'other')]}"/>
-                            <field name="withdraw" attrs="{'invisible': [('partner_type', '!=', 'other')]}"/>
                             <field name="file_number" attrs="{'invisible':[('partner_type','!=','student')]}"/>
-                            <field name="sex" attrs="{'invisible':[('partner_type','=',False)], 'required':[('partner_type','=','student')]}"/>
-                            <field name="promotion_id" attrs="{'invisible':[('partner_type','!=','student')], 'required':[('partner_type','=','student')]}"/>
+                            <field name="sex" attrs="{'invisible':[('partner_type','=',False)]}"/>
+                            <field name="promotion_id" attrs="{'invisible':[('partner_type','!=','student')]}"/>
                         </group>
                         <group>
                             <field name="birthdate" attrs="{'invisible':[('partner_type','=',False)]}"/>
@@ -50,6 +119,27 @@
                             <field name="disabled_person" attrs="{'invisible':[('partner_type','!=','student')]}"/>
                         </group>
                     </group>
+                    <group>
+                        <field name="partner_link_ids" readonly="True" attrs="{'invisible': [('partner_type','in',[False, 'student', 'family'])]}">
+                            <tree>
+                                <field name="student_id"/>
+                                <field name="relationship_id" options="{'no_create':True}"/>
+                                <field name="role_ids" widget="many2many_tags" options="{'no_create':True, 'color_field': 'color'}"/>
+                                <field name="note"/>
+                            </tree>
+                        </field>
+                    </group>
+                </page>
+                <page string="Contactos y Roles" attrs="{'invisible': ['|', ('links_by_student', '=', True), ('partner_type','not in',['student', 'family'])]}">
+                    <p attrs="{'invisible': ['|', ('partner_type', '!=', 'student'), ('parent_links_by_student', '=', True)]}">Los Contactos y Roles son gestionados en <button name="open_commercial_entity" type="object" string="la familia" class="oe_link"/></p>
+                    <field name="student_link_ids" attrs="{'readonly': [('partner_type', '=', 'student'), ('parent_links_by_student', '=', False)]}">
+                        <tree editable="bottom">
+                            <field name="partner_id" context="{'default_partner_type': 'parent'}"/>
+                            <field name="relationship_id" options="{'no_create':True}"/>
+                            <field name="role_ids" widget="many2many_tags" options="{'no_create':True, 'color_field': 'color'}"/>
+                            <field name="note"/>
+                        </tree>
+                    </field>
                 </page>
             </page>
 
@@ -67,9 +157,15 @@
                 <attribute name="invisible">1</attribute>
             </xpath>
 
+            <field name="company_type" position="before">
+                <!-- desde un estudiante elegimos familia de misma cia o sin cia (para el estudiante si la hacemos obligatoria) -->
+                <field name="partner_type" style="display: block;"/>
+            </field>
+            <field name="company_type" position="attributes">
+                <attribute name="attrs">{'invisible': [('partner_type', '!=', False)]}</attribute>
+            </field>
             <xpath expr="//span[@name='address_name']" position="before">
                 <field name="company_id" groups="base.group_multi_company" placeholder="Institution..." attrs="{'required':[('partner_type','in',['teacher','student','administrator', 'gral_administrator'])]}"/>
-                <field name="partner_type" attrs="{'invisible': [('is_company', '=', True)]}"/>
             </xpath>
 
             <field name="parent_id" position="after">
@@ -79,15 +175,15 @@
             </field>
 
         <!-- pop up contactos -->
-            <xpath expr="//field[@name='child_ids']//form//field[@name='name']" position="before">
+            <!-- <xpath expr="//field[@name='child_ids']//form//field[@name='name']" position="before">
                 <field name="is_company" invisible="1"/>
                 <field name="partner_type" attrs="{'invisible': [('is_company', '=', True)]}"/>
+                <field name="links_by_student" attrs="{'invisible': [('is_company', '=', False)]}"/>
+                <field name="parent_links_by_student" invisible="1"/>
             </xpath>
 
             <xpath expr="//field[@name='child_ids']//form//group" position="inside">
                 <group>
-                    <field name="relationship_id" attrs="{'invisible': [('partner_type', '!=', 'other')], 'required': [('partner_type', '=', 'other')]}"/>
-                    <field name="withdraw" attrs="{'invisible': [('partner_type', '!=', 'other')]}"/>
                     <field name="file_number" attrs="{'invisible':[('partner_type','!=','student')]}"/>
                     <field name="sex" attrs="{'invisible':[('partner_type','=',False)], 'required':[('partner_type','=','student')]}"/>
                     <field name="promotion_id" attrs="{'invisible':[('partner_type','!=','student')], 'required':[('partner_type','=','student')]}"/>
@@ -103,11 +199,16 @@
             </xpath>
             <xpath expr="//kanban//t[@t-name='kanban-box']//div[@t-if='record.function.raw_value']" position="after">
                 <strong><div t-if="record.partner_type.raw_value"><field name="partner_type"/></div></strong>
-            </xpath>
-            <field name="website" position="after">
-                <button name="quickly_create_portal_user" string="Create User" type="object" class="oe_link oe_inline" groups="base.group_erp_manager" attrs="{'invisible':['|',('partner_type', '=', False),('related_user_id','!=',False)]}"/>
-                <field name="related_user_id" attrs="{'invisible':[('related_user_id', '=', False)]}" context="{'form_view_ref':'base.view_users_form'}"/>
-            </field>
+            </xpath> -->
+
+            <!-- creacion de related user -->
+            <!-- <field name="website" position="after">
+                <label for="related_user_id"/>
+                <div>
+                    <field name="related_user_id" attrs="{'invisible':[('related_user_id', '=', False)]}" context="{'form_view_ref':'base.view_users_form'}"/>
+                    <button name="quickly_create_portal_user" string="Create User" type="object" class="oe_link oe_inline" groups="base.group_erp_manager" attrs="{'invisible':['|',('partner_type', '=', False),('related_user_id','!=',False)]}"/>
+                </div>
+            </field> -->
         </field>
     </record>
 
@@ -215,17 +316,28 @@
     </record>
 
     <record id="action_academic_partner_parents" model="ir.actions.act_window">
-        <field name="name">Parents</field>
+        <field name="name">Relatives</field>
         <field name="res_model">res.partner</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="view_academic_partner_tree"/>
         <field name="search_view_id" ref="view_academic_partner_filter"/>
-        <field name="context">{'default_partner_type':'parent',
-        'show_login':True}</field>
+        <field name="context">{'default_partner_type': 'parent', 'show_login':True}</field>
         <field name="domain">[('partner_type','=','parent')]</field>
     </record>
 
-    <menuitem name="Parents" id="menu_parents" sequence="50" action="action_academic_partner_parents" parent="menu_partners" groups="group_user" />
+    <menuitem name="Relatives" id="menu_parents" sequence="50" action="action_academic_partner_parents" parent="menu_partners" groups="group_user" />
+
+    <record id="action_academic_partner_families" model="ir.actions.act_window">
+        <field name="name">Families</field>
+        <field name="res_model">res.partner</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_academic_partner_tree"/>
+        <field name="search_view_id" ref="view_academic_partner_filter"/>
+        <field name="context">{'default_partner_type': 'family', 'show_login':True}</field>
+        <field name="domain">[('partner_type','=','family')]</field>
+    </record>
+
+    <menuitem name="Families" id="menu_families" sequence="60" action="action_academic_partner_families" parent="menu_partners" groups="group_user" />
 
     <menuitem name="Gral Administrators" id="menu_gral_administrators" sequence="15" action="action_academic_partner_gral_administrators" parent="menu_partners" groups="group_user" />
 
@@ -233,6 +345,7 @@
 
     <menuitem name="Teachers" id="menu_teachers" sequence="30" action="action_academic_partner_teachers" parent="menu_partners" groups="group_user" />
 
+
     <!-- portal menus -->
     <menuitem name="Students" id="menu_portal_students" sequence="20" action="action_academic_partner_students" parent="menu_portal_academic" groups="group_portal_teacher" />
     <menuitem name="Teachers" id="menu_portal_teachers" sequence="10" action="action_academic_partner_teachers" parent="menu_portal_academic" groups="group_portal_teacher" />
diff --git a/academic/views/sale_order_views.xml b/academic/views/sale_order_views.xml
new file mode 100644
index 00000000..374aaa09
--- /dev/null
+++ b/academic/views/sale_order_views.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="view_order_form" model="ir.ui.view">
+        <field name="name">sale.order.form</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_order_form"/>
+        <field name="arch" type="xml">
+            <form>
+                <field name="partner_invoice_ids" invisible="1"/>
+            </form>
+            <field name="partner_invoice_id" position="attributes">
+                <attribute name="domain">[('id', 'in', partner_invoice_ids)]</attribute>
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/academic_split_name/README.rst b/academic_split_name/README.rst
new file mode 100644
index 00000000..f3fe1db1
--- /dev/null
+++ b/academic_split_name/README.rst
@@ -0,0 +1,70 @@
+.. |company| replace:: ADHOC SA
+
+.. |company_logo| image:: https://raw.githubusercontent.com/ingadhoc/maintainer-tools/master/resources/adhoc-logo.png
+   :alt: ADHOC SA
+   :target: https://www.adhoc.com.ar
+
+.. |icon| image:: https://raw.githubusercontent.com/ingadhoc/maintainer-tools/master/resources/adhoc-icon.png
+
+.. image:: https://img.shields.io/badge/license-AGPL--3-blue.png
+   :target: https://www.gnu.org/licenses/agpl
+   :alt: License: AGPL-3
+
+===================
+Academic Split Name
+===================
+
+This module improves the partner records by adding fields for first name, middle name, last name, and second last name. It automatically combines these fields into a full name for partners who are students, family members, or parents.
+
+Installation
+============
+
+To install this module, you need to:
+
+#. Only need to install the module
+
+Configuration
+=============
+
+To configure this module, you need to:
+
+#. Nothing to configure
+
+Usage
+=====
+
+To use this module, you need to:
+
+#. Go to ...
+
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+   :alt: Try me on Runbot
+   :target: http://runbot.adhoc.com.ar/
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+<https://github.com/ingadhoc/{project_repo}/issues>`_. In case of trouble, please
+check there if your issue has already been reported. If you spotted it first,
+help us smashing it by providing a detailed and welcomed feedback.
+
+Credits
+=======
+
+Images
+------
+
+* |company| |icon|
+
+Contributors
+------------
+
+Maintainer
+----------
+
+|company_logo|
+
+This module is maintained by the |company|.
+
+To contribute to this module, please visit https://www.adhoc.com.ar.
diff --git a/academic_split_name/__init__.py b/academic_split_name/__init__.py
new file mode 100644
index 00000000..a6e90f24
--- /dev/null
+++ b/academic_split_name/__init__.py
@@ -0,0 +1,3 @@
+# © 2016 ADHOC SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from . import models
diff --git a/academic_split_name/__manifest__.py b/academic_split_name/__manifest__.py
new file mode 100644
index 00000000..44449e97
--- /dev/null
+++ b/academic_split_name/__manifest__.py
@@ -0,0 +1,20 @@
+# © 2016 ADHOC SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+{
+    'name': 'Academic Split Name',
+    'version': "16.0.1.0.0",
+    'sequence': 14,
+    'summary': '',
+    'author': 'ADHOC SA',
+    'website': 'www.adhoc.com.ar',
+    'license': 'AGPL-3',
+    'depends': [
+        'academic',
+    ],
+    'data': [
+        'views/res_partner_views.xml',
+    ],
+    'installable': True,
+    'auto_install': False,
+    'application': False,
+}
diff --git a/academic_split_name/models/__init__.py b/academic_split_name/models/__init__.py
new file mode 100644
index 00000000..2a45bf6e
--- /dev/null
+++ b/academic_split_name/models/__init__.py
@@ -0,0 +1,3 @@
+# © 2016 ADHOC SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from . import res_partner
diff --git a/academic_split_name/models/res_partner.py b/academic_split_name/models/res_partner.py
new file mode 100644
index 00000000..8eb73c63
--- /dev/null
+++ b/academic_split_name/models/res_partner.py
@@ -0,0 +1,25 @@
+##############################################################################
+# For copyright and license notices, see __manifest__.py file in module root
+# directory
+##############################################################################
+from odoo import fields, models, api
+
+
+class ResPartner(models.Model):
+    _inherit = "res.partner"
+
+    name = fields.Char(
+        compute="_compute_name",
+        store=True,
+        readonly=False,
+    )
+    firstname = fields.Char("Primer Nombre")
+    middlename = fields.Char("Segundo Nombre")
+    lastname = fields.Char("Primer Apellido")
+    second_lastname = fields.Char("Segundo Apellido")
+
+    @api.depends('firstname', 'lastname', 'second_lastname', 'middlename')
+    def _compute_name(self):
+        for rec in self.filtered(lambda x: x.partner_type in ('student', 'family', 'parent')):
+            name_parts = filter(None, [rec.firstname, rec.middlename, rec.lastname, rec.second_lastname])
+            rec.name = " ".join(name_parts)
diff --git a/academic_split_name/views/res_partner_views.xml b/academic_split_name/views/res_partner_views.xml
new file mode 100644
index 00000000..4671889e
--- /dev/null
+++ b/academic_split_name/views/res_partner_views.xml
@@ -0,0 +1,50 @@
+<odoo>
+    <record id="view_partner_form" model="ir.ui.view">
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="academic.view_academic_partner_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@id='individual']" position="attributes">
+                <attribute
+                    name="attrs"
+                >{'invisible':[('is_company','=',True)],
+                    'readonly': [('partner_type', 'in', ['student', 'parent', 'family'])],
+                                'required': [('partner_type', 'not in', ['student', 'parent', 'family'])]}</attribute>
+                <attribute name="force_save">1</attribute>
+            </xpath>
+            <xpath expr="//field[@id='company']" position="attributes">
+                <attribute
+                    name="attrs"
+                >{'invisible':[('is_company','=',False)],
+                    'readonly': [('partner_type', 'in', ['student', 'parent', 'family'])],
+                                'required': [('partner_type', 'not in', ['student', 'parent', 'family'])]}</attribute>
+                <attribute name="force_save">1</attribute>
+            </xpath>
+            <xpath expr="//group/group" position="after">
+                <group>
+                    <field
+                        name="lastname"
+                        attrs="{'required': [('partner_type', 'in', ['student', 'parent', 'family'])],
+                                'invisible': [('partner_type', 'not in', ['student', 'parent', 'family'])]}"
+                    />
+                    <field
+                        name="second_lastname"
+                        attrs="{'invisible': [('partner_type', 'not in', ['student', 'parent', 'family'])]}"
+                    />
+                    <field
+                        name="firstname"
+                        attrs="{'required': [('partner_type', 'in', ['student', 'parent'])],
+                                'invisible': [('partner_type', 'not in', ['student', 'parent'])]}"
+                    />
+                    <field
+                        name="middlename"
+                        attrs="{'invisible': [('partner_type', 'not in', ['student', 'parent'])]}"
+                    />
+                </group>
+            </xpath>
+            <xpath expr="//field[@name='student_link_ids']/tree//field[@name='partner_id']" position="attributes">
+                <attribute name="options">{'no_quick_create': True}</attribute>
+                <attribute name="context">{'default_partner_type': 'parent'}</attribute>
+            </xpath>
+        </field>
+    </record>
+</odoo>