Skip to content

Commit

Permalink
Merge pull request #30 from ajaychauhan727/openeducat_erp_cha
Browse files Browse the repository at this point in the history
Modification for Pylint and Flake8 check
  • Loading branch information
parthivgls committed Jul 7, 2015
2 parents c9f4c2e + aeb9274 commit bb44711
Show file tree
Hide file tree
Showing 98 changed files with 585 additions and 490 deletions.
112 changes: 55 additions & 57 deletions openeducat_erp/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,61 +20,59 @@
###############################################################################

# import controllers
import op_achievement
import op_achievement_type
import op_activity
import op_admission
import op_allocat_division
import op_assignment
import op_assignment_sub_history
import op_assignment_sub_line
import op_attendance_line
import op_attendance_register
import op_attendance_sheet
import op_author
import op_batch
import op_book
import op_book_movement
import op_book_purchase
import op_book_queue
import op_category
import op_classroom
import op_course
import op_division
import op_exam
import op_exam_attendees
import op_exam_res_allocation
import op_exam_room
import op_exam_type
import op_facility
import op_faculty
import op_health
import op_hostel
import op_hostel_room
import op_library
import op_marksheet_line
import op_marksheet_register
import op_parent
import op_placement_offer
import op_publisher
import op_religion
import op_result_line
import op_result_template
import op_roll_number
import op_route
import op_scholarship
import op_scholarship_type
import op_standard
import op_student
import op_subject
import op_tag
import op_timetable
import op_transportation
import op_vehicle
import report
import res_company
import res_partner
import wizard


from . import op_achievement
from . import op_achievement_type
from . import op_activity
from . import op_admission
from . import op_allocat_division
from . import op_assignment
from . import op_assignment_sub_history
from . import op_assignment_sub_line
from . import op_attendance_line
from . import op_attendance_register
from . import op_attendance_sheet
from . import op_author
from . import op_batch
from . import op_book
from . import op_book_movement
from . import op_book_purchase
from . import op_book_queue
from . import op_category
from . import op_classroom
from . import op_course
from . import op_division
from . import op_exam
from . import op_exam_attendees
from . import op_exam_res_allocation
from . import op_exam_room
from . import op_exam_type
from . import op_facility
from . import op_faculty
from . import op_health
from . import op_hostel
from . import op_hostel_room
from . import op_library
from . import op_marksheet_line
from . import op_marksheet_register
from . import op_parent
from . import op_placement_offer
from . import op_publisher
from . import op_religion
from . import op_result_line
from . import op_result_template
from . import op_roll_number
from . import op_route
from . import op_scholarship
from . import op_scholarship_type
from . import op_standard
from . import op_student
from . import op_subject
from . import op_tag
from . import op_timetable
from . import op_transportation
from . import op_vehicle
from . import report
from . import res_company
from . import res_partner
from . import wizard
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
34 changes: 17 additions & 17 deletions openeducat_erp/__openerp__.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,22 @@
'summary': 'Manage Students, Faculties and Education Institute',
'complexity': "easy",
'description': """
This module provide overall education management system over OpenERP
Features includes managing
* Student
* Faculty
* Admission
* Course
* Batch
* Standard
* Books
* Library
* Lectures
* Exams
* Marksheet
* Result
* Transportation
* Hostel
This module provide overall education management system overOpenERP
Features includes managing
* Student
* Faculty
* Admission
* Course
* Batch
* Standard
* Books
* Library
* Lectures
* Exams
* Marksheet
* Result
* Transportation
* Hostel
""",
'author': 'Tech Receptives',
Expand Down Expand Up @@ -73,12 +73,12 @@
'op_book_movement/op_book_movement_view.xml',
'op_book_queue/op_book_queue_view.xml',
'op_book_queue/op_book_queue_sequence.xml',
'op_division/op_division_view.xml',
'op_placement_offer/op_placement_offer_view.xml',
'op_marksheet_register/op_marksheet_register_view.xml',
'op_classroom/op_classroom_view.xml',
'op_vehicle/op_vehicle_view.xml',
'op_hostel/op_hostel_view.xml',
'op_division/op_division_view.xml',
'op_exam_attendees/op_exam_attendees_view.xml',
'wizard/exam_seating_arrangement_view.xml',
'wizard/book_request_queue_view.xml',
Expand Down
2 changes: 1 addition & 1 deletion openeducat_erp/controllers/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
import main
from . import main
44 changes: 24 additions & 20 deletions openeducat_erp/controllers/main.py
Original file line number Diff line number Diff line change
@@ -1,26 +1,30 @@
from openerp.addons.web import controllers
controllers.main.html_template = """<!DOCTYPE html>
<html style="height: 100%%">
<head>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>OpenEduCat</title>
<link rel="shortcut icon" href="/openeducat_erp/static/src/img/openeducat_favicon.png" type="image/x-icon"/>
<link rel="stylesheet" href="/web/static/src/css/full.css" />
%(css)s
%(js)s
<script type="text/javascript">
$(function() {
var s = new openerp.init(%(modules)s);
%(init)s
});
</script>
</head>
<body>
<!--[if lte IE 8]>
<script src="//ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script>
<script>CFInstall.check({mode: "overlay"});</script>
<![endif]-->
<head>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>OpenEduCat</title>
<link rel="shortcut icon"
href="/openeducat_erp/static/src/img/openeducat_favicon.png"
type="image/x-icon"/>
<link rel="stylesheet" href="/web/static/src/css/full.css" />
%(css)s
%(js)s
<script type="text/javascript">
$(function() {
var s = new openerp.init(%(modules)s);
%(init)s
});
</script>
</head>
<body>
<!--[if lte IE 8]>
<script
src="//ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js">
</script>
<script>CFInstall.check({mode: "overlay"});</script>
<![endif]-->
</body>
</html>
"""
Loading

0 comments on commit bb44711

Please sign in to comment.