Merge remote-tracking branch 'vishwas/mifosx-240'

.gitignore

@@ -16,3 +16,4 @@ repos
 *.ipr
 *.iws
 rebel.xml
+*.sublime-workspace

mifosng-db/0001a-mifosplatform-core-ddl-latest.sql

@@ -683,6 +683,7 @@ CREATE TABLE `m_loan_charge` (
   `amount_writtenoff_derived` decimal(19,6) DEFAULT NULL,
   `amount_outstanding_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `is_paid_derived` tinyint(1) NOT NULL DEFAULT '0',
+  `waived` tinyint(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   KEY `charge_id` (`charge_id`),
   KEY `m_loan_charge_ibfk_2` (`loan_id`),
@@ -1059,8 +1060,11 @@ CREATE TABLE `stretchy_parameter` (
   `selectOne` varchar(1) DEFAULT NULL,
   `selectAll` varchar(1) DEFAULT NULL,
   `parameter_sql` text,
+  `parent_parameter_id` int(11) NULL DEFAULT NULL,
   PRIMARY KEY (`parameter_id`),
-  UNIQUE KEY `name_UNIQUE` (`parameter_name`)
+  UNIQUE KEY `name_UNIQUE` (`parameter_name`),
+  INDEX `fk_stretchy_parameter_0001_idx` (`parent_parameter_id`),
+  CONSTRAINT `fk_stretchy_parameter_0001` FOREIGN KEY (`parent_parameter_id`) REFERENCES `stretchy_parameter` (`parameter_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `stretchy_report` (

mifosng-db/0002-mifosx-base-reference-data-utf8.sql

@@ -447,6 +447,8 @@ INSERT INTO `m_permission`
 ('portfolio', 'UPDATE_GROUP_CHECKER', 'GROUP', 'UPDATE', '0'),
 ('portfolio', 'DELETE_GROUP', 'GROUP', 'DELETE', '1'),
 ('portfolio', 'DELETE_GROUP_CHECKER', 'GROUP', 'DELETE', '0'),
+('portfolio', 'UNASSIGNSTAFF_GROUP', 'GROUP', 'UNASSIGNSTAFF', 1),
+('portfolio', 'UNASSIGNSTAFF_GROUP_CHECKER', 'GROUP', 'UNASSIGNSTAFF', 0),
 ('portfolio', 'CREATE_LOANCHARGE', 'LOANCHARGE', 'CREATE', '1'),
 ('portfolio', 'CREATE_LOANCHARGE_CHECKER', 'LOANCHARGE', 'CREATE', '0'),
 ('portfolio', 'UPDATE_LOANCHARGE', 'LOANCHARGE', 'UPDATE', '1'),

mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/api/ClientIdentifiersApiResource.java

@@ -88,7 +88,7 @@ public class ClientIdentifiersApiResource {
     @Path("template")
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    public String newClientDetails(@Context final UriInfo uriInfo) {
+    public String newClientIdentifierDetails(@Context final UriInfo uriInfo) {
 
         context.authenticatedUser().validateHasReadPermission(resourceNameForPermissions);