diff --git a/mifosng-db/migrations/core_db/V141__spelling_mistake_corrections.sql b/mifosng-db/migrations/core_db/V141__spelling_mistake_corrections.sql new file mode 100755 index 000000000..f0b5b41c3 --- /dev/null +++ b/mifosng-db/migrations/core_db/V141__spelling_mistake_corrections.sql @@ -0,0 +1,4 @@ +RENAME TABLE `x_table_cloumn_code_mappings` TO `x_table_column_code_mappings`; + +ALTER TABLE `acc_gl_journal_entry` + CHANGE COLUMN `is_running_balance_caculated` `is_running_balance_calculated` TINYINT(4) NOT NULL DEFAULT '0' AFTER `lastmodified_date`; \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosplatform/accounting/glaccount/service/GLAccountReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/accounting/glaccount/service/GLAccountReadPlatformServiceImpl.java index 2d6558914..1c654d439 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/accounting/glaccount/service/GLAccountReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/accounting/glaccount/service/GLAccountReadPlatformServiceImpl.java @@ -112,7 +112,7 @@ public class GLAccountReadPlatformServiceImpl implements GLAccountReadPlatformSe // append SQL statement for fetching account totals if(associationParametersData.isRunningBalanceRequired()){ sql = sql + " and gl_j.id in (select t1.id from (SELECT t2.id , max(concat(t2.entry_date,t2.id)) " - + "FROM acc_gl_journal_entry t2 WHERE is_running_balance_caculated = 1 GROUP BY t2.account_id DESC) t1)"; + + "FROM acc_gl_journal_entry t2 WHERE is_running_balance_calculated = 1 GROUP BY t2.account_id DESC) t1)"; } final Object[] paramaterArray = new Object[3]; int arrayPos = 0; @@ -191,7 +191,7 @@ public class GLAccountReadPlatformServiceImpl implements GLAccountReadPlatformSe final StringBuilder sql = new StringBuilder(); sql.append("select ").append(rm.schema()); if(associationParametersData.isRunningBalanceRequired()){ - sql.append(" and gl_j.is_running_balance_caculated = 1 "); + sql.append(" and gl_j.is_running_balance_calculated = 1 "); } sql.append("where gl.id = ?"); if(associationParametersData.isRunningBalanceRequired()){ diff --git a/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/JournalEntryReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/JournalEntryReadPlatformServiceImpl.java index 1091b5c1c..12e1a0cf3 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/JournalEntryReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/JournalEntryReadPlatformServiceImpl.java @@ -80,7 +80,7 @@ public class JournalEntryReadPlatformServiceImpl implements JournalEntryReadPlat .append(" journalEntry.currency_code as currencyCode, curr.name as currencyName, curr.internationalized_name_code as currencyNameCode, ") .append(" curr.display_symbol as currencyDisplaySymbol, curr.decimal_places as currencyDigits, curr.currency_multiplesof as inMultiplesOf "); if (associationParametersData.isRunningBalanceRequired()) { - sb.append(" ,journalEntry.is_running_balance_caculated as runningBalanceComputed, ") + sb.append(" ,journalEntry.is_running_balance_calculated as runningBalanceComputed, ") .append(" journalEntry.office_running_balance as officeRunningBalance, ") .append(" journalEntry.organization_running_balance as organizationRunningBalance "); } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/JournalEntryRunningBalanceUpdateServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/JournalEntryRunningBalanceUpdateServiceImpl.java index bf4623935..a088e2a41 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/JournalEntryRunningBalanceUpdateServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/JournalEntryRunningBalanceUpdateServiceImpl.java @@ -83,7 +83,7 @@ public class JournalEntryRunningBalanceUpdateServiceImpl implements JournalEntry @CronTarget(jobName = JobName.ACCOUNTING_RUNNING_BALANCE_UPDATE) public void updateRunningBalance() { String dateFinder = "select MIN(je.entry_date) as entityDate from acc_gl_journal_entry je " - + "where je.is_running_balance_caculated=0 "; + + "where je.is_running_balance_calculated=0 "; try { Date entityDate = this.jdbcTemplate.queryForObject(dateFinder, Date.class); updateOrganizationRunningBalance(entityDate); @@ -106,7 +106,7 @@ public class JournalEntryRunningBalanceUpdateServiceImpl implements JournalEntry if (office == null) { throw new OfficeNotFoundException(officeId); } String dateFinder = "select MIN(je.entry_date) as entityDate " + "from acc_gl_journal_entry je " - + "where je.is_running_balance_caculated=0 and je.office_id=?"; + + "where je.is_running_balance_calculated=0 and je.office_id=?"; try { Date entityDate = this.jdbcTemplate.queryForObject(dateFinder, Date.class, officeId); updateRunningBalance(officeId, entityDate); @@ -162,7 +162,7 @@ public class JournalEntryRunningBalanceUpdateServiceImpl implements JournalEntry } BigDecimal officeRunningBalance = calculateRunningBalance(entryData, officeRunningBalanceMap); BigDecimal runningBalance = calculateRunningBalance(entryData, runningBalanceMap); - String sql = "UPDATE acc_gl_journal_entry je SET je.is_running_balance_caculated=1, je.organization_running_balance=" + String sql = "UPDATE acc_gl_journal_entry je SET je.is_running_balance_calculated=1, je.organization_running_balance=" + runningBalance + ",je.office_running_balance=" + officeRunningBalance + " WHERE je.id=" + entryData.getId(); updateSql[i++] = sql; } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/GenericDataServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/GenericDataServiceImpl.java index eddc31168..df7fc1b8b 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/GenericDataServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/GenericDataServiceImpl.java @@ -278,7 +278,7 @@ public class GenericDataServiceImpl implements GenericDataService { private SqlRowSet getDatatableCodeData(final String datatable, final String columnName) { - final String sql = "select mc.id,mc.code_name from m_code mc join x_table_cloumn_code_mappings xcc on xcc.code_id = mc.id where xcc.column_alias_name='" + final String sql = "select mc.id,mc.code_name from m_code mc join x_table_column_code_mappings xcc on xcc.code_id = mc.id where xcc.column_alias_name='" + datatable.toLowerCase().replaceAll("\\s", "_") + "_" + columnName + "'"; final SqlRowSet rsValues = this.jdbcTemplate.queryForRowSet(sql); diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java index 9e5b41a70..e09f2d44a 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java @@ -573,7 +573,7 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ private int getCodeIdForColumn(final String dataTableNameAlias, final String name) { final StringBuilder checkColumnCodeMapping = new StringBuilder(); - checkColumnCodeMapping.append("select ccm.code_id from x_table_cloumn_code_mappings ccm where ccm.column_alias_name='") + checkColumnCodeMapping.append("select ccm.code_id from x_table_column_code_mappings ccm where ccm.column_alias_name='") .append(dataTableNameAlias).append("_").append(name).append("'"); int codeId = 0; try { @@ -650,7 +650,7 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ final String[] addSqlList = new String[codeMappings.size()]; int i = 0; for (final Map.Entry mapEntry : codeMappings.entrySet()) { - addSqlList[i++] = "insert into x_table_cloumn_code_mappings (column_alias_name, code_id) values ('" + mapEntry.getKey() + addSqlList[i++] = "insert into x_table_column_code_mappings (column_alias_name, code_id) values ('" + mapEntry.getKey() + "'," + mapEntry.getValue() + ");"; } @@ -663,7 +663,7 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ final String[] deleteSqlList = new String[columnNames.size()]; int i = 0; for (final String columnName : columnNames) { - deleteSqlList[i++] = "DELETE FROM x_table_cloumn_code_mappings WHERE column_alias_name='" + columnName + "';"; + deleteSqlList[i++] = "DELETE FROM x_table_column_code_mappings WHERE column_alias_name='" + columnName + "';"; } this.jdbcTemplate.batchUpdate(deleteSqlList); @@ -822,7 +822,7 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ deregisterDatatable(datatableName); String[] sqlArray = null; if (this.configurationDomainService.isConstraintApproachEnabledForDatatables()) { - final String deleteColumnCodeSql = "delete from x_table_cloumn_code_mappings where column_alias_name like'" + final String deleteColumnCodeSql = "delete from x_table_column_code_mappings where column_alias_name like'" + datatableName.toLowerCase().replaceAll("\\s", "_") + "_%'"; sqlArray = new String[2]; sqlArray[1] = deleteColumnCodeSql;