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
This commit is contained in:
parent
72e8801472
commit
403b9a207a
brewman/views/reports
overlord
@ -38,7 +38,6 @@ def show_blank(request):
|
||||
route_name="api_ledger_id",
|
||||
renderer="json",
|
||||
permission="Ledger",
|
||||
trans=True,
|
||||
)
|
||||
def show_data(request):
|
||||
account = (
|
||||
|
@ -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)
|
||||
|
@ -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"
|
||||
}
|
||||
}
|
||||
|
@ -20,8 +20,8 @@ export class LedgerService {
|
||||
constructor(private http: HttpClient, private log: ErrorLoggerService) {
|
||||
}
|
||||
|
||||
list(date: string, startDate: string, finishDate): Observable<Ledger> {
|
||||
const listUrl = (date === null) ? url : `${url}/${date}`;
|
||||
list(id: string, startDate: string, finishDate): Observable<Ledger> {
|
||||
const listUrl = (id === null) ? url : `${url}/${id}`;
|
||||
const options = {params: new HttpParams()};
|
||||
if (startDate !== null) {
|
||||
options.params = options.params.set('s', startDate);
|
||||
|
@ -20,8 +20,8 @@ export class ProductLedgerService {
|
||||
constructor(private http: HttpClient, private log: ErrorLoggerService) {
|
||||
}
|
||||
|
||||
list(date: string, startDate: string, finishDate): Observable<ProductLedger> {
|
||||
const listUrl = (date === null) ? url : `${url}/${date}`;
|
||||
list(id: string, startDate: string, finishDate): Observable<ProductLedger> {
|
||||
const listUrl = (id === null) ? url : `${url}/${id}`;
|
||||
const options = {params: new HttpParams()};
|
||||
if (startDate !== null) {
|
||||
options.params = options.params.set('s', startDate);
|
||||
|
Loading…
x
Reference in New Issue
Block a user