Commit Graph
161 Commits
Author SHA1 Message Date
sachinkulkarni12andVishwas Babu A J 89377a23b4 MIFOSX-1885
Conflicts:
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupingTypesWritePlatformServiceJpaRepositoryImpl.java
2015-03-19 16:57:35 +05:30
Vishwas Babu A J a16265eb92 fix failing test cases 2015-03-04 22:41:44 +05:30
Vishwas Babu A J d9ce1745da buping sql patch number 2015-03-03 20:07:17 +05:30
Vishwas Babu A J 95acad7cf4 Merge branch 'latest' of git://github.com/pramodn02/mifosx into develop 2015-03-03 20:06:35 +05:30
Vishwas Babu A J ab4e97821c fixing issue with patch number 244 2015-03-03 19:14:09 +05:30
MithunKashyap 72389cf933 MIFOSX-1737: Center Staff Assignment History 2015-03-03 10:40:16 +05:30
Vishwas Babu A J 445a98d225 deleting duplicate sql patches and bumping patch numbers 2015-03-03 08:50:54 +05:30
Vishwas Babu A J 495126b754 Merge branch 'TrancheDisbursal' of git://github.com/chandrikamohith/mifosx into chandrikamohith-TrancheDisbursal 2015-03-03 08:43:14 +05:30
MithunKashyap f179771b8d MIFOSX-1828:Updated Patch script for EntityMapping Feature 2015-02-28 15:01:52 +05:30
Chandrika f720bd6627 MIFOSX-1842 Changes made for improvements to tranche disbursal loans. 2015-02-24 17:36:11 +05:30
Chandrika f6f04d7ae3 MIFOSX-1824 API changes and test case for loan approval in case of multi-disburse loans. 2015-02-24 17:36:09 +05:30
Pramod Nuthakki 4a2a85d20e MIFOSX-1850 : Recurring deposits without maturity date 2015-02-24 10:45:10 +05:30
MithunKashyap f22cac3feb MIFOSX-1828:EntityMapping Feature 2015-02-16 09:51:32 +05:30
Vishwas Babu A J 88edeb8ee3 changing sql patch number for fixed emi changes 2015-02-03 00:42:58 -08:00
Vishwas Babu A J 13e3c0c605 Merge branch 'TestCases' of git://github.com/bharathc27/mifosx into bharathc27-TestCases
Conflicts:
	api-docs/apiLive.htm
	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/loanschedule/domain/LoanApplicationTerms.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/service/LoanScheduleAssembler.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/LoanProductConstants.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/data/LoanProductData.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanProduct.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/serialization/LoanProductDataValidator.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/service/LoanProductReadPlatformServiceImpl.java
2015-02-03 00:05:00 -08:00
bharathc27 0182be4cf9 MIFOSX: client/group loan testcases fixed 2015-01-30 11:11:37 +05:30
Vishwas Babu A J b4c354b224 Merge branch 'MIFOSX-1613' of git://github.com/pramodn02/mifosx into pramodn02-MIFOSX-1613
Conflicts:
	api-docs/apiLive.htm
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/data/LoanProductData.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanProduct.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/serialization/LoanProductDataValidator.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/service/LoanProductReadPlatformServiceImpl.java
2015-01-29 19:24:43 -08:00
Vishwas Babu A J 3f6d90e7d4 updating sql patch number 2015-01-28 15:33:29 -08:00
Vishwas Babu A J b490a42dcf Merge branch 'MIFOSX-1846' of git://github.com/MithunKashyap/mifosx into MithunKashyap-MIFOSX-1846 2015-01-28 15:32:44 -08:00
Vishwas Babu A J 371d38e1c9 bumping up sql patch number 2015-01-28 15:27:24 -08:00
Vishwas Babu A J f3c306ffbb Merge branch 'displayNameFix' of git://github.com/MegaAlex/mifosx into MegaAlex-displayNameFix 2015-01-28 15:24:42 -08:00
Pramod Nuthakki d9db7d5313 MIFOSX-1844 : added config to manage last transaction 2015-01-20 17:03:06 +05:30
MithunKashyap af43e6c58f MIFOSX-1846: Report and script files for Loan Transaction Receipt 2015-01-17 13:52:31 +05:30
Pramod Nuthakki 2bd1332da7 MIFOSX-1742 : added collection sheet for individuals 2015-01-16 10:24:26 +05:30
Vishwas Babu A J bd689bc008 MIFOSX-1838 2015-01-13 15:41:26 -08:00
Vishwas Babu A J f9d4af7d2f bump version number 2015-01-13 11:11:09 -08:00
Vishwas Babu A J 593ba64eac Merge branch 'MIFOSX-1786' of git://github.com/binaryking/mifosx into binaryking-MIFOSX-1786 2015-01-13 11:10:16 -08:00
Vishwas Babu A J fe9b3437d4 Merge branch 'openingbalances' of git://github.com/binnygopinath/mifosx into binnygopinath-openingbalances
Conflicts:
	mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java
