Skip to content

Commit

Permalink
Merge pull request #38 from openeducat/8.0
Browse files Browse the repository at this point in the history
Rebasing 8.0 on master
  • Loading branch information
parthivgls committed Jul 30, 2015
2 parents 2e788ce + 4603e97 commit f2c8232
Show file tree
Hide file tree
Showing 87 changed files with 153 additions and 148 deletions.
3 changes: 1 addition & 2 deletions openeducat_erp/__openerp__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

{
'name': 'OpenEduCat ERP',
'version': '1.0',
'version': '1.1.0',
'category': 'Openerp Education',
"sequence": 3,
'summary': 'Manage Students, Faculties and Education Institute',
Expand All @@ -47,7 +47,6 @@
""",
'author': 'Tech Receptives',
'website': 'http://www.openeducat.org',
'images': [],
'depends': ['account_accountant', 'document',
'hr', 'web', 'website'],
'data': [
Expand Down
10 changes: 10 additions & 0 deletions openeducat_erp/doc/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

Changelog
=========

`8.0.1.1.0`
---------
- Refactor the code as per New API.
- Follow pep8.
- Apply testing for flake8 & pylint via travis.
- Apply testing for code coverage.
- Minor bug fixes


`8.0.0`
---------
- OpenEduCat Now compatible with Odoo v8.
Expand Down
Empty file modified openeducat_erp/doc/source/_themes/flask_theme_support.py
100755 → 100644
Empty file.
Empty file modified openeducat_erp/doc/source/conf.py
100755 → 100644
Empty file.
5 changes: 4 additions & 1 deletion openeducat_erp/menu/library_menu.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,14 @@
<menuitem id="menu_sub_op_dashboard_library" name="Library Dashboard"
parent="menu_op_dashboard_library" sequence="80" action="open_board_libray" />


<menuitem id="menu_op_book_request_library" name="Request A Book(s)"
parent="menu_op_library_root" sequence="45"
groups="group_op_library,group_op_back_office_admin,group_op_back_office" />

<menuitem id="menu_op_book_queue_request_library_sub" name="Book Queue Request"
parent="menu_op_book_request_library" sequence="40"
action="act_open_op_book_queue_view" />

<menuitem id="menu_op_book_request_library_sub" name="Book Request"
parent="menu_op_book_request_library" sequence="45"
action="act_open_op_purchase_view" />
Expand Down
2 changes: 1 addition & 1 deletion openeducat_erp/op_achievement/op_achievement.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields


class op_achievement(models.Model):
class OpAchievement(models.Model):
_name = 'op.achievement'
_rec_name = 'student_id'

Expand Down
2 changes: 1 addition & 1 deletion openeducat_erp/op_achievement_type/op_achievement_type.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields


class op_achievement_type(models.Model):
class OpAchievementType(models.Model):
_name = 'op.achievement.type'

name = fields.Char('Name', size=256, required=True)
Expand Down
4 changes: 2 additions & 2 deletions openeducat_erp/op_activity/op_activity.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields


class op_activity(models.Model):
class OpActivity(models.Model):
_name = 'op.activity'

# name = fields.Char(string='Activity Name', size=128, required=True)
Expand All @@ -32,7 +32,7 @@ class op_activity(models.Model):
date = fields.Date('Date')


class op_activity_type(models.Model):
class OpActivityType(models.Model):
_name = 'op.activity.type'

name = fields.Char('Activity Type', size=128, required=True)
Expand Down
2 changes: 1 addition & 1 deletion openeducat_erp/op_admission/op_admission.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields, api


class op_admission(models.Model):
class OpAdmission(models.Model):
_name = 'op.admission'
_rec_name = 'application_number'
_order = "application_number desc"
Expand Down
2 changes: 1 addition & 1 deletion openeducat_erp/op_allocat_division/op_allocat_division.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields, api


class op_allocat_division(models.Model):
class OpAllocatDivision(models.Model):
_name = 'op.allocat.division'

name = fields.Char('Name', size=128, required=True)
Expand Down
2 changes: 1 addition & 1 deletion openeducat_erp/op_assignment/op_assignment.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields, api


class op_assignment(models.Model):
class OpAssignment(models.Model):
_name = 'op.assignment'

name = fields.Char('Name', size=16, required=True)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields


class op_assignment_sub_history(models.Model):
class OpAssignmentSubHistory(models.Model):
_name = 'op.assignment.sub.history'

assign_sub_id = fields.Many2one(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields, api


class op_assignment_sub_line(models.Model):
class OpAssignmentSubLine(models.Model):
_name = 'op.assignment.sub.line'
_rec_name = 'assignment_id'

Expand Down
2 changes: 1 addition & 1 deletion openeducat_erp/op_attendance_line/op_attendance_line.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields


class op_attendance_line(models.Model):
class OpAttendanceLine(models.Model):
_name = 'op.attendance.line'
_rec_name = 'attendance_id'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields


class op_attendance_register(models.Model):
class OpAttendanceRegister(models.Model):
_name = 'op.attendance.register'

name = fields.Char('Name', size=16, required=True)
Expand Down
2 changes: 1 addition & 1 deletion openeducat_erp/op_attendance_sheet/op_attendance_sheet.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields, api


class op_attendance_sheet(models.Model):
class OpAttendanceSheet(models.Model):
_name = 'op.attendance.sheet'

@api.one
Expand Down
2 changes: 1 addition & 1 deletion openeducat_erp/op_author/op_author.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields


class op_author(models.Model):
class OpAuthor(models.Model):
_name = 'op.author'

name = fields.Char('Name', size=128, required=True)
Expand Down
2 changes: 1 addition & 1 deletion openeducat_erp/op_batch/op_batch.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields


class op_batch(models.Model):
class OpBatch(models.Model):
_name = 'op.batch'

code = fields.Char('Code', size=8, required=True)
Expand Down
2 changes: 1 addition & 1 deletion openeducat_erp/op_book/op_book.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields


class op_book(models.Model):
class OpBook(models.Model):
_name = 'op.book'

name = fields.Char('Title', size=128, required=True)
Expand Down
2 changes: 1 addition & 1 deletion openeducat_erp/op_book_movement/op_book_movement.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def days_between(d1, d2):
return abs((d2 - d1).days)


class op_book_movement(models.Model):
class OpBookMovement(models.Model):
_name = 'op.book.movement'
_rec_name = 'book_id'

Expand Down
2 changes: 1 addition & 1 deletion openeducat_erp/op_book_movement/wizard/reserve_book.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields, api


class reserve_book(models.TransientModel):
class ReserveBook(models.TransientModel):

""" Reserve Book """
_name = 'reserve.book'
Expand Down
2 changes: 1 addition & 1 deletion openeducat_erp/op_book_movement/wizard/returndate.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields, api


class return_date(models.TransientModel):
class ReturnDate(models.TransientModel):

""" Assign return date """
_name = 'return.date'
Expand Down
2 changes: 1 addition & 1 deletion openeducat_erp/op_book_purchase/op_book_purchase.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields, api


class op_book_purchase(models.Model):
class OpBookPurchase(models.Model):
_name = 'op.book.purchase'

name = fields.Char('Title', size=128, required=True)
Expand Down
4 changes: 2 additions & 2 deletions openeducat_erp/op_book_queue/op_book_queue.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from openerp.exceptions import ValidationError


class op_book_queue(models.Model):
class OpBookQueue(models.Model):
_name = 'op.book.queue'
_rec_name = 'partner_id'
_description = """ Book Queue Request Detail for Students and Faculties """
Expand All @@ -49,7 +49,7 @@ def _check_date(self):
def create(self, vals):
if vals.get('name', '/') == '/':
vals['name'] = self.env['ir.sequence'].get('op.book.queue') or '/'
return super(op_book_queue, self).create(vals)
return super(OpBookQueue, self).create(vals)

@api.one
def do_reject(self):
Expand Down
2 changes: 1 addition & 1 deletion openeducat_erp/op_category/op_category.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields


class op_category(models.Model):
class OpCategory(models.Model):
_name = 'op.category'

name = fields.Char('Name', size=256, required=True)
Expand Down
4 changes: 2 additions & 2 deletions openeducat_erp/op_classroom/op_classroom.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields


class op_classroom(models.Model):
class OpClassroom(models.Model):
_name = 'op.classroom'

name = fields.Char('Name', size=16, required=True)
Expand All @@ -35,7 +35,7 @@ class op_classroom(models.Model):
'op.asset', 'asset_id', 'Asset', required=True)


class op_asset(models.Model):
class OpAsset(models.Model):
_name = 'op.asset'

asset_id = fields.Many2one('op.classroom', 'Asset')
Expand Down
2 changes: 1 addition & 1 deletion openeducat_erp/op_course/op_course.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields


class op_course(models.Model):
class OpCourse(models.Model):
_name = 'op.course'

name = fields.Char('Name', size=32, required=True)
Expand Down
2 changes: 1 addition & 1 deletion openeducat_erp/op_division/op_division.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields


class op_division(models.Model):
class OpDivision(models.Model):
_name = 'op.division'

code = fields.Char('Code', size=8, required=True)
Expand Down
4 changes: 2 additions & 2 deletions openeducat_erp/op_exam/op_exam.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from openerp.exceptions import ValidationError


class op_exam_session(models.Model):
class OpExamSession(models.Model):
_name = 'op.exam.session'
_description = 'Exam Session'

Expand All @@ -45,7 +45,7 @@ def _check_date_time(self):
_('Start Time Should be greater than End Time.'))


class op_exam(models.Model):
class OpExam(models.Model):
_name = 'op.exam'

session_id = fields.Many2one('op.exam.session', 'Exam Session')
Expand Down
2 changes: 1 addition & 1 deletion openeducat_erp/op_exam_attendees/op_exam_attendees.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields


class op_exam_attendees(models.Model):
class OpExamAttendees(models.Model):
_name = 'op.exam.attendees'
_rec_name = 'student_id'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields, api


class op_exam_res_allocation(models.Model):
class OpExamResAllocation(models.Model):
_name = 'op.exam.res.allocation'

exam_session_ids = fields.Many2many(
Expand Down
2 changes: 1 addition & 1 deletion openeducat_erp/op_exam_room/op_exam_room.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields


class op_exam_room(models.Model):
class OpExamRoom(models.Model):
_name = 'op.exam.room'

name = fields.Char('Name', size=256, required=True)
Expand Down
2 changes: 1 addition & 1 deletion openeducat_erp/op_exam_type/op_exam_type.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields


class op_exam_type(models.Model):
class OpExamType(models.Model):
_name = 'op.exam.type'

name = fields.Char('Name', size=256, required=True)
Expand Down
2 changes: 1 addition & 1 deletion openeducat_erp/op_facility/op_facility.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields


class op_facility(models.Model):
class OpFacility(models.Model):
_name = 'op.facility'
_rec_name = 'Name'

Expand Down
4 changes: 2 additions & 2 deletions openeducat_erp/op_faculty/op_faculty.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from openerp.exceptions import Warning


class op_faculty(models.Model):
class OpFaculty(models.Model):
_name = 'op.faculty'
_inherits = {'res.partner': 'partner_id'}

Expand Down Expand Up @@ -73,7 +73,7 @@ def create_employee(self):
self.write({'emp_id': emp_id.id})


class hr_employee(models.Model):
class HrEmployee(models.Model):
_inherit = 'hr.employee'

@api.onchange('user_id')
Expand Down
4 changes: 2 additions & 2 deletions openeducat_erp/op_health/op_health.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from openerp import models, fields


class op_health(models.Model):
class OpHealth(models.Model):
_name = 'op.health'
_description = """ Health Detail for Students and Faculties """

Expand All @@ -46,7 +46,7 @@ class op_health(models.Model):
'op.health.line', 'health_id', 'Checkup Line')


class op_health_line(models.Model):
class OpHealthLine(models.Model):
_name = 'op.health.line'

health_id = fields.Many2one('op.health', 'Health')
Expand Down
2 changes: 1 addition & 1 deletion openeducat_erp/op_hostel/op_hostel.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from openerp.exceptions import ValidationError


class op_hostel(models.Model):
class OpHostel(models.Model):
_name = 'op.hostel'

name = fields.Char('Name', size=16, required=True)
Expand Down
Loading

0 comments on commit f2c8232

Please sign in to comment.