Merge lp:~ajite/openobject-addons/elico-7.0-add-0001 into lp:~openerp-community/openobject-addons/elico-7.0

Status: Merged
Approved by: LIN Yu
Approved revision: no longer in the source branch.
Merged at revision: 22
Proposed branch: lp:~ajite/openobject-addons/elico-7.0-add-0001
Merge into: lp:~openerp-community/openobject-addons/elico-7.0
Diff against target: 80 lines (+61/-0)
3 files modified
web_adblock/__init__.py (+21/-0)
web_adblock/__openerp__.py (+37/-0)
web_adblock/static/src/js/announcement.js (+3/-0)
To merge this branch: bzr merge lp:~ajite/openobject-addons/elico-7.0-add-0001
Reviewer Review Type Date Requested Status
LIN Yu Approve
Alexandre Boily Approve
Review via email: mp+200167@code.launchpad.net

Commit message

[ADD] New web module named adblock

Description of the change

Added a new web module named adblock which removes the OpenERP announcement bar.

To post a comment you must log in.
Revision history for this message
Alexandre Boily (alexandre-boily) :
review: Approve
Revision history for this message
LIN Yu (lin-yu) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'web_adblock'
2=== added file 'web_adblock/__init__.py'
3--- web_adblock/__init__.py 1970-01-01 00:00:00 +0000
4+++ web_adblock/__init__.py 2013-12-30 02:34:00 +0000
5@@ -0,0 +1,21 @@
6+# -*- coding: utf-8 -*-
7+##############################################################################
8+#
9+# OpenERP, Open Source Management Solution
10+# Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
11+# Augustin Cisterne-Kaas <augustin.cisterne-kaaas@elico-corp.com>
12+#
13+# This program is free software: you can redistribute it and/or modify
14+# it under the terms of the GNU Affero General Public License as
15+# published by the Free Software Foundation, either version 3 of the
16+# License, or (at your option) any later version.
17+#
18+# This program is distributed in the hope that it will be useful,
19+# but WITHOUT ANY WARRANTY; without even the implied warranty of
20+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21+# GNU Affero General Public License for more details.
22+#
23+# You should have received a copy of the GNU Affero General Public License
24+# along with this program. If not, see <http://www.gnu.org/licenses/>.
25+#
26+##############################################################################
27
28=== added file 'web_adblock/__openerp__.py'
29--- web_adblock/__openerp__.py 1970-01-01 00:00:00 +0000
30+++ web_adblock/__openerp__.py 2013-12-30 02:34:00 +0000
31@@ -0,0 +1,37 @@
32+# -*- coding: utf-8 -*-
33+##############################################################################
34+#
35+# OpenERP, Open Source Management Solution
36+# Copyright (c) 2010-2013 Elico Corp. All Rights Reserved.
37+# Augustin Cisterne-Kaas <augustin.cisterne-kaaas@elico-corp.com>
38+#
39+# This program is free software: you can redistribute it and/or modify
40+# it under the terms of the GNU Affero General Public License as
41+# published by the Free Software Foundation, either version 3 of the
42+# License, or (at your option) any later version.
43+#
44+# This program is distributed in the hope that it will be useful,
45+# but WITHOUT ANY WARRANTY; without even the implied warranty of
46+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
47+# GNU Affero General Public License for more details.
48+#
49+# You should have received a copy of the GNU Affero General Public License
50+# along with this program. If not, see <http://www.gnu.org/licenses/>.
51+#
52+##############################################################################
53+{
54+ 'name': 'OpenERP Adblock',
55+ 'version': '0.1',
56+ 'category': '',
57+ 'depends': ['mail'],
58+ 'author': 'Elico Corp',
59+ 'license': 'AGPL-3',
60+ 'website': 'https://www.elico-corp.com',
61+ 'description': """
62+ Module which hides the OpenERP announcement bar.
63+ """,
64+ 'images': [],
65+ 'js': ['static/src/js/announcement.js'],
66+ 'installable': True,
67+ 'application': False,
68+}
69
70=== added directory 'web_adblock/static'
71=== added directory 'web_adblock/static/src'
72=== added directory 'web_adblock/static/src/js'
73=== added file 'web_adblock/static/src/js/announcement.js'
74--- web_adblock/static/src/js/announcement.js 1970-01-01 00:00:00 +0000
75+++ web_adblock/static/src/js/announcement.js 2013-12-30 02:34:00 +0000
76@@ -0,0 +1,3 @@
77+openerp_announcement = function(instance) {
78+
79+};
80\ No newline at end of file