diff --git a/addons/event_sale/event_demo.xml b/addons/event_sale/event_demo.xml index cd6139b82e0..5e707ade756 100644 --- a/addons/event_sale/event_demo.xml +++ b/addons/event_sale/event_demo.xml @@ -7,6 +7,8 @@ + + @@ -14,8 +16,6 @@ True - - service 2500.0 1000.0 diff --git a/addons/website_contract/__openerp__.py b/addons/website_contract/__openerp__.py index d1b26a02470..ef434effc93 100644 --- a/addons/website_contract/__openerp__.py +++ b/addons/website_contract/__openerp__.py @@ -9,7 +9,7 @@ OpenERP Blog """, 'author': 'OpenERP SA', - 'depends': ['website', 'sale', 'website_worldmap'], + 'depends': ['website', 'sale', 'website_google_map'], 'data': [ 'views/website_contract.xml', ], diff --git a/addons/website_contract/controllers/main.py b/addons/website_contract/controllers/main.py index af600cf1311..af06fbd9391 100644 --- a/addons/website_contract/controllers/main.py +++ b/addons/website_contract/controllers/main.py @@ -28,7 +28,7 @@ class website_contract(http.Controller): # public partner profile partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, domain + [('website_published', '=', True)]) - worldmap_partner_ids = ",".join([str(p) for p in partner_ids]) + google_map_partner_ids = ",".join([str(p) for p in partner_ids]) if request.uid != website.get_public_user().id: # search without website_published @@ -53,7 +53,7 @@ class website_contract(http.Controller): values = website.get_rendering_context({ 'countries': countries, 'partner_ids': partner_obj.browse(request.cr, openerp.SUPERUSER_ID, partner_ids), - 'worldmap_partner_ids': worldmap_partner_ids, + 'google_map_partner_ids': google_map_partner_ids, 'pager': pager, 'searches': post, 'search_path': "?%s" % urllib.urlencode(post), diff --git a/addons/website_contract/views/website_contract.xml b/addons/website_contract/views/website_contract.xml index 636c311ff7f..33b70ed037c 100644 --- a/addons/website_contract/views/website_contract.xml +++ b/addons/website_contract/views/website_contract.xml @@ -74,7 +74,7 @@
  • World Map
    • -
diff --git a/addons/website_crm/controllers/main.py b/addons/website_crm/controllers/main.py index a9b90f64c5a..380ba0c183b 100644 --- a/addons/website_crm/controllers/main.py +++ b/addons/website_crm/controllers/main.py @@ -22,15 +22,15 @@ class contactus(http.Controller): }) return website.render("website_crm.thanks", values) - @http.route(['/crm/worldmap/'], type='http', auth="admin") - def worldmap(self, *arg, **post): + @http.route(['/crm/google_map/'], type='http', auth="admin") + def google_map(self, *arg, **post): website = request.registry['website'] values = website.get_rendering_context() values['partner_ids'] = post.get('partner_ids', "") - return website.render("website_crm.worldmap", values) + return website.render("website_crm.google_map", values) - @http.route(['/crm/worldmap/partners.json'], type='http', auth="admin") - def worldmap_data(self, *arg, **post): + @http.route(['/crm/google_map/partners.json'], type='http', auth="admin") + def google_map_data(self, *arg, **post): website = request.registry['website'] partner_obj = request.registry['res.partner'] diff --git a/addons/website_crm_partner_assign/__openerp__.py b/addons/website_crm_partner_assign/__openerp__.py index 6dd9b5b5726..0cedea46e0e 100644 --- a/addons/website_crm_partner_assign/__openerp__.py +++ b/addons/website_crm_partner_assign/__openerp__.py @@ -9,7 +9,7 @@ OpenERP Blog """, 'author': 'OpenERP SA', - 'depends': ['website', 'website_worldmap'], + 'depends': ['website', 'website_google_map'], 'data': [ 'views/website_crm_partner_assign.xml', ], diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py index cc4af24d527..9d9992e9199 100644 --- a/addons/website_crm_partner_assign/controllers/main.py +++ b/addons/website_crm_partner_assign/controllers/main.py @@ -35,7 +35,7 @@ class website_crm_partner_assign(http.Controller): # public partner profile partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, dom_without(False) ) - worldmap_partner_ids = ",".join([str(p) for p in partner_ids]) + google_map_partner_ids = ",".join([str(p) for p in partner_ids]) # group by country @@ -59,7 +59,7 @@ class website_crm_partner_assign(http.Controller): 'countries': countries, 'grades': grades, 'partner_ids': partner_obj.browse(request.cr, openerp.SUPERUSER_ID, partner_ids), - 'worldmap_partner_ids': worldmap_partner_ids, + 'google_map_partner_ids': google_map_partner_ids, 'pager': pager, 'searches': post, 'search_path': "?%s" % urllib.urlencode(post), diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml index 974bd10bba4..c16042a9986 100644 --- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml +++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml @@ -91,7 +91,7 @@
  • World Map
    • -
