FINERACT-2091: Support for string type primary keys
This commit is contained in:
committed by
Adam Saghy
parent
111e28ed1b
commit
f48f94c454
+1
-1
@@ -36,7 +36,7 @@ import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
|
||||
@NoArgsConstructor(access = AccessLevel.PROTECTED)
|
||||
@AllArgsConstructor
|
||||
@Getter
|
||||
public class FinancialActivityAccount extends AbstractPersistableCustom {
|
||||
public class FinancialActivityAccount extends AbstractPersistableCustom<Long> {
|
||||
|
||||
@ManyToOne(fetch = FetchType.EAGER)
|
||||
@JoinColumn(name = "gl_account_id")
|
||||
|
||||
+1
-1
@@ -38,7 +38,7 @@ import org.apache.fineract.infrastructure.core.service.DateUtils;
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@Accessors(chain = true)
|
||||
public class TrialBalance extends AbstractPersistableCustom {
|
||||
public class TrialBalance extends AbstractPersistableCustom<Long> {
|
||||
|
||||
@Column(name = "office_id", nullable = false)
|
||||
private Long officeId;
|
||||
|
||||
+1
-1
@@ -37,7 +37,7 @@ import org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail;
|
||||
@Entity
|
||||
@Getter
|
||||
@Table(name = "acc_gl_journal_entry")
|
||||
public class JournalEntry extends AbstractAuditableWithUTCDateTimeCustom {
|
||||
public class JournalEntry extends AbstractAuditableWithUTCDateTimeCustom<Long> {
|
||||
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "office_id", nullable = false)
|
||||
|
||||
+1
-2
@@ -40,7 +40,7 @@ import org.apache.fineract.portfolio.paymenttype.domain.PaymentType;
|
||||
@Entity
|
||||
@Table(name = "acc_product_mapping", uniqueConstraints = { @UniqueConstraint(columnNames = { "product_id", "product_type",
|
||||
"financial_account_type", "payment_type" }, name = "financial_action") })
|
||||
public class ProductToGLAccountMapping extends AbstractPersistableCustom {
|
||||
public class ProductToGLAccountMapping extends AbstractPersistableCustom<Long> {
|
||||
|
||||
@ManyToOne(optional = true)
|
||||
@JoinColumn(name = "gl_account_id")
|
||||
@@ -69,5 +69,4 @@ public class ProductToGLAccountMapping extends AbstractPersistableCustom {
|
||||
return new ProductToGLAccountMapping().setGlAccount(glAccount).setProductId(productId).setProductType(productType)
|
||||
.setFinancialAccountType(financialAccountType);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+1
-1
@@ -52,7 +52,7 @@ import org.apache.fineract.organisation.office.domain.Office;
|
||||
@Entity
|
||||
@Table(name = "acc_accounting_rule", uniqueConstraints = {
|
||||
@UniqueConstraint(columnNames = { "name" }, name = "accounting_rule_name_unique") })
|
||||
public class AccountingRule extends AbstractPersistableCustom {
|
||||
public class AccountingRule extends AbstractPersistableCustom<Long> {
|
||||
|
||||
@Column(name = "name", nullable = false, length = 500)
|
||||
private String name;
|
||||
|
||||
+1
-1
@@ -38,7 +38,7 @@ import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
|
||||
@Entity
|
||||
@Table(name = "acc_rule_tags", uniqueConstraints = {
|
||||
@UniqueConstraint(columnNames = { "acc_rule_id", "tag_id", "acc_type_enum" }, name = "UNIQUE_ACCOUNT_RULE_TAGS") })
|
||||
public class AccountingTagRule extends AbstractPersistableCustom {
|
||||
public class AccountingTagRule extends AbstractPersistableCustom<Long> {
|
||||
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "acc_rule_id", nullable = false)
|
||||
|
||||
Reference in New Issue
Block a user