CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 10 Packages Projects Releases Wiki Activity
3,060 Commits 21 Branches 0 Tags
d67bf61d1c81f5c23fa3dcef0cee6339db33a3d7
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vishwas Babu A J d67bf61d1c Merge pull request #970 from pramodn02/MIFOSX-1341 
MIFOSX-1341 : added deposit type in savings data
 2014-06-24 10:05:25 -07:00
Vishwas Babu A J d1575d9cbb Merge pull request #968 from rishy/Batch-API 
added "UpdateClient" and "ApplyLoan" commands with dependency resolution
 2014-06-23 15:16:39 -07:00
Vishwas Babu A J 3aa3699eaa Merge pull request #969 from pramodn02/MIFOSX-1353 
MIFOSX-1353 : corrected monthly charge calculation
 2014-06-23 15:12:22 -07:00
Vishwas Babu A J a2ba251b83 Merge pull request #967 from vishwasbabu/Nayan-MIFOSX-12352 
Nayan mifosx 12352
 2014-06-22 15:08:33 -07:00
Vishwas Babu A J 199dbfd417 merge Nayan's work around weekly charges 2014-06-22 15:04:47 -07:00
Vishwas Babu A J 01c05abad6 Merge pull request #932 from rishy/Batch-API 
Batch-API added with 'Create Client Command' and transaction scope
 2014-06-21 22:45:35 -07:00
Vishwas Babu A J c2c2f65c13 Merge pull request #966 from vishwasbabu/develop 
MIFOSX-1364
 2014-06-20 02:11:51 -07:00
Vishwas Babu A J 43a3359ac2 MIFOSX-1364 2014-06-20 02:11:05 -07:00
Vishwas Babu A J e0e4b1db43 Merge pull request #965 from vishwasbabu/develop 
renaming a couple of methods for better readability in SavingsAccountCha...
 2014-06-19 20:48:25 -07:00
Vishwas Babu A J f23a0cb18b renaming a couple of methods for better readability in SavingsAccountCharge.java 2014-06-19 20:46:51 -07:00
Vishwas Babu A J 60e2af384b Update INSTALL.md 
with details of amazon image
 2014-06-19 20:03:11 -07:00
Vishwas Babu A J 722e657ea9 Merge pull request #964 from pramodn02/MIFOSX-1200 
added Override method for getEffectiveInterestRateAsFraction
 2014-06-18 20:44:06 -07:00
Vishwas Babu A J 4e84934110 Merge pull request #963 from lingalamadhukar/MIFOSX-1349 
MIFOSX-1351,MIFOSX-1349
 2014-06-18 20:43:33 -07:00
Vishwas Babu A J f7204f3905 Merge pull request #962 from pramodn02/MIFOSX-1272 
MIFOSX-1272 : added recalculation of charges for diff disburse amount
 2014-06-18 14:07:42 -07:00
Vishwas Babu A J 9aa9473c8c Update CHANGELOG.md 
for 1.23.1. Release
 2014-06-18 00:17:24 -07:00
Vishwas Babu A J 9126e40ddc updates for 1.23.1 release 2014-06-17 23:17:51 -07:00
Vishwas Babu A J 48baa127d4 Merge pull request #961 from pramodn02/MIFOSX-1336 
Mifosx 1336
 2014-06-17 17:52:21 -07:00
Vishwas Babu A J fcaad335f0 Merge pull request #960 from openMF/develop 
Update CHANGELOG.md
 2014-06-17 01:22:07 -07:00
Vishwas Babu A J 58d4458515 Update CHANGELOG.md 
and fix typos
 2014-06-17 01:21:06 -07:00
Vishwas Babu A J 7ad0a6c71b Merge pull request #959 from lingalamadhukar/MIFOSX-1247 
MIFOSX-1317 test case fix
 2014-06-17 00:46:15 -07:00
Vishwas Babu A J a01d243078 Update CHANGELOG.md 
with details of fixes for 1.23 release
 2014-06-16 22:12:28 -07:00
Vishwas Babu A J 46b653e387 merging pramods changes around rd and fd 2014-06-16 21:52:23 -07:00
Vishwas Babu A J e0fd3d0fe7 Merge pull request #958 from vishwasbabu/develop 
more fixes to account transfers test cases
 2014-06-16 21:37:59 -07:00
Vishwas Babu A J ccb98baf5f more fixes to account transfers test cases 2014-06-16 21:36:40 -07:00
Vishwas Babu A J f7254fc660 Merge pull request #957 from vishwasbabu/develop 
fix validations for financial activity accounts test
 2014-06-16 18:40:20 -07:00
