Trial Balanced was ignoring last date, fixed.
Salary Deduction fixed.
This commit is contained in:
parent
6b89a93bde
commit
6990131bf2
@ -86,7 +86,7 @@ def main(global_config, **settings):
|
||||
config.add_route('attendance_report', '/AttendanceReport')
|
||||
config.add_route('api_credit_salary', '/api/CreditSalary')
|
||||
config.add_route('employee_functions', '/EmployeeFunctions')
|
||||
config.add_route('fingerprint', '/Fingerprint')
|
||||
config.add_route('api_fingerprint', '/api/Fingerprint')
|
||||
|
||||
add_route(config, 'ledger', '/Ledger', has_list=False)
|
||||
add_route(config, 'product_ledger', '/ProductLedger', has_list=False)
|
||||
|
@ -1,6 +1,6 @@
|
||||
CACHE MANIFEST
|
||||
|
||||
# version 2012-12-07.8
|
||||
# version 2012-12-25.1
|
||||
|
||||
CACHE:
|
||||
/partial/404.html
|
||||
|
@ -25,7 +25,7 @@ var SalaryDeductionCtrl = ['$scope', '$location', 'voucher', function ($scope, $
|
||||
Sep:9,
|
||||
Oct:10,
|
||||
Nov:11,
|
||||
Dev:12
|
||||
Dec:12
|
||||
}
|
||||
if (!date.match(/^\d{2}-[\w]{3}-[\d]{4}$/g)) {
|
||||
return;
|
||||
|
@ -32,7 +32,7 @@ def build_report(date):
|
||||
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)\
|
||||
.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()
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user