[MERGE] add filter for done state in admission (openeducat#94)

[IMP] library card barcode report generation and bug fix
[IMP] library penalty process change and create invoice
[IMP] improve the library issue and return media logic
[IMP] change student and faculty menu structure and library changes
[IMP] Update Menue Groups
[IMP]:Made changes in group structure
[FIX]: Menus Groups and Module Dependencies
[IMP] improve access rights of openeducat
[FIX]: Menus Group and Dependencies
[IMP]:Made changes to update access rights & rule
[IMP] improvements in library and fees and reports
[FIX] fix for exceptions and change strings in library
[IMP]:Changed user rights & demo details
[IMP] add oe_chatter in openeducat modules
[IMP] openeducat access rights upgrade and rule
[IMP] changes in Views of Media movements
[IMP] media barcode report change and student view changes
[IMP] change in timetable of classroom and set flow
[FIX] fix for the recursion error on openeducat
[IMP] change icon and banner for modules
[IMP] change menu structure and remove unwanted code
[IMP] change from openerp to from odoo in objects
[IMP] openeducat exam structure changes and student subject registration
[CHANGE] change and set icons of the modules and banners
[IMP] some improvement and bug fixs
[IMP] library sequence add accesss rights changes
[FIX] change the links from about page to dashboard page
[FIX] solve issue openeducat#60, change logic to generate timetable

openeducat_activity/models/activity.py

@@ -19,7 +19,7 @@
 #
 ###############################################################################
 
-from openerp import models, fields
+from odoo import models, fields
 
 
 class OpActivity(models.Model):

openeducat_activity/models/activity_type.py

@@ -19,7 +19,7 @@
 #
 ###############################################################################
 
-from openerp import models, fields
+from odoo import models, fields
 
 
 class OpActivityType(models.Model):

openeducat_activity/models/student.py

@@ -19,7 +19,7 @@
 #
 ###############################################################################
 
-from openerp import models, fields
+from odoo import models, fields
 
 
 class OpStudent(models.Model):

openeducat_activity/wizard/student_migrate_wizard.py

@@ -19,8 +19,8 @@
 #
 ###############################################################################
 
-from openerp import models, fields, api, _
-from openerp.exceptions import ValidationError
+from odoo import models, fields, api, _
+from odoo.exceptions import ValidationError
 
 
 class StudentMigrate(models.TransientModel):
@@ -31,6 +31,8 @@ class StudentMigrate(models.TransientModel):
     date = fields.Date('Date', required=True, default=fields.Date.today())
     course_from_id = fields.Many2one('op.course', 'From Course', required=True)
     course_to_id = fields.Many2one('op.course', 'To Course', required=True)
+    batch_id = fields.Many2one('op.batch', 'To Batch')
+    optional_sub = fields.Boolean("Optional Subjects")
     student_ids = fields.Many2many(
         'op.student', string='Student(s)', required=True)
 
@@ -74,3 +76,15 @@ def student_migrate_forward(self):
                 [('student_id', '=', student.id), ('course_id', '=',
                                                    self.course_from_id.id)])
             student_course.write({'course_id': self.course_to_id.id})
+            reg_id = self.env['op.subject.registration'].create({
+                'student_id': student.id,
+                'batch_id': self.batch_id.id,
+                'course_id': self.course_to_id.id,
+                'min_unit_load': self.course_to_id.min_unit_load or 0.0,
+                'max_unit_load': self.course_to_id.max_unit_load or 0.0,
+                'state': 'draft',
+            })
+            reg_id.get_subjects()
+            if not self.optional_sub:
+                reg_id.action_submitted()
+                reg_id.action_approve()

openeducat_activity/wizard/student_migrate_wizard_view.xml

@@ -17,9 +17,17 @@
                         <group>
                             <field name="date" />
                         </group>
-                        <group col="4" colspan="4">
-                            <field name="course_from_id" />
-                            <field name="course_to_id" />
+                        <group col="2">
+                            <group>
+                                <field name="course_from_id" />
+                                <field name="optional_sub"/>
+                            </group>
+                            <group>
+                                <field name="course_to_id"/>
+                                <field name="batch_id"
+                                    required="1"
+                                    domain="[('course_id','=', course_to_id)]"/>
+                            </group>
                         </group>
                         <group col="4" colspan="4" string="Student(s)">
                             <field name="student_ids" colspan="4" nolabel="1"