Vishwas Babu A J e8de3cbecc fix validations for financial activity accounts test 2014-06-16 18:39:34 -07:00
Vishwas Babu A J 632855d896 Merge pull request #956 from vishwasbabu/develop 
more fixes to account transfer test cases
 2014-06-16 18:20:05 -07:00
Vishwas Babu A J fb5398e83b more fixes to account transfer test cases 2014-06-16 18:18:15 -07:00
Vishwas Babu A J 97a88e1d1e Merge pull request #955 from vishwasbabu/develop 
modifying test cases for account transfers
 2014-06-16 18:04:11 -07:00
Vishwas Babu A J 2a60b05bf6 modifying test cases for account transfers 2014-06-16 18:02:26 -07:00
Vishwas Babu A J c8fccc51ad Update CHANGELOG.md 2014-06-16 17:34:14 -07:00
Vishwas Babu A J 67a7570412 Merge pull request #954 from vishwasbabu/develop 
Develop
 2014-06-16 17:16:09 -07:00
Vishwas Babu A J f4e47cc013 fixing failing test cases and updating documentation for account transfers 2014-06-16 17:14:31 -07:00
Vishwas Babu A J 3eb0b46a89 Merge pull request #953 from vishwasbabu/develop 
updating test cases for financial activity accounts and accounts transfe...
 2014-06-16 16:34:36 -07:00
Vishwas Babu A J c6d39fa737 updating test cases for financial activity accounts and accounts transfers 2014-06-16 16:33:07 -07:00
Vishwas Babu A J a031463930 Merge pull request #952 from vishwasbabu/develop 
update default account for tracking inter branch transfers
 2014-06-16 13:09:48 -07:00
Vishwas Babu A J 5ef940627c update default account for tracking inter branch transfers 2014-06-16 13:08:37 -07:00
Vishwas Babu A J 469f871756 Merge pull request #951 from lingalamadhukar/MIFOSX-1247 
MIFOSX-1343, format api-docs of standing instructions, account transfers
 2014-06-16 12:14:02 -07:00
Vishwas Babu A J d7399cc6e5 Merge pull request #949 from vishwasbabu/develop 
Rewriting Financial Activity Account Mapping
 2014-06-16 01:31:01 -07:00
Vishwas Babu A J 80439d6e6d Rewriting Financial Activity Account Mapping 2014-06-16 01:28:04 -07:00
Vishwas Babu A J e820d4ae00 Merge pull request #946 from lingalamadhukar/MIFOSX-1267 
MIFOSX-1317 Premature Interest Calculation Fix
 2014-06-13 10:50:38 -07:00
Vishwas Babu A J baeab1f7c8 Merge pull request #945 from pramodn02/latest 
MIFOSX-1313 : client incentive code cleanup
 2014-06-12 04:58:18 -07:00
Vishwas Babu A J 06efcb73c9 updates to finanacial activity to account mapping api's 2014-06-11 13:36:03 -07:00
Vishwas Babu A J c2d94f2976 update sample data for 1.23 release 2014-06-11 10:21:41 -07:00
Vishwas Babu A J dbde081057 Update CHANGELOG.md 
for 1.23 release
 2014-06-11 09:38:00 -07:00
Vishwas Babu A J caad86ac65 updating details of 1.23 release 2014-06-11 09:01:09 -07:00
Vishwas Babu A J e1a8c8a371 Update CHANGELOG.md 
for 1.23 release
 2014-06-11 08:44:45 -07:00
Vishwas Babu A J 2885cc0864 Merge pull request #944 from lingalamadhukar/MIFOSX-1267 
MIFOSX-1318,MIFOSX-1314,MIFOSX-1300,MIFOSX-1242,MIFOSX-1199
 2014-06-11 07:08:51 -07:00
Vishwas Babu A J c89699c9df minor cleanups 2014-06-10 23:16:10 -07:00
Vishwas Babu A J 6cc6d03785 Merge pull request #940 from juniormonkey/develop 
MIFOSX-1302: A new exception when a currency that is still in use is set to be deleted.
 2014-06-10 16:57:01 -07:00
Vishwas Babu A J aa9643429b Merge pull request #938 from pramodn02/MIFOSX-1274 
MIFOSX-1274,MIFOSX-1268 : added check for negative account balance while...
 2014-06-10 16:50:32 -07:00
Vishwas Babu A J 1f86299cf1 Merge pull request #937 from pramodn02/MIFOSX-1270 
MIFOSX-1270 : corrected accounting for  activation charge
 2014-06-10 14:50:48 -07:00
