Commit Graph
2043 Commits
Author SHA1 Message Date
Vishwas Babu A J 2212618256 fix failing integration tests due to enabling optimistic locking on loans 2014-12-04 17:26:46 -08:00
Vishwas Babu A J 09e2d04a6e Merge pull request #1163 from pramodn02/develop
MIFOSX-1709 : corrected condition to add and delete guarantor
2014-12-04 08:35:43 -08:00
Mohammed Nafees cea6436470 MIFOSX-1284 Add the ability to sort offices 2014-12-04 20:02:14 +05:30
Pramod Nuthakki 65d9ca11bf MIFOSX-1709 : corrected condition to add and delete guarantor 2014-12-04 14:46:05 +05:30
Vishwas Babu A J 34a9ec41c5 missing response data parameters for code values 2014-12-04 01:14:46 -08:00
Vishwas Babu A J 64c642656f enable optimistic locking for m_loan 2014-12-04 01:12:21 -08:00
Pramod Nuthakki 118f4904c6 MIFOSX-1709 : guarantor on hold funds functionality 2014-12-04 11:31:12 +05:30
Vishwas Babu A J d5ce6f2c98 Merge pull request #1146 from emmanuelnnaa/MIFOSX-1671
commit for MIFOSX-1671 (User with 'ALL_FUNCTIONS_READ' permission does not have access to /users/{userId} resource)
2014-12-03 20:54:28 -08:00
Vishwas Babu A J 2fc3c9c7ee Merge pull request #1155 from MithunKashyap/MIFOSX-1674
MIFOSX-1674:The description field added to m_code_value can be edited/en...
2014-12-03 20:51:34 -08:00
Vishwas Babu A J 8ef61f3275 MIFOSX-1704 2014-12-03 12:31:59 -08:00
Mohammed Nafees 589b1c2dbb Merge branch develop of upstream 2014-12-03 22:21:30 +05:30
Mohammed Nafees 2f5dc2875f MIFOSX-1533 Fix advanced search exception 2014-12-03 22:17:20 +05:30
Vishwas Babu A J 466a691e56 Merge pull request #1154 from MegaAlex/bug/MIFOSX-1575
MIFOSX-1575 Add optional 'comments' parameter to Journal Reverse command
2014-12-03 08:37:00 -08:00
Vishwas Babu A J 07052f983e cath database errors related to savings withdrawals 2014-12-02 17:33:19 -08:00
Vishwas Babu A J f58fc1c116 add optimistic locking for savings account 2014-12-02 13:24:55 -08:00
Alex Ivanov 9b826ea98e MIFOSX-1575 Add optional 'comments' parameter to Journal Reverse command 2014-12-02 21:06:53 +02:00
Vishwas Babu A J 78b6f2a3e6 updating licences 2014-12-02 08:35:59 -08:00
Vishwas Babu A J 637f062ce3 MIFOSX-1511 custom formats for client, loan and savings account numbers 2014-12-02 08:34:08 -08:00
MithunKashyap d644fa9123 MIFOSX-1674:The description field added to m_code_value can be edited/entered 2014-12-02 16:18:29 +05:30
Pramod Nuthakki e25ddfd18a MIFOSX-1676 : changed AppUser to nullable in savings transactions 2014-11-25 18:14:41 +05:30
Pramod Nuthakki 958fb33db2 added licences 2014-11-24 13:17:07 +05:30
Pramod Nuthakki 6646ab57db MIFOSX-1675 : Added support to capture guarantor funding details for loan account 2014-11-24 12:23:08 +05:30
Vishwas Babu A J cd76d1d543 fixing failing Client integration tests 2014-11-22 03:10:49 +05:30
Vishwas Babu A J 1dee8c14ee fixing failing Client integration tests 2014-11-22 02:47:53 +05:30
Vishwas Babu A J c7a6d93bc4 fixing batch job failures 2014-11-22 00:54:22 +05:30
Emmanuel Nnaa cc487116bb commit for MIFOSX-1671 (User with 'ALL_FUNCTIONS_READ' permission does not have access to /users/{userId} resource) 2014-11-20 13:22:00 +01:00
Vishwas Babu A J 9dadb669a4 resolving compilation issue and bumping up sql patch number 2014-11-20 06:15:48 +05:30
Vishwas Babu A J 555839df31 Merge branch 'MIFOSX-1628' of git://github.com/binnygopinath/mifosx into binnygopinath-MIFOSX-1628 2014-11-20 06:09:17 +05:30
Vishwas Babu A J 094c205018 Merge branch 'ClientSubStatus_MIFOSX-1642' of git://github.com/MithunKashyap/mifosx into MithunKashyap-ClientSubStatus_MIFOSX-1642 2014-11-20 06:06:20 +05:30
Vishwas Babu A J e420a56986 Merge branch 'emmanuelnnaa-MIFOSX-1638' into develop 2014-11-20 06:00:55 +05:30
Vishwas Babu A J 5a21aa6bfd Merge branch 'MIFOSX-1638' of git://github.com/emmanuelnnaa/mifosx into emmanuelnnaa-MIFOSX-1638
Conflicts:
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java
2014-11-20 06:00:32 +05:30
Vishwas Babu A J 1c83f181ab Merge pull request #1140 from Musoni/MIFOSX-1655
fixed MIFOSX-1655 issue with updating a loan with a charge
2014-11-20 04:15:33 +05:30
Binny G Sreevas 99dfadf990 MIFOSX-1628 - Added DB upgrade script 2014-11-20 02:08:00 +05:30
Binny G Sreevas c11f3af180 MIFOSX-1628 - Added User ID and Datetime to Loan and Savings Transactions 2014-11-20 02:03:21 +05:30
Vishwas Babu A J 180c49fce9 initial work around MIFOSX-1634 2014-11-19 03:17:34 +05:30
MithunKashyap eb2741a0e2 MIFOSX-1642: Added sub status to client resource 2014-11-18 16:59:03 +05:30
andrew-dzak e1313fd254 fixed MIFOSX-1655 issue with updating a loan with a charge 2014-11-16 20:54:55 +01:00
Vishwas Babu A J 61a096f33c Merge branch 'MIFOSX-1068' of git://github.com/Nayan/mifosx into Nayan-MIFOSX-1068
Conflicts:
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoansApiResource.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanAccountData.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java
2014-11-13 21:35:54 +05:30
Vishwas Babu A J 7db8147f9d bump up gurantors sql 2014-11-13 21:13:40 +05:30
Vishwas Babu A J 77e08d11c8 fixing error messages for min days between loan disbursal and repayment 2014-11-13 21:10:16 +05:30
Vishwas Babu A J 95447d21b7 Merge branch 'develop' of git://github.com/pramodn02/mifosx into pramodn02-develop
Conflicts:
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccount.java
2014-11-13 20:25:48 +05:30
Vishwas Babu A J 10f22ab3eb Merge branch 'MIFOSX-1639' of git://github.com/emmanuelnnaa/mifosx into emmanuelnnaa-MIFOSX-1639
Conflicts:
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanAccountData.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java
2014-11-13 20:20:00 +05:30
Vishwas Babu A J c4ef820ad0 fix failing test cases 2014-11-13 19:23:04 +05:30
Vishwas Babu A J 5f5f94d5f2 updates to nth day logic 2014-11-13 17:57:41 +05:30
Vishwas Babu A J 580eec5064 updates to nth day logic 2014-11-13 17:55:01 +05:30
Nayan 8758d6f669 Fix for client activation withing a group and JLG loan 500 error 2014-11-13 09:50:13 +05:30
Vishwas Babu A J b27e0a9581 Merge branch 'MIFOSX-1461' of git://github.com/cgninan/mifosx into cgninan-MIFOSX-1461
Conflicts:
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/domain/DefaultScheduledDateGenerator.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/domain/ScheduledDateGenerator.java
2014-11-11 18:53:09 +05:30
Emmanuel Nnaa 0664aca901 commit for MIFOSX-1639 (Auto create standing instruction at loan disbursement) 2014-11-10 13:55:29 +01:00
Emmanuel Nnaa ef3d19c387 commit for MIFOSX-1638 (Waiving charges attached to zero balance instalments - Loan Rescheduling) 2014-11-10 13:46:29 +01:00
Nayan 131b07318e Option to change approved amount during loan approval 2014-11-08 19:01:00 +05:30