Skip to content

[IMP] academic: enrollment development #272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

[IMP] academic: enrollment development #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7786203
[IMP] academic: enrollment development
lef-adhoc Mar 25, 2025
70742c3
[IMP] academic: minor adjustments
jjscarafia May 28, 2025
d685d54
[REF] academic: move sales and account to academic_sale_subscription
jjscarafia May 28, 2025
0950a36
[IMP] academic: better demo
jjscarafia May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ Academic Evaluation Modules

<img alt="ADHOC" src="http://fotos.subefotos.com/83fed853c1e15a8023b86b2b22d6145bo.png" />
**Adhoc SA** - www.adhoc.com.ar
.
2 changes: 0 additions & 2 deletions academic/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@
##############################################################################
from . import models
from . import wizards
from . import controllers
from .hooks import post_init_hook
13 changes: 1 addition & 12 deletions academic/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
"hr",
"website",
"board",
"sale_management",
"account",
"contacts",
"report_aeroo",
"crm",
Expand All @@ -49,43 +47,34 @@
"views/res_partner_views.xml",
"views/academic_group_views.xml",
"views/academic_division_views.xml",
"views/academic_level_views.xml",
"views/academic_study_plan_views.xml",
"views/academic_promotion_views.xml",
"views/academic_section_views.xml",
"views/academic_subject_views.xml",
"views/hr_views.xml",
"views/res_users_views.xml",
"views/res_company_views.xml",
"views/login_page.xml",
"views/sale_order_views.xml",
"views/crm_lead_view.xml",
"views/res_partner_link_views.xml",
"views/res_partner_relationship_views.xml",
"views/account_move_views.xml",
"wizards/portal_wizard_views.xml",
"report/ir_actions_report.xml",
"views/res_partner_category.xml",
"views/account_portal_templates.xml",
"report/report_invoice.xml",
],
"demo": [
"demo/res_partner_relationship_demo.xml",
"demo/res_partner_demo.xml",
"demo/academic.subject.csv",
"demo/academic.section.csv",
"demo/academic.level.csv",
"demo/academic.section.csv",
"demo/academic.promotion.csv",
"demo/res.partner.csv",
"demo/res.partner.link.csv",
"demo/academic.division.csv",
"demo/academic.study.plan.csv",
"demo/res_company_demo.xml",
"demo/academic_group.xml",
"demo/res_users_demo.xml",
],
"installable": True,
"auto_install": False,
"application": False,
"post_init_hook": "post_init_hook",
}
1 change: 0 additions & 1 deletion academic/controllers/__init__.py
View file
Open in desktop

This file was deleted.

22 changes: 8 additions & 14 deletions academic/demo/academic.level.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
id,name,section_id/id
academic_course_1,Primer Grado,academic_section_1
academic_course_2,Segundo Grado,academic_section_1
academic_course_3,Tercer Grado,academic_section_1
academic_course_4,Cuarto Grado,academic_section_1
academic_course_5,Quinto Grado,academic_section_1
academic_course_6,Sexto Grado,academic_section_1
academic_course_7,Séptimo Grado,academic_section_1
academic_course_8,Primer Grado,academic_section_2
academic_course_9,Segundo Grado,academic_section_2
academic_course_10,Tercero Grado,academic_section_2
academic_course_11,Cuarto Grado,academic_section_2
academic_course_12,Quinto Grado,academic_section_2
academic_course_13,Sexto Grado,academic_section_2
id,name
academic_level_1,Primer año
academic_level_2,Segundo año
academic_level_3,Tercer año
academic_level_4,Cuarto año
academic_level_5,Quinto año
academic_level_6,Sexto año
academic_level_7,Séptimo año
14 changes: 11 additions & 3 deletions academic/demo/academic.section.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
id,name
academic_section_1,Primaria
academic_section_2,Secundaria
id,name,correlative_ids/id,level_ids/id
academic_section_1,Nivel Inicial,,"academic_level_1"
academic_section_2,Primario 1 a 6,academic_section_1,"academic_level_1,academic_level_2,academic_level_3,academic_level_4,academic_level_5,academic_level_6"
academic_section_3,Primario 1 a 7,academic_section_1,"academic_level_1,academic_level_2,academic_level_3,academic_level_4,academic_level_5,academic_level_6,academic_level_7"
academic_section_4,Secundario 1 a 5,academic_section_3,"academic_level_1,academic_level_2,academic_level_3,academic_level_4,academic_level_5"
academic_section_5,Secundario 1 a 6,academic_section_2,"academic_level_1,academic_level_2,academic_level_3,academic_level_4,academic_level_5,academic_level_6"
academic_section_6,Inglés Básico,,"academic_level_1,academic_level_2,academic_level_3"
academic_section_7,Inglés Avanzado,academic_section_6,"academic_level_1,academic_level_2,academic_level_3"
academic_section_8,Inglés Técnico,academic_section_7,"academic_level_1,academic_level_2,academic_level_3"
academic_section_9,Ingeniería Industrial,,"academic_level_1,academic_level_2,academic_level_3,academic_level_4,academic_level_5"
academic_section_10,Maestría en Ciencias de Datos,academic_section_9,"academic_level_1,academic_level_2"
3 changes: 0 additions & 3 deletions academic/demo/academic.study.plan.csv
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions academic/demo/academic_group.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<odoo>
<record id="academic_group_1" model="academic.group">
<field name="level_id" ref="academic_course_1"/>
<field name="section_id" ref="academic_section_2"/>
<field name="level_id" ref="academic_level_4"/>
<field name="division_id" ref="academic_division_1"/>
<field name="company_id" ref="res_company_los_arroyos"/>
<field name="subject_id" ref="academic_subject_1"/>
<field name="teacher_id" ref="res_partner_ignacio_rodriguez"/>
<field name="year" eval="str(datetime.now().year)"/>
<field name="student_ids" eval="[(6, 0, [ref('res_partner_alvaro_diaz'), ref('res_partner_jose_martin_rodriguez'), ref('res_partner_bautista')])]"/>
</record>

