[REM] account: removing total with tax field from invoice anlysis report

bzr revid: ara@tinyerp.com-20110510115133-r34pmomampl983x5

diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index 8640072..839c9b1 100644 (file)
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -47,7 +47,6 @@ class account_invoice_report(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
         'price_total': fields.float('Total Without Tax', readonly=True),
-        'price_total_tax': fields.float('Total With Tax', readonly=True),
         'price_average': fields.float('Average Price', readonly=True, group_operator="avg"),
         'currency_rate': fields.float('Currency Rate', readonly=True),
         'nbr':fields.integer('# of Lines', readonly=True),
@@ -121,21 +120,6 @@ class account_invoice_report(osv.osv):
                           ail.price_subtotal
                         end) / cr.rate as price_total,
 
-                    sum(case when ai.type in ('out_refund','in_invoice') then
-                         -ai.amount_total
-                        else
-                         ai.amount_total
-                         end) / (CASE WHEN
-                              (select count(l.id) from account_invoice_line as l
-                               left join account_invoice as a ON (a.id=l.invoice_id)
-                               where a.id=ai.id) <> 0
-                            THEN
-                              (select count(l.id) from account_invoice_line as l
-                               left join account_invoice as a ON (a.id=l.invoice_id)
-                               where a.id=ai.id)
-                            ELSE 1
-                            END) / cr.rate as price_total_tax,
-
                     (case when ai.type in ('out_refund','in_invoice') then
                       sum(-ail.price_subtotal)
                     else

diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 3778153..963c41b 100644 (file)
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -32,7 +32,6 @@
                 <field name="product_qty" sum="Qty"/>
                 <!-- <field name="reconciled"  sum="# Reconciled"/> -->
                 <field name="price_total" sum="Total Without Tax"/>
-                <field name="price_total_tax" sum="Total With Tax"/>
                 <field name="residual"  sum="Total Residual" invisible="context.get('residual_invisible',False)"/>
                 <field name="due_delay"  sum="Avg. Due Delay" invisible="context.get('residual_invisible',False)"/>
                 <field name="delay_to_pay"  sum="Avg. Delay To Pay" invisible="context.get('residual_invisible',False)"/>