2015-01-08 06:32:58 -08:00
Vishwas Babu A J e979bdf6b7 resolving version number conflict with sql patch 2015-01-07 22:57:28 -08:00
Vishwas Babu A J 7d059acd83 Merge branch 'MIFOSX-1809' of git://github.com/chandrikamohith/mifosx into chandrikamohith-MIFOSX-1809 2015-01-07 22:56:28 -08:00
Vishwas Babu A J 653c534514 Merge pull request #1234 from satish-conflux/MIFOSX-1817
MIFOSX-1870 : Added Currency Type
2015-01-07 21:39:05 -08:00
MithunKashyap ebab8699fe MIFOSX-1823: Report file and upgrade script for Savings Transaction Receipt 2015-01-06 15:45:25 +05:30
Satish Sajjan 70331f8447 MIFOSX-1870 : Added Currency Type 2014-12-31 19:24:29 +05:30
Pramod Nuthakki 4b6d794a47 MIFOSX-1613 : changes for overdue status and npa 2014-12-31 18:28:43 +05:30
Chandrika e4cf90562c MIFOSX-1809 Closure Reason Code added for Centers-'CenterClosureReason' 2014-12-30 12:50:28 -05:00
Alex Ivanov 66133d7f22 Change maximum display name length for staff 2014-12-28 17:50:49 +02:00
Vishwas Babu A J 6f16786aa8 updating migration script v_230 as a aworkaround for a flyway bug 2014-12-28 07:42:48 -08:00
Mohammed Nafees d8bcbba79c MIFOSX-1786 Allow usage of UGD (Templates) for Hooks 2014-12-28 00:18:29 +05:30
Satish Sajjan 9b3f56f6f6 Role Functionality with test cases 2014-12-26 17:51:36 +05:30
Vishwas Babu A J dc979da263 schema update was missed out for 1.26 release 2014-12-23 09:18:52 -08:00
Vishwas Babu A J 38ffaba65b Revert "update V197__updated_loan_running_balance_of_transactions.sql with a stored procedure" 2014-12-19 04:28:47 -08:00
Sughosh 54a45c5e41 update V197__updated_loan_running_balance_of_transactions.sql with a stored procedure 2014-12-19 14:06:10 +05:30
Vishwas Babu A J a665beb1b7 bump sql patch 2014-12-18 18:51:29 -08:00
Vishwas Babu A J 7acc549a01 Merge branch 'cash_mgmt_revised' of git://github.com/binnygopinath/mifosx into binnygopinath-cash_mgmt_revised 2014-12-18 18:46:22 -08:00
Vishwas Babu A J 18dba2fe2c bumping up sql patch number 2014-12-16 20:45:08 -08:00
Vishwas Babu A J dac4c63632 Merge pull request #1169 from binnygopinath/branch_specific_products_and_charges
Branch Specific Products and Charges - initial commit
2014-12-16 18:33:14 -08:00
Vishwas Babu A J 299b52ca45 Merge branch 'develop' of git://github.com/michaeldk-miagstan/mifosx into michaeldk-miagstan-develop
Conflicts:
	mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/loans/LoanTransactionHelper.java
	mifosng-provider/src/main/java/org/mifosplatform/commands/service/SynchronousCommandProcessingService.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/service/PortfolioAccountReadPlatformService.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
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanAccountDomainServiceJpa.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformService.java
	mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanWritePlatformService.java
2014-12-16 18:29:31 -08:00
Pramod Nuthakki 00d00551ad MIFOSX-1464 : added loan installment round-off 2014-12-16 15:17:42 +05:30
Vishwas Babu A J af6c9e2ed6 MIFOSX-1727 2014-12-07 19:47:19 -08:00
Vishwas Babu A J 002ef06d51 MIFOSX-1700 2014-12-06 21:49:20 -08:00