Fix: Due to some reason, sqlalchemy on webfaction was not escaping upper case labels in sql statements. Fixed now.
This commit is contained in:
parent
c419b3ae2e
commit
17750f7721
@ -47,8 +47,8 @@ def report_id(request):
|
||||
def build_report(request, start_date, finish_date):
|
||||
report = {'StartDate': start_date, 'FinishDate': finish_date, 'Body': [], 'Footer': []}
|
||||
|
||||
sum_issue = func.sum(case([(LedgerBase.type == 2, Journal.signed_amount)], else_=0)).label('Issue')
|
||||
sum_sale = (func.sum(case([(LedgerBase.type == 3, Journal.signed_amount)], else_=0)) * -1).label('Sale')
|
||||
sum_issue = func.sum(case([(LedgerBase.type == 2, Journal.signed_amount)], else_=0)).label('issue')
|
||||
sum_sale = (func.sum(case([(LedgerBase.type == 3, Journal.signed_amount)], else_=0)) * -1).label('sale')
|
||||
|
||||
query = DBSession.query(CostCenter, sum_issue, sum_sale) \
|
||||
.join(CostCenter.journals).join(Journal.voucher).join(Journal.ledger) \
|
||||
@ -79,9 +79,9 @@ def build_report(request, start_date, finish_date):
|
||||
def build_report_id(request, cost_center_id, start_date, finish_date):
|
||||
report = {'StartDate': start_date, 'FinishDate': finish_date, 'Body': []}
|
||||
|
||||
sum_quantity = func.sum(Inventory.quantity * Journal.debit).label('Quantity')
|
||||
sum_net = func.sum(Inventory.rate * Inventory.quantity * Journal.debit).label('Net')
|
||||
sum_gross = func.sum(Inventory.amount * Journal.debit).label('Gross')
|
||||
sum_quantity = func.sum(Inventory.quantity * Journal.debit).label('quantity')
|
||||
sum_net = func.sum(Inventory.rate * Inventory.quantity * Journal.debit).label('net')
|
||||
sum_gross = func.sum(Inventory.amount * Journal.debit).label('gross')
|
||||
|
||||
query = DBSession.query(Product, sum_quantity, sum_net, sum_gross) \
|
||||
.join(Product.inventories).join(Inventory.voucher).join(Voucher.journals).join(Product.product_group) \
|
||||
|
Loading…
x
Reference in New Issue
Block a user