diff --git a/.gitignore b/.gitignore index 986478884..5547434bb 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ repos *.ipr *.iws rebel.xml +*.sublime-workspace diff --git a/mifosng-db/0001a-mifosplatform-core-ddl-latest.sql b/mifosng-db/0001a-mifosplatform-core-ddl-latest.sql index 22f5c5d66..ec4875b7e 100644 --- a/mifosng-db/0001a-mifosplatform-core-ddl-latest.sql +++ b/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` ( diff --git a/mifosng-db/0002-mifosx-base-reference-data-utf8.sql b/mifosng-db/0002-mifosx-base-reference-data-utf8.sql index 6d4cabc1a..01ad1b28b 100644 --- a/mifosng-db/0002-mifosx-base-reference-data-utf8.sql +++ b/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'), diff --git a/mifosng-db/patches/03a-patch_add_remove_loanofficer_permission.sql b/mifosng-db/patchesPutOnDemoServer20130315/03a-patch_add_remove_loanofficer_permission.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/03a-patch_add_remove_loanofficer_permission.sql rename to mifosng-db/patchesPutOnDemoServer20130315/03a-patch_add_remove_loanofficer_permission.sql diff --git a/mifosng-db/patches/03b-patch_add_remove_loanofficer_checker_permission.sql b/mifosng-db/patchesPutOnDemoServer20130315/03b-patch_add_remove_loanofficer_checker_permission.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/03b-patch_add_remove_loanofficer_checker_permission.sql rename to mifosng-db/patchesPutOnDemoServer20130315/03b-patch_add_remove_loanofficer_checker_permission.sql diff --git a/mifosng-db/patches/04-code_value_permissions.sql b/mifosng-db/patchesPutOnDemoServer20130315/04-code_value_permissions.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/04-code_value_permissions.sql rename to mifosng-db/patchesPutOnDemoServer20130315/04-code_value_permissions.sql diff --git a/mifosng-db/patches/05a-modify_tenant_timezoneid.sql b/mifosng-db/patchesPutOnDemoServer20130315/05a-modify_tenant_timezoneid.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/05a-modify_tenant_timezoneid.sql rename to mifosng-db/patchesPutOnDemoServer20130315/05a-modify_tenant_timezoneid.sql diff --git a/mifosng-db/patches/05b-tz_table.sql b/mifosng-db/patchesPutOnDemoServer20130315/05b-tz_table.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/05b-tz_table.sql rename to mifosng-db/patchesPutOnDemoServer20130315/05b-tz_table.sql diff --git a/mifosng-db/patches/06-hugo_specific_client_details.sql b/mifosng-db/patchesPutOnDemoServer20130315/06-hugo_specific_client_details.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/06-hugo_specific_client_details.sql rename to mifosng-db/patchesPutOnDemoServer20130315/06-hugo_specific_client_details.sql diff --git a/mifosng-db/patches/07-alter-loan-add-loanpurpose-add-loan-collateral-table.sql b/mifosng-db/patchesPutOnDemoServer20130315/07-alter-loan-add-loanpurpose-add-loan-collateral-table.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/07-alter-loan-add-loanpurpose-add-loan-collateral-table.sql rename to mifosng-db/patchesPutOnDemoServer20130315/07-alter-loan-add-loanpurpose-add-loan-collateral-table.sql diff --git a/mifosng-db/patches/08-add-fields-to-capture-move-loan-into-lifecycle-state.sql b/mifosng-db/patchesPutOnDemoServer20130315/08-add-fields-to-capture-move-loan-into-lifecycle-state.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/08-add-fields-to-capture-move-loan-into-lifecycle-state.sql rename to mifosng-db/patchesPutOnDemoServer20130315/08-add-fields-to-capture-move-loan-into-lifecycle-state.sql diff --git a/mifosng-db/patches/09-patch_add_accounting_permissions.txt b/mifosng-db/patchesPutOnDemoServer20130315/09-patch_add_accounting_permissions.txt similarity index 100% rename from mifosng-db/patches/09-patch_add_accounting_permissions.txt rename to mifosng-db/patchesPutOnDemoServer20130315/09-patch_add_accounting_permissions.txt diff --git a/mifosng-db/patches/10-refactor-contra-reversal-transactions-for-loan-portfolio.sql b/mifosng-db/patchesPutOnDemoServer20130315/10-refactor-contra-reversal-transactions-for-loan-portfolio.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/10-refactor-contra-reversal-transactions-for-loan-portfolio.sql rename to mifosng-db/patchesPutOnDemoServer20130315/10-refactor-contra-reversal-transactions-for-loan-portfolio.sql diff --git a/mifosng-db/patches/11_add_saving_permissions.sql b/mifosng-db/patchesPutOnDemoServer20130315/11_add_saving_permissions.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/11_add_saving_permissions.sql rename to mifosng-db/patchesPutOnDemoServer20130315/11_add_saving_permissions.sql diff --git a/mifosng-db/patches/11a-alter-group_to_add_loanofficer.sql b/mifosng-db/patchesPutOnDemoServer20130315/11a-alter-group_to_add_loanofficer.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/11a-alter-group_to_add_loanofficer.sql rename to mifosng-db/patchesPutOnDemoServer20130315/11a-alter-group_to_add_loanofficer.sql diff --git a/mifosng-db/patches/11b-ddl_group_level_table.sql b/mifosng-db/patchesPutOnDemoServer20130315/11b-ddl_group_level_table.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/11b-ddl_group_level_table.sql rename to mifosng-db/patchesPutOnDemoServer20130315/11b-ddl_group_level_table.sql diff --git a/mifosng-db/patches/11c-ddl_group_level_col_name_changed.sql b/mifosng-db/patchesPutOnDemoServer20130315/11c-ddl_group_level_col_name_changed.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/11c-ddl_group_level_col_name_changed.sql rename to mifosng-db/patchesPutOnDemoServer20130315/11c-ddl_group_level_col_name_changed.sql diff --git a/mifosng-db/patches/12-journal-entry-updates.sql b/mifosng-db/patchesPutOnDemoServer20130315/12-journal-entry-updates.sql similarity index 100% rename from mifosng-db/patches/12-journal-entry-updates.sql rename to mifosng-db/patchesPutOnDemoServer20130315/12-journal-entry-updates.sql diff --git a/mifosng-db/patches/13-more-jounal-entry-updates.sql b/mifosng-db/patchesPutOnDemoServer20130315/13-more-jounal-entry-updates.sql similarity index 100% rename from mifosng-db/patches/13-more-jounal-entry-updates.sql rename to mifosng-db/patchesPutOnDemoServer20130315/13-more-jounal-entry-updates.sql diff --git a/mifosng-db/patches/14-drop_per_row_audit_support.sql b/mifosng-db/patchesPutOnDemoServer20130315/14-drop_per_row_audit_support.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/14-drop_per_row_audit_support.sql rename to mifosng-db/patchesPutOnDemoServer20130315/14-drop_per_row_audit_support.sql diff --git a/mifosng-db/patches/14-r_enum_value-transaction-type-enum.sql b/mifosng-db/patchesPutOnDemoServer20130315/14-r_enum_value-transaction-type-enum.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/14-r_enum_value-transaction-type-enum.sql rename to mifosng-db/patchesPutOnDemoServer20130315/14-r_enum_value-transaction-type-enum.sql diff --git a/mifosng-db/patches/15a-loan-derived-fields.sql b/mifosng-db/patchesPutOnDemoServer20130315/15a-loan-derived-fields.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/15a-loan-derived-fields.sql rename to mifosng-db/patchesPutOnDemoServer20130315/15a-loan-derived-fields.sql diff --git a/mifosng-db/patches/15b-update_loan-create-loan_arrears_aging.sql b/mifosng-db/patchesPutOnDemoServer20130315/15b-update_loan-create-loan_arrears_aging.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/15b-update_loan-create-loan_arrears_aging.sql rename to mifosng-db/patchesPutOnDemoServer20130315/15b-update_loan-create-loan_arrears_aging.sql diff --git a/mifosng-db/patches/15c-loan-summary-fields.sql b/mifosng-db/patchesPutOnDemoServer20130315/15c-loan-summary-fields.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/15c-loan-summary-fields.sql rename to mifosng-db/patchesPutOnDemoServer20130315/15c-loan-summary-fields.sql diff --git a/mifosng-db/patches/15d-loan_arrears_aging_populate.sql b/mifosng-db/patchesPutOnDemoServer20130315/15d-loan_arrears_aging_populate.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/15d-loan_arrears_aging_populate.sql rename to mifosng-db/patchesPutOnDemoServer20130315/15d-loan_arrears_aging_populate.sql diff --git a/mifosng-db/patches/16-calendar_table.sql b/mifosng-db/patchesPutOnDemoServer20130315/16-calendar_table.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/16-calendar_table.sql rename to mifosng-db/patchesPutOnDemoServer20130315/16-calendar_table.sql diff --git a/mifosng-db/patches/17-calendar_permissions.sql b/mifosng-db/patchesPutOnDemoServer20130315/17-calendar_permissions.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/17-calendar_permissions.sql rename to mifosng-db/patchesPutOnDemoServer20130315/17-calendar_permissions.sql diff --git a/mifosng-db/patches/18-modify_m_product_deposit.sql b/mifosng-db/patchesPutOnDemoServer20130315/18-modify_m_product_deposit.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/18-modify_m_product_deposit.sql rename to mifosng-db/patchesPutOnDemoServer20130315/18-modify_m_product_deposit.sql diff --git a/mifosng-db/patches/19-note_permissions.sql b/mifosng-db/patchesPutOnDemoServer20130315/19-note_permissions.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/19-note_permissions.sql rename to mifosng-db/patchesPutOnDemoServer20130315/19-note_permissions.sql diff --git a/mifosng-db/patches/20-add_group_id_to_note_table.sql b/mifosng-db/patchesPutOnDemoServer20130315/20-add_group_id_to_note_table.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/20-add_group_id_to_note_table.sql rename to mifosng-db/patchesPutOnDemoServer20130315/20-add_group_id_to_note_table.sql diff --git a/mifosng-db/patches/21-add_group_permission_code.sql b/mifosng-db/patchesPutOnDemoServer20130315/21-add_group_permission_code.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/21-add_group_permission_code.sql rename to mifosng-db/patchesPutOnDemoServer20130315/21-add_group_permission_code.sql diff --git a/mifosng-db/patches/22-add-parent-id-stretchy-parameter.sql b/mifosng-db/patchesPutOnDemoServer20130315/22-add-parent-id-stretchy-parameter.sql old mode 100644 new mode 100755 similarity index 100% rename from mifosng-db/patches/22-add-parent-id-stretchy-parameter.sql rename to mifosng-db/patchesPutOnDemoServer20130315/22-add-parent-id-stretchy-parameter.sql diff --git a/mifosng-db/patches/23-charges_updates.sql b/mifosng-db/patchesPutOnDemoServer20130315/23-charges_updates.sql similarity index 100% rename from mifosng-db/patches/23-charges_updates.sql rename to mifosng-db/patchesPutOnDemoServer20130315/23-charges_updates.sql diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/api/ClientIdentifiersApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/api/ClientIdentifiersApiResource.java index dc4fd867f..d69f241fc 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/api/ClientIdentifiersApiResource.java +++ b/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);