Fix: Other instances of Capitalized labels.

This commit is contained in:
Amritanshu 2014-05-27 12:18:09 +05:30
parent eb63166f39
commit b1aa130421
5 changed files with 6 additions and 6 deletions

View File

@ -34,7 +34,7 @@ def report_data(request):
def build_report(date):
date = datetime.datetime.strptime(date, '%d-%b-%Y')
amount_sum = func.sum(Journal.debit * Inventory.quantity * Inventory.rate * (1 + Inventory.tax)).label('amount')
quantity_sum = func.sum(Journal.debit * Inventory.quantity).label('Quantity')
quantity_sum = func.sum(Journal.debit * Inventory.quantity).label('quantity')
query = DBSession.query(Product, quantity_sum, amount_sum) \
.join(Product.inventories).join(Inventory.voucher).join(Voucher.journals) \
.filter(Voucher.date <= date) \

View File

@ -36,7 +36,7 @@ def build_report(start_date, finish_date):
if not isinstance(finish_date, datetime.datetime):
finish_date = datetime.datetime.strptime(finish_date, '%d-%b-%Y')
amount_sum = func.sum(Journal.amount * Journal.debit).label('Amount')
amount_sum = func.sum(Journal.amount * Journal.debit).label('amount')
query = DBSession.query(LedgerBase, amount_sum) \
.join(Journal.voucher).join(Journal.ledger) \
.filter(Voucher.date >= start_date) \

View File

@ -35,8 +35,8 @@ def report_data(request):
def build_report(request, start_date, finish_date):
report = {'StartDate': start_date, 'FinishDate': finish_date, 'Body': []}
quantity_sum = func.sum(Journal.debit * Inventory.quantity).label('Quantity')
amount_sum = func.sum(Journal.debit * Inventory.quantity * Inventory.rate * (1 + Inventory.tax)).label('Amount')
quantity_sum = func.sum(Journal.debit * Inventory.quantity).label('quantity')
amount_sum = func.sum(Journal.debit * Inventory.quantity * Inventory.rate * (1 + Inventory.tax)).label('amount')
query = DBSession.query(Product, quantity_sum, amount_sum) \
.join(Product.inventories).join(Inventory.voucher).join(Voucher.journals) \
.filter(Voucher.date >= datetime.datetime.strptime(start_date, '%d-%b-%Y')) \

View File

@ -36,7 +36,7 @@ def get_stock_movement(request):
def build_stock_movement(start_date, finish_date):
dict = {}
quantity_sum = func.sum(Journal.debit * Inventory.quantity).label('Quantity')
quantity_sum = func.sum(Journal.debit * Inventory.quantity).label('quantity')
openings = DBSession.query(Product, quantity_sum) \
.join(Product.inventories).join(Inventory.voucher).join(Voucher.journals) \
.filter(Voucher.date < start_date) \

View File

@ -31,7 +31,7 @@ def report_data(request):
def build_report(date):
date = datetime.datetime.strptime(date, '%d-%b-%Y')
amount_sum = func.sum(Journal.amount * Journal.debit).label('Amount')
amount_sum = func.sum(Journal.amount * Journal.debit).label('amount')
query = DBSession.query(LedgerBase, amount_sum)\
.join(Journal.voucher).join(Journal.ledger)\
.filter(Voucher.date <= date).filter(Voucher.type != VoucherType.by_name('Issue').id).group_by(LedgerBase)\