diff options
| author | Thibault Delavallée <tde@openerp.com> | 2014-04-09 13:54:39 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2014-04-09 13:54:39 +0200 |
| commit | 5d4d42903436d492efa0e03cca6ad8fe098082d4 (patch) | |
| tree | f400383820b0ca8d964c17c958e64cd4677944cc | |
| parent | 1aee6d631b1c8f54f6734b1911d0e55942d4f875 (diff) | |
[CLEAN] website_forum: cleaned manifests before merging
bzr revid: tde@openerp.com-20140409115439-jflj09sdvc3d19hv
| -rw-r--r-- | addons/website_forum/__init__.py | 2 | ||||
| -rw-r--r-- | addons/website_forum/__openerp__.py | 22 |
2 files changed, 14 insertions, 10 deletions
diff --git a/addons/website_forum/__init__.py b/addons/website_forum/__init__.py index 708d6ce4669..7190ada2d28 100644 --- a/addons/website_forum/__init__.py +++ b/addons/website_forum/__init__.py @@ -2,7 +2,7 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>). +# Copyright (C) 2014-Today OpenERP SA (<http://www.openerp.com>). # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/addons/website_forum/__openerp__.py b/addons/website_forum/__openerp__.py index a335e8fc971..8b33c11995b 100644 --- a/addons/website_forum/__openerp__.py +++ b/addons/website_forum/__openerp__.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- -# -*- coding: utf-8 -*- ############################################################################## # # OpenERP, Open Source Management Solution -# Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>). +# Copyright (C) 2014-Today OpenERP SA (<http://www.openerp.com>). # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -29,16 +28,21 @@ Ask questions, get answers, no distractions """, 'author': 'OpenERP SA', - 'depends': ['website', 'website_mail', 'gamification', 'website_partner', 'auth_signup'], + 'depends': [ + 'auth_signup', + 'gamification', + 'website_mail', + 'website_partner' + ], 'data': [ - 'data/forum_data.xml', - 'views/website_forum.xml', - 'security/ir.model.access.csv', - 'security/website_forum.xml', - 'data/forum_badges_data.xml', + 'data/forum_data.xml', + 'views/website_forum.xml', + 'security/ir.model.access.csv', + 'security/website_forum.xml', + 'data/forum_badges_data.xml', ], 'qweb': [ - 'static/src/xml/*.xml' + 'static/src/xml/*.xml' ], 'demo': [ 'data/forum_demo.xml', |