[FIX] make it possible for web_pytz and

web_relativedelta to coexist by adding moment.js in its own module.

Fixes #141
pull/142/head
Holger Brunn 2015-06-03 10:31:36 +02:00
parent 5b1147ec5d
commit 98bc653495
10 changed files with 4222 additions and 2505 deletions

View File

@ -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/>.
#
##############################################################################

View File

@ -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': [],
},
}

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

View File

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

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

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

File diff suppressed because it is too large Load Diff