diff --git a/internal/modules/repports/repositories/debt_supplier.repository.go b/internal/modules/repports/repositories/debt_supplier.repository.go index 70bf644b..a95ef1bc 100644 --- a/internal/modules/repports/repositories/debt_supplier.repository.go +++ b/internal/modules/repports/repositories/debt_supplier.repository.go @@ -514,7 +514,7 @@ func (r *debtSupplierRepositoryImpl) baseExpenseSupplierIDs(ctx context.Context, Table("expenses"). Select("DISTINCT expenses.supplier_id"). Joins("JOIN (?) AS la ON la.approvable_id = expenses.id", r.latestExpenseApproval(ctx)). - Where("la.step_number >= ?", uint16(utils.ExpenseStepFinance)). + Where("la.step_number >= ?", uint16(utils.ExpenseStepRealisasi)). Where("(la.action IS NULL OR la.action != ?)", string(entity.ApprovalActionRejected)). Where("expenses.deleted_at IS NULL") @@ -623,7 +623,7 @@ func (r *debtSupplierRepositoryImpl) GetExpensesBySuppliers(ctx context.Context, Model(&entity.Expense{}). Joins("JOIN (?) AS la ON la.approvable_id = expenses.id", r.latestExpenseApproval(ctx)). Where("expenses.supplier_id IN ?", supplierIDs). - Where("la.step_number >= ?", uint16(utils.ExpenseStepFinance)). + Where("la.step_number >= ?", uint16(utils.ExpenseStepRealisasi)). Where("(la.action IS NULL OR la.action != ?)", string(entity.ApprovalActionRejected)). Where("expenses.deleted_at IS NULL") @@ -692,7 +692,7 @@ func (r *debtSupplierRepositoryImpl) GetExpenseTotalsBeforeDate(ctx context.Cont Joins("JOIN expense_nonstocks en ON en.expense_id = expenses.id"). Joins("JOIN (?) AS la ON la.approvable_id = expenses.id", r.latestExpenseApproval(ctx)). Where("expenses.supplier_id IN ?", supplierIDs). - Where("la.step_number >= ?", uint16(utils.ExpenseStepFinance)). + Where("la.step_number >= ?", uint16(utils.ExpenseStepRealisasi)). Where("(la.action IS NULL OR la.action != ?)", string(entity.ApprovalActionRejected)). Where("expenses.deleted_at IS NULL"). Where("DATE(expenses.transaction_date) < ?", dateFrom).