tanshu/brewman
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Trial Balanced was ignoring last date, fixed.

Browse Source 
Salary Deduction fixed.
This commit is contained in:
Tanshu 2013-01-02 19:18:25 +05:30
parent 6b89a93bde
commit 6990131bf2
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
brewman/brewman/__init__.py
View File

@ -86,7 +86,7 @@ def main(global_config, **settings):
config.add_route('attendance_report', '/AttendanceReport') config.add_route('attendance_report', '/AttendanceReport')
config.add_route('api_credit_salary', '/api/CreditSalary') config.add_route('api_credit_salary', '/api/CreditSalary')
config.add_route('employee_functions', '/EmployeeFunctions') 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, 'ledger', '/Ledger', has_list=False)
add_route(config, 'product_ledger', '/ProductLedger', has_list=False) add_route(config, 'product_ledger', '/ProductLedger', has_list=False)

2
brewman/brewman/static/offline.appcache
View File

@ -1,6 +1,6 @@
CACHE MANIFEST CACHE MANIFEST
# version 2012-12-07.8 # version 2012-12-25.1
CACHE: CACHE:
/partial/404.html /partial/404.html

2
brewman/brewman/static/scripts/salary-deduction.js
View File

@ -25,7 +25,7 @@ var SalaryDeductionCtrl = ['$scope', '$location', 'voucher', function ($scope, $
Sep:9, Sep:9,
Oct:10, Oct:10,
Nov:11, Nov:11,
Dev:12 Dec:12
} }
if (!date.match(/^\d{2}-[\w]{3}-[\d]{4}$/g)) { if (!date.match(/^\d{2}-[\w]{3}-[\d]{4}$/g)) {
return; return;

2
brewman/brewman/views/reports/trial_balance.py
View File

@ -32,7 +32,7 @@ def build_report(date):
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)\ query = DBSession.query(LedgerBase, amount_sum)\
.join(Journal.voucher).join(Journal.ledger)\ .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() .order_by(LedgerBase.type).order_by(func.abs(amount_sum).desc()).all()