From 403b9a207a324adf323f1eef06cd971a622a7000 Mon Sep 17 00:00:00 2001 From: Amritanshu Date: Mon, 15 Apr 2019 11:02:54 +0530 Subject: [PATCH] Fix: ProductLedger was crapping out because of ambiguous join in opening balace. (Probably triggered by upgrade in sqlalchemy) Chore: Updated the dev dependencies as Angular 7 does not support Typescript 3.2 and further --- brewman/views/reports/ledger.py | 1 - brewman/views/reports/product_ledger.py | 4 ++-- overlord/package.json | 4 ++-- overlord/src/app/ledger/ledger.service.ts | 4 ++-- overlord/src/app/product-ledger/product-ledger.service.ts | 4 ++-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/brewman/views/reports/ledger.py b/brewman/views/reports/ledger.py index c68e6794..8b8a44a4 100644 --- a/brewman/views/reports/ledger.py +++ b/brewman/views/reports/ledger.py @@ -38,7 +38,6 @@ def show_blank(request): route_name="api_ledger_id", renderer="json", permission="Ledger", - trans=True, ) def show_data(request): account = ( diff --git a/brewman/views/reports/product_ledger.py b/brewman/views/reports/product_ledger.py index 5ae46a3c..4be784e4 100644 --- a/brewman/views/reports/product_ledger.py +++ b/brewman/views/reports/product_ledger.py @@ -46,7 +46,6 @@ def show_blank(request): route_name="api_product_ledger_id", renderer="json", permission="Product Ledger", - trans=True, ) def show_data(request): id = to_uuid(request.matchdict["id"]) @@ -158,7 +157,8 @@ def opening_balance(product_id, start_date, dbsession): func.sum(Inventory.quantity * Journal.debit), func.sum(Inventory.amount * Journal.debit), ) - .join(Voucher) + .join(Inventory.voucher) + .join(Voucher.journals) .filter(Voucher.id == Inventory.voucher_id) .filter(Voucher.id == Journal.voucher_id) .filter(Inventory.product_id == product_id) diff --git a/overlord/package.json b/overlord/package.json index 566b6018..6f230f6c 100644 --- a/overlord/package.json +++ b/overlord/package.json @@ -35,7 +35,7 @@ "zone.js": "^0.8.26" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.10.0", + "@angular-devkit/build-angular": "~0.10.7", "@angular/cli": "^7.0.6", "@angular/compiler-cli": "^7.1.0", "@angular/language-service": "^7.1.0", @@ -54,6 +54,6 @@ "standard-version": "^4.4.0", "ts-node": "^7.0.0", "tslint": "^5.11.0", - "typescript": "^3.1.6" + "typescript": "3.1.6" } } diff --git a/overlord/src/app/ledger/ledger.service.ts b/overlord/src/app/ledger/ledger.service.ts index 1338de62..49722f4d 100644 --- a/overlord/src/app/ledger/ledger.service.ts +++ b/overlord/src/app/ledger/ledger.service.ts @@ -20,8 +20,8 @@ export class LedgerService { constructor(private http: HttpClient, private log: ErrorLoggerService) { } - list(date: string, startDate: string, finishDate): Observable { - const listUrl = (date === null) ? url : `${url}/${date}`; + list(id: string, startDate: string, finishDate): Observable { + const listUrl = (id === null) ? url : `${url}/${id}`; const options = {params: new HttpParams()}; if (startDate !== null) { options.params = options.params.set('s', startDate); diff --git a/overlord/src/app/product-ledger/product-ledger.service.ts b/overlord/src/app/product-ledger/product-ledger.service.ts index fe428af2..3ca368a1 100644 --- a/overlord/src/app/product-ledger/product-ledger.service.ts +++ b/overlord/src/app/product-ledger/product-ledger.service.ts @@ -20,8 +20,8 @@ export class ProductLedgerService { constructor(private http: HttpClient, private log: ErrorLoggerService) { } - list(date: string, startDate: string, finishDate): Observable { - const listUrl = (date === null) ? url : `${url}/${date}`; + list(id: string, startDate: string, finishDate): Observable { + const listUrl = (id === null) ? url : `${url}/${id}`; const options = {params: new HttpParams()}; if (startDate !== null) { options.params = options.params.set('s', startDate);