Commit Graph
3312 Commits
Author SHA1 Message Date
Vishwas Babu A J e458dd0a4e Merge pull request #1095 from pramodn02/develop
removed unnecessary save of loan
2014-10-03 21:41:40 -07:00
pramod ab14373f35 removed unnecessary save of loan 2014-10-04 09:48:14 +05:30
Vishwas Babu A J 856beec760 bumping up version number for MIFOSX-1397 sql patch 2014-10-03 12:51:26 -07:00
Vishwas Babu A J 3a525ac671 merging pull request for MIFOSX-1397 2014-10-03 12:47:42 -07:00
Vishwas Babu A J 4ddf99498e merging localization changes for dates in unit test cases 2014-10-03 10:41:34 -07:00
Vishwas Babu A J 430977306b Merge pull request #1090 from vorburger/warFinalizedByBootRepackage
MIFOSX-1552 Fix which makes gradlew war produce an executable WAR, just like standard gradlew build does
2014-10-01 13:22:11 -07:00
Vishwas Babu A J f7be3555c4 Merge pull request #1092 from pramodn02/develop
MIFOSX-1557 : added check for disbursement fee
2014-10-01 13:20:56 -07:00
Vishwas Babu A J 3e433a12c2 Merge pull request #1093 from pramodn02/MIFOSX-1561
MIFOSX-1561 : added check to validate principal collected
2014-10-01 13:20:02 -07:00
Pramod Nuthakki 1cac15959c MIFOSX-1561 : added check to validate principal collected 2014-10-01 18:33:41 +05:30
Pramod Nuthakki adc99d2dec MIFOSX-1557 : added check for disbursement fee 2014-10-01 14:26:41 +05:30
Michael Vorburger 0b501d1dcd MIFOSX-1552 war { ... war.finalizedBy(bootRepackage) } makes gradlew war
produce an executable WAR, just like standard gradlew build does (this
resolves the problem mentioned in the PS on
http://blog2.vorburger.ch/2014/09/mifos-executable-war-with-mariadb4j.html)

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
2014-09-30 01:01:17 +02:00
Michael Vorburger 00309de7e0 MIFOSX-1552 Upgrading rest-assured from v1.7.2 to v2.3.3 (incl.
reverting httpcomponents change from
848797985a +
b9cfcce1f9 as that wasn't the cause), as
that fixes the "java.lang.IllegalStateException: Unsupported cookie
spec: default at
org.apache.http.cookie.CookieSpecRegistry.getCookieSpec(CookieSpecRegistry.java:110)"

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
2014-09-29 23:55:44 +02:00
Vishwas Babu A J ccb5717bd6 Merge pull request #1089 from chandrikamohith/MIFOSX-1252Java
MIFOSX-1252 Changes for Savings Officer API Doc
2014-09-29 11:52:59 -07:00
Chandrika b760624cd4 MIFOSX-1252 Changes for Savings Officer API Doc 2014-09-29 14:47:56 -04:00
mplescano 15a9804427 Fixing for locale differents of English 2014-09-29 11:24:28 -05:00
Vishwas Babu A J a4465fbc15 Merge pull request #1086 from pramodn02/develop
MIFOSX-1557 : corrected journal entries for advanced accounting with acc...
2014-09-26 19:21:26 -07:00
Vishwas Babu A J 848797985a commenting out apache httpcomponents to see if it makes any difference on the Cloudbees server 2014-09-26 18:12:44 -07:00
Vishwas Babu A J b9cfcce1f9 adding httpclient 3.1 as a dependency to check if this solves integration test failures on cloudbees 2014-09-26 16:01:33 -07:00
Vishwas Babu A J 3a7c8d8ebb Merge branch 'develop' of github.com:openMF/mifosx into develop 2014-09-26 12:56:37 -07:00
Vishwas Babu A J e7aadae9fa removing dependency on httpclient 4.2.3 2014-09-26 12:56:11 -07:00
Vishwas Babu A J 192d690240 Merge pull request #1087 from pramodn02/MIFOSX-1563
MIFOSX-1563 : excluded disburse charge transaction on recalculation
2014-09-26 12:27:18 -07:00
Pramod Nuthakki 7ed6705f74 MIFOSX-1563 : excluded disburse charge transaction on recalculation 2014-09-26 19:50:32 +05:30
Pramod Nuthakki 71517d87c6 MIFOSX-1557 : corrected journal entries for advanced accounting with accrual 2014-09-26 16:02:59 +05:30
Vishwas Babu A J 276e6b1864 Ignoring hasMifosPlatformStarted test case and shorter file name for Windows 2014-09-26 01:42:46 -07:00
Vishwas Babu A J 68f6ecc60d moving sql files to new folder 2014-09-24 21:23:56 -07:00
Vishwas Babu A J bda10bbf78 Merge pull request #1079 from vorburger/SpringBootAndMariaDB4j
MIFOSX-1552 Spring Boot + MariaDB4j
2014-09-24 21:06:48 -07:00
Vishwas Babu A J a41f926dbe Merge pull request #1085 from chandrikamohith/MIFOSX-1252Java
MIFOSX-1252 Squashing all previous commits.Savings Officer changes
2014-09-24 14:49:08 -07:00
Chandrika 253c444a45 MIFOSX-1252 Squashing all previous commits.Savings Officer changes 2014-09-24 17:39:11 -04:00
Vishwas Babu A J 114f17e300 Merge pull request #1083 from pramodn02/develop
MIFOSX-1554 : added min balance check only for withdrawal transactions
2014-09-24 14:32:39 -07:00
Pramod Nuthakki d19ab1c8e4 MIFOSX-1554 : added min balance check only for withdrawal transactions 2014-09-24 14:57:37 +05:30
Vishwas Babu A J 57f014a8b0 Merge pull request #1082 from pramodn02/develop
interest recalculation test cases + fixes
2014-09-23 14:56:10 -07:00
Pramod Nuthakki 6d5830e232 added accrual test case for interest recalculation 2014-09-23 19:27:48 +05:30
Pramod Nuthakki 4266e5d705 corrected early payment related issues 2014-09-23 16:42:37 +05:30
Vishwas Babu A J ad51032aec Merge pull request #1078 from vorburger/CronMethodParserDoubleSlashProblemWithWAR
Fix for start-up problem if WAR is NOT unpacked
2014-09-22 13:43:15 -07:00
Vishwas Babu A J 4a83cb3d17 Merge pull request #1077 from vorburger/FlywayCoreInsteadMaven
Fix Flyway Core vs. Maven plug-in mess
2014-09-22 13:41:58 -07:00
Vishwas Babu A J 0b22529bb9 Merge pull request #1080 from pramodn02/develop
recalculation test cases and some corrections
2014-09-22 13:41:34 -07:00
Pramod Nuthakki 598f0ba4b1 recalculation test cases and some corrections 2014-09-23 01:37:36 +05:30
Michael Vorburger 4b0658a685 MIFOSX-1552 Spring Boot + MariaDB4j, read
http://blog2.vorburger.ch/2014/09/mifos-executable-war-with-mariadb4j.html

Signed-off-by: Michael Vorburger <mike@vorburger.ch>
2014-09-22 04:04:15 +02:00
Michael Vorburger 0e2f0eb85c Fix for start-up problem if WAR is NOT unpacked (relevant e.g. for upcoming Spring Boot + MariaDB4j java -jar mifos.war 2014-09-22 01:03:36 +02:00
Michael Vorburger 4eb2cf6e21 Fix Flyway Core vs. Maven plug-in mess
Signed-off-by: Michael Vorburger <mike@vorburger.ch>
2014-09-19 00:32:42 +02:00
Vishwas Babu A J 0d8bd285dc Merge pull request #1075 from pramodn02/develop
MIFOSX-1549 : corrected first repayment date
2014-09-18 03:46:48 -07:00
Pramod Nuthakki 7e0742b576 MIFOSX-1549 : corrected first repayment date 2014-09-18 15:15:21 +05:30
Vishwas Babu A J 9e1313226a Merge pull request #1074 from pramodn02/develop
Develop
2014-09-17 22:28:45 -07:00
Pramod Nuthakki 2e4203614c updated API documentation 2014-09-18 10:09:26 +05:30
Vishwas Babu A J 5356f5b45f Merge pull request #1063 from avikganguly01/develop
Hooks
2014-09-17 17:20:21 -07:00
Pramod Nuthakki 5b0dc5b77b MIFOSX-1541 : corrected prepayment and interest calculation on date change 2014-09-17 20:19:59 +05:30
avikganguly01 68e0b873fe Hooks 2014-09-17 19:46:01 +05:30
Pramod Nuthakki 7da550fe7c MIFOSX-1535 : added condition to set the default value 2014-09-17 13:23:13 +05:30
Pramod Nuthakki 91ea2f0e2e MIFOSX-1524 : corrected Interest waiver 2014-09-17 12:20:41 +05:30
Vishwas Babu A J 7889254e78 Merge pull request #1072 from chandrikamohith/MIFOSX-1252Java
MIFOSX-1252Java API documentation added for Loan officer and Savings Off...
2014-09-15 15:03:12 -07:00