[fineract] branch develop updated: FINERACT-1399 Tag as non-mandatory field in Chart Of Accounts bulk upload

[ptuomola]

This is an automated email from the ASF dual-hosted git repository.

ptuomola pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git


The following commit(s) were added to refs/heads/develop by this push:
     new 899a036  FINERACT-1399 Tag as non-mandatory field in Chart Of Accounts 
bulk upload
899a036 is described below

commit 899a0363c29bcd04125cd1dec65af0af1caa5567
Author: Ankita Ranjan <ank...@fynarfin.io>
AuthorDate: Wed Oct 6 19:16:15 2021 +0530

    FINERACT-1399 Tag as non-mandatory field in Chart Of Accounts bulk upload
---
 .../importhandler/chartofaccounts/ChartOfAccountsImportHandler.java    | 3 ++-
 .../bulkimport/populator/chartofaccounts/ChartOfAccountsWorkbook.java  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/chartofaccounts/ChartOfAccountsImportHandler.java
 
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/chartofaccounts/ChartOfAccountsImportHandler.java
index e58f7cf..02d99bc 100644
--- 
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/chartofaccounts/ChartOfAccountsImportHandler.java
+++ 
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/chartofaccounts/ChartOfAccountsImportHandler.java
@@ -103,10 +103,11 @@ public class ChartOfAccountsImportHandler implements 
ImportHandler {
         }
         String glCode = 
ImportHandlerUtils.readAsString(ChartOfAcountsConstants.GL_CODE_COL, row);
         Long tagId = null;
+        CodeValueData tagIdCodeValueData = null;
         if 
(ImportHandlerUtils.readAsString(ChartOfAcountsConstants.TAG_ID_COL, row) != 
null) {
             tagId = 
Long.parseLong(ImportHandlerUtils.readAsString(ChartOfAcountsConstants.TAG_ID_COL,
 row));
+            tagIdCodeValueData = new CodeValueData(tagId);
         }
-        CodeValueData tagIdCodeValueData = new CodeValueData(tagId);
         String description = 
ImportHandlerUtils.readAsString(ChartOfAcountsConstants.DESCRIPTION_COL, row);
         return GLAccountData.importInstance(accountName, parentId, glCode, 
manualEntriesAllowed, accountTypeEnum, usageEnum, description,
                 tagIdCodeValueData, row.getRowNum());
diff --git 
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/chartofaccounts/ChartOfAccountsWorkbook.java
 
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/chartofaccounts/ChartOfAccountsWorkbook.java
index afc61e7..576e589 100644
--- 
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/chartofaccounts/ChartOfAccountsWorkbook.java
+++ 
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/chartofaccounts/ChartOfAccountsWorkbook.java
@@ -231,7 +231,7 @@ public class ChartOfAccountsWorkbook extends 
AbstractWorkbookPopulator {
         writeString(ChartOfAcountsConstants.PARENT_COL, rowHeader, "Parent");
         writeString(ChartOfAcountsConstants.PARENT_ID_COL, rowHeader, "Parent 
Id");
         writeString(ChartOfAcountsConstants.ACCOUNT_NAME_COL, rowHeader, 
"Account Name");
-        writeString(ChartOfAcountsConstants.TAG_COL, rowHeader, "Tag *");
+        writeString(ChartOfAcountsConstants.TAG_COL, rowHeader, "Tag");
         writeString(ChartOfAcountsConstants.TAG_ID_COL, rowHeader, "Tag Id");
         writeString(ChartOfAcountsConstants.DESCRIPTION_COL, rowHeader, 
"Description *");
         writeString(ChartOfAcountsConstants.LOOKUP_ACCOUNT_TYPE_COL, 
rowHeader, "Lookup Account type");