diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index c15c2e670e3..b7fb9766bf1 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -122,17 +122,20 @@ class account_invoice_report(osv.osv):
                         left join account_invoice as a ON (a.move_id=aml.move_id)
                         left join account_invoice_line as l ON (a.id=l.invoice_id)
                         where a.id=ai.id)) as delay_to_pay,
-                    sum(case when ai.type in ('out_refund','in_invoice') then
-                         ai.residual * -1
-                        else
-                         ai.residual
-                        end) as residual
+                    (case when ai.type in ('out_refund','in_invoice') then
+                      ai.residual * -1
+                    else
+                      ai.residual
+                    end)/(select count(l.*) from account_invoice_line as l
+                            left join account_invoice as a ON (a.id=l.invoice_id)
+                            where a.id=ai.id) as residual
                 from account_invoice_line as ail
                 left join account_invoice as ai ON (ai.id=ail.invoice_id)
                 left join product_template pt on (pt.id=ail.product_id)
                 left join product_uom u on (u.id=ail.uos_id)
                 group by ail.product_id,
                     ai.date_invoice,
+                    ai.id,
                     to_char(ai.date_invoice, 'YYYY'),
                     to_char(ai.date_invoice, 'MM'),
                     to_char(ai.date_invoice, 'YYYY-MM-DD'),
@@ -153,7 +156,8 @@ class account_invoice_report(osv.osv):
                     ai.address_contact_id,
                     ai.address_invoice_id,
                     ai.account_id,
-                    ai.partner_bank
+                    ai.partner_bank,
+                    ai.residual
             )
         """)
 account_invoice_report()
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index b947f9d5f6a..ee9ee498365 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -32,7 +32,7 @@
                 <field name="reconciled"  sum="# Reconciled"/>
                 <field name="price_average" avg="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
-                <field name="residual"  sum="Total Residual"/>
+                <field name="residual"  sum="Total Residual" invisible="not context.get('residual_visible',False)"/>
                 <field name="delay_to_pay"  avg="Avg. Delay To Pay"/>
             </tree>
         </field>
@@ -93,24 +93,24 @@
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
-                    <filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
-                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                    <filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id','residual_visible':True}"/>
+                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id','residual_visible':True}"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
                     <separator orientation="vertical"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state','residual_visible':True}"/>
+                    <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type','residual_visible':True}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
-                    <filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_id'}"/>
+                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id','residual_visible':True}"/>
+                    <filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_id','residual_visible':True}"/>
                     <separator orientation="vertical"/>
                     <filter string="Category of Product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
-                    <filter string="Force Period" icon="terp-go-month" context="{'group_by':'period_id'}"/>
+                    <filter string="Force Period" icon="terp-go-month" context="{'group_by':'period_id','residual_visible':True}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id','residual_visible':True}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}"/>
-                    <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}"/>
-                    <filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year'}"/>
+                    <filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day','residual_visible':True}"/>
+                    <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month','residual_visible':True}"/>
+                    <filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year','residual_visible':True}"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..." groups="base.group_extended">