<record id="academic_group_2" model="academic.group">
<field name="level_id" ref="academic_course_2"/>
<field name="section_id" ref="academic_section_2"/>
<field name="level_id" ref="academic_level_4"/>
<field name="division_id" ref="academic_division_2"/>
<field name="company_id" ref="res_company_los_molinos"/>
<field name="subject_id" ref="academic_subject_2"/>
<field name="teacher_id" ref="res_partner_laura_sali"/>
<field name="year" eval="str(datetime.now().year)"/>
<field name="student_ids" eval="[(6, 0, [ref('res_partner_martin_perez'), ref('res_partner_luz'), ref('res_partner_martina')])]"/>
</record>

<record id="academic_group_3" model="academic.group">
<field name="level_id" ref="academic_course_3"/>
<field name="section_id" ref="academic_section_2"/>
<field name="level_id" ref="academic_level_4"/>
<field name="division_id" ref="academic_division_3"/>
<field name="company_id" ref="base.main_company"/>
<field name="year" eval="str(datetime.now().year)"/>
<field name="student_ids" eval="[(6, 0, [ref('res_partner_mateo'), ref('res_partner_amalia'), ref('res_partner_ignacio')])]"/>
</record>
</odoo>
64 changes: 32 additions & 32 deletions academic/demo/res.partner.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
id,name,partner_type,is_company,section_id/id,promotion_id/id,sex,parent_id/id,links_by_student,vat
res_partner_flia_mufaza,Flia. Mufaza,family,False,,,,,,10000000
res_partner_flia_frias,Flia. Frias,family,False,,,,,True,10000001
res_partner_flia_pampa,Flia. Pampa,family,False,,,,,,10000002
res_partner_ignacio_rodriguez,Ignacio Rodriguez,teacher,False,,,M,,,10000003
res_partner_laura_sali,Laura Sali,teacher,False,,,F,,,10000004
res_partner_alvaro_diaz,Alvaro Diaz,student,False,,academic_promotion_1,M,,,10000005
res_partner_jose_martin_rodriguez,José Martín Rodriguez,student,False,,academic_promotion_1,M,,,10000006
res_partner_martin_perez,Martin Perez,student,False,,academic_promotion_2,M,,,10000007
res_partner_juan_gomez,Juan Gomez,administrator,False,academic_section_1,,M,,,10000008
res_partner_roberto_martin,Roberto Martin,administrator,False,academic_section_1,,M,,,10000009
res_partner_malena_apdes,Malena Apdes,,False,,,F,,,10000010
res_partner_luz,Luz Mufaza,student,False,,academic_promotion_2,F,res_partner_flia_mufaza,,10000011
res_partner_bautista,Bautista Mufaza,student,False,,academic_promotion_2,M,res_partner_flia_mufaza,,10000012
res_partner_mateo,Mateo Frias,student,False,,academic_promotion_2,M,res_partner_flia_frias,,10000013
res_partner_amalia,Amalia Frias,student,False,,academic_promotion_2,F,res_partner_flia_frias,,10000014
res_partner_ignacio,Ignacio Frias,student,False,,academic_promotion_2,M,res_partner_flia_frias,,10000015
res_partner_martina,Martina Pampa,student,False,,academic_promotion_2,M,res_partner_flia_pampa,,10000016
res_partner_gonzalo,Gonzalo Mufaza,relative,False,,,M,,,10000017
res_partner_teresa,Teresa Ciudadela,relative,False,,,F,,,10000018
res_partner_marina,Marina Priti,relative,False,,,F,,,10000019
res_partner_juan,Juan Frias,relative,False,,,M,,,10000020
res_partner_manuel,Manuel Pampa,relative,False,,,M,,,10000021
res_partner_cecilia,Cecilia Todi,relative,False,,,F,,,10000022
res_partner_marcelo,Marcelo Pampa,relative,False,,,M,,,10000023
res_partner_laura,Laura Perez,relative,False,,,F,,,10000024
res_partner_cristina,Cristina Garcia,relative,False,,,F,,,10000025
res_partner_rosa,Rosa Roma,relative,False,,,F,,,10000026
res_partner_daniel,Daniel Priti,relative,False,,,M,,,10000027
res_partner_jose_luis,Jose Luis Mufaza,relative,False,,,M,,,10000028
res_partner_hospital_espanol,Hospital Español,,True,,,,,,10000029
res_partner_sanatorio_amercano,Sanatorio Americano,,True,,,,,,10000030
id,name,partner_type,is_company,promotion_id/id,sex,parent_id/id,links_by_student,vat
res_partner_flia_mufaza,Flia. Mufaza,family,False,,,,,10000000
res_partner_flia_frias,Flia. Frias,family,False,,,,True,10000001
res_partner_flia_pampa,Flia. Pampa,family,False,,,,,10000002
res_partner_ignacio_rodriguez,Ignacio Rodriguez,teacher,False,,M,,,10000003
res_partner_laura_sali,Laura Sali,teacher,False,,F,,,10000004
res_partner_alvaro_diaz,Alvaro Diaz,student,False,academic_promotion_1,M,,,10000005
res_partner_jose_martin_rodriguez,José Martín Rodriguez,student,False,academic_promotion_1,M,,,10000006
res_partner_martin_perez,Martin Perez,student,False,academic_promotion_2,M,,,10000007
res_partner_juan_gomez,Juan Gomez,administrator,False,,M,,,10000008
res_partner_roberto_martin,Roberto Martin,administrator,False,,M,,,10000009
res_partner_malena_apdes,Malena Apdes,,False,,F,,,10000010
res_partner_luz,Luz Mufaza,student,False,academic_promotion_2,F,res_partner_flia_mufaza,,10000011
res_partner_bautista,Bautista Mufaza,student,False,academic_promotion_2,M,res_partner_flia_mufaza,,10000012
res_partner_mateo,Mateo Frias,student,False,academic_promotion_2,M,res_partner_flia_frias,,10000013
res_partner_amalia,Amalia Frias,student,False,academic_promotion_2,F,res_partner_flia_frias,,10000014
res_partner_ignacio,Ignacio Frias,student,False,academic_promotion_2,M,res_partner_flia_frias,,10000015
res_partner_martina,Martina Pampa,student,False,academic_promotion_2,M,res_partner_flia_pampa,,10000016
res_partner_gonzalo,Gonzalo Mufaza,relative,False,,M,,,10000017
res_partner_teresa,Teresa Ciudadela,relative,False,,F,,,10000018
res_partner_marina,Marina Priti,relative,False,,F,,,10000019
res_partner_juan,Juan Frias,relative,False,,M,,,10000020
res_partner_manuel,Manuel Pampa,relative,False,,M,,,10000021
res_partner_cecilia,Cecilia Todi,relative,False,,F,,,10000022
res_partner_marcelo,Marcelo Pampa,relative,False,,M,,,10000023
res_partner_laura,Laura Perez,relative,False,,F,,,10000024
res_partner_cristina,Cristina Garcia,relative,False,,F,,,10000025
res_partner_rosa,Rosa Roma,relative,False,,F,,,10000026
res_partner_daniel,Daniel Priti,relative,False,,M,,,10000027
res_partner_jose_luis,Jose Luis Mufaza,relative,False,,M,,,10000028
res_partner_hospital_espanol,Hospital Español,,True,,,,,10000029
res_partner_sanatorio_amercano,Sanatorio Americano,,True,,,,,10000030
33 changes: 28 additions & 5 deletions academic/demo/res_company_demo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,19 @@
<record id="base.main_company" model="res.company">
<field name="name">APDES</field>
<field name="report_header">ASOCIACIÓN PARA LA PROMOCIÓN DEPORTIVA, EDUCATIVA Y SOCIAL</field>
<field name="study_plan_id" ref="academic_study_plan_2"/>
<field name="section_ids" eval="[(4, ref('academic.academic_section_2'))]"/>
</record>

