From b277d95dabfa173a12db061b60f04310d6cd87bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Mon, 10 Mar 2014 20:23:19 +0100
Subject: [PATCH] Improve sale mount computation and remove total from list
 view

issue3738
review3941005
---
 purchase.py            | 20 +++++++++++++++-----
 view/purchase_tree.xml |  1 -
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/purchase.py b/purchase.py
index 55167cbc73..a0ef560eda 100644
--- a/purchase.py
+++ b/purchase.py
@@ -442,21 +442,31 @@ class Purchase(Workflow, ModelSQL, ModelView):
         tax_amount = {}
         total_amount = {}
 
+        if {'tax_amount', 'total_amount'} & set(names):
+            compute_taxes = True
+        else:
+            compute_taxes = False
+        # Sort cached first and re-instanciate to optimize cache management
+        purchases = sorted(purchases,
+            key=lambda p: p.state in cls._states_cached, reverse=True)
+        purchases = cls.browse(purchases)
         for purchase in purchases:
             if (purchase.state in cls._states_cached
                     and purchase.untaxed_amount_cache is not None
                     and purchase.tax_amount_cache is not None
                     and purchase.total_amount_cache is not None):
                 untaxed_amount[purchase.id] = purchase.untaxed_amount_cache
-                tax_amount[purchase.id] = purchase.tax_amount_cache
-                total_amount[purchase.id] = purchase.total_amount_cache
+                if compute_taxes:
+                    tax_amount[purchase.id] = purchase.tax_amount_cache
+                    total_amount[purchase.id] = purchase.total_amount_cache
             else:
                 untaxed_amount[purchase.id] = sum(
                     (line.amount for line in purchase.lines
                         if line.type == 'line'), _ZERO)
-                tax_amount[purchase.id] = purchase.get_tax_amount()
-                total_amount[purchase.id] = (
-                    untaxed_amount[purchase.id] + tax_amount[purchase.id])
+                if compute_taxes:
+                    tax_amount[purchase.id] = purchase.get_tax_amount()
+                    total_amount[purchase.id] = (
+                        untaxed_amount[purchase.id] + tax_amount[purchase.id])
 
         result = {
             'untaxed_amount': untaxed_amount,
diff --git a/view/purchase_tree.xml b/view/purchase_tree.xml
index 4f16d6c6cb..6e62f5215a 100644
--- a/view/purchase_tree.xml
+++ b/view/purchase_tree.xml
@@ -9,7 +9,6 @@ this repository contains the full copyright notices and license terms. -->
     <field name="warehouse"/>
     <field name="currency"/>
     <field name="untaxed_amount"/>
-    <field name="total_amount"/>
     <field name="state"/>
     <field name="invoice_state"/>
     <field name="shipment_state"/>