savoirfairelinux-openerp team mailing list archive
-
savoirfairelinux-openerp team
-
Mailing list archive
-
Message #00325
lp:~savoirfairelinux-openerp/openerp-mgmtsystem/7.0-pep8-compliance into lp:openerp-mgmtsystem
Maxime Chambreuil (http://www.savoirfairelinux.com) has proposed merging lp:~savoirfairelinux-openerp/openerp-mgmtsystem/7.0-pep8-compliance into lp:openerp-mgmtsystem.
Requested reviews:
OpenERP Management System Core Editors (openerp-mgmtsystem-core-editors)
For more details, see:
https://code.launchpad.net/~savoirfairelinux-openerp/openerp-mgmtsystem/7.0-pep8-compliance/+merge/184689
[FIX] PEP8 compliance
--
https://code.launchpad.net/~savoirfairelinux-openerp/openerp-mgmtsystem/7.0-pep8-compliance/+merge/184689
Your team Savoir-faire Linux' OpenERP is subscribed to branch lp:~savoirfairelinux-openerp/openerp-mgmtsystem/7.0-pep8-compliance.
=== modified file 'document_page_environment_manual/__openerp__.py'
--- document_page_environment_manual/__openerp__.py 2013-08-06 16:22:21 +0000
+++ document_page_environment_manual/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -19,19 +19,18 @@
#
##############################################################################
{
- "name" : "Document Management - Wiki - Environment Manual",
- "version" : "1.0",
- "author" : "Savoir-faire Linux",
- "website" : "http://www.savoirfairelinux.com";,
- "license" : "AGPL-3",
- "category" : "Generic Modules/Others",
+ "name": "Document Management - Wiki - Environment Manual",
+ "version": "1.0",
+ "author": "Savoir-faire Linux",
+ "website": "http://www.savoirfairelinux.com";,
+ "license": "AGPL-3",
+ "category": "Generic Modules/Others",
"description": """Environment Manual Template
""",
- "depends" : ['mgmtsystem_manuals'],
- "data" : ['document_page_environment_manual.xml'],
- "demo" : [],
- "installable" : True,
- "certificate" : ''
+ "depends": ['mgmtsystem_manuals'],
+ "data": ['document_page_environment_manual.xml'],
+ "demo": [],
+ "installable": True,
+ "certificate": ''
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== modified file 'document_page_environmental_aspect/__openerp__.py'
--- document_page_environmental_aspect/__openerp__.py 2013-08-28 15:12:07 +0000
+++ document_page_environmental_aspect/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -19,19 +19,26 @@
#
##############################################################################
{
- "name" : "Document Management - Wiki - Environmental Aspects",
- "version" : "1.0",
- "author" : "Savoir-faire Linux",
- "website" : "http://www.savoirfairelinux.com";,
- "license" : "AGPL-3",
- "category" : "Generic Modules/Others",
+ "name": "Document Management - Wiki - Environmental Aspects",
+ "version": "1.0",
+ "author": "Savoir-faire Linux",
+ "website": "http://www.savoirfairelinux.com";,
+ "license": "AGPL-3",
+ "category": "Generic Modules/Others",
"description": """Environmental Aspects Template, useful for Environment Management System
""",
+<<<<<<< TREE
"depends" : ['document_page','mgmtsystem'],
"data" : ['document_page_environmental_aspect.xml'],
"demo" : [],
"installable" : True,
"certificate" : ''
+=======
+ "depends": ['document_page_approval', 'mgmtsystem'],
+ "data": ['document_page_environmental_aspect.xml'],
+ "demo": [],
+ "installable": True,
+ "certificate": ''
+>>>>>>> MERGE-SOURCE
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== modified file 'document_page_health_safety_manual/__openerp__.py'
--- document_page_health_safety_manual/__openerp__.py 2013-08-06 16:22:21 +0000
+++ document_page_health_safety_manual/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -19,19 +19,18 @@
#
##############################################################################
{
- "name" : "Document Management - Wiki - Health and Safety Manual",
- "version" : "1.0",
- "author" : "Savoir-faire Linux",
- "website" : "http://www.savoirfairelinux.com";,
- "license" : "AGPL-3",
- "category" : "Generic Modules/Others",
+ "name": "Document Management - Wiki - Health and Safety Manual",
+ "version": "1.0",
+ "author": "Savoir-faire Linux",
+ "website": "http://www.savoirfairelinux.com";,
+ "license": "AGPL-3",
+ "category": "Generic Modules/Others",
"description": """Health and Safety Manual Template
""",
- "depends" : ['mgmtsystem_manuals'],
- "data" : ['document_page_health_safety_manual.xml'],
- "demo" : [],
- "installable" : True,
- "certificate" : ''
+ "depends": ['mgmtsystem_manuals'],
+ "data": ['document_page_health_safety_manual.xml'],
+ "demo": [],
+ "installable": True,
+ "certificate": ''
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== modified file 'document_page_procedure/__openerp__.py'
--- document_page_procedure/__openerp__.py 2013-08-06 16:22:21 +0000
+++ document_page_procedure/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -19,19 +19,18 @@
#
##############################################################################
{
- "name" : "Document Management - Wiki - Procedures",
- "version" : "1.0",
- "author" : "Savoir-faire Linux",
- "website" : "http://www.savoirfairelinux.com";,
- "license" : "AGPL-3",
- "category" : "Generic Modules/Others",
+ "name": "Document Management - Wiki - Procedures",
+ "version": "1.0",
+ "author": "Savoir-faire Linux",
+ "website": "http://www.savoirfairelinux.com";,
+ "license": "AGPL-3",
+ "category": "Generic Modules/Others",
"description": """Procedure Template
""",
- "depends" : ['document_page_work_instructions'],
- "data" : ['document_page_procedure.xml'],
- "demo" : [],
- "installable" : True,
- "certificate" : ''
+ "depends": ['document_page_work_instructions'],
+ "data": ['document_page_procedure.xml'],
+ "demo": [],
+ "installable": True,
+ "certificate": ''
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== modified file 'document_page_quality_manual/__openerp__.py'
--- document_page_quality_manual/__openerp__.py 2013-08-06 16:22:21 +0000
+++ document_page_quality_manual/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -38,7 +38,7 @@
'demo': [],
'installable': True,
'auto_install': False,
- 'certificate' : '',
+ 'certificate': '',
'images': ['images/wiki_pages_quality_manual.jpeg'],
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'document_page_work_instructions/__openerp__.py'
--- document_page_work_instructions/__openerp__.py 2013-08-28 15:12:07 +0000
+++ document_page_work_instructions/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -19,19 +19,26 @@
#
##############################################################################
{
- "name" : "Document Management - Wiki - Work Instructions",
- "version" : "1.0",
- "author" : "Savoir-faire Linux",
- "website" : "http://www.savoirfairelinux.com";,
- "license" : "AGPL-3",
- "category" : "Generic Modules/Others",
+ "name": "Document Management - Wiki - Work Instructions",
+ "version": "1.0",
+ "author": "Savoir-faire Linux",
+ "website": "http://www.savoirfairelinux.com";,
+ "license": "AGPL-3",
+ "category": "Generic Modules/Others",
"description": """Work Instructions Template
""",
+<<<<<<< TREE
"depends" : ['mgmtsystem','document_page'],
"data" : ['document_page_work_instructions.xml'],
"demo" : [],
"installable" : True,
"certificate" : ''
+=======
+ "depends": ['mgmtsystem', 'document_page_approval'],
+ "data": ['document_page_work_instructions.xml'],
+ "demo": [],
+ "installable": True,
+ "certificate": ''
+>>>>>>> MERGE-SOURCE
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== modified file 'information_security_manual/__openerp__.py'
--- information_security_manual/__openerp__.py 2013-08-06 16:23:11 +0000
+++ information_security_manual/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -19,20 +19,19 @@
#
##############################################################################
{
- "name" : "Information Security Management System Manual",
- "version" : "1.0",
- "author" : "Savoir-faire Linux",
- "website" : "http://www.savoirfairelinux.com";,
- "license" : "AGPL-3",
- "category" : "Generic Modules/Others",
+ "name": "Information Security Management System Manual",
+ "version": "1.0",
+ "author": "Savoir-faire Linux",
+ "website": "http://www.savoirfairelinux.com";,
+ "license": "AGPL-3",
+ "category": "Generic Modules/Others",
"description": """Information Security Manual Template
""",
- "depends" : ['mgmtsystem_manuals'],
- "init" : [],
- "data" : ['information_security_manual.xml'],
- "demo" : [],
- "installable" : True,
- "certificate" : ''
+ "depends": ['mgmtsystem_manuals'],
+ "init": [],
+ "data": ['information_security_manual.xml'],
+ "demo": [],
+ "installable": True,
+ "certificate": ''
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== modified file 'mgmtsystem/__openerp__.py'
--- mgmtsystem/__openerp__.py 2013-08-06 16:22:21 +0000
+++ mgmtsystem/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -15,17 +15,17 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
{
- "name" : "Management System",
- "version" : "1.0",
- "author" : "Savoir-faire Linux",
- "website" : "http://www.savoirfairelinux.com";,
- "license" : "AGPL-3",
- "category" : "Management System",
- "complexity" : "normal",
+ "name": "Management System",
+ "version": "1.0",
+ "author": "Savoir-faire Linux",
+ "website": "http://www.savoirfairelinux.com";,
+ "license": "AGPL-3",
+ "category": "Management System",
+ "complexity": "normal",
"description": """\
This module is the basis of any management system applications:
* audit reports,
@@ -35,21 +35,20 @@
* corrective actions,
* improvement opportunities.
""",
- "depends" : [
+ "depends": [
'base',
'board',
'document_page',
],
- "data" : [
+ "data": [
'security/mgmtsystem_security.xml',
'security/ir.model.access.csv',
'mgmtsystem.xml',
'mgmtsystem_system.xml',
'board_mgmtsystem_view.xml',
],
- "demo" : [],
- "installable" : True,
- "certificate" : ''
+ "demo": [],
+ "installable": True,
+ "certificate": ''
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== modified file 'mgmtsystem/mgmtsystem_system.py'
--- mgmtsystem/mgmtsystem_system.py 2013-01-31 14:21:30 +0000
+++ mgmtsystem/mgmtsystem_system.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2012 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -15,13 +15,14 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
-from osv import fields, osv
-
-class mgmtsystem_system(osv.osv):
+from osv import fields, orm
+
+
+class mgmtsystem_system(orm.Model):
_name = 'mgmtsystem.system'
description = 'System'
@@ -36,4 +37,4 @@
'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
}
-mgmtsystem_system()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'mgmtsystem_action/__openerp__.py'
--- mgmtsystem_action/__openerp__.py 2013-08-26 03:22:45 +0000
+++ mgmtsystem_action/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -19,12 +19,12 @@
#
##############################################################################
{
- "name" : "Management System - Action",
- "version" : "1.1",
- "author" : "Savoir-faire Linux",
- "website" : "http://www.savoirfairelinux.com";,
- "license" : "AGPL-3",
- "category" : "Management System",
+ "name": "Management System - Action",
+ "version": "1.1",
+ "author": "Savoir-faire Linux",
+ "website": "http://www.savoirfairelinux.com";,
+ "license": "AGPL-3",
+ "category": "Management System",
"description": """\
This module enables you to manage the different actions of your management system:
* immediate actions
@@ -41,8 +41,7 @@
'mgmtsystem_action.xml',
'board_mgmtsystem_action.xml',
],
- "demo" : ['demo_action.xml',],
- "installable" : True,
+ "demo": ['demo_action.xml'],
+ "installable": True,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== modified file 'mgmtsystem_action/mgmtsystem_action.py'
--- mgmtsystem_action/mgmtsystem_action.py 2013-08-25 14:58:18 +0000
+++ mgmtsystem_action/mgmtsystem_action.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -15,12 +15,12 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from openerp.osv import fields, orm
-from crm import crm
+
class mgmtsystem_action(orm.Model):
_name = "mgmtsystem.action"
@@ -36,7 +36,7 @@
'message_ids': fields.one2many('mail.message',
'res_id',
'Messages',
- domain=[('model','=',_name)]),
+ domain=[('model', '=', _name)]),
'system_id': fields.many2one('mgmtsystem.system', 'System'),
'company_id': fields.many2one('res.company', 'Company')
}
=== modified file 'mgmtsystem_action_audittrail/__init__.py'
--- mgmtsystem_action_audittrail/__init__.py 2013-03-04 14:58:34 +0000
+++ mgmtsystem_action_audittrail/__init__.py 2013-09-09 21:19:34 +0000
@@ -1,2 +1,2 @@
# -*- coding: utf-8 -*-
-# empty
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'mgmtsystem_action_audittrail/__openerp__.py'
--- mgmtsystem_action_audittrail/__openerp__.py 2013-03-04 14:58:34 +0000
+++ mgmtsystem_action_audittrail/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -26,7 +26,7 @@
"license": "AGPL-3",
"category": "Management System",
"description": """\
-Adds rule to track changes to Management System Actions, if Audit Trail module
+Adds rule to track changes to Management System Actions, if Audit Trail module
is installed.
""",
"depends": ['mgmtsystem_action', 'audittrail'],
=== modified file 'mgmtsystem_audit/__openerp__.py'
--- mgmtsystem_audit/__openerp__.py 2013-08-26 03:22:45 +0000
+++ mgmtsystem_audit/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -19,17 +19,17 @@
#
##############################################################################
{
- "name" : "Management System - Audit",
- "version" : "1.1",
- "author" : "Savoir-faire Linux",
- "website" : "http://www.savoirfairelinux.com";,
- "license" : "AGPL-3",
- "category" : "Management System",
+ "name": "Management System - Audit",
+ "version": "1.1",
+ "author": "Savoir-faire Linux",
+ "website": "http://www.savoirfairelinux.com";,
+ "license": "AGPL-3",
+ "category": "Management System",
"description": """\
This module enables you to manage audits and verifications lists of your management system.
""",
"depends": ['mgmtsystem_nonconformity'],
- "data" : [
+ "data": [
'security/ir.model.access.csv',
'security/mgmtsystem_audit_security.xml',
'audit_sequence.xml',
@@ -39,10 +39,10 @@
'board_mgmtsystem_audit.xml',
'wizard/copy_verification_lines.xml',
],
- "demo" : [
+ "demo": [
'demo_audit.xml',
],
- "installable" : True,
- "certificate" : ''
+ "installable": True,
+ "certificate": ''
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'mgmtsystem_audit/mgmtsystem_audit.py'
--- mgmtsystem_audit/mgmtsystem_audit.py 2013-08-25 15:20:05 +0000
+++ mgmtsystem_audit/mgmtsystem_audit.py 2013-09-09 21:19:34 +0000
@@ -29,14 +29,14 @@
'name': fields.char('Name', size=50),
'reference': fields.char('Reference', size=64, required=True, readonly=True),
'date': fields.datetime('Date'),
- 'line_ids': fields.one2many('mgmtsystem.verification.line','audit_id','Verification List'),
- 'auditor_user_ids': fields.many2many('res.users','mgmtsystem_auditor_user_rel','user_id','mgmtsystem_audit_id','Auditors'),
- 'auditee_user_ids': fields.many2many('res.users','mgmtsystem_auditee_user_rel','user_id','mgmtsystem_audit_id','Auditees'),
+ 'line_ids': fields.one2many('mgmtsystem.verification.line', 'audit_id', 'Verification List'),
+ 'auditor_user_ids': fields.many2many('res.users', 'mgmtsystem_auditor_user_rel', 'user_id', 'mgmtsystem_audit_id', 'Auditors'),
+ 'auditee_user_ids': fields.many2many('res.users', 'mgmtsystem_auditee_user_rel', 'user_id', 'mgmtsystem_audit_id', 'Auditees'),
'strong_points': fields.text('Strong Points'),
'to_improve_points': fields.text('Points To Improve'),
- 'imp_opp_ids': fields.many2many('mgmtsystem.action','mgmtsystem_audit_imp_opp_rel','mgmtsystem_action_id','mgmtsystem_audit_id','Improvement Opportunities'),
+ 'imp_opp_ids': fields.many2many('mgmtsystem.action', 'mgmtsystem_audit_imp_opp_rel', 'mgmtsystem_action_id', 'mgmtsystem_audit_id', 'Improvement Opportunities'),
'nonconformity_ids': fields.many2many('mgmtsystem.nonconformity', string='Nonconformities'),
- 'state': fields.selection([('open','Open'),('done','Closed')], 'State'),
+ 'state': fields.selection([('open', 'Open'), ('done', 'Closed')], 'State'),
'system_id': fields.many2one('mgmtsystem.system', 'System'),
'company_id': fields.many2one('res.company', 'Company')
}
@@ -61,7 +61,7 @@
_name = "mgmtsystem.verification.line"
_description = "Verification Line"
_columns = {
- 'name': fields.char('Question',size=300, required=True),
+ 'name': fields.char('Question', size=300, required=True),
'audit_id': fields.many2one('mgmtsystem.audit', 'Audit', ondelete='cascade', select=True),
'procedure_id': fields.many2one('document.page', 'Procedure', ondelete='cascade', select=True),
'is_conformed': fields.boolean('Is conformed'),
=== modified file 'mgmtsystem_audit/migrations/7.0.1.0/post-migration.py'
--- mgmtsystem_audit/migrations/7.0.1.0/post-migration.py 2013-04-01 19:13:26 +0000
+++ mgmtsystem_audit/migrations/7.0.1.0/post-migration.py 2013-09-09 21:19:34 +0000
@@ -19,17 +19,14 @@
#
##############################################################################
-import os
-from osv import osv
import logging
logger = logging.getLogger('upgrade')
+
def migrate(cr, version):
logger.info("Migrating mgmtsystem_audit from version %s", version)
-
logger.info("Updating state flags")
cr.execute("update mgmtsystem_audit set state = 'open' where state = 'o'")
cr.execute("update mgmtsystem_audit set state = 'done' where state = 'c'")
-
logger.info("mgmtsystem_audit update... done!")
=== modified file 'mgmtsystem_audit/report/__init__.py'
--- mgmtsystem_audit/report/__init__.py 2012-12-17 17:18:12 +0000
+++ mgmtsystem_audit/report/__init__.py 2013-09-09 21:19:34 +0000
@@ -1,4 +1,4 @@
# -*- encoding: utf-8 -*-
import audit_report
-import verification_list
+import verification_list
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'mgmtsystem_audit/report/audit_report.py'
--- mgmtsystem_audit/report/audit_report.py 2013-05-29 16:51:38 +0000
+++ mgmtsystem_audit/report/audit_report.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -15,13 +15,14 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import time
from report import report_sxw
+
class mgmtsystem_audit_report(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
super(mgmtsystem_audit_report, self).__init__(cr, uid, name, context)
=== modified file 'mgmtsystem_audit/report/verification_list.py'
--- mgmtsystem_audit/report/verification_list.py 2013-05-29 16:51:38 +0000
+++ mgmtsystem_audit/report/verification_list.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -15,13 +15,14 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import time
from report import report_sxw
+
class mgmtsystem_audit_verification_list(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
super(mgmtsystem_audit_verification_list, self).__init__(cr, uid, name, context)
@@ -32,7 +33,6 @@
self.context = context
def get_lines_by_procedure(self, verification_lines):
- v = {}
p = []
for l in verification_lines:
proc_nm = self.pool.get('document.page').read(self.cr, self.uid, l.procedure_id.id, ['name'])
@@ -40,16 +40,13 @@
"procedure": proc_nm['name'],
"name": l.name,
"yes_no": "Yes / No"})
-
p = sorted(p, key=lambda k: k["procedure"])
-
proc_line = False
q = []
proc_name = ''
for i in range(len(p)):
if proc_name != p[i]['procedure']:
proc_line = True
-
if proc_line:
q.append({"id": p[i]['id'],
"procedure": p[i]['procedure'],
@@ -57,16 +54,12 @@
"yes_no": ""})
proc_line = False
proc_name = p[i]['procedure']
-
q.append({"id": p[i]['id'],
"procedure": "",
"name": p[i]['name'],
"yes_no": "Yes / No"})
-
-
-
return q
-
+
report_sxw.report_sxw(
'report.mgmtsystem.audit.verificationlist',
'mgmtsystem.audit',
=== modified file 'mgmtsystem_audit/wizard/copy_verification_lines.py'
--- mgmtsystem_audit/wizard/copy_verification_lines.py 2012-12-17 17:18:12 +0000
+++ mgmtsystem_audit/wizard/copy_verification_lines.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -15,12 +15,13 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from osv import fields, osv
+
class copy_verification_lines(osv.osv_memory):
"""
Copy Verification Lines
@@ -29,11 +30,11 @@
_description = "Copy Verification Lines"
_columns = {
- 'audit_src': fields.many2one('mgmtsystem.audit','Choose audit'),
+ 'audit_src': fields.many2one('mgmtsystem.audit', 'Choose audit'),
}
def copy(self, cr, uid, ids, context=None):
- # Code to copy verification lines from the chosen audit to the current one
+ # Code to copy verification lines from the chosen audit to the current one
if context is None:
context = {}
@@ -42,14 +43,14 @@
src_id = self.read(cr, uid, ids, [], context=context)[0]['audit_src'][0]
for line in audit_proxy.browse(cr, uid, src_id, context=context).line_ids:
- verification_line_proxy.create(cr,uid, {
- 'seq' : line.seq,
- 'name' : line.name,
- 'audit_id' : context['active_id'],
- 'procedure_id' : line.procedure_id.id,
- 'is_conformed' : False,
+ verification_line_proxy.create(cr, uid, {
+ 'seq': line.seq,
+ 'name': line.name,
+ 'audit_id': context['active_id'],
+ 'procedure_id': line.procedure_id.id,
+ 'is_conformed': False,
}, context=context)
- return {'type':'ir.actions.act_window_close'}
+ return {'type': 'ir.actions.act_window_close'}
copy_verification_lines()
=== modified file 'mgmtsystem_audit_audittrail/__init__.py'
--- mgmtsystem_audit_audittrail/__init__.py 2013-03-04 14:58:34 +0000
+++ mgmtsystem_audit_audittrail/__init__.py 2013-09-09 21:19:34 +0000
@@ -1,2 +1,2 @@
# -*- coding: utf-8 -*-
-# empty
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'mgmtsystem_audit_audittrail/__openerp__.py'
--- mgmtsystem_audit_audittrail/__openerp__.py 2013-03-04 14:58:34 +0000
+++ mgmtsystem_audit_audittrail/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -26,7 +26,7 @@
"license": "AGPL-3",
"category": "Management System",
"description": """\
-Adds rule to track changes to Management System Audits, if Audit Trail module
+Adds rule to track changes to Management System Audits, if Audit Trail module
is installed.
""",
"depends": ['mgmtsystem_audit', 'audittrail'],
=== modified file 'mgmtsystem_claim/__openerp__.py'
--- mgmtsystem_claim/__openerp__.py 2013-08-26 03:22:45 +0000
+++ mgmtsystem_claim/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -19,12 +19,12 @@
#
##############################################################################
{
- "name" : "Management System - Claim",
- "version" : "1.1",
- "author" : "Savoir-faire Linux",
- "website" : "http://www.savoirfairelinux.com";,
- "license" : "AGPL-3",
- "category" : "Management System",
+ "name": "Management System - Claim",
+ "version": "1.1",
+ "author": "Savoir-faire Linux",
+ "website": "http://www.savoirfairelinux.com";,
+ "license": "AGPL-3",
+ "category": "Management System",
"description": """This module enables you to manage the claims of your management system.""",
"depends": ['mgmtsystem', 'crm_claim', 'mail'],
"data": [
@@ -37,4 +37,3 @@
],
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== modified file 'mgmtsystem_claim/mgmtsystem_claim.py'
--- mgmtsystem_claim/mgmtsystem_claim.py 2013-08-25 14:58:18 +0000
+++ mgmtsystem_claim/mgmtsystem_claim.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -15,20 +15,20 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
-from osv import fields, osv
-from crm import crm
-
-class mgmtsystem_claim(osv.osv):
+from osv import fields, orm
+
+
+class mgmtsystem_claim(orm.Model):
_name = "mgmtsystem.claim"
_description = "Claim"
_inherit = "crm.claim"
_columns = {
'reference': fields.char('Reference', size=64, required=True, readonly=True),
- 'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
+ 'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', domain=[('model', '=', _name)]),
'company_id': fields.many2one('res.company', 'Company')
}
@@ -43,6 +43,4 @@
})
return super(mgmtsystem_claim, self).create(cr, uid, vals, context)
-mgmtsystem_claim()
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'mgmtsystem_claim_audittrail/__init__.py'
--- mgmtsystem_claim_audittrail/__init__.py 2013-03-04 14:58:34 +0000
+++ mgmtsystem_claim_audittrail/__init__.py 2013-09-09 21:19:34 +0000
@@ -1,2 +1,2 @@
# -*- coding: utf-8 -*-
-# empty
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'mgmtsystem_claim_audittrail/__openerp__.py'
--- mgmtsystem_claim_audittrail/__openerp__.py 2013-03-04 14:58:34 +0000
+++ mgmtsystem_claim_audittrail/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -26,7 +26,7 @@
"license": "AGPL-3",
"category": "Management System",
"description": """\
-Adds rule to track changes to Management System Claims, if Audit Trail module
+Adds rule to track changes to Management System Claims, if Audit Trail module
is installed.
""",
"depends": ['mgmtsystem_claim', 'audittrail'],
=== modified file 'mgmtsystem_environment/__openerp__.py'
--- mgmtsystem_environment/__openerp__.py 2013-08-06 16:22:21 +0000
+++ mgmtsystem_environment/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -19,12 +19,12 @@
#
##############################################################################
{
- "name" : "Environment Management System",
- "version" : "1.0",
- "author" : "Savoir-faire Linux",
- "website" : "http://www.savoirfairelinux.com";,
- "license" : "AGPL-3",
- "category" : "Management System",
+ "name": "Environment Management System",
+ "version": "1.0",
+ "author": "Savoir-faire Linux",
+ "website": "http://www.savoirfairelinux.com";,
+ "license": "AGPL-3",
+ "category": "Management System",
"description": """\
This module enables you to manage your environment management system, including :
* Environment Manual
@@ -35,18 +35,17 @@
* Actions
* Employee Training
""",
- "depends" : [
+ "depends": [
'mgmtsystem_audit',
'mgmtsystem_review',
'document_page_environment_manual',
'document_page_environmental_aspect',
-# 'training_hr',
+ # 'training_hr',
],
- "data" : ['environment.xml'],
- "demo" : [],
- "installable" : True,
- "application" : True,
- "certificate" : ''
+ "data": ['environment.xml'],
+ "demo": [],
+ "installable": True,
+ "application": True,
+ "certificate": ''
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== modified file 'mgmtsystem_hazard/__openerp__.py'
--- mgmtsystem_hazard/__openerp__.py 2013-08-26 03:22:45 +0000
+++ mgmtsystem_hazard/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -19,14 +19,15 @@
#
##############################################################################
{
- "name" : "Management System - Hazard",
- "version" : "1.1",
- "author" : "Savoir-faire Linux",
- "website" : "http://www.savoirfairelinux.com";,
- "license" : "AGPL-3",
- "category" : "Management System",
+ "name": "Management System - Hazard",
+ "version": "1.1",
+ "author": "Savoir-faire Linux",
+ "website": "http://www.savoirfairelinux.com";,
+ "license": "AGPL-3",
+ "category": "Management System",
"description": """\
-This module enables you to manage the hazards and risks of your health and safety management system.
+This module enables you to manage the hazards and risks of your health
+and safety management system.
""",
"depends": ['mgmtsystem', 'hr'],
"data": [
@@ -37,4 +38,3 @@
],
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== modified file 'mgmtsystem_hazard/mgmtsystem_hazard.py'
--- mgmtsystem_hazard/mgmtsystem_hazard.py 2013-08-25 14:58:18 +0000
+++ mgmtsystem_hazard/mgmtsystem_hazard.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -15,18 +15,19 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from openerp.osv import fields, orm
-import time
+
def _parse_risk_formula(formula, a, b, c):
"""Calculate the risk replacing the variables A, B, C into the formula."""
f = formula.replace('A', str(a)).replace('B', str(b)).replace('C', str(c))
return eval(f)
+
class mgmtsystem_hazard_type(orm.Model):
_name = "mgmtsystem.hazard.type"
@@ -54,22 +55,26 @@
}
def _get_formula(self, cr, uid, context=None):
- ids = self.pool.get('mgmtsystem.hazard.risk.computation').search(cr,uid,[('name','=','A * B * C')], context=context)
+ ids = self.pool.get('mgmtsystem.hazard.risk.computation').
+ search(cr, uid, [('name', '=', 'A * B * C')], context=context)
return ids and ids[0] or False
_defaults = {
'risk_computation_id': _get_formula
}
+
class mgmtsystem_hazard_risk_type(orm.Model):
_name = "mgmtsystem.hazard.risk.type"
_description = "Risk type of the hazard"
_columns = {
- 'name': fields.char('Risk Type', size=50, required=True, translate=True),
+ 'name': fields.char('Risk Type', size=50, required=True,
+ translate=True),
'description': fields.text('Description'),
}
+
class mgmtsystem_hazard_origin(orm.Model):
_name = "mgmtsystem.hazard.origin"
@@ -79,6 +84,7 @@
'description': fields.text('Description')
}
+
class mgmtsystem_hazard_hazard(orm.Model):
_name = "mgmtsystem.hazard.hazard"
@@ -88,59 +94,73 @@
'description': fields.text('Description'),
}
+
class mgmtsystem_hazard_probability(orm.Model):
_name = "mgmtsystem.hazard.probability"
_description = "Probability of hazard"
_columns = {
- 'name': fields.char('Probability', size=50, required=True, translate=True),
+ 'name': fields.char('Probability', size=50, required=True,
+ translate=True),
'value': fields.integer('Value', required=True),
'description': fields.text('Description')
}
+
class mgmtsystem_hazard_severity(orm.Model):
_name = "mgmtsystem.hazard.severity"
_description = "Severity of hazard"
_columns = {
- 'name': fields.char('Severity', size=50, required=True, translate=True),
+ 'name': fields.char('Severity', size=50, required=True,
+ translate=True),
'value': fields.integer('Value', required=True),
'description': fields.text('Description')
}
+
class mgmtsystem_hazard_usage(orm.Model):
_name = "mgmtsystem.hazard.usage"
_description = "Usage of hazard"
_columns = {
- 'name': fields.char('Occupation / Usage', size=50, required=True, translate=True),
+ 'name': fields.char('Occupation / Usage', size=50, required=True,
+ translate=True),
'value': fields.integer('Value', required=True),
'description': fields.text('Description')
}
+
class mgmtsystem_hazard_control_measure(orm.Model):
_name = "mgmtsystem.hazard.control_measure"
_description = "Control Measure of hazard"
_columns = {
- 'name': fields.char('Control Measure', size=50, required=True, translate=True),
- 'responsible_user_id': fields.many2one('res.users','Responsible', required=True),
+ 'name': fields.char('Control Measure', size=50, required=True,
+ translate=True),
+ 'responsible_user_id': fields.many2one('res.users', 'Responsible',
+ required=True),
'comments': fields.text('Comments'),
- 'hazard_id': fields.many2one('mgmtsystem.hazard', 'Hazard', ondelete='cascade', select=True),
+ 'hazard_id': fields.many2one('mgmtsystem.hazard', 'Hazard',
+ ondelete='cascade', select=True),
}
+
class mgmtsystem_hazard_test(orm.Model):
_name = "mgmtsystem.hazard.test"
_description = "Implementation Tests of hazard"
_columns = {
'name': fields.char('Test', size=50, required=True, translate=True),
- 'responsible_user_id': fields.many2one('res.users','Responsible', required=True),
+ 'responsible_user_id': fields.many2one('res.users', 'Responsible',
+ required=True),
'review_date': fields.date('Review Date', required=True),
'executed': fields.boolean('Executed'),
- 'hazard_id': fields.many2one('mgmtsystem.hazard', 'Hazard', ondelete='cascade', select=True),
+ 'hazard_id': fields.many2one('mgmtsystem.hazard', 'Hazard',
+ ondelete='cascade', select=True),
}
+
class mgmtsystem_hazard_residual_risk(orm.Model):
_name = "mgmtsystem.hazard.residual_risk"
@@ -152,7 +172,8 @@
for obj in self.browse(cr, uid, ids):
if obj.probability_id and obj.severity_id and obj.usage_id:
- mycompany = self.pool.get('res.company').browse(cr, uid, user.company_id.id, context)[0]
+ mycompany = self.pool.get('res.company').
+ browse(cr, uid, user.company_id.id, context)[0]
result[obj.id] = _parse_risk_formula(mycompany.risk_computation_id.name,
obj.probability_id.value,
obj.severity_id.value,
@@ -161,18 +182,19 @@
result[obj.id] = False
return result
-
+
_columns = {
'name': fields.char('Name', size=50, required=True, translate=True),
- 'probability_id': fields.many2one('mgmtsystem.hazard.probability','Probability', required=True),
- 'severity_id': fields.many2one('mgmtsystem.hazard.severity','Severity', required=True),
- 'usage_id': fields.many2one('mgmtsystem.hazard.usage','Occupation / Usage'),
- 'risk': fields.function(_compute_risk,string='Risk',type='integer'),
+ 'probability_id': fields.many2one('mgmtsystem.hazard.probability', 'Probability', required=True),
+ 'severity_id': fields.many2one('mgmtsystem.hazard.severity', 'Severity', required=True),
+ 'usage_id': fields.many2one('mgmtsystem.hazard.usage', 'Occupation / Usage'),
+ 'risk': fields.function(_compute_risk, string='Risk', type='integer'),
'acceptability': fields.boolean('Acceptability'),
'justification': fields.text('Justification'),
- 'hazard_id': fields.many2one('mgmtsystem.hazard', 'Hazard', ondelete='cascade', select=True),
+ 'hazard_id': fields.many2one('mgmtsystem.hazard', 'Hazard', ondelete='cascade', select=True),
}
+
class mgmtsystem_hazard(orm.Model):
_name = "mgmtsystem.hazard"
@@ -195,22 +217,22 @@
_columns = {
'name': fields.char('Name', size=50, required=True, translate=True),
- 'type_id': fields.many2one('mgmtsystem.hazard.type', 'Type', required=True),
- 'hazard_id': fields.many2one('mgmtsystem.hazard.hazard','Hazard', required=True),
- 'risk_type_id': fields.many2one('mgmtsystem.hazard.risk.type', 'Risk Type', required=True),
- 'origin_id': fields.many2one('mgmtsystem.hazard.origin', 'Origin', required=True),
- 'department_id': fields.many2one('hr.department', 'Department', required=True),
- 'responsible_user_id': fields.many2one('res.users','Responsible', required=True),
+ 'type_id': fields.many2one('mgmtsystem.hazard.type', 'Type', required=True),
+ 'hazard_id': fields.many2one('mgmtsystem.hazard.hazard', 'Hazard', required=True),
+ 'risk_type_id': fields.many2one('mgmtsystem.hazard.risk.type', 'Risk Type', required=True),
+ 'origin_id': fields.many2one('mgmtsystem.hazard.origin', 'Origin', required=True),
+ 'department_id': fields.many2one('hr.department', 'Department', required=True),
+ 'responsible_user_id': fields.many2one('res.users', 'Responsible', required=True),
'analysis_date': fields.date('Date', required=True),
- 'probability_id': fields.many2one('mgmtsystem.hazard.probability','Probability'),
- 'severity_id': fields.many2one('mgmtsystem.hazard.severity','Severity'),
- 'usage_id': fields.many2one('mgmtsystem.hazard.usage','Occupation / Usage'),
- 'risk': fields.function(_compute_risk,string='Risk',type='integer'),
+ 'probability_id': fields.many2one('mgmtsystem.hazard.probability', 'Probability'),
+ 'severity_id': fields.many2one('mgmtsystem.hazard.severity', 'Severity'),
+ 'usage_id': fields.many2one('mgmtsystem.hazard.usage', 'Occupation / Usage'),
+ 'risk': fields.function(_compute_risk, string='Risk', type='integer'),
'acceptability': fields.boolean('Acceptability'),
'justification': fields.text('Justification'),
- 'control_measure_ids': fields.one2many('mgmtsystem.hazard.control_measure','hazard_id','Control Measures'),
- 'test_ids': fields.one2many('mgmtsystem.hazard.test','hazard_id','Implementation Tests'),
- 'residual_risk_ids': fields.one2many('mgmtsystem.hazard.residual_risk','hazard_id','Residual Risk Evaluations'),
+ 'control_measure_ids': fields.one2many('mgmtsystem.hazard.control_measure', 'hazard_id', 'Control Measures'),
+ 'test_ids': fields.one2many('mgmtsystem.hazard.test', 'hazard_id', 'Implementation Tests'),
+ 'residual_risk_ids': fields.one2many('mgmtsystem.hazard.residual_risk', 'hazard_id', 'Residual Risk Evaluations'),
'company_id': fields.many2one('res.company', 'Company')
}
=== modified file 'mgmtsystem_hazard_audittrail/__init__.py'
--- mgmtsystem_hazard_audittrail/__init__.py 2013-03-04 14:58:34 +0000
+++ mgmtsystem_hazard_audittrail/__init__.py 2013-09-09 21:19:34 +0000
@@ -1,2 +1,2 @@
# -*- coding: utf-8 -*-
-# empty
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'mgmtsystem_hazard_audittrail/__openerp__.py'
--- mgmtsystem_hazard_audittrail/__openerp__.py 2013-03-04 14:58:34 +0000
+++ mgmtsystem_hazard_audittrail/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -26,7 +26,7 @@
"license": "AGPL-3",
"category": "Management System",
"description": """\
-Adds rule to track changes to Management System Hazards, if Audit Trail module
+Adds rule to track changes to Management System Hazards, if Audit Trail module
is installed.
""",
"depends": ['mgmtsystem_hazard', 'audittrail'],
=== modified file 'mgmtsystem_health_safety/__openerp__.py'
--- mgmtsystem_health_safety/__openerp__.py 2013-08-06 16:22:21 +0000
+++ mgmtsystem_health_safety/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -19,12 +19,12 @@
#
##############################################################################
{
- "name" : "Health and Safety Management System",
- "version" : "1.0",
- "author" : "Savoir-faire Linux",
- "website" : "http://www.savoirfairelinux.com";,
- "license" : "AGPL-3",
- "category" : "Management System",
+ "name": "Health and Safety Management System",
+ "version": "1.0",
+ "author": "Savoir-faire Linux",
+ "website": "http://www.savoirfairelinux.com";,
+ "license": "AGPL-3",
+ "category": "Management System",
"description": """\
This module enables you to manage your health and safety management system, including :
* Hazards
@@ -38,18 +38,17 @@
* Claims
* Letters
""",
- "depends" : [
+ "depends": [
'mgmtsystem_audit',
'mgmtsystem_review',
'mgmtsystem_claim',
'document_page_health_safety_manual',
'mgmtsystem_hazard',
],
- "data" : ['health_safety.xml'],
- "demo" : [],
- "installable" : True,
- "application" : True,
- "certificate" : ''
+ "data": ['health_safety.xml'],
+ "demo": [],
+ "installable": True,
+ "application": True,
+ "certificate": ''
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== modified file 'mgmtsystem_kpi/__openerp__.py'
--- mgmtsystem_kpi/__openerp__.py 2013-08-26 03:22:45 +0000
+++ mgmtsystem_kpi/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2012 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -15,57 +15,56 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
{
- "name" : "Key Performance Indicator",
- "version" : "1.1",
- "author" : "Savoir-faire Linux",
- "website" : "http://www.savoirfairelinux.com";,
- "license" : "AGPL-3",
- "category" : "Management System",
- "complexity" : "normal",
+ "name": "Key Performance Indicator",
+ "version": "1.1",
+ "author": "Savoir-faire Linux",
+ "website": "http://www.savoirfairelinux.com";,
+ "license": "AGPL-3",
+ "category": "Management System",
+ "complexity": "normal",
"description": """\
This module provides the basis for creating key performance indicators,
-including static and dynamic thresholds (SQL query or Python code),
+including static and dynamic thresholds (SQL query or Python code),
on local and remote data sources.
-The module also provides the mecanism to update KPIs automatically.
-A scheduler is executed every hour and updates the KPI values, based
-on the periodicity of each KPI. KPI computation can also be done
+The module also provides the mecanism to update KPIs automatically.
+A scheduler is executed every hour and updates the KPI values, based
+on the periodicity of each KPI. KPI computation can also be done
manually.
A threshold is a list of ranges and a range is:
* a name (like Good, Warning, Bad)
* a minimum value (fixed, sql query or python code)
* a maximum value (fixed, sql query or python code)
- * color (RGB code like #00FF00 for green, #FFA500 for orange,
+ * color (RGB code like #00FF00 for green, #FFA500 for orange,
#FF0000 for red)
This module depends on:
* base_external_dbsource (available in lp:openobject-extension)
* web_color (available in lp:web-addons)
""",
- "depends" : [
+ "depends": [
'mgmtsystem',
'base_external_dbsource',
'web_color',
],
- "data" : [
+ "data": [
'security/ir.model.access.csv',
'security/mgmtsystem_kpi_security.xml',
'mgmtsystem_kpi_view.xml',
],
- "images" : [
+ "images": [
"images/kpi_definition.png",
"images/kpi_computation.png",
"images/kpi_threshold.png",
"images/kpi_range.png",
],
- "demo" : [],
- "test" : [],
- "installable" : True,
+ "demo": [],
+ "test": [],
+ "installable": True,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== modified file 'mgmtsystem_kpi/mgmtsystem_kpi.py'
--- mgmtsystem_kpi/mgmtsystem_kpi.py 2013-08-25 14:58:18 +0000
+++ mgmtsystem_kpi/mgmtsystem_kpi.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2012 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -15,19 +15,19 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from dateutil.relativedelta import relativedelta
from datetime import datetime
-from osv import fields, osv
+from osv import fields, orm, osv
from openerp.tools.translate import _
-import openerp.tools as tools
import time
import logging
_logger = logging.getLogger(__name__)
+
def is_one_value(result):
# check if sql query returns only one value
if type(result) is dict and 'value' in result.dictfetchone():
@@ -37,6 +37,7 @@
else:
return False
+
def is_select_query(query):
# check if sql query is a SELECT statement
@@ -45,7 +46,8 @@
return False
return True
-class mgmtsystem_kpi_category(osv.osv):
+
+class mgmtsystem_kpi_category(orm.Model):
"""
KPI Category
"""
@@ -56,9 +58,8 @@
'description': fields.text('Description')
}
-mgmtsystem_kpi_category()
-class mgmtsystem_kpi_threshold_range(osv.osv):
+class mgmtsystem_kpi_threshold_range(orm.Model):
"""
KPI Threshold Range
"""
@@ -70,7 +71,7 @@
context = {}
result = {}
for obj in self.browse(cr, uid, ids):
- value = None
+ value = None
if obj.min_type == 'local' and is_select_query(obj.min_code):
cr.execute(obj.min_code)
dic = cr.dictfetchall()
@@ -119,7 +120,7 @@
if obj.max_value < obj.min_value:
result[obj.id] = False
else:
- result[obj.id] = True
+ result[obj.id] = True
return result
def _generate_invalid_message(self, cr, uid, ids, field_name, arg, context=None):
@@ -137,18 +138,18 @@
'name': fields.char('Name', size=50, required=True),
'valid': fields.function(_is_valid_range, string='Valid', type='boolean', required=True),
'invalid_message': fields.function(_generate_invalid_message, string='Message', type='char', size=100),
- 'min_type': fields.selection((('static','Fixed value'), ('python','Python Code'), ('local', 'SQL - Local DB'), ('external', 'SQL - Externa DB')), 'Min Type', required=True),
+ 'min_type': fields.selection((('static', 'Fixed value'), ('python', 'Python Code'), ('local', 'SQL - Local DB'), ('external', 'SQL - Externa DB')), 'Min Type', required=True),
'min_value': fields.function(compute_min_value, string='Minimum', type='float'),
'min_fixed_value': fields.float('Minimum'),
'min_code': fields.text('Minimum Computation Code'),
- 'min_dbsource_id': fields.many2one('base.external.dbsource','External DB Source'),
- 'max_type': fields.selection((('static','Fixed value'), ('python','Python Code'), ('local', 'SQL - Local DB'), ('external', 'SQL - External DB')), 'Max Type', required=True),
+ 'min_dbsource_id': fields.many2one('base.external.dbsource', 'External DB Source'),
+ 'max_type': fields.selection((('static', 'Fixed value'), ('python', 'Python Code'), ('local', 'SQL - Local DB'), ('external', 'SQL - External DB')), 'Max Type', required=True),
'max_value': fields.function(compute_max_value, string='Maximum', type='float'),
'max_fixed_value': fields.float('Maximum'),
'max_code': fields.text('Maximum Computation Code'),
- 'max_dbsource_id': fields.many2one('base.external.dbsource','External DB Source'),
+ 'max_dbsource_id': fields.many2one('base.external.dbsource', 'External DB Source'),
'color': fields.char('Color', help='RGB code with #', size=7, required=True),
- 'threshold_ids': fields.many2many('mgmtsystem.kpi.threshold','mgmtsystem_kpi_threshold_range_rel', 'range_id', 'threshold_id', 'Thresholds'),
+ 'threshold_ids': fields.many2many('mgmtsystem.kpi.threshold', 'mgmtsystem_kpi_threshold_range_rel', 'range_id', 'threshold_id', 'Thresholds'),
'company_id': fields.many2one('res.company', 'Company')
}
@@ -157,9 +158,8 @@
'valid': True,
}
-mgmtsystem_kpi_threshold_range()
-class mgmtsystem_kpi_threshold(osv.osv):
+class mgmtsystem_kpi_threshold(orm.Model):
"""
KPI Threshold
"""
@@ -194,7 +194,7 @@
_columns = {
'name': fields.char('Name', size=50, required=True),
- 'range_ids': fields.many2many('mgmtsystem.kpi.threshold.range','mgmtsystem_kpi_threshold_range_rel', 'threshold_id', 'range_id', 'Ranges'),
+ 'range_ids': fields.many2many('mgmtsystem.kpi.threshold.range', 'mgmtsystem_kpi_threshold_range_rel', 'threshold_id', 'range_id', 'Ranges'),
'valid': fields.function(_is_valid_threshold, string='Valid', type='boolean', required=True),
'invalid_message': fields.function(_generate_invalid_message, string='Message', type='char', size=100),
'kpi_ids': fields.one2many('mgmtsystem.kpi', 'threshold_id', 'KPIs'),
@@ -231,14 +231,13 @@
color = '#FFFFFF'
for obj in self.browse(cr, uid, ids, context):
for range_id in obj.range_ids:
- range_obj = self.pool.get('mgmtsystem.kpi.threshold.range').browse(cr, uid, range_id.id, context)
- if range_obj.min_value <= kpi_value <= range_obj.max_value and range_obj.valid:
- color = range_obj.color
+ range_obj = self.pool.get('mgmtsystem.kpi.threshold.range').browse(cr, uid, range_id.id, context)
+ if range_obj.min_value <= kpi_value <= range_obj.max_value and range_obj.valid:
+ color = range_obj.color
return color
-mgmtsystem_kpi_threshold()
-class mgmtsystem_kpi_history(osv.osv):
+class mgmtsystem_kpi_history(orm.Model):
"""
History of the KPI
"""
@@ -261,11 +260,10 @@
'color': '#FFFFFF',
}
- _order = "date desc"
-
-mgmtsystem_kpi_threshold()
-
-class mgmtsystem_kpi(osv.osv):
+ _order = "date desc"
+
+
+class mgmtsystem_kpi(orm.Model):
"""
Key Performance Indicators
"""
@@ -275,7 +273,7 @@
def _display_last_kpi_value(self, cr, uid, ids, field_name, arg, context=None):
if context is None:
context = {}
-
+
result = {}
for obj in self.browse(cr, uid, ids):
if obj.history_ids:
@@ -288,8 +286,8 @@
def compute_kpi_value(self, cr, uid, ids, context=None):
if context is None:
context = {}
- for obj in self.browse(cr, uid, ids):
- kpi_value = 0
+ for obj in self.browse(cr, uid, ids):
+ kpi_value = 0
if obj.kpi_type == 'local' and is_select_query(obj.kpi_code):
cr.execute(obj.kpi_code)
dic = cr.dictfetchall()
@@ -305,10 +303,10 @@
threshold_obj = self.pool.get('mgmtsystem.kpi.threshold').browse(cr, uid, obj.threshold_id.id, context)
values = {
- 'kpi_id': obj.id,
+ 'kpi_id': obj.id,
'value': kpi_value,
'color': threshold_obj.get_color(kpi_value),
- }
+ }
history_obj = self.pool.get('mgmtsystem.kpi.history')
history_id = history_obj.create(cr, uid, values, context=context)
@@ -322,13 +320,13 @@
for obj in self.browse(cr, uid, ids):
if obj.periodicity_uom == 'hour':
- new_date = datetime.now() + relativedelta( hours = +obj.periodicity )
- elif obj.periodicity_uom == 'day':
- new_date = datetime.now() + relativedelta( days = +obj.periodicity )
- elif obj.periodicity_uom == 'week':
- new_date = datetime.now() + relativedelta( weeks = +obj.periodicity )
- elif obj.periodicity_uom == 'month':
- new_date = datetime.now() + relativedelta( months = +obj.periodicity )
+ new_date = datetime.now()+relativedelta(hours=+obj.periodicity)
+ elif obj.periodicity_uom == 'day':
+ new_date = datetime.now()+relativedelta(days=+obj.periodicity)
+ elif obj.periodicity_uom == 'week':
+ new_date = datetime.now()+relativedelta(weeks=+obj.periodicity)
+ elif obj.periodicity_uom == 'month':
+ new_date = datetime.now()+relativedelta(months=+obj.periodicity)
values = {
'next_execution_date': new_date.strftime('%Y-%m-%d %H:%M:%S'),
@@ -354,20 +352,20 @@
self.update_next_execution_date(cr, uid, ids, context=context)
except Exception:
_logger.exception("Failed updating KPI values")
-
+
return res
_columns = {
'name': fields.char('Name', size=50, required=True),
'description': fields.text('Description'),
- 'category_id': fields.many2one('mgmtsystem.kpi.category','Category', required=True),
- 'threshold_id': fields.many2one('mgmtsystem.kpi.threshold','Threshold', required=True),
+ 'category_id': fields.many2one('mgmtsystem.kpi.category', 'Category', required=True),
+ 'threshold_id': fields.many2one('mgmtsystem.kpi.threshold', 'Threshold', required=True),
'periodicity': fields.integer('Periodicity'),
- 'periodicity_uom': fields.selection((('hour','Hour'), ('day','Day'), ('week','Week'), ('month','Month')), 'Periodicity UoM', required=True),
+ 'periodicity_uom': fields.selection((('hour', 'Hour'), ('day', 'Day'), ('week', 'Week'), ('month', 'Month')), 'Periodicity UoM', required=True),
'next_execution_date': fields.datetime('Next execution date', readonly=True),
'value': fields.function(_display_last_kpi_value, string='Value', type='float'),
- 'kpi_type': fields.selection((('python','Python'), ('local','SQL - Local DB'), ('external','SQL - External DB')),'KPI Computation Type'),
- 'dbsource_id': fields.many2one('base.external.dbsource','External DB Source'),
+ 'kpi_type': fields.selection((('python', 'Python'), ('local', 'SQL - Local DB'), ('external', 'SQL - External DB')), 'KPI Computation Type'),
+ 'dbsource_id': fields.many2one('base.external.dbsource', 'External DB Source'),
'kpi_code': fields.text('KPI Code', help='SQL code must return the result as \'value\' (i.e. \'SELECT 5 AS value\').'),
'history_ids': fields.one2many('mgmtsystem.kpi.history', 'kpi_id', 'History'),
'active': fields.boolean('Active', help="Only active KPIs will be updated by the scheduler based on the periodicity configuration."),
@@ -381,6 +379,4 @@
'periodicity_uom': 'day',
}
-mgmtsystem_kpi()
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'mgmtsystem_manuals/__openerp__.py'
--- mgmtsystem_manuals/__openerp__.py 2013-08-28 15:12:07 +0000
+++ mgmtsystem_manuals/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -19,23 +19,30 @@
#
##############################################################################
{
- "name" : "Management System - Manual",
- "version" : "1.1",
- "author" : "Savoir-faire Linux",
- "website" : "http://www.savoirfairelinux.com";,
- "license" : "AGPL-3",
- "category" : "Management System",
+ "name": "Management System - Manual",
+ "version": "1.1",
+ "author": "Savoir-faire Linux",
+ "website": "http://www.savoirfairelinux.com";,
+ "license": "AGPL-3",
+ "category": "Management System",
"description": """
This module adds a menu item "Manual" and is a dependency of:
* document_page_environment_manual
* document_page_health_safety_manual
* mgmtsystem_quality
""",
+<<<<<<< TREE
"depends" : ['document_page', 'mgmtsystem'],
"data" : ['mgmtsystem_manuals.xml'],
"demo" : [],
"installable" : True,
"certificate" : ''
+=======
+ "depends": ['document_page_approval', 'mgmtsystem'],
+ "data": ['mgmtsystem_manuals.xml'],
+ "demo": [],
+ "installable": True,
+ "certificate": ''
+>>>>>>> MERGE-SOURCE
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== modified file 'mgmtsystem_nonconformity/__openerp__.py'
--- mgmtsystem_nonconformity/__openerp__.py 2013-08-26 03:22:45 +0000
+++ mgmtsystem_nonconformity/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -19,23 +19,23 @@
#
##############################################################################
{
- "name" : "Management System - Nonconformity",
- "version" : "1.1",
- "author" : "Savoir-faire Linux",
- "website" : "http://www.savoirfairelinux.com";,
- "license" : "AGPL-3",
- "category" : "Management System",
+ "name": "Management System - Nonconformity",
+ "version": "1.1",
+ "author": "Savoir-faire Linux",
+ "website": "http://www.savoirfairelinux.com";,
+ "license": "AGPL-3",
+ "category": "Management System",
"description": """\
-This module enables you to manage the nonconformities of your management
-system : quality (ISO9001), environment (ISO14001) or security (ISO27001).
+This module enables you to manage the nonconformities of your management
+system : quality (ISO9001), environment (ISO14001) or security (ISO27001).
WARNING: when upgrading from v0.1, data conversion is required, since there are subtancial changes to the data structure.
""",
- "depends" : [
+ "depends": [
'mgmtsystem_action',
'document_page_procedure',
],
- "data" : [
+ "data": [
'security/ir.model.access.csv',
'security/mgmtsystem_nonconformity_security.xml',
'mgmtsystem_nonconformity.xml',
@@ -44,10 +44,9 @@
'board_mgmtsystem_nonconformity.xml',
'mgmtsystem_nonconformity_data.xml',
],
- "demo" : [
+ "demo": [
'demo_nonconformity.xml',
],
- "installable" : True,
+ "installable": True,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== modified file 'mgmtsystem_nonconformity/mgmtsystem_nonconformity.py'
--- mgmtsystem_nonconformity/mgmtsystem_nonconformity.py 2013-09-05 20:36:23 +0000
+++ mgmtsystem_nonconformity/mgmtsystem_nonconformity.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -27,17 +27,18 @@
from tools import DEFAULT_SERVER_DATETIME_FORMAT as DATETIME_FORMAT
from tools import DEFAULT_SERVER_DATE_FORMAT as DATE_FORMAT
+
class mgmtsystem_nonconformity_cause(orm.Model):
"""
Cause of the nonconformity of the management system
"""
_name = "mgmtsystem.nonconformity.cause"
_description = "Cause of the nonconformity of the management system"
- _order = 'parent_id, sequence'
+ _order = 'parent_id, sequence'
def name_get(self, cr, uid, ids, context=None):
ids = ids or []
- reads = self.read(cr, uid, ids, ['name','parent_id'], context=context)
+ reads = self.read(cr, uid, ids, ['name', 'parent_id'], context=context)
res = []
for record in reads:
name = record['name']
@@ -45,7 +46,7 @@
name = record['parent_id'][1]+' / '+name
res.append((record['id'], name))
return res
-
+
def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
res = self.name_get(cr, uid, ids, context=context)
return dict(res)
@@ -73,11 +74,11 @@
"""
_name = "mgmtsystem.nonconformity.origin"
_description = "Origin of nonconformity of the management system"
- _order = 'parent_id, sequence'
+ _order = 'parent_id, sequence'
def name_get(self, cr, uid, ids, context=None):
ids = ids or []
- reads = self.read(cr, uid, ids, ['name','parent_id'], context=context)
+ reads = self.read(cr, uid, ids, ['name', 'parent_id'], context=context)
res = []
for record in reads:
name = record['name']
@@ -85,7 +86,7 @@
name = record['parent_id'][1]+' / '+name
res.append((record['id'], name))
return res
-
+
def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
res = self.name_get(cr, uid, ids, context=context)
return dict(res)
@@ -127,11 +128,12 @@
('done', _('Closed')),
('cancel', _('Cancelled')),
]
-_STATES_DICT = dict(_STATES)
+_STATES_DICT = dict(_STATES)
+
class mgmtsystem_nonconformity(orm.Model):
"""
- Management System - Nonconformity
+ Management System - Nonconformity
"""
_name = "mgmtsystem.nonconformity"
_description = "Nonconformity of the management system"
@@ -152,35 +154,32 @@
'date': fields.date('Date', required=True),
'partner_id': fields.many2one('res.partner', 'Partner', required=True),
'reference': fields.char('Related to', size=50),
- 'responsible_user_id': fields.many2one('res.users','Responsible', required=True),
- 'manager_user_id': fields.many2one('res.users','Manager', required=True),
- 'author_user_id': fields.many2one('res.users','Filled in by', required=True),
- 'origin_ids': fields.many2many('mgmtsystem.nonconformity.origin','mgmtsystem_nonconformity_origin_rel', 'nonconformity_id', 'origin_id', 'Origin', required=True),
- 'procedure_ids': fields.many2many('document.page','mgmtsystem_nonconformity_procedure_rel', 'nonconformity_id', 'procedure_id', 'Procedure'),
+ 'responsible_user_id': fields.many2one('res.users', 'Responsible', required=True),
+ 'manager_user_id': fields.many2one('res.users', 'Manager', required=True),
+ 'author_user_id': fields.many2one('res.users', 'Filled in by', required=True),
+ 'origin_ids': fields.many2many('mgmtsystem.nonconformity.origin', 'mgmtsystem_nonconformity_origin_rel', 'nonconformity_id', 'origin_id', 'Origin', required=True),
+ 'procedure_ids': fields.many2many('document.page', 'mgmtsystem_nonconformity_procedure_rel', 'nonconformity_id', 'procedure_id', 'Procedure'),
'description': fields.text('Description', required=True),
'state': fields.selection(_STATES, 'State', readonly=True),
'state_name': fields.function(_state_name, string='State Description', type='char', size=40),
'system_id': fields.many2one('mgmtsystem.system', 'System'),
- 'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
+ 'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', domain=[('model', '=', _name)]),
#2. Root Cause Analysis
- 'cause_ids': fields.many2many('mgmtsystem.nonconformity.cause','mgmtsystem_nonconformity_cause_rel', 'nonconformity_id', 'cause_id', 'Cause'),
+ 'cause_ids': fields.many2many('mgmtsystem.nonconformity.cause', 'mgmtsystem_nonconformity_cause_rel', 'nonconformity_id', 'cause_id', 'Cause'),
'severity_id': fields.many2one('mgmtsystem.nonconformity.severity', 'Severity'),
'analysis': fields.text('Analysis'),
- 'immediate_action_id': fields.many2one('mgmtsystem.action', 'Immediate action',
- domain="[('nonconformity_id','=',id)]"),
+ 'immediate_action_id': fields.many2one('mgmtsystem.action', 'Immediate action', domain="[('nonconformity_id', '=', id)]"),
'analysis_date': fields.datetime('Analysis Date', readonly=True),
- 'analysis_user_id': fields.many2one('res.users','Analysis by', readonly=True),
+ 'analysis_user_id': fields.many2one('res.users', 'Analysis by', readonly=True),
#3. Action Plan
'action_ids': fields.many2many('mgmtsystem.action', 'mgmtsystem_nonconformity_action_rel', 'nonconformity_id', 'action_id', 'Actions'),
'actions_date': fields.datetime('Action Plan Date', readonly=True),
- 'actions_user_id': fields.many2one('res.users','Action Plan by', readonly=True),
- 'action_comments': fields.text('Action Plan Comments',
- help="Comments on the action plan."),
+ 'actions_user_id': fields.many2one('res.users', 'Action Plan by', readonly=True),
+ 'action_comments': fields.text('Action Plan Comments', help="Comments on the action plan."),
#4. Effectiveness Evaluation
'evaluation_date': fields.datetime('Evaluation Date', readonly=True),
- 'evaluation_user_id': fields.many2one('res.users','Evaluation by', readonly=True),
- 'evaluation_comments': fields.text('Evaluation Comments',
- help="Conclusions from the last effectiveness evaluation."),
+ 'evaluation_user_id': fields.many2one('res.users', 'Evaluation by', readonly=True),
+ 'evaluation_comments': fields.text('Evaluation Comments', help="Conclusions from the last effectiveness evaluation."),
# Multi-company
'company_id': fields.many2one('res.company', 'Company'),
}
@@ -213,7 +212,7 @@
raise orm.except_orm(_('Error !'), _('Analysis is already approved.'))
if not o.analysis:
raise orm.except_orm(_('Error !'), _('Please provide an analysis before approving.'))
- vals = {'analysis_date': time.strftime(DATETIME_FORMAT), 'analysis_user_id': uid }
+ vals = {'analysis_date': time.strftime(DATETIME_FORMAT), 'analysis_user_id': uid}
self.write(cr, uid, ids, vals, context=context)
self.message_post(cr, uid, self.browse(cr, uid, ids, context=context), _('Analysis Approved'))
return True
@@ -235,7 +234,7 @@
raise orm.except_orm(_('Error !'), _('Action plan is already approved.'))
if not self.browse(cr, uid, ids, context=context)[0].analysis_date:
raise orm.except_orm(_('Error !'), _('Analysis approved before the review confirmation.'))
- vals = {'actions_date': time.strftime(DATETIME_FORMAT), 'actions_user_id': uid }
+ vals = {'actions_date': time.strftime(DATETIME_FORMAT), 'actions_user_id': uid}
self.write(cr, uid, ids, vals, context=context)
self.message_post(cr, uid, self.browse(cr, uid, ids, context=context), _('Action Plan Approved'))
return True
@@ -259,7 +258,7 @@
o = self.browse(cr, uid, ids, context=context)[0]
if o.state != 'open':
raise orm.except_orm(_('Error !'), _('This action can only be done in the In Progress state.'))
- vals = {'evaluation_date': time.strftime(DATETIME_FORMAT), 'evaluation_user_id': uid }
+ vals = {'evaluation_date': time.strftime(DATETIME_FORMAT), 'evaluation_user_id': uid}
self.write(cr, uid, ids, vals, context=context)
self.message_post(cr, uid, self.browse(cr, uid, ids, context=context), _('Effectiveness Evaluation Approved'))
return True
@@ -286,11 +285,11 @@
"""Reset to Draft and restart the workflows"""
wf_service = netsvc.LocalService("workflow")
for id in ids:
- res = wf_service.trg_create(uid, self._name, id, cr)
+ wf_service.trg_create(uid, self._name, id, cr)
self.message_post(cr, uid, self.browse(cr, uid, ids, context=context), _('Draft'))
vals = {
'state': 'draft',
- 'analysis_date': None, 'analysis_user_id': None,
+ 'analysis_date': None, 'analysis_user_id': None,
'actions_date': None, 'actions_user_id': None,
'evaluation_date': None, 'evaluation_user_id': None,
}
=== modified file 'mgmtsystem_nonconformity/migrations/7.0.1.0/post-migration.py'
--- mgmtsystem_nonconformity/migrations/7.0.1.0/post-migration.py 2013-04-01 19:13:26 +0000
+++ mgmtsystem_nonconformity/migrations/7.0.1.0/post-migration.py 2013-09-09 21:19:34 +0000
@@ -19,12 +19,11 @@
#
##############################################################################
-import os
-from osv import osv
import logging
logger = logging.getLogger('upgrade')
+
def migrate(cr, version):
logger.info("Migrating mgmtsystem_nonconformity from version %s", version)
cr.execute("select count(*) from mgmtsystem_nonconformity_action_rel")
@@ -33,17 +32,17 @@
logger.info("Moving nonconformity/action relations to mgmtsystem_nonconformity_action_rel")
for action_field in ('preventive_action_id', 'immediate_action_id', 'corrective_action_id'):
cr.execute("insert into mgmtsystem_nonconformity_action_rel"
- "(nonconformity_id, action_id) "
- "(SELECT id, %s FROM "
- " mgmtsystem_nonconformity "
- "WHERE %s IS NOT NULL )" % (action_field, action_field))
+ "(nonconformity_id, action_id) "
+ "(SELECT id, %s FROM "
+ "mgmtsystem_nonconformity "
+ "WHERE %s IS NOT NULL )" % (action_field, action_field))
else:
logger.warning("Attempt to migrate nonconformity action IDs failed: migration was already done.")
logger.info("Concatening action comments into evaluation_comments")
cr.execute("update mgmtsystem_nonconformity set evaluation_comments = "
- "effectiveness_preventive || ' ' || effectiveness_immediate || ' ' || effectiveness_corrective "
- "where evaluation_comments is null")
+ "effectiveness_preventive || ' ' || effectiveness_immediate || ' ' || effectiveness_corrective "
+ "where evaluation_comments is null")
logger.info("Updating state flags")
cr.execute("update mgmtsystem_nonconformity set state = 'open' where state = 'o'")
=== modified file 'mgmtsystem_nonconformity_analytic/__openerp__.py'
--- mgmtsystem_nonconformity_analytic/__openerp__.py 2012-12-17 16:19:36 +0000
+++ mgmtsystem_nonconformity_analytic/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# Copyright (C) 2012 Daniel Reis
#
# This program is free software: you can redistribute it and/or modify
@@ -18,14 +18,13 @@
#
##############################################################################
{
- "name" : "Management System Nonconformity - Analytic Account",
- "version" : "1.0",
- "author" : "Daniel Reis",
- "category" : "Management System",
+ "name": "Management System Nonconformity - Analytic Account",
+ "version": "1.0",
+ "author": "Daniel Reis",
+ "category": "Management System",
"description": """Add Analytic Accounts / Contracts to Non Conformities""",
- "depends" : ['mgmtsystem_nonconformity', 'analytic'],
- "data" : ['mgmtsystem_nonconformity.xml'],
- "installable" : True,
+ "depends": ['mgmtsystem_nonconformity', 'analytic'],
+ "data": ['mgmtsystem_nonconformity.xml'],
+ "installable": True,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== modified file 'mgmtsystem_nonconformity_analytic/mgmtsystem_nonconformity.py'
--- mgmtsystem_nonconformity_analytic/mgmtsystem_nonconformity.py 2012-12-17 15:28:12 +0000
+++ mgmtsystem_nonconformity_analytic/mgmtsystem_nonconformity.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# Copyright (C) 2012 Daniel Reis
#
# This program is free software: you can redistribute it and/or modify
@@ -20,6 +20,7 @@
from openerp.osv import fields, orm
+
class mgmtsystem_nonconformity(orm.Model):
_inherit = "mgmtsystem.nonconformity"
_columns = {
=== modified file 'mgmtsystem_nonconformity_claim/__openerp__.py'
--- mgmtsystem_nonconformity_claim/__openerp__.py 2012-12-17 16:19:36 +0000
+++ mgmtsystem_nonconformity_claim/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# Copyright (C) 2012 Daniel Reis
#
# This program is free software: you can redistribute it and/or modify
@@ -18,28 +18,27 @@
#
##############################################################################
{
- 'name' : 'Management System - Claims and Nonconformities',
- 'version' : '1.0',
- 'author' : 'Daniel Reis',
- 'category' : 'Management System',
+ 'name': 'Management System - Claims and Nonconformities',
+ 'version': '1.0',
+ 'author': 'Daniel Reis',
+ 'category': 'Management System',
'description': """\
Extends the Nonconformity form so it can also represent NC candidates and other types of feedback, such as complaints, measurements, suggestions, etc.
-The "type" field identifies if the feedback corresponds to a nonconformity, or to other type of record, such as "best practice", "suggestion", etc.
+The "type" field identifies if the feedback corresponds to a nonconformity, or to other type of record, such as "best practice", "suggestion", etc.
-This module purpose overlaps with "mgmtsystem_claim" module, so you should use either one or the other.
+This module purpose overlaps with "mgmtsystem_claim" module, so you should use either one or the other.
It will fit best to your uses cases requiring:
* a common numbering sequence for complaints and nonconformities;
* a single point-of-entry for all management system related occurrences.
""",
- 'depends' : ['mgmtsystem_nonconformity'],
- 'data' : [
+ 'depends': ['mgmtsystem_nonconformity'],
+ 'data': [
'security/ir.model.access.csv',
'mgmtsystem_nonconformity.xml',
'mgmtsystem_nonconformity_data.xml',
],
- 'installable' : True,
- 'application' : False,
+ 'installable': True,
+ 'application': False,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== modified file 'mgmtsystem_nonconformity_claim/mgmtsystem_nonconformity.py'
--- mgmtsystem_nonconformity_claim/mgmtsystem_nonconformity.py 2012-12-17 17:08:34 +0000
+++ mgmtsystem_nonconformity_claim/mgmtsystem_nonconformity.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# Copyright (C) 2012 Daniel Reis
#
# This program is free software: you can redistribute it and/or modify
@@ -20,10 +20,11 @@
from openerp.osv import fields, orm
+
class mgmtsystem_nonconformity_type(orm.Model):
"""Claim Type: Nonconformity, Good Practice, Improvement Opportunity, Observation, ..."""
_name = "mgmtsystem.nonconformity.type"
- _description = "Claim Type"
+ _description = "Claim Type"
_columns = {
'name': fields.char('Title', size=50, required=True, translate=True),
'description': fields.text('Description', translate=True),
@@ -39,7 +40,7 @@
_inherit = "mgmtsystem.nonconformity"
_description = "Feedback and Nonconformities"
_columns = {
- 'type_id': fields.many2one('mgmtsystem.nonconformity.type','Type'),
+ 'type_id': fields.many2one('mgmtsystem.nonconformity.type', 'Type'),
}
=== modified file 'mgmtsystem_nonconformity_deptm/__openerp__.py'
--- mgmtsystem_nonconformity_deptm/__openerp__.py 2012-12-17 16:19:36 +0000
+++ mgmtsystem_nonconformity_deptm/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# Copyright (C) 2012 Daniel Reis
#
# This program is free software: you can redistribute it and/or modify
@@ -18,15 +18,14 @@
#
##############################################################################
{
- "name" : "Management System Nonconformity - Department",
- "version" : "1.0",
- "author" : "Daniel Reis",
- "category" : "Management System",
+ "name": "Management System Nonconformity - Department",
+ "version": "1.0",
+ "author": "Daniel Reis",
+ "category": "Management System",
"description": """Add Department to Non Conformities""",
- "depends" : ['mgmtsystem_nonconformity', 'hr'],
- "init" : [],
- "data" : ['mgmtsystem_nonconformity.xml'],
- "installable" : True,
+ "depends": ['mgmtsystem_nonconformity', 'hr'],
+ "init": [],
+ "data": ['mgmtsystem_nonconformity.xml'],
+ "installable": True,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== modified file 'mgmtsystem_nonconformity_deptm/mgmtsystem_nonconformity.py'
--- mgmtsystem_nonconformity_deptm/mgmtsystem_nonconformity.py 2013-04-12 15:10:42 +0000
+++ mgmtsystem_nonconformity_deptm/mgmtsystem_nonconformity.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# Copyright (C) 2012 Daniel Reis
#
# This program is free software: you can redistribute it and/or modify
@@ -20,11 +20,12 @@
from openerp.osv import fields, orm
+
class mgmtsystem_nonconformity(orm.Model):
_inherit = "mgmtsystem.nonconformity"
_columns = {
'department_id': fields.many2one('hr.department', 'Department', required=True),
- 'superior_user_id': fields.many2one('res.users','Top Manager', required=True),
+ 'superior_user_id': fields.many2one('res.users', 'Top Manager', required=True),
}
def onchange_department_id(self, cr, uid, ids, new_id, context=None):
=== modified file 'mgmtsystem_nonconformity_project/__openerp__.py'
--- mgmtsystem_nonconformity_project/__openerp__.py 2013-08-06 16:22:21 +0000
+++ mgmtsystem_nonconformity_project/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -19,26 +19,25 @@
#
##############################################################################
{
- "name" : "Management System - Project",
- "version" : "1.0",
- "author" : "Savoir-faire Linux",
- "website" : "http://www.savoirfairelinux.com";,
- "license" : "AGPL-3",
- "category" : "Management System",
+ "name": "Management System - Project",
+ "version": "1.0",
+ "author": "Savoir-faire Linux",
+ "website": "http://www.savoirfairelinux.com";,
+ "license": "AGPL-3",
+ "category": "Management System",
"description": """\
This module enables you to set a project as an action in the nonconformity.
""",
- "depends" : [
+ "depends": [
'mgmtsystem_nonconformity',
'mgmtsystem_action',
'project'
],
- "data" : [
+ "data": [
'mgmtsystem_nonconformity_project.xml',
'mgmtsystem_nonconformity_project_data.xml',
],
- "demo" : [],
- "installable" : True,
+ "demo": [],
+ "installable": True,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== modified file 'mgmtsystem_nonconformity_project/mgmtsystem_nonconformity_project.py'
--- mgmtsystem_nonconformity_project/mgmtsystem_nonconformity_project.py 2012-12-17 17:18:12 +0000
+++ mgmtsystem_nonconformity_project/mgmtsystem_nonconformity_project.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -15,12 +15,13 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from openerp.osv import fields, orm
+
class mgmtsystem_action(orm.Model):
_inherit = "mgmtsystem.action"
@@ -29,36 +30,34 @@
for t in self.name_get(cr, uid, ids, context=context):
res[t[0]] = t[1]
return res
-
+
_columns = {
#Remark - upgrade from v0.1 requires data conversion:
- # * deprecated fields: corrective_type, corrective_project_id, preventive_type,preventive_project_id
+ # * deprecated fields: corrective_type, corrective_project_id, preventive_type, preventive_project_id
# * 1 action => 1 correction action + 1 prevention action
- 'action_type': fields.selection([('action','Action'), ('project','Project')], 'Action Type', required=True),
+ 'action_type': fields.selection([('action', 'Action'), ('project', 'Project')], 'Action Type', required=True),
'project_id': fields.many2one('project.project', 'Project'),
'complete_name': fields.function(_complete_name, string='Complete Name', type='char', size=250),
- 'name': fields.char('Claim Subject', size=128, required=False), #modified: it's not always required
+ 'name': fields.char('Claim Subject', size=128),
}
_defaults = {
'action_type': 'action',
}
-
+
def name_get(self, cr, uid, ids, context=None):
if not ids:
return list()
res = list()
- project_model = self.pool.get('project.project')
for o in self.browse(cr, uid, ids, context=context):
r = (o.id, o.name)
if o.action_type == 'project' and o.project_id:
r = (o.id, o.project_id.name)
res.append(r)
return res
-
+
def _init_install(self, cr, uid):
"""Initialize current data in inherited modules."""
cr.execute("update mgmtsystem_action set action_type='action' where action_type is null")
- return True
-
+ return True
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'mgmtsystem_quality/__openerp__.py'
--- mgmtsystem_quality/__openerp__.py 2013-08-06 16:22:21 +0000
+++ mgmtsystem_quality/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -19,12 +19,12 @@
#
##############################################################################
{
- "name" : " Quality Management System",
- "version" : "1.0",
- "author" : "Savoir-faire Linux",
- "website" : "http://www.savoirfairelinux.com";,
- "license" : "AGPL-3",
- "category" : "Management System",
+ "name": " Quality Management System",
+ "version": "1.0",
+ "author": "Savoir-faire Linux",
+ "website": "http://www.savoirfairelinux.com";,
+ "license": "AGPL-3",
+ "category": "Management System",
"description": """\
This module enables you to manage your quality management system, including :
* Quality Manual
@@ -35,16 +35,15 @@
* Actions
* Employee Training
""",
- "depends" : [
+ "depends": [
'mgmtsystem_audit',
'document_page_quality_manual',
'mgmtsystem_review',
],
- "data" : ['quality.xml'],
- "demo" : [],
- "installable" : True,
- "application" : True,
- "certificate" : ''
+ "data": ['quality.xml'],
+ "demo": [],
+ "installable": True,
+ "application": True,
+ "certificate": ''
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== modified file 'mgmtsystem_review/__openerp__.py'
--- mgmtsystem_review/__openerp__.py 2013-08-26 03:22:45 +0000
+++ mgmtsystem_review/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -19,29 +19,28 @@
#
##############################################################################
{
- "name" : "Management System - Review",
- "version" : "1.0",
- "author" : "Savoir-faire Linux",
- "website" : "http://www.savoirfairelinux.com";,
- "license" : "AGPL-3",
- "category" : "Management System",
+ "name": "Management System - Review",
+ "version": "1.0",
+ "author": "Savoir-faire Linux",
+ "website": "http://www.savoirfairelinux.com";,
+ "license": "AGPL-3",
+ "category": "Management System",
"description": """\
This module enables you to manage reviews of your management system.
""",
- "depends" : [
+ "depends": [
'mgmtsystem_nonconformity',
'mgmtsystem_survey',
],
- "data" : [
+ "data": [
'security/ir.model.access.csv',
'security/mgmtsystem_review_security.xml',
'review_sequence.xml',
'mgmtsystem_review.xml',
'report/review_report.xml',
],
- "demo" : [],
- "installable" : True,
- "certificate" : ''
+ "demo": [],
+ "installable": True,
+ "certificate": ''
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== modified file 'mgmtsystem_review/mgmtsystem_review.py'
--- mgmtsystem_review/mgmtsystem_review.py 2013-08-26 03:21:52 +0000
+++ mgmtsystem_review/mgmtsystem_review.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -15,33 +15,33 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
-
-class mgmtsystem_review(osv.osv):
+from osv import fields, orm
+
+
+class mgmtsystem_review(orm.Model):
_name = "mgmtsystem.review"
_description = "Review"
_columns = {
'name': fields.char('Name', size=50, required=True),
'reference': fields.char('Reference', size=64, required=True, readonly=True),
'date': fields.datetime('Date', required=True),
- 'user_ids': fields.many2many('res.users','mgmtsystem_review_user_rel','user_id','mgmtsystem_review_id','Participants'),
- 'response_ids': fields.many2many('survey.response','mgmtsystem_review_response_rel','response_id','mgmtsystem_review_id','Survey Answers'),
+ 'user_ids': fields.many2many('res.users', 'mgmtsystem_review_user_rel', 'user_id', 'mgmtsystem_review_id', 'Participants'),
+ 'response_ids': fields.many2many('survey.response', 'mgmtsystem_review_response_rel', 'response_id', 'mgmtsystem_review_id', 'Survey Answers'),
'policy': fields.text('Policy'),
'changes': fields.text('Changes'),
- 'line_ids': fields.one2many('mgmtsystem.review.line','review_id','Lines'),
+ 'line_ids': fields.one2many('mgmtsystem.review.line', 'review_id', 'Lines'),
'conclusion': fields.text('Conclusion'),
- 'state': fields.selection([('open','Open'),('done','Closed')], 'State'),
+ 'state': fields.selection([('open', 'Open'), ('done', 'Closed')], 'State'),
'company_id': fields.many2one('res.company', 'Company'),
}
_defaults = {
'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
- 'reference': 'NEW',
+ 'reference': 'NEW',
'state': 'open'
}
@@ -54,14 +54,13 @@
def button_close(self, cr, uid, ids, context=None):
return self.write(cr, uid, ids, {'state': 'done'})
-mgmtsystem_review()
-class mgmtsystem_review_line(osv.osv):
+class mgmtsystem_review_line(orm.Model):
_name = "mgmtsystem.review.line"
_description = "Review Line"
_columns = {
- 'name': fields.char('Title',size=300, required=True),
- 'type': fields.selection((('action','Action'), ('nonconformity','Noncomformity')),'Type'),
+ 'name': fields.char('Title', size=300, required=True),
+ 'type': fields.selection((('action', 'Action'), ('nonconformity', 'Noncomformity')), 'Type'),
'action_id': fields.many2one('mgmtsystem.action', 'Action', select=True),
'nonconformity_id': fields.many2one('mgmtsystem.nonconformity', 'Nonconformity', select=True),
'decision': fields.text('Decision'),
@@ -73,6 +72,4 @@
'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
}
-mgmtsystem_review_line()
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'mgmtsystem_review/migrations/7.0.1.0/post-migration.py'
--- mgmtsystem_review/migrations/7.0.1.0/post-migration.py 2013-04-01 19:13:26 +0000
+++ mgmtsystem_review/migrations/7.0.1.0/post-migration.py 2013-09-09 21:19:34 +0000
@@ -19,17 +19,14 @@
#
##############################################################################
-import os
-from osv import osv
import logging
logger = logging.getLogger('upgrade')
+
def migrate(cr, version):
logger.info("Migrating mgmtsystem_review from version %s", version)
-
logger.info("Updating state flags")
cr.execute("update mgmtsystem_review set state = 'open' where state = 'o'")
cr.execute("update mgmtsystem_review set state = 'done' where state = 'c'")
-
logger.info("mgmtsystem_review update... done!")
=== modified file 'mgmtsystem_review/report/review_report.py'
--- mgmtsystem_review/report/review_report.py 2012-12-17 17:18:12 +0000
+++ mgmtsystem_review/report/review_report.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -15,13 +15,14 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import time
from report import report_sxw
+
class mgmtsystem_review_report(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
super(mgmtsystem_review_report, self).__init__(cr, uid, name, context)
=== modified file 'mgmtsystem_review_audittrail/__init__.py'
--- mgmtsystem_review_audittrail/__init__.py 2013-03-04 14:58:34 +0000
+++ mgmtsystem_review_audittrail/__init__.py 2013-09-09 21:19:34 +0000
@@ -1,2 +1,2 @@
# -*- coding: utf-8 -*-
-# empty
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'mgmtsystem_review_audittrail/__openerp__.py'
--- mgmtsystem_review_audittrail/__openerp__.py 2013-03-04 14:58:34 +0000
+++ mgmtsystem_review_audittrail/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -26,7 +26,7 @@
"license": "AGPL-3",
"category": "Management System",
"description": """\
-Adds rule to track changes to Management System Reviews, if Audit Trail module
+Adds rule to track changes to Management System Reviews, if Audit Trail module
is installed.
""",
"depends": ['mgmtsystem_review', 'audittrail'],
=== modified file 'mgmtsystem_survey/__openerp__.py'
--- mgmtsystem_survey/__openerp__.py 2013-08-06 16:22:21 +0000
+++ mgmtsystem_survey/__openerp__.py 2013-09-09 21:19:34 +0000
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
#
@@ -19,18 +19,17 @@
#
##############################################################################
{
- "name" : "Management System - Survey",
- "version" : "1.0",
- "author" : "Savoir-faire Linux",
- "website" : "http://www.savoirfairelinux.com";,
- "license" : "AGPL-3",
- "category" : "Management System",
+ "name": "Management System - Survey",
+ "version": "1.0",
+ "author": "Savoir-faire Linux",
+ "website": "http://www.savoirfairelinux.com";,
+ "license": "AGPL-3",
+ "category": "Management System",
"description": """This module enables you to manage your satisfaction surveys and its answers.""",
- "depends" : ['survey'],
- "data" : ['mgmtsystem_survey.xml',],
- "demo" : [],
- "installable" : True,
- "certificate" : ''
+ "depends": ['survey'],
+ "data": ['mgmtsystem_survey.xml'],
+ "demo": [],
+ "installable": True,
+ "certificate": ''
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
Follow ups
