Skip to content

Commit

Permalink
Merge pull request #1300 from fiterlatam/fix/FSF-69-QA
Browse files Browse the repository at this point in the history
FIX FSF-69
  • Loading branch information
BrianMuhimbura authored Nov 18, 2024
2 parents c488cf2 + 18b1094 commit 8b9110b
Showing 1 changed file with 4 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.util.List;
import org.apache.fineract.accounting.glaccount.data.GLAccountData;
import org.apache.fineract.infrastructure.core.data.EnumOptionData;
import org.apache.fineract.infrastructure.core.service.DateUtils;
import org.apache.fineract.organisation.monetary.data.CurrencyData;

/**
Expand Down Expand Up @@ -93,6 +94,7 @@ public class JournalEntryData {
private String bankNumber;
private transient Long savingTransactionId;
private ZonedDateTime createdTimestamp;
private String systemTimezone;

// for opening bal bulk import
public JournalEntryData(Long officeId, LocalDate transactionDate, String currencyCode, List<CreditDebit> credits,
Expand Down Expand Up @@ -241,6 +243,7 @@ public JournalEntryData(final Long id, final Long officeId, final String officeN
this.transactionDetails = transactionDetailData;
this.currency = currency;
this.createdTimestamp = createdTimestamp;
this.systemTimezone = DateUtils.getTimeZoneOfTenant().getID();
}

public JournalEntryData(final Long id, final Long officeId, final String glAccountName, final Long glAccountId,
Expand Down Expand Up @@ -275,6 +278,7 @@ public JournalEntryData(final Long id, final Long officeId, final String glAccou
this.transactionDetails = null;
this.currency = null;
this.currencyCode = currencyCode;
this.systemTimezone = DateUtils.getTimeZoneOfTenant().getDisplayName();
}

public static JournalEntryData fromGLAccountData(final GLAccountData glAccountData) {
Expand Down

0 comments on commit 8b9110b

Please sign in to comment.