diff --git a/addons/website_event/event_demo.xml b/addons/website_event/event_demo.xml new file mode 100644 index 00000000000..a471f36a039 --- /dev/null +++ b/addons/website_event/event_demo.xml @@ -0,0 +1,55 @@ + + + + + + True + OpenERP v.7 Technical Training in English (5 days) +

 

+

Course summary:

+

This course is dedicated to partners, integrators and developers who need to grasp knowledge of the OpenERP development process. This course is for new developers or for IT professionals eager to learn more about the OpenERP technical aspects.

+

 

+

Objectives:

+

Having attended this course, participants should be able to:

+
    +
  • Understand the development concepts and architecture;
    • +
  • Install and administer OpenERP;
    • +
  • Develop a new OpenERP module.
    • +
+

 

+

Our prices include:

+
    +
  • drinks and lunch;
    • +
  • training material.
    • +
+

 

+

Requirements:

+
    +
  • Bring your own laptop.
    • +
  • Participants are expected to have some knowledge in programming. A basic knowledge of the Python programming is recommended.
    • +
  • Participants preferably have a functional knowledge of the OpenERP software (see Functional Training).
    • +
+

 

+

For more information on the program, please explore http://www.openerp.com/services/technical-training.

+

If you have a question concerning the content of the training, please contact training@openerp.com.

+

 

+

Where to find us:

+

Chaussée de Namur 40, 1367 Ramillies (Belgium)

+

More information about our Headquarter office (directions, transports, parking, hotels, ...), please have a look at http://bit.ly/VD8J67.

+

 

+

Cancellation Policy: 

+

The organization of the training session has related costs. Due to these costs, cancellations made less than 2 weeks (14 calendar days) prior to the start of the training session is a subject to a fee. This fee can be up to a maximum of 1000€ per cancellation request.

+

We strongly recommend to book your flight tickets and/or hotel reservations 2 weeks prior to the training. If the training is cancelled 2 weeks in advance, you'll be notified by email.

+
 
+

For any additional information, please contact us at events@openerp.com.

+

 

+

Best regards,

+

Miss Charline Louis, OpenERP Junior Event Manager

+

 

+

(OpenERP reserves the right to cancel, re-name or re-locate
the event or change the dates on which it is held.)