Vishwas Babu A J 123a59f2e7 Merge pull request #935 from pramodn02/MIFOSX-1306 
MIFOSX-1306 : added check to identify account transfer
 2014-06-10 12:22:38 -07:00
Vishwas Babu A J 6df2f48bc9 Merge pull request #933 from lingalamadhukar/MIFOSX-1267 
MIFOSX-1260,MIFOSX-1287,MIFOSX-1311
 2014-06-10 07:55:38 -07:00
Vishwas Babu A J 45e12ac91e Merge pull request #931 from pramodn02/latest 
MIFOSX-1313 :  changes for interest  incentives
 2014-06-09 22:06:20 -07:00
Vishwas Babu A J 8bd0e29ba5 MIFOSX-1183 and adding upfront accrual transaction back for cash based and no accounting rules 2014-06-08 03:24:18 -07:00
Vishwas Babu A J 59c8671522 removed addition of main compile classpath to test compile classpath 2014-06-07 10:56:43 -07:00
Vishwas Babu A J 2d7c828eee Merge pull request #929 from vishwasbabu/develop 
augument runtime and compile classpath for integration tests to include ...
 2014-06-07 10:54:40 -07:00
Vishwas Babu A J f9397725cd augument runtime and compile classpath for integration tests to include main and test 2014-06-07 10:50:21 -07:00
Vishwas Babu A J 6c52c91dbe Merge pull request #928 from lingalamadhukar/MIFOSX-1267 
Bug Fixes for 1.23 release
 2014-06-07 00:35:49 -07:00
Vishwas Babu A J 8e61abe4ed removing most warnings in ppi/survey related code 2014-06-06 11:23:50 -07:00
Vishwas Babu A J b63364962d resolving compilation errors in survey integration test 2014-06-05 21:27:12 -07:00
Vishwas Babu A J 10fd3be477 MIFOSX-merging musonis work around ppi 2014-06-05 21:06:30 -07:00
Vishwas Babu A J 941d732cfb Merge branch 'MIFOSX-1023' of git://github.com/Musoni/mifosx into Musoni-MIFOSX-1023 2014-06-05 18:49:13 -07:00
Vishwas Babu A J 4e53e3b94d changing visibility of lockinPeriodFrequencyTypeValue variable in DepositAccountAssembler 2014-06-05 14:39:25 -07:00
Vishwas Babu A J d41cea8d46 Merge pull request #927 from lingalamadhukar/MIFOSX-1267 
MIFOSX-1288,MIFOSX-1280,build#699 testcase fixes
 2014-06-05 14:37:04 -07:00
Vishwas Babu A J 7dcb9913a4 bumping up version number for sql patch related to accounting cleanup for transfers 2014-06-04 18:09:56 -07:00
Vishwas Babu A J 03028fc4ee merging pramods pr around account transfers accounting clean up 2014-06-04 18:07:24 -07:00
Vishwas Babu A J 19833af1a9 Merge pull request #926 from lingalamadhukar/MIFOSX-1267 
MIFOSX-1267 and fix for view loan audit entry
 2014-06-04 09:00:30 -07:00
Vishwas Babu A J 75ac5c2d68 renaming get_url to url in Audit Data response 2014-06-03 17:56:07 -07:00
Vishwas Babu A J adc42ddaf1 Merge pull request #917 from ashok-conflux/NBLMS-9 
added api_get_url value to audit api response data
 2014-06-03 17:43:00 -07:00
Vishwas Babu A J 528423ddc2 Merge pull request #925 from lingalamadhukar/MIFOSX-1166 
MIFOSX-1216 and loan integration tests with accounting
 2014-06-03 06:17:22 -07:00
Vishwas Babu A J a3a414ff0a Merge pull request #924 from lingalamadhukar/MIFOSX-1242 
MIFOSX-1245,MIFOSX-1244,MIFOSX-1243,MIFOSX-1242,MIFOSX-1241,MIFOSX-1240
 2014-06-02 16:15:48 -07:00
Vishwas Babu A J 761c3b1e8d Merge pull request #918 from Nayan/MIFOSX-1228 
#MIFOSX-1228 Templates should not show inactive staff under staff drop down
 2014-05-28 11:47:05 +05:30
Vishwas Babu A J d59683c9f8 Merge pull request #920 from ashok-conflux/CONFLUX-39-CR 
Added support to mandatory savings
 2014-05-28 11:45:07 +05:30
Vishwas Babu A J 00a10a31ac Merge pull request #922 from lingalamadhukar/MIFOSX-1237 
FIXED MIFSOX-1237,MIFOSX-1238
 2014-05-26 19:13:10 +05:30
