From b1aa1304216f8409711c5eddf663893acdb04f65 Mon Sep 17 00:00:00 2001 From: Amritanshu Date: Tue, 27 May 2014 12:18:09 +0530 Subject: [PATCH] Fix: Other instances of Capitalized labels. --- brewman/views/reports/closing_stock.py | 2 +- brewman/views/reports/net_transactions.py | 2 +- brewman/views/reports/purchases.py | 4 ++-- brewman/views/reports/stock_movement.py | 2 +- brewman/views/reports/trial_balance.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/brewman/views/reports/closing_stock.py b/brewman/views/reports/closing_stock.py index f36c298e..8b0786e1 100644 --- a/brewman/views/reports/closing_stock.py +++ b/brewman/views/reports/closing_stock.py @@ -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) \ diff --git a/brewman/views/reports/net_transactions.py b/brewman/views/reports/net_transactions.py index 726bbb19..bc82dc4a 100644 --- a/brewman/views/reports/net_transactions.py +++ b/brewman/views/reports/net_transactions.py @@ -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) \ diff --git a/brewman/views/reports/purchases.py b/brewman/views/reports/purchases.py index 7bbbbcdc..f5d18087 100644 --- a/brewman/views/reports/purchases.py +++ b/brewman/views/reports/purchases.py @@ -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')) \ diff --git a/brewman/views/reports/stock_movement.py b/brewman/views/reports/stock_movement.py index dd3b8b0e..6bfd4a8d 100644 --- a/brewman/views/reports/stock_movement.py +++ b/brewman/views/reports/stock_movement.py @@ -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) \ diff --git a/brewman/views/reports/trial_balance.py b/brewman/views/reports/trial_balance.py index 535bb53b..28b4a13c 100644 --- a/brewman/views/reports/trial_balance.py +++ b/brewman/views/reports/trial_balance.py @@ -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)\