Continued:

- renamed as there will be only company employees

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/org/mxchange/jfinancials/model/receipt/BillableReceipt.java b/src/org/mxchange/jfinancials/model/receipt/BillableReceipt.java
index 5afec5d4b4bc5f33f572f293f3c3ddce320eaa2f..b1edba3fc564db8bfe68727c6a4c3730597db7a9 100644 (file)
--- a/src/org/mxchange/jfinancials/model/receipt/BillableReceipt.java
+++ b/src/org/mxchange/jfinancials/model/receipt/BillableReceipt.java
@@ -19,9 +19,9 @@ package org.mxchange.jfinancials.model.receipt;
 import java.io.Serializable;
 import java.util.Date;
 import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
-import org.mxchange.jcontactsbusiness.model.employee.Employee;
 import org.mxchange.jproduct.model.payment.PaymentType;
 import org.mxchange.jusercore.model.user.User;
+import org.mxchange.jcontactsbusiness.model.employee.Employable;
 
 /**
  * An interface for receipts
@@ -91,14 +91,14 @@ public interface BillableReceipt extends Serializable {
         * <p>
         * @return Seller (employee)
         */
-       Employee getReceiptSellerEmployee ();
+       Employable getReceiptSellerEmployee ();
 
        /**
         * Setter for seller (employee)
         * <p>
         * @param receiptSellerEmployee Seller (employee)
         */
-       void setReceiptSellerEmployee (final Employee receiptSellerEmployee);
+       void setReceiptSellerEmployee (final Employable receiptSellerEmployee);
 
        /**
         * Getter for receipt number

diff --git a/src/org/mxchange/jfinancials/model/receipt/FinancialReceipt.java b/src/org/mxchange/jfinancials/model/receipt/FinancialReceipt.java
index 44607e7a4e8ff75278956daf012c9a3412053452..5d4d72fb7addb31060b4eefabf28d0367c6ed0c9 100644 (file)
--- a/src/org/mxchange/jfinancials/model/receipt/FinancialReceipt.java
+++ b/src/org/mxchange/jfinancials/model/receipt/FinancialReceipt.java
@@ -37,12 +37,12 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
 import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
-import org.mxchange.jcontactsbusiness.model.branchoffice.CompanyBranchOffice;
-import org.mxchange.jcontactsbusiness.model.employee.CompanyEmployee;
-import org.mxchange.jcontactsbusiness.model.employee.Employee;
+import org.mxchange.jcontactsbusiness.model.branchoffice.BusinessBranchOffice;
+import org.mxchange.jcontactsbusiness.model.employee.BusinessEmployee;
 import org.mxchange.jproduct.model.payment.PaymentType;
 import org.mxchange.jusercore.model.user.LoginUser;
 import org.mxchange.jusercore.model.user.User;
+import org.mxchange.jcontactsbusiness.model.employee.Employable;
 
 /**
  *
@@ -77,7 +77,7 @@ public class FinancialReceipt implements BillableReceipt {
         * Seller instance
         */
        @JoinColumn (name = "receipt_branch_id", referencedColumnName = "branch_id", nullable = false, updatable = false)
-       @OneToOne (targetEntity = CompanyBranchOffice.class, cascade = CascadeType.REFRESH, optional = false)
+       @OneToOne (targetEntity = BusinessBranchOffice.class, cascade = CascadeType.REFRESH, optional = false)
        private BranchOffice receiptBranchOffice;
 
        /**
@@ -128,8 +128,8 @@ public class FinancialReceipt implements BillableReceipt {
         * Selling employee instance
         */
        @JoinColumn (name = "receipt_seller_id", referencedColumnName = "employee_id")
-       @OneToOne (targetEntity = CompanyEmployee.class, cascade = CascadeType.REFRESH)
-       private Employee receiptSellerEmployee;
+       @OneToOne (targetEntity = BusinessEmployee.class, cascade = CascadeType.REFRESH)
+       private Employable receiptSellerEmployee;
 
        /**
         * Which user this receipt belongs to
@@ -329,12 +329,12 @@ public class FinancialReceipt implements BillableReceipt {
        }
 
        @Override
-       public Employee getReceiptSellerEmployee () {
+       public Employable getReceiptSellerEmployee () {
                return this.receiptSellerEmployee;
        }
 
        @Override
-       public void setReceiptSellerEmployee (final Employee receiptSellerEmployee) {
+       public void setReceiptSellerEmployee (final Employable receiptSellerEmployee) {
                this.receiptSellerEmployee = receiptSellerEmployee;
        }