Commit Graph
2328 Commits
Author SHA1 Message Date
Pramod Nuthakki 2bd1332da7 MIFOSX-1742 : added collection sheet for individuals 2015-01-16 10:24:26 +05:30
Vishwas Babu A J 20f292d329 MIFOSX-1841 2015-01-14 09:29:42 -08:00
Vishwas Babu A J bd689bc008 MIFOSX-1838 2015-01-13 15:41:26 -08:00
Vishwas Babu A J bdbd1a85ed Merge pull request #1248 from chandrikamohith/MIFOSX-1776
MIFOSX-1776 Sync repayment dates with meeting dates for group loan
2015-01-13 11:14:33 -08:00
Vishwas Babu A J 19c7ef1f32 Merge pull request #1249 from MegaAlex/licenseFix
Add license headers
2015-01-13 11:13:56 -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
Alex Ivanov deb506ece3 Add license headers 2015-01-09 22:47:56 +02:00
Chandrika 0c7b8c937c MIFOSX-1776 Sync repayment dates with meeting dates for group loan 2015-01-09 12:17:22 -05: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 0acf7c1498 Merge pull request #1237 from chandrikamohith/MIFOSX-1776
MIFOSX-1776 Sync repayment dates with meeting dates for Group Loan appli...
2015-01-07 22:50:45 -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
Chandrika 4cd7c79225 MIFOSX-1776 Sync repayment dates with meeting dates for Group Loan application 2015-01-05 13:54:38 -05:00
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
Michael Vorburger 4ad30d91d9 MIFOSX-1756 Follow-up, switched to using (existing) /apps/ instead /web/, and slightly updated the doc 2014-12-30 01:57:41 +01:00
Michael Vorburger 74242ed036 Merge pull request #1201 from binaryking/MIFOSX-1756
MIFOSX-1756 Make it easy for Static Web Content such as the community-app to be served by the new standalone end-user server (not development)
2014-12-29 18:30:16 +01: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 436bdfd538 Merge pull request #1209 from MegaAlex/MIFOSX-1739
MIFOSX-1739 Add option to show only active loan products
2014-12-18 19:05:10 -08:00
Vishwas Babu A J 532425626e remove compilation warnings furing gradle build 2014-12-18 19:00:53 -08:00
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
Alex Ivanov 9d07e9ad7a MIFOSX-1739 Add option to show only active loan products 2014-12-19 00:32:59 +02:00
Chandrika d7b6e22344 MIFOSX-1768 Corrected Spelling error 2014-12-18 17:12:01 -05:00
Vishwas Babu A J f72a5efb52 Merge pull request #1198 from pramodn02/MIFOSX-1744
MIFOSX-1744 : added portion of recovery incase guarantee is more than 100%
2014-12-17 17:34:22 -08:00
Chandrika 114dcb21c4 MIFOSX-1766 Table entry is now being made for savingsOfficer in assignment history table after Approval 2014-12-17 16:55:21 -05:00
Mohammed Nafees 7ec1f9e808 MIFOSX-1756 Make it easy for Static Web Content such as the community-app to be served by the new standalone end-user server (not development) 2014-12-17 21:41:32 +05:30
Mohammed Nafees 7ab8a7bf8e Add missing license headers to fix TravisCI build. 2014-12-17 21:03:30 +05:30
Vishwas Babu A J 90ac626fc1 Merge pull request #1200 from pramodn02/MIFOSX-1760
MIFOSX-1760 : corrected start date calculation for approval
2014-12-17 06:42:43 -08:00
Vishwas Babu A J d8ed1b685f Merge pull request #1199 from Nayan/MIFOSX-1680
#MIFOSX-1680 Allow to modifiy frequncy and intervals if calendar is NOT synced with any active entity
2014-12-17 06:34:16 -08:00
Pramod Nuthakki 651da79697 MIFOSX-1760 : corrected start date calculation for approval 2014-12-17 15:22:29 +05:30
Nayan 11ba1f5301 Allow to modifiy frequncy and intervals if calendar is NOT synced with any active entity 2014-12-17 15:01:19 +05:30
Pramod Nuthakki a174469d19 MIFOSX-1744 : added portion of recovery incase guarantee is more than 100% 2014-12-17 12:50:34 +05:30
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
Vishwas Babu A J 0b9b2bb6f6 Merge pull request #1194 from MegaAlex/MIFOSX-1747
MIFOSX-1747 Don't register the basic auth filter before Spring's filter ...
2014-12-16 11:46:53 -08:00
Alex Ivanov 9160fb5f57 MIFOSX-1747 Don't register the basic auth filter before Spring's filter chain 2014-12-16 21:06:14 +02:00
Chandrika 88a7ffd75a MIFOSX-1662 Corrected Code Names for Reject and Withdraw. 2014-12-16 13:31:17 -05:00
Michael Vorburger 45790c3a60 Merge pull request #1189 from MegaAlex/MIFOSX-1701
MIFOSX-1701 Add option to display only active group members
2014-12-16 19:18:32 +01:00