From c85b8669bd4e8a9b3e6c32043209862ad84bb4ed Mon Sep 17 00:00:00 2001 From: Tanshu Date: Thu, 18 Oct 2012 00:18:20 +0530 Subject: [PATCH] Fixed to use LedgerBase not Ledger in reports as that excluded salary accounts. Some cleanup. --- brewman/brewman/templates/beer_type/add.pt | 26 ----------- brewman/brewman/templates/nav_bar/report.mako | 2 - .../brewman/templates/pos/main_screen.mako | 13 ------ brewman/brewman/templates/pos/sales.mako | 45 ------------------ brewman/brewman/templates/pos/sales.pt | 46 ------------------- brewman/brewman/templates/widgets/archive.pt | 25 ---------- .../brewman/templates/widgets/blog_roll.pt | 13 ------ .../brewman/templates/widgets/categories.pt | 27 ----------- brewman/brewman/templates/widgets/comments.pt | 29 ------------ brewman/brewman/templates/widgets/contact.pt | 31 ------------- brewman/brewman/templates/widgets/events.pt | 17 ------- brewman/brewman/templates/widgets/footer.pt | 20 -------- brewman/brewman/templates/widgets/gallery.pt | 42 ----------------- .../brewman/templates/widgets/recent_posts.pt | 28 ----------- brewman/brewman/templates/widgets/tweets.pt | 6 --- brewman/brewman/views/reports/cash_flow.py | 22 ++++----- brewman/brewman/views/reports/ledger.py | 4 +- .../brewman/views/reports/product_ledger.py | 41 ++--------------- .../brewman/views/reports/trial_balance.py | 8 ++-- 19 files changed, 20 insertions(+), 425 deletions(-) delete mode 100644 brewman/brewman/templates/beer_type/add.pt delete mode 100644 brewman/brewman/templates/pos/main_screen.mako delete mode 100644 brewman/brewman/templates/pos/sales.mako delete mode 100644 brewman/brewman/templates/pos/sales.pt delete mode 100644 brewman/brewman/templates/widgets/archive.pt delete mode 100644 brewman/brewman/templates/widgets/blog_roll.pt delete mode 100644 brewman/brewman/templates/widgets/categories.pt delete mode 100644 brewman/brewman/templates/widgets/comments.pt delete mode 100644 brewman/brewman/templates/widgets/contact.pt delete mode 100644 brewman/brewman/templates/widgets/events.pt delete mode 100644 brewman/brewman/templates/widgets/footer.pt delete mode 100644 brewman/brewman/templates/widgets/gallery.pt delete mode 100644 brewman/brewman/templates/widgets/recent_posts.pt delete mode 100644 brewman/brewman/templates/widgets/tweets.pt diff --git a/brewman/brewman/templates/beer_type/add.pt b/brewman/brewman/templates/beer_type/add.pt deleted file mode 100644 index 922ba500..00000000 --- a/brewman/brewman/templates/beer_type/add.pt +++ /dev/null @@ -1,26 +0,0 @@ - - -
- - -
-

${title}

-
-

- - -

- -

- -

