diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index e89a52aa0e5..1c26e93b917 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -941,16 +941,19 @@ class calendar_event(osv.osv):
duration = 1.00
value['duration'] = duration
- if allday: # For all day event
- value = {'duration': 24.0}
- duration = 24.0
- if start_date:
- start = datetime.strptime(start_date, "%Y-%m-%d %H:%M:%S")
- start_date = datetime.strftime(datetime(start.year, start.month, start.day, 0,0,0), "%Y-%m-%d %H:%M:%S")
- value['date'] = start_date
-
-
start = datetime.strptime(start_date, "%Y-%m-%d %H:%M:%S")
+ if allday: # For all day event
+ duration = 24.0
+ value['duration'] = duration
+ # change start_date's time to 00:00:00 in the user's timezone
+ user = self.pool.get('res.users').browse(cr, uid, uid)
+ tz = pytz.timezone(user.context_tz) if user.context_tz else pytz.utc
+ start = pytz.utc.localize(start).astimezone(tz) # convert start in user's timezone
+ start = start.replace(hour=0, minute=0, second=0) # change start's time to 00:00:00
+ start = start.astimezone(pytz.utc) # convert start back to utc
+ start_date = start.strftime("%Y-%m-%d %H:%M:%S")
+ value['date'] = start_date
+
if end_date and not duration:
end = datetime.strptime(end_date, "%Y-%m-%d %H:%M:%S")
diff = end - start
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 76bb0c24cb5..642f8f7b9e9 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -136,7 +136,7 @@
+ parent="base.menu_base_config" sequence="50" groups="base.group_no_one"/>
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index cbcd5b3b3bd..b4071b62058 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -12,17 +12,11 @@
{'default_type':'lead', 'stage_type':'lead'}
<img src="http://www.thaicrmsoftware.com/wp-content/uploads/2011/11/lead-conversion.jpg" align="right" style="padding: 6px" width="306" height="223">
- <h2>Create your first OpenERP Lead </h2>
- <p>
- Leads allow you to manage and keep track of all initial contacts with a prospect or partner showing interest in your products or services.
+ <h2>Click here to create a Lead. </h2>
<p>
A lead is usually the first step in your sales cycle.
<p>
Once qualified, a lead may be converted into a business opportunity, while creating the related partner for further detailed tracking of any linked activities.
- <p>
- You can import a database of prospects, keep track of your business cards or integrate your website's contact form with the OpenERP Leads.
- <p>
- Leads can be connected to the email gateway: new emails may create leads, each of them automatically gets the history of the conversation with the prospect.
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f7bd27854f1..7fd14980a34 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -67,7 +67,7 @@
Add specific stages to leads and opportunities allowing your sales to better organise their sales pipeline. Stages will allow them to easily track how a specific lead or opportunity is positioned in the sales cycle.
-
+