Merge pull request #142 from hbrunn/7.0-web_pytz_relativedelta_coexistence

[FIX] make it possible for web_pytz and

web_lib_moment/__init__.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2015 Therp BV <http://therp.nl>.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    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/>.
+#
+##############################################################################

web_lib_moment/__openerp__.py

@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2015 Therp BV <http://therp.nl>.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    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/>.
+#
+##############################################################################
+{
+    "name": "Moment.js for Odoo",
+    "version": "1.0",
+    "author": "Therp BV,Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "category": "Hidden/Dependency",
+    "description": '''
+Moment.js for Odoo
+==================
+
+This module contains moment.js in order for other modules to depend on it
+avoiding version clashes in case multiple modules need moment.js
+
+Credits
+=======
+
+Contributors
+------------
+
+* Holger Brunn <hbrunn@therp.nl>
+
+The actual work
+---------------
+
+* http://momentjs.com
+
+Maintainer
+----------
+
+.. image:: http://odoo-community.org/logo.png
+    :alt: Odoo Community Association
+    :target: http://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+To contribute to this module, please visit http://odoo-community.org.''',
+    "depends": [
+        'web',
+    ],
+    "js": [
+        'static/lib/moment.js',
+    ],
+    "auto_install": False,
+    "installable": True,
+    "application": False,
+    "external_dependencies": {
+        'python': [],
+    },
+}

web_pytz/__openerp__.py

@@ -53,13 +53,13 @@ which displays records changed in the user's conception of today.""",
     "category": "Dependency",
     "depends": [
         'web',
+        'web_lib_moment',
     ],
     "data": [
     ],
     "js": [
         'static/src/js/web_pytz.js',
-        'static/lib/moment.min.js',
-        'static/lib/moment-timezone.min.js',
+        'static/lib/moment-timezone.js',
     ],
     "css": [
     ],

web_relativedelta/__openerp__.py

@@ -55,11 +55,11 @@ functionality
     "category": "Dependency",
     "depends": [
         'web',
+        'web_lib_moment',
     ],
     "data": [
     ],
     "js": [
-        'static/lib/moment.js',
         'static/src/js/web_relativedelta.js'
     ],
     "css": [