From 08358e0720356425d6cad7753375a87310a79473 Mon Sep 17 00:00:00 2001 From: rona Date: Tue, 20 Oct 2015 15:43:05 +0800 Subject: [PATCH 01/12] add module website_event_baidu_map --- website_event_baidu_map/README.rst | 57 +++++++++++++++++++ website_event_baidu_map/__init__.py | 21 +++++++ website_event_baidu_map/__openerp__.py | 34 +++++++++++ .../website_event_baidu_map.xml | 30 ++++++++++ 4 files changed, 142 insertions(+) create mode 100644 website_event_baidu_map/README.rst create mode 100644 website_event_baidu_map/__init__.py create mode 100644 website_event_baidu_map/__openerp__.py create mode 100644 website_event_baidu_map/website_event_baidu_map.xml diff --git a/website_event_baidu_map/README.rst b/website_event_baidu_map/README.rst new file mode 100644 index 00000000..85e6f880 --- /dev/null +++ b/website_event_baidu_map/README.rst @@ -0,0 +1,57 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :alt: License + +website_event_baidu_map +======================= + +This module replace google map with baidu map of the website event module. The address is only based on street field. + +Installation +============ + +To install this module, you need to: + + * have basic modules installed (website, base, website_event) + +Configuration +============= + +To configure this module, you need to: + + * No specific configuration needed. + +Usage +===== + + +For further information, please visit: + + * https://www.odoo.com/forum/help-1 + +Known issues / Roadmap +====================== + + +Credits +======= + + +Contributors +------------ + +* Liu Lixia + +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. \ No newline at end of file diff --git a/website_event_baidu_map/__init__.py b/website_event_baidu_map/__init__.py new file mode 100644 index 00000000..f164d0c6 --- /dev/null +++ b/website_event_baidu_map/__init__.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2010-2015 Elico Corp () +# Authors: Liu Lixia +# +# 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 . +# +############################################################################## diff --git a/website_event_baidu_map/__openerp__.py b/website_event_baidu_map/__openerp__.py new file mode 100644 index 00000000..8fd8dcea --- /dev/null +++ b/website_event_baidu_map/__openerp__.py @@ -0,0 +1,34 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2010-2015 Elico Corp () +# Authors: Liu Lixia +# +# 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 . +# +############################################################################## +{'name': 'Website Event Baidu Map', + 'version': '0.1', + 'category': 'Website', + 'depends': ['website', 'base', 'website_event'], + 'author': 'Elico Corp,Odoo Community Association (OCA)', + 'license': 'AGPL-3', + 'website': 'https://www.elico-corp.com', + 'images': [], + 'demo': [], + 'data': ['website_event_baidu_map.xml', + ], + 'installable': True, + 'application': False} diff --git a/website_event_baidu_map/website_event_baidu_map.xml b/website_event_baidu_map/website_event_baidu_map.xml new file mode 100644 index 00000000..789e70b3 --- /dev/null +++ b/website_event_baidu_map/website_event_baidu_map.xml @@ -0,0 +1,30 @@ + + + + + + + + From 16160f52a3abfa06ad809496884dcf9cdbecdf2e Mon Sep 17 00:00:00 2001 From: rona Date: Fri, 4 Dec 2015 13:54:30 +0800 Subject: [PATCH 02/12] [FIX]fix the header/readme/pep8. --- website_event_baidu_map/README.rst | 36 ++++--------- website_event_baidu_map/__init__.py | 22 +------- website_event_baidu_map/__openerp__.py | 53 +++++++------------ .../website_event_baidu_map.xml | 2 - 4 files changed, 31 insertions(+), 82 deletions(-) diff --git a/website_event_baidu_map/README.rst b/website_event_baidu_map/README.rst index 85e6f880..725fbbd5 100644 --- a/website_event_baidu_map/README.rst +++ b/website_event_baidu_map/README.rst @@ -1,6 +1,8 @@ .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :alt: License + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +======================= website_event_baidu_map ======================= @@ -13,24 +15,6 @@ To install this module, you need to: * have basic modules installed (website, base, website_event) -Configuration -============= - -To configure this module, you need to: - - * No specific configuration needed. - -Usage -===== - - -For further information, please visit: - - * https://www.odoo.com/forum/help-1 - -Known issues / Roadmap -====================== - Credits ======= @@ -44,14 +28,12 @@ Contributors Maintainer ---------- -.. image:: http://odoo-community.org/logo.png - :alt: Odoo Community Association - :target: http://odoo-community.org +.. image:: https://www.elico-corp.com/logo.png +:alt: Elico Corp +:target: https://www.elico-corp.com -This module is maintained by the OCA. +This module is maintained by Elico Corporation. -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. +Elico Corporation offers consulting services to implement open source management software in SMEs, with a strong involvement in quality of service. -To contribute to this module, please visit http://odoo-community.org. \ No newline at end of file +Our headquarters are located in Shanghai with branches in Hong Kong, ShenZhen and Singapore servicing customers from Greater China, Asia Pacific, Europe, Americas, etc... \ No newline at end of file diff --git a/website_event_baidu_map/__init__.py b/website_event_baidu_map/__init__.py index f164d0c6..88a71b5c 100644 --- a/website_event_baidu_map/__init__.py +++ b/website_event_baidu_map/__init__.py @@ -1,21 +1,3 @@ # -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2010-2015 Elico Corp () -# Authors: Liu Lixia -# -# 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 . -# -############################################################################## +# © 2015 Elico corp (www.elico-corp.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/website_event_baidu_map/__openerp__.py b/website_event_baidu_map/__openerp__.py index 8fd8dcea..e983d9af 100644 --- a/website_event_baidu_map/__openerp__.py +++ b/website_event_baidu_map/__openerp__.py @@ -1,34 +1,21 @@ # -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2010-2015 Elico Corp () -# Authors: Liu Lixia -# -# 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 . -# -############################################################################## -{'name': 'Website Event Baidu Map', - 'version': '0.1', - 'category': 'Website', - 'depends': ['website', 'base', 'website_event'], - 'author': 'Elico Corp,Odoo Community Association (OCA)', - 'license': 'AGPL-3', - 'website': 'https://www.elico-corp.com', - 'images': [], - 'demo': [], - 'data': ['website_event_baidu_map.xml', - ], - 'installable': True, - 'application': False} +# © 2015 Elico corp (www.elico-corp.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +{ + 'name': 'Website Event Baidu Map', + 'version': '8.0.1.0.1', + 'category': 'Website', + 'depends': [ + 'website', + 'base', + 'website_event', + ], + 'author': 'Elico Corp', + 'license': 'AGPL-3', + 'website': 'https://www.elico-corp.com', + 'data': [ + 'website_event_baidu_map.xml', + ], + 'installable': True, + 'application': False, +} diff --git a/website_event_baidu_map/website_event_baidu_map.xml b/website_event_baidu_map/website_event_baidu_map.xml index 789e70b3..bb6a8d9e 100644 --- a/website_event_baidu_map/website_event_baidu_map.xml +++ b/website_event_baidu_map/website_event_baidu_map.xml @@ -1,7 +1,6 @@ - - From 125064122a3583c72dfb121605243b0fd2e6df2a Mon Sep 17 00:00:00 2001 From: rona Date: Fri, 4 Dec 2015 14:27:34 +0800 Subject: [PATCH 03/12] [FIX]add Bug Tracker. --- website_event_baidu_map/README.rst | 9 +++++++++ website_event_baidu_map/__openerp__.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/website_event_baidu_map/README.rst b/website_event_baidu_map/README.rst index 725fbbd5..2a69ac2d 100644 --- a/website_event_baidu_map/README.rst +++ b/website_event_baidu_map/README.rst @@ -16,6 +16,15 @@ To install this module, you need to: * have basic modules installed (website, base, website_event) +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed feedback +`here `_. + + Credits ======= diff --git a/website_event_baidu_map/__openerp__.py b/website_event_baidu_map/__openerp__.py index e983d9af..1ba53bd9 100644 --- a/website_event_baidu_map/__openerp__.py +++ b/website_event_baidu_map/__openerp__.py @@ -3,7 +3,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': 'Website Event Baidu Map', - 'version': '8.0.1.0.1', + 'version': '8.0.1.0.2', 'category': 'Website', 'depends': [ 'website', From a677f4829b75011ce8fccbe2a262277be510d235 Mon Sep 17 00:00:00 2001 From: rona Date: Fri, 4 Dec 2015 15:20:11 +0800 Subject: [PATCH 04/12] [FIX]fix the readme. --- website_event_baidu_map/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website_event_baidu_map/README.rst b/website_event_baidu_map/README.rst index 2a69ac2d..16bbf8a0 100644 --- a/website_event_baidu_map/README.rst +++ b/website_event_baidu_map/README.rst @@ -22,7 +22,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed feedback -`here `_. +`here `_. Credits From f8952252e7a5c4bbd8281fac9636290cf92f53cc Mon Sep 17 00:00:00 2001 From: rona Date: Wed, 6 Jan 2016 16:50:23 +0800 Subject: [PATCH 05/12] [IMP]make it possible that create a parameter in properties and chose http or https and also the ak. --- website_event_baidu_map/README.rst | 53 ++++++++++++------ website_event_baidu_map/__init__.py | 2 +- website_event_baidu_map/__init__.pyc | Bin 0 -> 144 bytes website_event_baidu_map/__openerp__.py | 10 ++-- website_event_baidu_map/website_baidu_map.xml | 31 ++++++++++ 5 files changed, 73 insertions(+), 23 deletions(-) create mode 100644 website_event_baidu_map/__init__.pyc create mode 100644 website_event_baidu_map/website_baidu_map.xml diff --git a/website_event_baidu_map/README.rst b/website_event_baidu_map/README.rst index 16bbf8a0..41b27992 100644 --- a/website_event_baidu_map/README.rst +++ b/website_event_baidu_map/README.rst @@ -1,28 +1,46 @@ .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 + :alt: License ======================= -website_event_baidu_map +Website Event Baidu Map ======================= -This module replace google map with baidu map of the website event module. The address is only based on street field. +This module extends the functionality of website to support baidu map in the website event page. + Installation ============ To install this module, you need to: - * have basic modules installed (website, base, website_event) + * have basic modules installed (website_event) + + +Configuration + +============= + +To configure this module, you need to: + +* Go to Settings/Parameters/System Parameters and create a record which Key must be named baidu.api and the Value like [http://api.map.baidu.com/api]?v=[2.0]&ak=[your ak]. + +Configuration +============= + +To configure this module, you need to: + + * No specific configuration needed. + +Usage +===== + +For further information, please visit: -Bug Tracker -=========== + * https://www.odoo.com/forum/help-1 -Bugs are tracked on `GitHub Issues `_. -In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed feedback -`here `_. +Known issues / Roadmap +====================== Credits @@ -33,16 +51,19 @@ Contributors ------------ * Liu Lixia +* Rona Lin Maintainer ---------- .. image:: https://www.elico-corp.com/logo.png -:alt: Elico Corp -:target: https://www.elico-corp.com + :alt: Elico Corp + :target: https://www.elico-corp.com -This module is maintained by Elico Corporation. +This module is maintained by the OCA. -Elico Corporation offers consulting services to implement open source management software in SMEs, with a strong involvement in quality of service. +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. -Our headquarters are located in Shanghai with branches in Hong Kong, ShenZhen and Singapore servicing customers from Greater China, Asia Pacific, Europe, Americas, etc... \ No newline at end of file +To contribute to this module, please visit http://odoo-community.org. diff --git a/website_event_baidu_map/__init__.py b/website_event_baidu_map/__init__.py index 88a71b5c..eb1aa3d2 100644 --- a/website_event_baidu_map/__init__.py +++ b/website_event_baidu_map/__init__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -# © 2015 Elico corp (www.elico-corp.com) +# 2016 Elico Corp (https://www.elico-corp.com). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/website_event_baidu_map/__init__.pyc b/website_event_baidu_map/__init__.pyc new file mode 100644 index 0000000000000000000000000000000000000000..9a526f3e50c3e7580f0223572b32ca08a874fcc6 GIT binary patch literal 144 zcmZSn%*&Nr&>fb{00oRd+5w1*S%5?e14FO|NW@PANHCxg#g;%Z{rrLw{rr^teEr0f zl+2RM{Jg}Rcpx)BuUNl4HK{nWBsD%MF*Bt!J~y#IKR!M)FS8^*Uaz3CgafGCCO1E& OG$+*#WJfU&GXMac;2>fE literal 0 HcmV?d00001 diff --git a/website_event_baidu_map/__openerp__.py b/website_event_baidu_map/__openerp__.py index 1ba53bd9..f0dbb610 100644 --- a/website_event_baidu_map/__openerp__.py +++ b/website_event_baidu_map/__openerp__.py @@ -1,13 +1,11 @@ # -*- coding: utf-8 -*- -# © 2015 Elico corp (www.elico-corp.com) +# 2016 Elico Corp (https://www.elico-corp.com). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': 'Website Event Baidu Map', - 'version': '8.0.1.0.2', - 'category': 'Website', + 'version': '8.0.1.0.3', + 'category': 'map', 'depends': [ - 'website', - 'base', 'website_event', ], 'author': 'Elico Corp', @@ -17,5 +15,5 @@ 'website_event_baidu_map.xml', ], 'installable': True, - 'application': False, + 'application': False } diff --git a/website_event_baidu_map/website_baidu_map.xml b/website_event_baidu_map/website_baidu_map.xml new file mode 100644 index 00000000..30c79176 --- /dev/null +++ b/website_event_baidu_map/website_baidu_map.xml @@ -0,0 +1,31 @@ + + + + + + + From dbea770077d1f7d2b0d0d2f4311f332acc2f94d1 Mon Sep 17 00:00:00 2001 From: rona Date: Wed, 6 Jan 2016 17:04:40 +0800 Subject: [PATCH 06/12] [IMP]fix the issues. --- website_event_baidu_map/__openerp__.py | 2 +- website_event_baidu_map/website_baidu_map.xml | 31 ------------------- .../website_event_baidu_map.xml | 10 +++--- 3 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 website_event_baidu_map/website_baidu_map.xml diff --git a/website_event_baidu_map/__openerp__.py b/website_event_baidu_map/__openerp__.py index f0dbb610..6285fbbd 100644 --- a/website_event_baidu_map/__openerp__.py +++ b/website_event_baidu_map/__openerp__.py @@ -4,7 +4,7 @@ { 'name': 'Website Event Baidu Map', 'version': '8.0.1.0.3', - 'category': 'map', + 'category': 'Website', 'depends': [ 'website_event', ], diff --git a/website_event_baidu_map/website_baidu_map.xml b/website_event_baidu_map/website_baidu_map.xml deleted file mode 100644 index 30c79176..00000000 --- a/website_event_baidu_map/website_baidu_map.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - diff --git a/website_event_baidu_map/website_event_baidu_map.xml b/website_event_baidu_map/website_event_baidu_map.xml index bb6a8d9e..4b32cf7d 100644 --- a/website_event_baidu_map/website_event_baidu_map.xml +++ b/website_event_baidu_map/website_event_baidu_map.xml @@ -10,13 +10,14 @@ #allmap{width:100%;height:250px;} p{margin-left:5px; font-size:14px;} - +
+ From 3595c6c841e03848d99f2c59cf194b3e262a3518 Mon Sep 17 00:00:00 2001 From: Noah Wang - Elico <234082230@qq.com> Date: Mon, 19 Dec 2016 15:12:11 +0800 Subject: [PATCH 07/12] Revert "[IMP]change the api to the latest v2.0." --- website_event_baidu_map/README.rst | 53 ++++++------------ website_event_baidu_map/__init__.py | 2 +- website_event_baidu_map/__init__.pyc | Bin 144 -> 0 bytes website_event_baidu_map/__openerp__.py | 8 ++- .../website_event_baidu_map.xml | 10 ++-- 5 files changed, 26 insertions(+), 47 deletions(-) delete mode 100644 website_event_baidu_map/__init__.pyc diff --git a/website_event_baidu_map/README.rst b/website_event_baidu_map/README.rst index 41b27992..16bbf8a0 100644 --- a/website_event_baidu_map/README.rst +++ b/website_event_baidu_map/README.rst @@ -1,46 +1,28 @@ .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :alt: License + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 ======================= -Website Event Baidu Map +website_event_baidu_map ======================= -This module extends the functionality of website to support baidu map in the website event page. - +This module replace google map with baidu map of the website event module. The address is only based on street field. Installation ============ To install this module, you need to: - * have basic modules installed (website_event) - - -Configuration - -============= - -To configure this module, you need to: - -* Go to Settings/Parameters/System Parameters and create a record which Key must be named baidu.api and the Value like [http://api.map.baidu.com/api]?v=[2.0]&ak=[your ak]. - -Configuration -============= - -To configure this module, you need to: - - * No specific configuration needed. - -Usage -===== - + * have basic modules installed (website, base, website_event) -For further information, please visit: - * https://www.odoo.com/forum/help-1 +Bug Tracker +=========== -Known issues / Roadmap -====================== +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed feedback +`here `_. Credits @@ -51,19 +33,16 @@ Contributors ------------ * Liu Lixia -* Rona Lin Maintainer ---------- .. image:: https://www.elico-corp.com/logo.png - :alt: Elico Corp - :target: https://www.elico-corp.com +:alt: Elico Corp +:target: https://www.elico-corp.com -This module is maintained by the OCA. +This module is maintained by Elico Corporation. -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. +Elico Corporation offers consulting services to implement open source management software in SMEs, with a strong involvement in quality of service. -To contribute to this module, please visit http://odoo-community.org. +Our headquarters are located in Shanghai with branches in Hong Kong, ShenZhen and Singapore servicing customers from Greater China, Asia Pacific, Europe, Americas, etc... \ No newline at end of file diff --git a/website_event_baidu_map/__init__.py b/website_event_baidu_map/__init__.py index eb1aa3d2..88a71b5c 100644 --- a/website_event_baidu_map/__init__.py +++ b/website_event_baidu_map/__init__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -# 2016 Elico Corp (https://www.elico-corp.com). +# © 2015 Elico corp (www.elico-corp.com) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/website_event_baidu_map/__init__.pyc b/website_event_baidu_map/__init__.pyc deleted file mode 100644 index 9a526f3e50c3e7580f0223572b32ca08a874fcc6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmZSn%*&Nr&>fb{00oRd+5w1*S%5?e14FO|NW@PANHCxg#g;%Z{rrLw{rr^teEr0f zl+2RM{Jg}Rcpx)BuUNl4HK{nWBsD%MF*Bt!J~y#IKR!M)FS8^*Uaz3CgafGCCO1E& OG$+*#WJfU&GXMac;2>fE diff --git a/website_event_baidu_map/__openerp__.py b/website_event_baidu_map/__openerp__.py index 6285fbbd..1ba53bd9 100644 --- a/website_event_baidu_map/__openerp__.py +++ b/website_event_baidu_map/__openerp__.py @@ -1,11 +1,13 @@ # -*- coding: utf-8 -*- -# 2016 Elico Corp (https://www.elico-corp.com). +# © 2015 Elico corp (www.elico-corp.com) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': 'Website Event Baidu Map', - 'version': '8.0.1.0.3', + 'version': '8.0.1.0.2', 'category': 'Website', 'depends': [ + 'website', + 'base', 'website_event', ], 'author': 'Elico Corp', @@ -15,5 +17,5 @@ 'website_event_baidu_map.xml', ], 'installable': True, - 'application': False + 'application': False, } diff --git a/website_event_baidu_map/website_event_baidu_map.xml b/website_event_baidu_map/website_event_baidu_map.xml index 4b32cf7d..bb6a8d9e 100644 --- a/website_event_baidu_map/website_event_baidu_map.xml +++ b/website_event_baidu_map/website_event_baidu_map.xml @@ -10,14 +10,13 @@ #allmap{width:100%;height:250px;} p{margin-left:5px; font-size:14px;} - +
- From ec5fab4d2ea4139cb51ecf58cfdd2ee0b1c868ca Mon Sep 17 00:00:00 2001 From: elicoidal Date: Mon, 25 Mar 2019 12:45:14 +0800 Subject: [PATCH 08/12] fix flake8+pylint --- website_event_baidu_map/README.rst | 24 +++++++++++++++---- .../website_event_baidu_map.xml | 0 2 files changed, 19 insertions(+), 5 deletions(-) mode change 100644 => 100755 website_event_baidu_map/README.rst mode change 100644 => 100755 website_event_baidu_map/website_event_baidu_map.xml diff --git a/website_event_baidu_map/README.rst b/website_event_baidu_map/README.rst old mode 100644 new mode 100755 index 16bbf8a0..7d09651f --- a/website_event_baidu_map/README.rst +++ b/website_event_baidu_map/README.rst @@ -19,7 +19,7 @@ To install this module, you need to: Bug Tracker =========== -Bugs are tracked on `GitHub Issues `_. +Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed feedback `here `_. @@ -38,11 +38,25 @@ Maintainer ---------- .. image:: https://www.elico-corp.com/logo.png -:alt: Elico Corp -:target: https://www.elico-corp.com + :alt: Elico Corp + :target: https://www.elico-corp.com This module is maintained by Elico Corporation. -Elico Corporation offers consulting services to implement open source management software in SMEs, with a strong involvement in quality of service. +Elico Corp is an innovative actor in China, Hong-Kong and Singapore servicing +well known international companies and as well as local mid-sized businesses. +Since 2010, our seasoned Sino-European consultants have been providing full +range Odoo services: -Our headquarters are located in Shanghai with branches in Hong Kong, ShenZhen and Singapore servicing customers from Greater China, Asia Pacific, Europe, Americas, etc... \ No newline at end of file +* Business consultancy for Gap analysis, BPM, operational work-flows review. +* Ready-to-use ERP packages aimed at starting businesses. +* Odoo implementation for manufacturing, international trading, service industry + and e-commerce. +* Connectors and integration with 3rd party software (Magento, Taobao, Coswin, + Joomla, Prestashop, Tradevine etc...). +* Odoo Support services such as developments, training, maintenance and hosting. + +Our headquarters are located in Shanghai with branch in Singapore servicing +customers from all over Asia Pacific. + +Contact information: `Sales `__ diff --git a/website_event_baidu_map/website_event_baidu_map.xml b/website_event_baidu_map/website_event_baidu_map.xml old mode 100644 new mode 100755 From 694c6512429673ced331db4d8caba62edf0611b7 Mon Sep 17 00:00:00 2001 From: Ruter Lv Date: Mon, 8 Apr 2019 18:00:57 +0800 Subject: [PATCH 09/12] [MIG] Migrate website_event_baidu_map from 8.0 to 12.0 --- website_event_baidu_map/__init__.py | 3 -- .../{__openerp__.py => __manifest__.py} | 14 ++++------ .../views/website_event_baidu_map.xml | 24 ++++++++++++++++ .../website_event_baidu_map.xml | 28 ------------------- 4 files changed, 30 insertions(+), 39 deletions(-) rename website_event_baidu_map/{__openerp__.py => __manifest__.py} (51%) create mode 100755 website_event_baidu_map/views/website_event_baidu_map.xml delete mode 100755 website_event_baidu_map/website_event_baidu_map.xml diff --git a/website_event_baidu_map/__init__.py b/website_event_baidu_map/__init__.py index 88a71b5c..e69de29b 100644 --- a/website_event_baidu_map/__init__.py +++ b/website_event_baidu_map/__init__.py @@ -1,3 +0,0 @@ -# -*- coding: utf-8 -*- -# © 2015 Elico corp (www.elico-corp.com) -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/website_event_baidu_map/__openerp__.py b/website_event_baidu_map/__manifest__.py similarity index 51% rename from website_event_baidu_map/__openerp__.py rename to website_event_baidu_map/__manifest__.py index 1ba53bd9..120f1e94 100644 --- a/website_event_baidu_map/__openerp__.py +++ b/website_event_baidu_map/__manifest__.py @@ -1,20 +1,18 @@ -# -*- coding: utf-8 -*- -# © 2015 Elico corp (www.elico-corp.com) -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# © 2015-2019 Elico corp (www.elico-corp.com) +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). { 'name': 'Website Event Baidu Map', - 'version': '8.0.1.0.2', + 'version': '12.0.1.0.0', 'category': 'Website', 'depends': [ - 'website', - 'base', + 'website_baidu_map', 'website_event', ], 'author': 'Elico Corp', - 'license': 'AGPL-3', + 'license': 'LGPL-3', 'website': 'https://www.elico-corp.com', 'data': [ - 'website_event_baidu_map.xml', + 'views/website_event_baidu_map.xml', ], 'installable': True, 'application': False, diff --git a/website_event_baidu_map/views/website_event_baidu_map.xml b/website_event_baidu_map/views/website_event_baidu_map.xml new file mode 100755 index 00000000..f082a597 --- /dev/null +++ b/website_event_baidu_map/views/website_event_baidu_map.xml @@ -0,0 +1,24 @@ + + + + diff --git a/website_event_baidu_map/website_event_baidu_map.xml b/website_event_baidu_map/website_event_baidu_map.xml deleted file mode 100755 index bb6a8d9e..00000000 --- a/website_event_baidu_map/website_event_baidu_map.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - From ea4011afb61c957a581a28ee2a491c52d2293cff Mon Sep 17 00:00:00 2001 From: Ruter Lv Date: Fri, 12 Apr 2019 15:52:04 +0800 Subject: [PATCH 10/12] Fix cannot be located error --- website_event_baidu_map/README.rst | 10 +++------- .../views/website_event_baidu_map.xml | 6 +++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/website_event_baidu_map/README.rst b/website_event_baidu_map/README.rst index 7d09651f..8774d727 100755 --- a/website_event_baidu_map/README.rst +++ b/website_event_baidu_map/README.rst @@ -1,6 +1,6 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 +.. image:: https://img.shields.io/badge/licence-LGPL--3-blue.png + :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html + :alt: License: LGPL-3 ======================= website_event_baidu_map @@ -21,14 +21,10 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed feedback -`here `_. - Credits ======= - Contributors ------------ diff --git a/website_event_baidu_map/views/website_event_baidu_map.xml b/website_event_baidu_map/views/website_event_baidu_map.xml index f082a597..31556ed4 100755 --- a/website_event_baidu_map/views/website_event_baidu_map.xml +++ b/website_event_baidu_map/views/website_event_baidu_map.xml @@ -1,7 +1,11 @@ +