+]]> + + + + diff --git a/addons/website_google_map/__init__.py b/addons/website_google_map/__init__.py new file mode 100644 index 00000000000..03fd7013e17 --- /dev/null +++ b/addons/website_google_map/__init__.py @@ -0,0 +1,2 @@ +import controllers +import website_google_map \ No newline at end of file diff --git a/addons/website_worldmap/__openerp__.py b/addons/website_google_map/__openerp__.py similarity index 73% rename from addons/website_worldmap/__openerp__.py rename to addons/website_google_map/__openerp__.py index 416f6ca45b2..ac97bd20fd8 100644 --- a/addons/website_worldmap/__openerp__.py +++ b/addons/website_google_map/__openerp__.py @@ -1,17 +1,17 @@ { - 'name': 'Website Worldmap', + 'name': 'Website Google Map', 'category': 'Website', 'summary': '', 'version': '1.0', 'description': """ -OpenERP Website Worldmap +OpenERP Website Google Map ======================== """, 'author': 'OpenERP SA', 'depends': ['website', 'crm_partner_assign'], 'data': [ - 'views/worldmap.xml', + 'views/google_map.xml', ], 'installable': True, } diff --git a/addons/website_worldmap/controllers/__init__.py b/addons/website_google_map/controllers/__init__.py similarity index 100% rename from addons/website_worldmap/controllers/__init__.py rename to addons/website_google_map/controllers/__init__.py diff --git a/addons/website_worldmap/controllers/main.py b/addons/website_google_map/controllers/main.py similarity index 84% rename from addons/website_worldmap/controllers/main.py rename to addons/website_google_map/controllers/main.py index 2e8c203244a..f2f42c41651 100644 --- a/addons/website_worldmap/controllers/main.py +++ b/addons/website_google_map/controllers/main.py @@ -7,20 +7,20 @@ import simplejson import werkzeug.wrappers from datetime import datetime -class contactus(http.Controller): +class google_map(http.Controller): - @http.route(['/worldmap/'], type='http', auth="admin") - def worldmap(self, *arg, **post): + @http.route(['/google_map/'], type='http', auth="admin") + def google_map(self, *arg, **post): website = request.registry['website'] values = website.get_rendering_context() values['partner_ids'] = post.get('partner_ids', "") values['width'] = post.get('width', 900) values['height'] = post.get('height', 460) values['partner_url'] = post.get('partner_url') - return website.render("website_worldmap.worldmap", values) + return website.render("website_google_map.google_map", values) - @http.route(['/worldmap/partners.json'], type='http', auth="admin") - def worldmap_data(self, *arg, **post): + @http.route(['/google_map/partners.json'], type='http', auth="admin") + def google_map_data(self, *arg, **post): website = request.registry['website'] partner_obj = request.registry['res.partner'] @@ -48,8 +48,8 @@ class contactus(http.Controller): body = "var data = " + "}, \n{".join(simplejson.dumps(data).split("}, {")) return werkzeug.wrappers.Response(body, headers=[('Content-Type', mime), ('Content-Length', len(body))]) - @http.route(['/worldmap/set_partner_position/'], type='http', auth="admin") - def worldmap_set_partner_position(self, *arg, **post): + @http.route(['/google_map/set_partner_position/'], type='http', auth="admin") + def google_map_set_partner_position(self, *arg, **post): website = request.registry['website'] partner_obj = request.registry['res.partner'] diff --git a/addons/website_worldmap/static/src/img/partners.png b/addons/website_google_map/static/src/img/partners.png similarity index 100% rename from addons/website_worldmap/static/src/img/partners.png rename to addons/website_google_map/static/src/img/partners.png diff --git a/addons/website_worldmap/static/src/js/worldmap.js b/addons/website_google_map/static/src/js/google_map.js similarity index 92% rename from addons/website_worldmap/static/src/js/worldmap.js rename to addons/website_google_map/static/src/js/google_map.js index 045cd2f28da..df5b7011ed7 100644 --- a/addons/website_worldmap/static/src/js/worldmap.js +++ b/addons/website_google_map/static/src/js/google_map.js @@ -14,7 +14,7 @@ function initialize(pt) { infoWindow.close(); }); - var partners = new google.maps.MarkerImage("/website_worldmap/static/src/img/partners.png",new google.maps.Size(25, 25)); + var partners = new google.maps.MarkerImage("/website_google_map/static/src/img/partners.png",new google.maps.Size(25, 25)); var markers = []; @@ -38,7 +38,7 @@ function initialize(pt) { if (status == google.maps.GeocoderStatus.OK) { var location = results[0].geometry.location; - $.post("/worldmap/set_partner_position/", { + $.post("/google_map/set_partner_position/", { 'partner_id': partner.id, 'latitude': location.ob, 'longitude': location.pb diff --git a/addons/website_worldmap/static/src/js/markerclusterer.js b/addons/website_google_map/static/src/js/markerclusterer.js similarity index 100% rename from addons/website_worldmap/static/src/js/markerclusterer.js rename to addons/website_google_map/static/src/js/markerclusterer.js diff --git a/addons/website_worldmap/static/src/js/markerclusterer_compiled.js b/addons/website_google_map/static/src/js/markerclusterer_compiled.js similarity index 100% rename from addons/website_worldmap/static/src/js/markerclusterer_compiled.js rename to addons/website_google_map/static/src/js/markerclusterer_compiled.js diff --git a/addons/website_worldmap/views/worldmap.xml b/addons/website_google_map/views/google_map.xml similarity index 71% rename from addons/website_worldmap/views/worldmap.xml rename to addons/website_google_map/views/google_map.xml index 7b4c4bc4d91..eee8f31741b 100644 --- a/addons/website_worldmap/views/worldmap.xml +++ b/addons/website_google_map/views/google_map.xml @@ -1,7 +1,7 @@ -