NaNtic/trytond-stock_lot_deactivatable
1
0
Fork 0
mirror of https://github.com/NaN-tic/trytond-stock_lot_deactivatable.git synced 2023-12-14 03:22:55 +01:00
Code Issues Projects Releases Wiki Activity

fix problem with grouping

Browse source
This commit is contained in:
?ngel ?lvarez 2017-06-28 12:20:03 +02:00
parent 524ee6bf8f
commit f7ed313c09
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
stock.py
View file

@ -76,10 +76,10 @@ class Move:
pool = Pool()
Lot = pool.get('stock.lot')
Period = pool.get('stock.period')
query = super(Move, cls).compute_quantities_query(
location_ids, with_childs=with_childs, grouping=grouping,
grouping_filter=grouping_filter)
if not query or 'lot' not in grouping:
return query
@ -109,6 +109,7 @@ class Move:
yield query
lot = Lot.__table__()
slot = lot.select(lot.id, lot.active)
union, = query.from_
for sub_query in find_queries(union):
# Find move table
@ -117,16 +118,16 @@ class Move:
if (isinstance(table, Table)
and table._name in tables_to_find):
new_from_list.append(
table.join(lot,
table.join(slot,
type_='LEFT',
condition=(table.lot == lot.id)))
condition=(table.lot == slot.id)))
break
found = find_table(table)
if found:
new_from_list.append(
table.join(lot,
table.join(slot,
type_='LEFT',
condition=(found.lot == lot.id)))
condition=(found.lot == slot.id)))
break
new_from_list.append(table)
else:
@ -136,5 +137,5 @@ class Move:
sub_query.from_ = From()
for new_from in new_from_list:
sub_query.from_.append(new_from)
sub_query.where &= ((lot.id == Null) | (lot.active == True))
sub_query.where &= ((slot.id == Null) | (slot.active == True))
return query