openeducat_admission/__manifest__.py

@@ -32,7 +32,7 @@
     """,
     'author': 'Tech Receptives',
     'website': 'http://www.openeducat.org',
-    'depends': ['openeducat_fees'],
+    'depends': ['openeducat_fees', 'openeducat_core'],
     'data': [
         'views/admission_register_view.xml',
         'views/admission_view.xml',

openeducat_admission/demo/admission_demo.xml

@@ -5,8 +5,8 @@
         <record id="op_admission_1" model="op.admission">
             <field name="title" ref="base.res_partner_title_miss" />
             <field name="name">Sumita</field>
-            <field name="middle_name">R</field>
-            <field name="last_name">Singh</field>
+            <field name="middle_name">S</field>
+            <field name="last_name">Dani</field>
             <field name="gender">f</field>
             <field name="fees">100000.0</field>
             <field name="state">done</field>
@@ -16,6 +16,7 @@
             <field name="course_id" ref="openeducat_core.op_course_2" />
             <field name="batch_id" ref="openeducat_core.op_batch_1" />
             <field name="application_number">AD046</field>
+            <field name="fees_term_id" ref="openeducat_fees.op_fees_term_1" />
             <field name="register_id" ref="op_admission_register_1" />
             <field name="application_date" eval="'%s-04-11' %(datetime.now().year-1)" />
             <field name="admission_date" eval="'%s-05-03' %(datetime.now().year-1)" />
@@ -37,6 +38,7 @@
             <field name="course_id" ref="openeducat_core.op_course_2" />
             <field name="batch_id" ref="openeducat_core.op_batch_1" />
             <field name="application_number">AD045</field>
+            <field name="fees_term_id" ref="openeducat_fees.op_fees_term_1" />
             <field name="register_id" ref="op_admission_register_1" />
             <field name="application_date" eval="'%s-04-22' %(datetime.now().year-1)" />
             <field name="admission_date" eval="'%s-05-13' %(datetime.now().year-1)" />
@@ -58,6 +60,7 @@
             <field name="course_id" ref="openeducat_core.op_course_2" />
             <field name="batch_id" ref="openeducat_core.op_batch_1" />
             <field name="application_number">AD044</field>
+            <field name="fees_term_id" ref="openeducat_fees.op_fees_term_1" />
             <field name="register_id" ref="op_admission_register_1" />
             <field name="application_date" eval="'%s-04-08' %(datetime.now().year-1)" />
             <field name="admission_date" eval="'%s-05-19' %(datetime.now().year-1)" />
@@ -79,6 +82,7 @@
             <field name="course_id" ref="openeducat_core.op_course_2" />
             <field name="batch_id" ref="openeducat_core.op_batch_1" />
             <field name="application_number">AD043</field>
+            <field name="fees_term_id" ref="openeducat_fees.op_fees_term_1" />
             <field name="register_id" ref="op_admission_register_1" />
             <field name="application_date" eval="'%s-04-24' %(datetime.now().year-1)" />
             <field name="admission_date" eval="'%s-05-09' %(datetime.now().year-1)" />
@@ -100,6 +104,7 @@
             <field name="course_id" ref="openeducat_core.op_course_3" />
             <field name="batch_id" ref="openeducat_core.op_batch_2" />
             <field name="application_number">AD042</field>
+            <field name="fees_term_id" ref="openeducat_fees.op_fees_term_1" />
             <field name="register_id" ref="op_admission_register_1" />
             <field name="application_date" eval="'%s-04-20' %(datetime.now().year-1)" />
             <field name="admission_date" eval="'%s-05-16' %(datetime.now().year-1)" />
@@ -121,6 +126,7 @@
             <field name="course_id" ref="openeducat_core.op_course_3" />
             <field name="batch_id" ref="openeducat_core.op_batch_2" />
             <field name="application_number">AD041</field>
+            <field name="fees_term_id" ref="openeducat_fees.op_fees_term_1" />
             <field name="register_id" ref="op_admission_register_1" />
             <field name="application_date" eval="'%s-04-22' %(datetime.now().year-1)" />
             <field name="admission_date" eval="'%s-05-05' %(datetime.now().year-1)" />
@@ -142,6 +148,7 @@
             <field name="course_id" ref="openeducat_core.op_course_3" />
             <field name="batch_id" ref="openeducat_core.op_batch_2" />
             <field name="application_number">AD040</field>
+            <field name="fees_term_id" ref="openeducat_fees.op_fees_term_1" />
             <field name="register_id" ref="op_admission_register_1" />
             <field name="application_date" eval="'%s-04-05' %(datetime.now().year-1)" />
             <field name="admission_date" eval="'%s-05-20' %(datetime.now().year-1)" />
@@ -163,6 +170,7 @@
             <field name="course_id" ref="openeducat_core.op_course_3" />
             <field name="batch_id" ref="openeducat_core.op_batch_2" />
             <field name="application_number">AD039</field>
+            <field name="fees_term_id" ref="openeducat_fees.op_fees_term_1" />
             <field name="register_id" ref="op_admission_register_1" />
             <field name="application_date" eval="'%s-04-09' %(datetime.now().year-1)" />
             <field name="admission_date" eval="'%s-05-02' %(datetime.now().year-1)" />
@@ -184,6 +192,7 @@
             <field name="course_id" ref="openeducat_core.op_course_4" />
             <field name="batch_id" ref="openeducat_core.op_batch_3" />
             <field name="application_number">AD092</field>
+            <field name="fees_term_id" ref="openeducat_fees.op_fees_term_2" />
             <field name="register_id" ref="op_admission_register_2" />
             <field name="application_date" eval="'%s-04-17' %(datetime.now().year-1)" />
             <field name="admission_date" eval="'%s-05-12' %(datetime.now().year-1)" />
@@ -205,6 +214,7 @@
             <field name="course_id" ref="openeducat_core.op_course_4" />
             <field name="batch_id" ref="openeducat_core.op_batch_3" />
             <field name="application_number">AD091</field>
+            <field name="fees_term_id" ref="openeducat_fees.op_fees_term_2" />
             <field name="register_id" ref="op_admission_register_2" />
             <field name="application_date" eval="'%s-04-25' %(datetime.now().year-1)" />
             <field name="admission_date" eval="'%s-05-17' %(datetime.now().year-1)" />
@@ -226,6 +236,7 @@
             <field name="course_id" ref="openeducat_core.op_course_4" />
             <field name="batch_id" ref="openeducat_core.op_batch_3" />
             <field name="application_number">AD090</field>
+            <field name="fees_term_id" ref="openeducat_fees.op_fees_term_2" />
             <field name="register_id" ref="op_admission_register_2" />
             <field name="application_date" eval="'%s-04-21' %(datetime.now().year-1)" />
             <field name="admission_date" eval="'%s-05-26' %(datetime.now().year-1)" />
@@ -247,6 +258,7 @@
             <field name="course_id" ref="openeducat_core.op_course_4" />
             <field name="batch_id" ref="openeducat_core.op_batch_3" />
             <field name="application_number">AD093</field>
+            <field name="fees_term_id" ref="openeducat_fees.op_fees_term_2" />
             <field name="register_id" ref="op_admission_register_2" />
             <field name="application_date" eval="'%s-04-09' %(datetime.now().year-1)" />
             <field name="admission_date" eval="'%s-05-06' %(datetime.now().year-1)" />
@@ -268,6 +280,7 @@
             <field name="course_id" ref="openeducat_core.op_course_5" />
             <field name="batch_id" ref="openeducat_core.op_batch_4" />
             <field name="application_number">AD094</field>
+            <field name="fees_term_id" ref="openeducat_fees.op_fees_term_3" />
             <field name="register_id" ref="op_admission_register_3" />
             <field name="application_date" eval="'%s-04-08' %(datetime.now().year-1)" />
             <field name="admission_date" eval="'%s-05-03' %(datetime.now().year-1)" />
@@ -289,6 +302,7 @@
             <field name="course_id" ref="openeducat_core.op_course_5" />
             <field name="batch_id" ref="openeducat_core.op_batch_4" />
             <field name="application_number">AD095</field>
+            <field name="fees_term_id" ref="openeducat_fees.op_fees_term_3" />
             <field name="register_id" ref="op_admission_register_3" />
             <field name="application_date" eval="'%s-04-04' %(datetime.now().year-1)" />
             <field name="admission_date" eval="'%s-05-10' %(datetime.now().year-1)" />
@@ -310,6 +324,7 @@
             <field name="course_id" ref="openeducat_core.op_course_5" />
             <field name="batch_id" ref="openeducat_core.op_batch_5" />
             <field name="application_number">AD096</field>
+            <field name="fees_term_id" ref="openeducat_fees.op_fees_term_3" />
             <field name="register_id" ref="op_admission_register_3" />
             <field name="application_date" eval="'%s-04-05' %(datetime.now().year-1)" />
             <field name="admission_date" eval="'%s-05-12' %(datetime.now().year-1)" />
@@ -331,6 +346,7 @@
             <field name="course_id" ref="openeducat_core.op_course_5" />
             <field name="batch_id" ref="openeducat_core.op_batch_5" />
             <field name="application_number">AD101</field>
+            <field name="fees_term_id" ref="openeducat_fees.op_fees_term_3" />
             <field name="register_id" ref="op_admission_register_3" />
             <field name="application_date" eval="'%s-04-06' %(datetime.now().year-1)" />
             <field name="admission_date" eval="'%s-05-24' %(datetime.now().year-1)" />
@@ -352,6 +368,7 @@
             <field name="course_id" ref="openeducat_core.op_course_6" />
             <field name="batch_id" ref="openeducat_core.op_batch_6" />
             <field name="application_number">AD102</field>
+            <field name="fees_term_id" ref="openeducat_fees.op_fees_term_3" />
             <field name="register_id" ref="op_admission_register_4" />
             <field name="application_date" eval="'%s-04-12' %(datetime.now().year-1)" />
             <field name="admission_date" eval="'%s-05-04' %(datetime.now().year-1)" />
@@ -373,6 +390,7 @@
             <field name="course_id" ref="openeducat_core.op_course_6" />
             <field name="batch_id" ref="openeducat_core.op_batch_6" />
             <field name="application_number">AD103</field>
+            <field name="fees_term_id" ref="openeducat_fees.op_fees_term_3" />
             <field name="register_id" ref="op_admission_register_4" />
             <field name="application_date" eval="'%s-04-11' %(datetime.now().year-1)" />
             <field name="admission_date" eval="'%s-05-15' %(datetime.now().year-1)" />
@@ -394,6 +412,7 @@
             <field name="course_id" ref="openeducat_core.op_course_6" />
             <field name="batch_id" ref="openeducat_core.op_batch_6" />
             <field name="application_number">AD104</field>
+            <field name="fees_term_id" ref="openeducat_fees.op_fees_term_3" />
             <field name="register_id" ref="op_admission_register_4" />
             <field name="application_date" eval="'%s-04-09' %(datetime.now().year-1)" />
             <field name="admission_date" eval="'%s-05-06' %(datetime.now().year-1)" />
@@ -415,6 +434,7 @@
             <field name="course_id" ref="openeducat_core.op_course_6" />
             <field name="batch_id" ref="openeducat_core.op_batch_6" />
             <field name="application_number">AD105</field>
+            <field name="fees_term_id" ref="openeducat_fees.op_fees_term_3" />
             <field name="register_id" ref="op_admission_register_4" />
             <field name="application_date" eval="'%s-04-12' %(datetime.now().year-1)" />
             <field name="admission_date" eval="'%s-05-10' %(datetime.now().year-1)" />
@@ -436,6 +456,7 @@
             <field name="course_id" ref="openeducat_core.op_course_6" />
             <field name="batch_id" ref="openeducat_core.op_batch_6" />
             <field name="application_number">AD108</field>
+            <field name="fees_term_id" ref="openeducat_fees.op_fees_term_3" />
             <field name="register_id" ref="op_admission_register_4" />
             <field name="application_date" eval="'%s-04-10' %(datetime.now().year-1)" />
             <field name="admission_date" eval="'%s-05-17' %(datetime.now().year-1)" />
@@ -455,6 +476,7 @@
             <field name="course_id" ref="openeducat_core.op_course_6" />
             <field name="batch_id" ref="openeducat_core.op_batch_6" />
             <field name="application_number">AD109</field>
+            <field name="fees_term_id" ref="openeducat_fees.op_fees_term_3" />
             <field name="register_id" ref="op_admission_register_4" />
             <field name="application_date" eval="'%s-04-17' %(datetime.now().year-1)" />
             <field name="admission_date" eval="'%s-05-21' %(datetime.now().year-1)" />
@@ -474,6 +496,7 @@
             <field name="course_id" ref="openeducat_core.op_course_6" />
             <field name="batch_id" ref="openeducat_core.op_batch_6" />
             <field name="application_number">AD110</field>
+            <field name="fees_term_id" ref="openeducat_fees.op_fees_term_3" />
             <field name="register_id" ref="op_admission_register_4" />
             <field name="application_date" eval="'%s-04-18' %(datetime.now().year-1)" />
             <field name="admission_date" eval="'%s-05-14' %(datetime.now().year-1)" />

openeducat_admission/models/admission.py

@@ -22,8 +22,8 @@
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 
-from openerp import models, fields, api, _
-from openerp.exceptions import ValidationError, UserError
+from odoo import models, fields, api, _
+from odoo.exceptions import ValidationError, UserError
 
 
 class OpAdmission(models.Model):
@@ -88,8 +88,7 @@ class OpAdmission(models.Model):
          ('confirm', 'Confirmed'), ('admission', 'Admission Confirm'),
          ('reject', 'Rejected'), ('pending', 'Pending'),
          ('cancel', 'Cancelled'), ('done', 'Done')],
-        'State', readonly=True, select=True,
-        default='draft', track_visibility='onchange')
+        'State', default='draft', track_visibility='onchange')
     due_date = fields.Date('Due Date', states={'done': [('readonly', True)]})
     prev_institute_id = fields.Many2one(
         'res.partner', 'Previous Institute',
@@ -279,6 +278,15 @@ def enroll_student(self):
             'admission_date': fields.Date.today(),
             'student_id': student_id,
         })
+        reg_id = self.env['op.subject.registration'].create({
+            'student_id': student_id,
+            'batch_id': self.batch_id.id,
+            'course_id': self.course_id.id,
+            'min_unit_load': self.course_id.min_unit_load or 0.0,
+            'max_unit_load': self.course_id.max_unit_load or 0.0,
+            'state': 'draft',
+        })
+        reg_id.get_subjects()
 
     @api.one
     def confirm_rejected(self):

openeducat_admission/models/admission_register.py

@@ -21,8 +21,8 @@
 
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
-from openerp import models, fields, api, _
-from openerp.exceptions import ValidationError
+from odoo import models, fields, api, _
+from odoo.exceptions import ValidationError
 
 
 class OpAdmissionRegister(models.Model):

openeducat_admission/models/student.py

@@ -18,8 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp import models, api, fields, _
-from openerp.exceptions import UserError
+from odoo import models, api, fields, _
+from odoo.exceptions import UserError
 
 
 class OpStudentFeesDetails(models.Model):

openeducat_admission/report/admission_analysis_report.py

@@ -21,7 +21,7 @@
 
 import time
 
-from openerp import models, api
+from odoo import models, api
 
 
 class ReportAdmissionAnalysis(models.AbstractModel):

openeducat_admission/views/admission_register_view.xml

@@ -50,7 +50,7 @@
                             <field name="max_count" />
                         </group>
                         <group string="Applications">
-                            <field name="admission_ids" nolabel="1" />
+                            <field name="admission_ids" nolabel="1" readonly="1" />
                         </group>
                     </sheet>
                     <div class="oe_chatter">