<!-- Kinder Companies -->
<record id="res_company_los_senderos" model="res.company">
<field name="partner_id" ref="res_partner_los_senderos"/>
<!-- <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="name">Colegio Los Senderos</field>
<field name="family_required" eval="True"/>
<field name="section_ids" eval="[(4, ref('academic.academic_section_1'))]"/>
</record>

<!-- Schools Companies -->
Expand All @@ -25,10 +37,9 @@
<!-- <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>
<field name="study_plan_id" ref="academic_study_plan_2"/>
<field name="family_required" eval="False"/>
<field name="section_ids" eval="[(4, ref('academic.academic_section_1')), (4, ref('academic.academic_section_2')), (4, ref('academic.academic_section_5'))]"/>
</record>

<record id="res_company_los_molinos" model="res.company">
Expand All @@ -37,10 +48,22 @@
<!-- 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>
<field name="study_plan_id" ref="academic_study_plan_1"/>
<field name="family_required" eval="False"/>
<field name="section_ids" eval="[(4, ref('academic.academic_section_3')), (4, ref('academic.academic_section_4'))]"/>
</record>

<!-- University companies -->

<record id="res_company_facultad_ingenieria" model="res.company">
<field name="partner_id" ref="res_partner_facultad_ingenieria"/>
<!-- <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="name">Facultad de Ingeniería</field>
<field name="family_required" eval="False"/>
<field name="section_ids" eval="[(4, ref('academic.academic_section_6')), (4, ref('academic.academic_section_7')), (4, ref('academic.academic_section_8')), (4, ref('academic.academic_section_9')), (4, ref('academic.academic_section_10'))]"/>
</record>

