Merge pull request #638 from Musoni/develop

Mifosx-735 removed office runningBalance from glaccount api and updated ...

api-docs/apiLive.htm

@@ -18409,7 +18409,6 @@ GET https://DomainName/api/v1/glaccounts
 	  "id": 10,
 	  "name": "asset tag"
 	},
-	"officeRunningBalance":12030,
         "organizationRunningBalance": 118437,
     },
     {
@@ -18429,7 +18428,6 @@ GET https://DomainName/api/v1/glaccounts
             "value": "DETAIL"
         },
         "description": "Desc",
-	"officeRunningBalance":12030,
         "organizationRunningBalance": 118437,
     }
 ]
@@ -18716,7 +18714,6 @@ GET https://DomainName/api/v1/glaccounts/{glaccountsId}
         "value": "DETAIL"
     },
     "description": "Desc",
-    "officeRunningBalance":12030,
     "organizationRunningBalance": 118437,
 }
                     </code>

mifosng-provider/src/main/java/org/mifosplatform/accounting/glaccount/data/GLAccountData.java

@@ -33,7 +33,6 @@ public class GLAccountData {
     private final String description;
     private final String nameDecorated;
     private final CodeValueData tagId;
-    private final Long officeRunningBalance;
     private final Long organizationRunningBalance;
 
 
@@ -53,7 +52,7 @@ public class GLAccountData {
 
     public GLAccountData(final Long id, final String name, final Long parentId, final String glCode, final boolean disabled,
             final boolean manualEntriesAllowed, final EnumOptionData type, final EnumOptionData usage, final String description,
-            final String nameDecorated, final CodeValueData tagId,final Long officeRunningBalance,final Long organizationRunningBalance) {
+            final String nameDecorated, final CodeValueData tagId,final Long organizationRunningBalance) {
         this.id = id;
         this.name = name;
         this.parentId = parentId;
@@ -65,7 +64,6 @@ public class GLAccountData {
         this.description = description;
         this.nameDecorated = nameDecorated;
         this.tagId = tagId;
-        this.officeRunningBalance = officeRunningBalance;
         this.organizationRunningBalance = organizationRunningBalance;
         this.accountTypeOptions = null;
         this.usageOptions = null;
@@ -99,7 +97,6 @@ public class GLAccountData {
         this.description = accountData.description;
         this.nameDecorated = accountData.nameDecorated;
         this.tagId = accountData.tagId;
-        this.officeRunningBalance =  accountData.officeRunningBalance;
         this.organizationRunningBalance =  accountData.organizationRunningBalance;
         this.accountTypeOptions = accountTypeOptions;
         this.usageOptions = usageOptions;
@@ -132,10 +129,9 @@ public class GLAccountData {
         final String description = null;
         final String nameDecorated = null;
         final CodeValueData tagId = null;
-        final Long officeRunningBalance = null;
         final Long organizationRunningBalance = null;
 
-        return new GLAccountData(id, name, parentId, glCode, disabled, manualEntriesAllowed, type, usage, description, nameDecorated, tagId,officeRunningBalance,organizationRunningBalance);
+        return new GLAccountData(id, name, parentId, glCode, disabled, manualEntriesAllowed, type, usage, description, nameDecorated, tagId,organizationRunningBalance);
     }
 
     public GLAccountData(final Long id, final String name, final String glCode) {
@@ -150,7 +146,6 @@ public class GLAccountData {
         this.description = null;
         this.nameDecorated = null;
         this.tagId = null;
-        this.officeRunningBalance = null;
         this.organizationRunningBalance = null;
         this.accountTypeOptions = null;
         this.usageOptions = null;

mifosng-provider/src/main/java/org/mifosplatform/accounting/glaccount/service/GLAccountReadPlatformServiceImpl.java

@@ -45,7 +45,7 @@ public class GLAccountReadPlatformServiceImpl implements GLAccountReadPlatformSe
                     + "classification_enum as classification, account_usage as accountUsage, gl.description as description, "
                     + nameDecoratedBaseOnHierarchy
                     + "as nameDecorated, "
-                    + "cv.id as codeId, cv.code_value as codeValue,gl_j.office_running_balance as officeRunningBalance,gl_j.organization_running_balance as organizationRunningBalance "
+                    + "cv.id as codeId, cv.code_value as codeValue,gl_j.organization_running_balance as organizationRunningBalance "
                     + "from acc_gl_account gl left join m_code_value cv on tag_id=cv.id "
                     + "left outer Join acc_gl_journal_entry gl_j on gl_j.account_id = gl.id";
 
@@ -69,10 +69,9 @@ public class GLAccountReadPlatformServiceImpl implements GLAccountReadPlatformSe
             final Long codeId = rs.wasNull() ? null : rs.getLong("codeId");
             final String codeValue = rs.getString("codeValue");
             final CodeValueData tagId = CodeValueData.instance(codeId, codeValue);
-            final Long officeRunningBalance = rs.getLong("officeRunningBalance");
             final Long organizationRunningBalance =  rs.getLong("organizationRunningBalance");
             return new GLAccountData(id, name, parentId, glCode, disabled, manualEntriesAllowed, accountType, usage, description,
-                    nameDecorated, tagId, officeRunningBalance,organizationRunningBalance);
+                    nameDecorated, tagId,organizationRunningBalance);
         }
     }