diff --git a/employee_management/__init__.py b/employee_management/__init__.py index 9449f95..1853868 100644 --- a/employee_management/__init__.py +++ b/employee_management/__init__.py @@ -3,4 +3,4 @@ from . import controllers from . import models from . import security - +from . import wizard diff --git a/employee_management/__manifest__.py b/employee_management/__manifest__.py index 7ebcb00..91142e8 100644 --- a/employee_management/__manifest__.py +++ b/employee_management/__manifest__.py @@ -1,37 +1,29 @@ # -*- coding: utf-8 -*- { - 'name': "employee_management", - - 'summary': "Short (1 phrase/line) summary of the module's purpose", - - 'description': """ + "name": "employee_management", + "summary": "Short (1 phrase/line) summary of the module's purpose", + "description": """ Long description of module's purpose """, - - 'author': "My Company", - 'website': "https://www.yourcompany.com", - + "author": "My Company", + "website": "https://www.yourcompany.com", # Categories can be used to filter modules in modules listing # Check https://github.com/odoo/odoo/blob/15.0/odoo/addons/base/data/ir_module_category_data.xml # for the full list - 'category': 'management', - 'version': '0.1', - + "category": "management", + "version": "0.1", # any module necessary for this one to work correctly - 'depends': ['base','contacts'], - + "depends": ["base", "contacts"], # always loaded - 'data': [ - 'security/ir.model.access.csv', - 'security/employee_security.xml', - 'views/employee_profile_view.xml', - 'views/add_employee_wizard_view.xml', - 'views/menu_item.xml', - 'views/employee_report_view.xml', + "data": [ + "security/ir.model.access.csv", + "views/employee_profile_view.xml", + "views/menu_item.xml", + "report/employee_report_view.xml", + "wizard/add_employee_wizard_view.xml", ], # only loaded in demonstration mode - 'demo': [ - 'demo/demo.xml', + "demo": [ + "demo/demo.xml", ], } - diff --git a/employee_management/models/__init__.py b/employee_management/models/__init__.py index 64aaf6f..17cfb0a 100644 --- a/employee_management/models/__init__.py +++ b/employee_management/models/__init__.py @@ -1 +1 @@ -from . import add_employee_wizard,models,employee_report \ No newline at end of file +from . import employee_profile diff --git a/employee_management/models/models.py b/employee_management/models/employee_profile.py similarity index 100% rename from employee_management/models/models.py rename to employee_management/models/employee_profile.py diff --git a/employee_management/report/__init__.py b/employee_management/report/__init__.py new file mode 100644 index 0000000..afeef30 --- /dev/null +++ b/employee_management/report/__init__.py @@ -0,0 +1 @@ +from . import employee_report diff --git a/employee_management/models/employee_report.py b/employee_management/report/employee_report.py similarity index 100% rename from employee_management/models/employee_report.py rename to employee_management/report/employee_report.py diff --git a/employee_management/views/employee_report_view.xml b/employee_management/report/employee_report_view.xml similarity index 100% rename from employee_management/views/employee_report_view.xml rename to employee_management/report/employee_report_view.xml diff --git a/employee_management/security/employee_security.xml b/employee_management/security/employee_security.xml deleted file mode 100644 index 5336695..0000000 --- a/employee_management/security/employee_security.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - Employee Management - Access rights for employee management - 10 - - - - Employee Admin - - - - - - Employee User - - - - - diff --git a/employee_management/security/ir.model.access.csv b/employee_management/security/ir.model.access.csv index 5828211..105cb7d 100644 --- a/employee_management/security/ir.model.access.csv +++ b/employee_management/security/ir.model.access.csv @@ -1,5 +1,5 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_employee_profile_user,employee.profile,model_employee_profile,employee_management.group_employee_user,1,1,1,1 -access_employee_profile_admin,employee.profile,model_employee_profile,employee_management.group_employee_admin,1,1,1,1 -access_add_employee_wizard_user,add.employee.wizard,model_add_employee_wizard,employee_management.group_employee_user,1,1,1,1 -access_add_employee_wizard_admin,add.employee.wizard,model_add_employee_wizard,employee_management.group_employee_admin,1,1,1,1 +access_employee_profile_user,employee.profile,model_employee_profile,base.group_user,1,1,1,1 +access_employee_profile_admin,employee.profile,model_employee_profile,base.group_user,1,1,1,1 +access_add_employee_wizard_user,add.employee.wizard,model_add_employee_wizard,base.group_user,1,1,1,1 +access_add_employee_wizard_admin,add.employee.wizard,model_add_employee_wizard,base.group_user,1,1,1,1 diff --git a/employee_management/views/employee_profile_view.xml b/employee_management/views/employee_profile_view.xml index ce586b8..4037e1e 100644 --- a/employee_management/views/employee_profile_view.xml +++ b/employee_management/views/employee_profile_view.xml @@ -60,10 +60,8 @@ employee.profile.form employee.profile -
-
-
+ + @@ -89,9 +87,5 @@ Employee Profiles employee.profile kanban,list,form - diff --git a/employee_management/views/menu_item.xml b/employee_management/views/menu_item.xml index 4025611..6b53ed8 100644 --- a/employee_management/views/menu_item.xml +++ b/employee_management/views/menu_item.xml @@ -3,5 +3,4 @@ - diff --git a/employee_management/wizard/__init__.py b/employee_management/wizard/__init__.py new file mode 100644 index 0000000..8ecbb78 --- /dev/null +++ b/employee_management/wizard/__init__.py @@ -0,0 +1 @@ +from . import add_employee_wizard diff --git a/employee_management/models/add_employee_wizard.py b/employee_management/wizard/add_employee_wizard.py similarity index 100% rename from employee_management/models/add_employee_wizard.py rename to employee_management/wizard/add_employee_wizard.py diff --git a/employee_management/views/add_employee_wizard_view.xml b/employee_management/wizard/add_employee_wizard_view.xml similarity index 89% rename from employee_management/views/add_employee_wizard_view.xml rename to employee_management/wizard/add_employee_wizard_view.xml index 052b6f3..5361948 100644 --- a/employee_management/views/add_employee_wizard_view.xml +++ b/employee_management/wizard/add_employee_wizard_view.xml @@ -30,9 +30,6 @@ form new - +