<!-- Partners companies -->
Expand Down
10 changes: 10 additions & 0 deletions academic/demo/res_partner_demo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,16 @@
<field name="is_company" eval="1" />
</record>

<record id="res_partner_facultad_ingenieria" model="res.partner">
<field name="name">Facultad de Ingeniería</field>
<field name="is_company" eval="1" />
</record>

<record id="res_partner_los_senderos" model="res.partner">
<field name="name">Jardín Los Senderos</field>
<field name="is_company" eval="1" />
</record>

<record id="res_partner_ignacio_rodriguez" model="res.partner">
<field name="name">Ignacio Rodriguez</field>
</record>
Expand Down
6 changes: 3 additions & 3 deletions academic/demo/res_users_demo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@


<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')])]"/>
<field name="company_ids" eval="[(6, 0, [ref('base.main_company'), ref('academic.res_company_los_molinos'), ref('academic.res_company_los_arroyos'), ref('academic.res_company_los_senderos'), ref('academic.res_company_facultad_ingenieria')])]"/>
</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')])]"/>
<field name="company_ids" eval="[(6, 0, [ref('base.main_company'), ref('academic.res_company_los_molinos'), ref('academic.res_company_los_arroyos'), ref('academic.res_company_los_senderos'), ref('academic.res_company_facultad_ingenieria')])]"/>
</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')])]"/>
<field name="company_ids" eval="[(6, 0, [ref('base.main_company'), ref('academic.res_company_los_molinos'), ref('academic.res_company_los_arroyos'), ref('academic.res_company_los_senderos'), ref('academic.res_company_facultad_ingenieria')])]"/>
</record>

<!-- Apdes Manger -->
Expand Down
4 changes: 0 additions & 4 deletions academic/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from . import academic_division
from . import academic_group
from . import academic_level
from . import academic_study_plan
from . import academic_promotion
from . import academic_section
from . import academic_subject
Expand All @@ -16,7 +15,4 @@
from . import res_users
from . import res_partner_role
from . import res_partner_link
from . import sale_order
from . import account_move
from . import account_move_line
from . import res_partner_category
Loading