diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index 523d77c84e3..1fb90a86bec 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -49,6 +49,7 @@ class account_invoice_report(osv.osv):
'price_total':fields.float('Total Price', readonly=True),
'price_average':fields.float('Average Price', readonly=True),
'nbr':fields.integer('# of Lines', readonly=True),
+ 'reconciled':fields.integer('# reconciled lines', readonly=True),
'type': fields.selection([
('out_invoice','Customer Invoice'),
('in_invoice','Supplier Invoice'),
@@ -62,7 +63,7 @@ class account_invoice_report(osv.osv):
('open','Open'),
('paid','Done'),
('cancel','Cancelled')
- ], 'Order State', readonly=True),
+ ], 'Invoice State', readonly=True),
'date_due': fields.date('Due Date', readonly=True),
'address_contact_id': fields.many2one('res.partner.address', 'Contact Address Name', readonly=True),
'address_invoice_id': fields.many2one('res.partner.address', 'Invoice Address Name', readonly=True),
@@ -89,6 +90,7 @@ class account_invoice_report(osv.osv):
l.quantity * u.factor
end) as product_qty,
s.partner_id as partner_id,
+ s.reconciled::integer,
s.payment_term as payment_term,
s.period_id as period_id,
u.name as uom_name,
@@ -137,6 +139,7 @@ class account_invoice_report(osv.osv):
l.product_id,
u.name,
l.uos_id,
+ s.reconciled,
s.user_id,
s.state,
s.residual,
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 965d5078ae9..a76ccb95f3d 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -20,8 +20,6 @@
-
-
@@ -29,8 +27,11 @@
-
+
+
+
+
@@ -69,31 +70,26 @@
domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
help="Invoices during last 7 days"/>
-
+ domain="[('state','in',('draft','open'))]"
+ help = "Draft and Open Invoices"/>
-
-
-
+
+
-
@@ -101,42 +97,35 @@
-
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
+
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index 17ddf5d3024..db9837b5d0c 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -93,7 +93,10 @@ class crm_lead_report(osv.osv):
'day': fields.char('Day', size=128, readonly=True),
'email': fields.integer('# of Emails', size=128, readonly=True),
'delay_open': fields.float('Delay to open',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to open the case"),
+ 'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"),
'delay_close': fields.float('Delay to close',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
+ 'probability': fields.float('Probability',digits=(16,2),readonly=True),
+ 'planned_revenue': fields.float('Planned Revenue',digits=(16,2),readonly=True),
'categ_id': fields.many2one('crm.case.categ', 'Category',\
domain="[('section_id','=',section_id),\
('object_id.model', '=', 'crm.lead')]" , readonly=True),
@@ -132,6 +135,7 @@ class crm_lead_report(osv.osv):
to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
c.state as state,
c.user_id,
+ c.probability,
c.stage_id,
c.type as type,
c.company_id,
@@ -139,6 +143,7 @@ class crm_lead_report(osv.osv):
c.section_id,
c.categ_id,
c.partner_id,
+ c.planned_revenue,
(select 1) as nbr,
0 as avg_answers,
0.0 as perc_done,
@@ -146,6 +151,7 @@ class crm_lead_report(osv.osv):
(select count(id) from mailgate_message where thread_id=c.id) as email,
date_trunc('day',c.create_date) as create_date,
avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as delay_close,
+ avg(extract('epoch' from (c.date_deadline - c.date_closed)))/(3600*24) as delay_expected,
avg(extract('epoch' from (c.date_open-c.create_date)))/(3600*24) as delay_open
from
crm_lead c
@@ -159,8 +165,10 @@ class crm_lead_report(osv.osv):
c.id,
c.section_id,
c.stage_id,
+ c.probability,
c.categ_id,
c.partner_id,
+ c.planned_revenue,
c.company_id,
c.priority,
c.type,
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 5dd32fe349d..af5c5aeb7a6 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -26,6 +26,8 @@
+
+
@@ -167,12 +169,14 @@
-
-
-
+
+
+
+
+