Vishwas Babu A J b2131b52a7 Merge pull request #915 from Vishwa1311/MIFOSX-1208 
[MIFOSX-1208] Issue with retrieving datatables for offices has been fixed
 2014-05-21 12:18:02 +05:30
Vishwas Babu A J f67b82d0b9 Merge pull request #914 from lingalamadhukar/dailycheck 
MIFOSX-1203 and test case fix for build history 692
 2014-05-19 15:36:00 +05:30
Vishwas Babu A J 64c8121362 Merge pull request #911 from pramodn02/MIFOSX-1200 
MIFOSX-1200 : corrected openning balance while calculations
 2014-05-19 09:55:11 +05:30
Vishwas Babu A J 9c9c24060f Merge pull request #910 from lingalamadhukar/MIFOSX-1166 
Integration tests for loan accounting flow
 2014-05-19 09:53:42 +05:30
Vishwas Babu A J c3cd9aacbf Merge pull request #912 from pramodn02/MIFOSX-1196 
MIFOSX-1196 - corrected the validation for update
 2014-05-19 09:52:13 +05:30
Vishwas Babu A J a86ef1da2d Merge pull request #913 from pramodn02/MIFOSX-1187 
MIFOSX-1187 - added null checks before compare with min and max values
 2014-05-19 09:48:05 +05:30
Vishwas Babu A J 0a3e039122 cleaning up PR for MIFOSX-709 2014-05-15 13:01:34 +05:30
Vishwas Babu A J b2771704f6 Merge pull request #909 from erikbarbara/MIFOSX-709 
MIFOSX-709: adding functionality to prevent closing of client with overd...
 2014-05-15 12:33:17 +05:30
Vishwas Babu A J 363ca7dc0e Merge pull request #902 from vorburger/JobLogImprovementIllustratingBug 
JobRegisterServiceImpl error logging improvement
 2014-05-11 03:39:01 +05:30
Vishwas Babu A J 9e8ead2045 Merge pull request #901 from lingalamadhukar/MIFOSX-1166 
Update users api docs with staff details
 2014-05-11 01:13:34 +05:30
Vishwas Babu A J 7ff989dbe0 Merge pull request #900 from vorburger/newKeystoreToReplacedExpiredCert 
keystore.jks with new self-signed cert
 2014-05-10 12:10:29 +05:30
Vishwas Babu A J 7f25cc3a91 fixing compilation issues 2014-05-09 20:12:19 +05:30
Vishwas Babu A J a37edf45d8 resoving merge conflicts with MIFOSX-1182 2014-05-09 19:26:48 +05:30
Vishwas Babu A J 4d2913be8f Merge branch 'develop' of git://github.com/pramodn02/mifosx into pramodn02-develop 2014-05-09 19:16:06 +05:30
Vishwas Babu A J c0a6ed8081 Merge pull request #898 from Vishwa1311/NEW-ONE-MIFOSX-1117 
[MIFOSX-1117] JUnit Test Cases for FD and RD accounts
 2014-05-09 18:16:52 +05:30
Vishwas Babu A J c7e21fc39d cleaning up MIFOSX-1024 2014-05-09 18:07:50 +05:30
Vishwas Babu A J 9472ec236c cleaning up commit for MIFOSX-982 2014-05-09 14:50:44 +05:30
Vishwas Babu A J 67ec9163bd Merge pull request #896 from lingalamadhukar/MIFOSX-1166 
MIFOSX-281 Add template for recovery payments
 2014-05-06 18:25:26 +05:30
Vishwas Babu A J 37e84789c2 Merge pull request #895 from vishwasbabu/develop 
MIFOSX-281 adding accrual accounting support
 2014-05-06 18:16:34 +05:30
Vishwas Babu A J 6ddacc7cdb MIFOSX-281 adding accrual accounting support 2014-05-06 18:15:22 +05:30
Vishwas Babu A J 6b33966b54 Merging Michael's changes around FD and RD 2014-05-06 15:53:01 +05:30
Vishwas Babu A J 285cce1bf8 fix for MIFOSX-1019 2014-05-05 21:20:21 +05:30
Vishwas Babu A J a0c26c65d9 Merge pull request #893 from lingalamadhukar/MIFOSX-1166 
MIFOSX-1166 Rename sql schema name
 2014-05-05 17:51:20 +05:30
Vishwas Babu A J 62e4b6f6e3 Merge pull request #892 from lingalamadhukar/Docs 
Update API docs
 2014-05-05 17:50:40 +05:30