diff --git a/mifosng-db/patches/01-drop-audit-columns.sql b/mifosng-db/patchesPutOnDemoServer20130201/01-drop-audit-columns.sql similarity index 100% rename from mifosng-db/patches/01-drop-audit-columns.sql rename to mifosng-db/patchesPutOnDemoServer20130201/01-drop-audit-columns.sql diff --git a/mifosng-db/patches/02-drop-office-audit-columns.sql b/mifosng-db/patchesPutOnDemoServer20130201/02-drop-office-audit-columns.sql similarity index 100% rename from mifosng-db/patches/02-drop-office-audit-columns.sql rename to mifosng-db/patchesPutOnDemoServer20130201/02-drop-office-audit-columns.sql diff --git a/mifosng-db/patches/03-drop-currency-audit-columns.sql b/mifosng-db/patchesPutOnDemoServer20130201/03-drop-currency-audit-columns.sql similarity index 100% rename from mifosng-db/patches/03-drop-currency-audit-columns.sql rename to mifosng-db/patchesPutOnDemoServer20130201/03-drop-currency-audit-columns.sql diff --git a/mifosng-db/patchesPutOnDemoServer20130201/04-a-creocore-only-drop-fund.sql b/mifosng-db/patchesPutOnDemoServer20130201/04-a-creocore-only-drop-fund.sql new file mode 100644 index 000000000..7320f0275 --- /dev/null +++ b/mifosng-db/patchesPutOnDemoServer20130201/04-a-creocore-only-drop-fund.sql @@ -0,0 +1,11 @@ +ALTER TABLE `mifostenant-creocore`.`m_fund` +DROP FOREIGN KEY `FK4E56DB408F889C3F`, +DROP FOREIGN KEY `FK4E56DB40541F0A56`; + +ALTER TABLE `mifostenant-creocore`.`m_fund` +DROP COLUMN `lastmodified_date`, +DROP COLUMN `lastmodifiedby_id`, +DROP COLUMN `created_date`, +DROP COLUMN `createdby_id`, +DROP INDEX `FK4E56DB408F889C3F`, +DROP INDEX `FK4E56DB40541F0A56`; \ No newline at end of file diff --git a/mifosng-db/patchesPutOnDemoServer20130201/04-b-heavensfamily-only-drop-fund.sql b/mifosng-db/patchesPutOnDemoServer20130201/04-b-heavensfamily-only-drop-fund.sql new file mode 100644 index 000000000..3e94858ee --- /dev/null +++ b/mifosng-db/patchesPutOnDemoServer20130201/04-b-heavensfamily-only-drop-fund.sql @@ -0,0 +1,5 @@ +ALTER TABLE `m_fund` +DROP COLUMN `lastmodifiedby_id` , +DROP COLUMN `lastmodified_date` , +DROP COLUMN `created_date`, +DROP COLUMN `createdby_id`; \ No newline at end of file diff --git a/mifosng-db/patches/04-drop-audit-columns-of-organisationwide-entities.sql b/mifosng-db/patchesPutOnDemoServer20130201/04-c-drop-audit-columns-of-organisationwide-entities.sql similarity index 75% rename from mifosng-db/patches/04-drop-audit-columns-of-organisationwide-entities.sql rename to mifosng-db/patchesPutOnDemoServer20130201/04-c-drop-audit-columns-of-organisationwide-entities.sql index 7e166b01d..cd36b3ae7 100644 --- a/mifosng-db/patches/04-drop-audit-columns-of-organisationwide-entities.sql +++ b/mifosng-db/patchesPutOnDemoServer20130201/04-c-drop-audit-columns-of-organisationwide-entities.sql @@ -1,9 +1,3 @@ -ALTER TABLE `m_fund` -DROP COLUMN `lastmodifiedby_id` , -DROP COLUMN `lastmodified_date` , -DROP COLUMN `created_date`, -DROP COLUMN `createdby_id`; - ALTER TABLE `m_staff` DROP COLUMN `lastmodifiedby_id` , DROP COLUMN `lastmodified_date` , diff --git a/mifosng-db/patches/05-add-delete-office-transaction-permission.sql b/mifosng-db/patchesPutOnDemoServer20130201/05-add-delete-office-transaction-permission.sql similarity index 100% rename from mifosng-db/patches/05-add-delete-office-transaction-permission.sql rename to mifosng-db/patchesPutOnDemoServer20130201/05-add-delete-office-transaction-permission.sql diff --git a/mifosng-db/patches/06-guarantor-redux.sql b/mifosng-db/patchesPutOnDemoServer20130201/06-guarantor-redux.sql similarity index 100% rename from mifosng-db/patches/06-guarantor-redux.sql rename to mifosng-db/patchesPutOnDemoServer20130201/06-guarantor-redux.sql diff --git a/mifosng-db/patches/07-drop-audit-columns-of-client-groups.sql b/mifosng-db/patchesPutOnDemoServer20130201/07-drop-audit-columns-of-client-groups.sql similarity index 100% rename from mifosng-db/patches/07-drop-audit-columns-of-client-groups.sql rename to mifosng-db/patchesPutOnDemoServer20130201/07-drop-audit-columns-of-client-groups.sql diff --git a/mifosng-db/patches/08-drop-audit-columns-of-products.sql b/mifosng-db/patchesPutOnDemoServer20130201/08-drop-audit-columns-of-products.sql similarity index 100% rename from mifosng-db/patches/08-drop-audit-columns-of-products.sql rename to mifosng-db/patchesPutOnDemoServer20130201/08-drop-audit-columns-of-products.sql diff --git a/mifosng-db/patches/09-reload-r-enum-values.sql b/mifosng-db/patchesPutOnDemoServer20130201/09-reload-r-enum-values.sql similarity index 100% rename from mifosng-db/patches/09-reload-r-enum-values.sql rename to mifosng-db/patchesPutOnDemoServer20130201/09-reload-r-enum-values.sql diff --git a/mifosng-provider/src/main/java/org/mifosplatform/organisation/office/serialization/OfficeTransactionCommandFromApiJsonDeserializer.java b/mifosng-provider/src/main/java/org/mifosplatform/organisation/office/serialization/OfficeTransactionCommandFromApiJsonDeserializer.java index 623a874be..cdb9b9c59 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/organisation/office/serialization/OfficeTransactionCommandFromApiJsonDeserializer.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/organisation/office/serialization/OfficeTransactionCommandFromApiJsonDeserializer.java @@ -45,7 +45,7 @@ public final class OfficeTransactionCommandFromApiJsonDeserializer { fromApiJsonHelper.checkForUnsupportedParameters(typeOfMap, json, supportedParameters); final List dataValidationErrors = new ArrayList(); - final DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(dataValidationErrors).resource("code"); + final DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(dataValidationErrors).resource("officeTransaction"); final JsonElement element = fromApiJsonHelper.parse(json); final Long fromOfficeId = fromApiJsonHelper.extractLongNamed("fromOfficeId", element);