tryton-do/tryton
2
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Improve sale mount computation and remove total from list view

Browse Source 
issue3738
review3941005
This commit is contained in:
Cédric Krier
2014-03-10 20:23:19 +01:00
parent 38f3a21aa7
commit b277d95dab
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
purchase.py
+15 -5
View File
@@ -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,
view/purchase_tree.xml
-1
View File
@@ -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"/>