-
- -
-
- - - \ No newline at end of file diff --git a/brewman/brewman/templates/nav_bar/report.mako b/brewman/brewman/templates/nav_bar/report.mako index 4bd0ea78..44a7c711 100644 --- a/brewman/brewman/templates/nav_bar/report.mako +++ b/brewman/brewman/templates/nav_bar/report.mako @@ -21,8 +21,6 @@
  • Trail Balance
  • Differential Trail Balance
  • Profit and Loss
    • -
  • Balance Sheet
    • -
  • Full Balance Sheet
    • diff --git a/brewman/brewman/templates/pos/main_screen.mako b/brewman/brewman/templates/pos/main_screen.mako deleted file mode 100644 index ea48eebe..00000000 --- a/brewman/brewman/templates/pos/main_screen.mako +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -<%inherit file="../base.mako"/> -<%block name="content"> - - \ No newline at end of file diff --git a/brewman/brewman/templates/pos/sales.mako b/brewman/brewman/templates/pos/sales.mako deleted file mode 100644 index e919d86c..00000000 --- a/brewman/brewman/templates/pos/sales.mako +++ /dev/null @@ -1,45 +0,0 @@ -# -*- coding: utf-8 -*- -<%inherit file="../base.mako"/> -<%block name="content"> -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - -
    ParticularsQuantity
    ABC1
    ABC1
    ABC1
    -
    -
    -
    -
      - % for item in links: -
    • -
      - ${item.name} -
      -
      • - % endfor -
    -
    -
    -
    - \ No newline at end of file diff --git a/brewman/brewman/templates/pos/sales.pt b/brewman/brewman/templates/pos/sales.pt deleted file mode 100644 index 3ebe4baf..00000000 --- a/brewman/brewman/templates/pos/sales.pt +++ /dev/null @@ -1,46 +0,0 @@ - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - -
    ParticularsQuantity
    ABC1
    ABC1
    ABC1
    -
    -
    -
    - -
    -
    -
    -     - \ No newline at end of file diff --git a/brewman/brewman/templates/widgets/archive.pt b/brewman/brewman/templates/widgets/archive.pt deleted file mode 100644 index 29f6b3b3..00000000 --- a/brewman/brewman/templates/widgets/archive.pt +++ /dev/null @@ -1,25 +0,0 @@ - - - diff --git a/brewman/brewman/templates/widgets/blog_roll.pt b/brewman/brewman/templates/widgets/blog_roll.pt deleted file mode 100644 index ddc6ed34..00000000 --- a/brewman/brewman/templates/widgets/blog_roll.pt +++ /dev/null @@ -1,13 +0,0 @@ - - - \ No newline at end of file diff --git a/brewman/brewman/templates/widgets/categories.pt b/brewman/brewman/templates/widgets/categories.pt deleted file mode 100644 index 6edd038d..00000000 --- a/brewman/brewman/templates/widgets/categories.pt +++ /dev/null @@ -1,27 +0,0 @@ - \ No newline at end of file diff --git a/brewman/brewman/templates/widgets/comments.pt b/brewman/brewman/templates/widgets/comments.pt deleted file mode 100644 index e6faaa00..00000000 --- a/brewman/brewman/templates/widgets/comments.pt +++ /dev/null @@ -1,29 +0,0 @@ - - - \ No newline at end of file diff --git a/brewman/brewman/templates/widgets/contact.pt b/brewman/brewman/templates/widgets/contact.pt deleted file mode 100644 index 40b9e27b..00000000 --- a/brewman/brewman/templates/widgets/contact.pt +++ /dev/null @@ -1,31 +0,0 @@ - -
    -

    Contact form

    -
    - -
    -

    - - -

    - -

    - - -

    - -

    - - -

    - -

    - -

    -
    - -
    - -
    -
    - \ No newline at end of file diff --git a/brewman/brewman/templates/widgets/events.pt b/brewman/brewman/templates/widgets/events.pt deleted file mode 100644 index e2ed9586..00000000 --- a/brewman/brewman/templates/widgets/events.pt +++ /dev/null @@ -1,17 +0,0 @@ - - - \ No newline at end of file diff --git a/brewman/brewman/templates/widgets/footer.pt b/brewman/brewman/templates/widgets/footer.pt deleted file mode 100644 index 813ffa1f..00000000 --- a/brewman/brewman/templates/widgets/footer.pt +++ /dev/null @@ -1,20 +0,0 @@ - - - diff --git a/brewman/brewman/templates/widgets/gallery.pt b/brewman/brewman/templates/widgets/gallery.pt deleted file mode 100644 index 487919c6..00000000 --- a/brewman/brewman/templates/widgets/gallery.pt +++ /dev/null @@ -1,42 +0,0 @@ - - - \ No newline at end of file diff --git a/brewman/brewman/templates/widgets/recent_posts.pt b/brewman/brewman/templates/widgets/recent_posts.pt deleted file mode 100644 index 2fc68406..00000000 --- a/brewman/brewman/templates/widgets/recent_posts.pt +++ /dev/null @@ -1,28 +0,0 @@ - - - \ No newline at end of file diff --git a/brewman/brewman/templates/widgets/tweets.pt b/brewman/brewman/templates/widgets/tweets.pt deleted file mode 100644 index a5a81a20..00000000 --- a/brewman/brewman/templates/widgets/tweets.pt +++ /dev/null @@ -1,6 +0,0 @@ - -
    -

    Recent tweets

    -
    -
    - \ No newline at end of file diff --git a/brewman/brewman/views/reports/cash_flow.py b/brewman/brewman/views/reports/cash_flow.py index ac97cde8..bc50f5b8 100644 --- a/brewman/brewman/views/reports/cash_flow.py +++ b/brewman/brewman/views/reports/cash_flow.py @@ -5,7 +5,7 @@ from sqlalchemy.sql.expression import func, desc from pyramid.view import view_config from brewman.models import DBSession -from brewman.models.master import Ledger, LedgerType +from brewman.models.master import LedgerBase, LedgerType from brewman.models.voucher import Voucher, Journal from brewman.views.services.session import services_session_period_start, services_session_period_finish @@ -41,7 +41,7 @@ def build_report(request, start_date, finish_date): report = {'StartDate': start_date, 'FinishDate': finish_date, 'Body': [], 'Footer': []} sub_voucher = aliased(Voucher) sub_journal = aliased(Journal) - sub_ledger = aliased(Ledger) + sub_ledger = aliased(LedgerBase) sub_query = DBSession.query(sub_voucher.id)\ .join(sub_journal, sub_voucher.journals)\ @@ -50,12 +50,12 @@ def build_report(request, start_date, finish_date): .filter(sub_voucher.date >= datetime.datetime.strptime(start_date, '%d-%b-%Y'))\ .filter(sub_voucher.date <= datetime.datetime.strptime(finish_date, '%d-%b-%Y')).subquery() - query = DBSession.query(Ledger.type, func.sum(Journal.signed_amount))\ + query = DBSession.query(LedgerBase.type, func.sum(Journal.signed_amount))\ .join(Journal, Voucher.journals)\ - .join(Ledger, Journal.ledger)\ + .join(LedgerBase, Journal.ledger)\ .filter(Voucher.id.in_(sub_query))\ - .filter(Ledger.type != LedgerType.by_name('Cash').id)\ - .group_by(Ledger.type)\ + .filter(LedgerBase.type != LedgerType.by_name('Cash').id)\ + .group_by(LedgerBase.type)\ .order_by(func.sum(Journal.signed_amount)).all() totalInflow = 0 @@ -82,7 +82,7 @@ def build_report_id(request, ledger_type, start_date, finish_date): report = {'StartDate': start_date, 'FinishDate': finish_date, 'Body': [], 'Footer': []} sub_voucher = aliased(Voucher) sub_journal = aliased(Journal) - sub_ledger = aliased(Ledger) + sub_ledger = aliased(LedgerBase) sub_query = DBSession.query(sub_voucher.id)\ .join(sub_journal, sub_voucher.journals)\ @@ -91,12 +91,12 @@ def build_report_id(request, ledger_type, start_date, finish_date): .filter(sub_voucher.date >= datetime.datetime.strptime(start_date, '%d-%b-%Y'))\ .filter(sub_voucher.date <= datetime.datetime.strptime(finish_date, '%d-%b-%Y')).subquery() - query = DBSession.query(Ledger, func.sum(Journal.signed_amount))\ + query = DBSession.query(LedgerBase, func.sum(Journal.signed_amount))\ .join(Journal, Voucher.journals)\ - .join(Ledger, Journal.ledger)\ + .join(LedgerBase, Journal.ledger)\ .filter(Voucher.id.in_(sub_query))\ - .filter(Ledger.type == ledger_type)\ - .group_by(Ledger)\ + .filter(LedgerBase.type == ledger_type)\ + .group_by(LedgerBase)\ .order_by(desc(func.sum(Journal.amount))).all() totalInflow = 0 diff --git a/brewman/brewman/views/reports/ledger.py b/brewman/brewman/views/reports/ledger.py index 643f83d0..9efb6c7b 100644 --- a/brewman/brewman/views/reports/ledger.py +++ b/brewman/brewman/views/reports/ledger.py @@ -6,7 +6,7 @@ import uuid from pyramid.view import view_config from brewman.models import DBSession -from brewman.models.master import Ledger +from brewman.models.master import LedgerBase from brewman.models.voucher import Voucher, Journal, VoucherType from brewman.views.services.session import services_session_period_start, services_session_period_finish @@ -28,7 +28,7 @@ def ledger_display_post(request): return {'StartDate': services_session_period_start(request), 'FinishDate': services_session_period_finish(request), 'Ledger': {}, 'Body': [], 'Footer': {}} else: - ledger = Ledger.by_id(uuid.UUID(id)) + ledger = LedgerBase.by_id(uuid.UUID(id)) start_date = request.GET.get('StartDate', services_session_period_start(request)) finish_date = request.GET.get('FinishDate', services_session_period_finish(request)) info = {'StartDate': start_date, 'FinishDate': finish_date, diff --git a/brewman/brewman/views/reports/product_ledger.py b/brewman/brewman/views/reports/product_ledger.py index e9064d22..45277dbe 100644 --- a/brewman/brewman/views/reports/product_ledger.py +++ b/brewman/brewman/views/reports/product_ledger.py @@ -4,7 +4,6 @@ from sqlalchemy.sql.expression import func import uuid from pyramid.view import view_config -from brewman.helpers import Literal from brewman.models import DBSession from brewman.models.master import Product, CostCenter @@ -21,29 +20,6 @@ def ledger_display_get(request): return {} -def product_ledger_get(request): - product_id = request.matchdict.get('id', None) - product = Product.by_id(uuid.UUID(product_id)) - startDate = request.GET.get('startDate', None) - finishDate = request.GET.get('finishDate', None) - report = build_report(request, product, startDate, finishDate) - body = Literal(report['body']) - footer = Literal(report['footer']) - startDate = Literal("$('#txtStartDate').val('{0}');".format(startDate)) - finishDate = Literal("$('#txtFinishDate').val('{0}');".format(finishDate)) - product = Literal("$('#txtProduct').val('{0}');".format(product.full_name)) - - return {'title': 'Display Ledger - Hops n Grains', - 'pageclass': "page-blogpost page-sidebar-right", - 'pagecontentclass': "page-content grid_12", - 'page_header': '', - 'body': body, - 'footer': footer, - 'startDate': startDate, - 'finishDate': finishDate, - 'product': product} - - @view_config(request_method='GET', route_name='product_ledger_id', renderer='json', xhr=True) @view_config(request_method='GET', route_name='product_ledger', renderer='json', xhr=True) def ledger_display_post(request): @@ -62,20 +38,6 @@ def ledger_display_post(request): return info -@view_config(request_method='POST', route_name='product_ledger', renderer='json', xhr=True) -def product_ledger_post(request): - productID = request.json_body['productID'] - if productID == '': - productString = request.json_body['productString'] - product = Product.by_full_name(productString) - else: - productID = uuid.UUID(productID) - product = Product.by_id(productID) - startDate = request.json_body['startDate'] - finishDate = request.json_body['finishDate'] - return build_report(request, product, startDate, finishDate) - - def build_report(request, info): product_id = info['Product']['ProductID'] start_date = info['StartDate'] @@ -146,6 +108,9 @@ def opening_balance(product_id, start_date): if quantity and quantity > 0: debitQuantity = "{0:.2f}".format(quantity) debitAmount = "\u20B9 {0:.2f}".format(amount) + else: + debitQuantity = '' + debitAmount = '' if quantity is None: quantity = 0 diff --git a/brewman/brewman/views/reports/trial_balance.py b/brewman/brewman/views/reports/trial_balance.py index ae507954..9c37c05a 100644 --- a/brewman/brewman/views/reports/trial_balance.py +++ b/brewman/brewman/views/reports/trial_balance.py @@ -4,7 +4,7 @@ from sqlalchemy.sql.expression import func from pyramid.view import view_config from brewman.models import DBSession -from brewman.models.master import Ledger +from brewman.models.master import LedgerBase from brewman.models.voucher import Voucher, Journal, VoucherType from brewman.views.services.session import services_session_period_finish @@ -30,10 +30,10 @@ def trial_balance(request): def build_report(date): date = datetime.datetime.strptime(date, '%d-%b-%Y') amount_sum = func.sum(Journal.amount * Journal.debit).label('Amount') - query = DBSession.query(Ledger, amount_sum)\ + 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(Ledger)\ - .order_by(Ledger.type).order_by(func.abs(amount_sum).desc()).all() + .filter(Voucher.date < date).filter(Voucher.type != VoucherType.by_name('Issue').id).group_by(LedgerBase)\ + .order_by(LedgerBase.type).order_by(func.abs(amount_sum).desc()).all() body = []