diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index 2858250e86a..2cf7b104a3f 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -9,11 +9,13 @@
Indirect Sales
IM
+
Marketing
SPD
+
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index 23347988573..ed4b6c4310a 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -116,11 +116,12 @@ class crm_lead_report(osv.osv):
for group in res:
group['user_currency_probable_revenue'] = 0
group['user_currency_planned_revenue'] = 0
- group_ids = self.search(cr, uid, group.get('__domain'),context=context)
- record = self._compute_amounts_in_user_currency(cr, uid, group_ids, context=context)
- for id, rec in record.iteritems():
- group['user_currency_planned_revenue'] += rec['user_currency_planned_revenue']
- group['user_currency_probable_revenue'] += rec['user_currency_probable_revenue']
+ if group.get('__domain'):
+ group_ids = self.search(cr, uid, group.get('__domain'),context=context)
+ record = self._compute_amounts_in_user_currency(cr, uid, group_ids, context=context)
+ for id, rec in record.iteritems():
+ group['user_currency_planned_revenue'] += rec['user_currency_planned_revenue']
+ group['user_currency_probable_revenue'] += rec['user_currency_probable_revenue']
return res
def init(self, cr):
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index d2f7849a958..9b2728c1668 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -70,9 +70,9 @@ class sale_report(osv.osv):
1 as nbr,
s.date_order as date,
s.date_confirm as date_confirm,
- to_char(s.date_order, 'YYYY') as year,
- to_char(s.date_order, 'MM') as month,
- to_char(s.date_order, 'YYYY-MM-DD') as day,
+ case when (s.state='draft') then to_char(s.date_order, 'YYYY') else to_char(s.date_confirm, 'YYYY') end as year,
+ case when (s.state='draft') then to_char(s.date_order, 'MM') else to_char(s.date_confirm, 'MM') end as month,
+ case when (s.state='draft') then to_char(s.date_order, 'YYYY-MM-DD') else to_char(s.date_confirm, 'YYYY-MM-DD') end as day,
s.partner_id as partner_id,
s.user_id as user_id,
s.company_id as company_id,