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
parent 10f22ab3eb c3e66a6bff
commit 95447d21b7
28 changed files with 640 additions and 179 deletions
@@ -0,0 +1,18 @@
+ALTER TABLE `m_savings_account`
+	ADD COLUMN `on_hold_funds_derived` DECIMAL(19,6) NULL DEFAULT NULL;
+	
+ALTER TABLE `m_portfolio_account_associations`
+	ADD COLUMN `association_type_enum` SMALLINT(1) NOT NULL DEFAULT '1';
+
+CREATE TABLE `m_product_loan_guarantee_details` (
+	`id` BIGINT(20) NOT NULL AUTO_INCREMENT,
+	`loan_product_id` BIGINT(20) NOT NULL,
+	`mandatory_guarantee` DECIMAL(19,5) NOT NULL,
+	`minimum_guarantee_from_own_funds` DECIMAL(19,5) NULL,
+	`minimum_guarantee_from_guarantor_funds` DECIMAL(19,5) NULL,
+	PRIMARY KEY (`id`),
+	CONSTRAINT `FK_guarantee_details_loan_product` FOREIGN KEY (`loan_product_id`) REFERENCES `m_product_loan` (`id`)
+);	
+
+ALTER TABLE `m_product_loan`
+	ADD COLUMN `hold_guarantee_funds` TINYINT(1) NOT NULL DEFAULT '0';