Presik/trytonpsk-sale_pos
1
0
Fork 0
mirror of https://bitbucket.org/presik/trytonpsk-sale_pos.git synced 2023-12-14 07:13:02 +01:00
Code Issues Projects Releases Wiki Activity

minor fix

Browse source
This commit is contained in:
wilsongomez 2022-08-04 15:12:10 -05:00
parent 5041c54d66
commit 5121f7ba76
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sale.py
View file

@ -1548,9 +1548,8 @@ class SaleByKindReport(Report):
columns = [ columns = [
invoice.shop.as_('shop_id'), invoice.shop.as_('shop_id'),
shop.name.as_('shop'), shop.name.as_('shop'),
invoice.number.as_('invoice_number')
] ]
group_by = (invoice.shop, shop.name, invoice.number) group_by = (invoice.shop, shop.name)
from_item = invoice.join( from_item = invoice.join(
shop, condition=shop.id == invoice.shop shop, condition=shop.id == invoice.shop
@ -1688,8 +1687,8 @@ class SaleByKindReport(Report):
columns = list(cursor.description) columns = list(cursor.description)
result = cursor.fetchall() result = cursor.fetchall()
for row in result: for row in result:
# key = row[0] key = row[0]
key = str(row[0]) + '_' + str(row[2]) # key = str(row[0]) + '_' + str(row[2])
if detailed: if detailed:
key = str(row[0]) + '_' + str(row[3]) key = str(row[0]) + '_' + str(row[3])
row_dict = {} row_dict = {}
@ -1700,7 +1699,6 @@ class SaleByKindReport(Report):
except: except:
totals[col.name] = row[i] totals[col.name] = row[i]
row_dict[col.name] = row[i] row_dict[col.name] = row[i]
print(row, 'row')
try: try:
records[key].update(row_dict) records[key].update(row_dict)
except: except: