From 12a6e3977eb76cb3d6eb759e536b5d80e50f3dea Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxOLI.org>
Date: Thu, 3 Jun 2021 15:42:06 -0400
Subject: [PATCH] funds: tweak columns in debits tab

LH#2

Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
---
 .../staff/admin/acq/funds/fund-details-dialog.component.html   | 10 ++++++----
 .../app/staff/admin/acq/funds/fund-details-dialog.component.ts |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.html
index d8ea6ee7d2..87ee598bad 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.html
@@ -146,6 +146,7 @@
             <eg-grid #fundDetailsDebitsGrid idlClass="acqfdeb" [dataSource]="acqfdebDataSource"
                 [cellTextGenerator]="cellTextGenerator"
                 [sortable]="true" persistKey="acq.fund.fund_debit"
+                ignoreFields="invoice_entry"
                 [filterable]="true" [stickyHeader]="true">
 
               <eg-grid-column path="amount"></eg-grid-column>
@@ -159,20 +160,21 @@
                   {{row.li_id}}
                 </a>
               </ng-template>
-              <eg-grid-column path="li_id" i18n-label label="Line Item" [cellTemplate]="liTmpl" [filterable]="false" [sortable]="false"></eg-grid-column>
+              <eg-grid-column path="li" i18n-label label="Line Item" [cellTemplate]="liTmpl" [filterable]="false" [sortable]="false"></eg-grid-column>
               <ng-template #poTmpl let-row="row">
                 <a href="/eg/staff/acq/legacy/po/view/{{row.po_id}}" target="_blank">
                   {{row.po_name}}
                 </a>
               </ng-template>
-              <eg-grid-column path="po_id" i18n-label label="Purchase Order" [cellTemplate]="poTmpl" [filterable]="false" [sortable]="false"></eg-grid-column>
+              <eg-grid-column path="po" i18n-label label="Purchase Order" [cellTemplate]="poTmpl" [filterable]="false" [sortable]="false"></eg-grid-column>
               <ng-template #invTmpl let-row="row">
                 <a href="/eg/staff/acq/legacy/invoice/view/{{row.invoice_id}}" target="_blank">
                   {{row.vendor_invoice_id}}
                 </a>
               </ng-template>
-              <eg-grid-column path="invoice_id" i18n-label label="Invoice" [cellTemplate]="invTmpl" [filterable]="false" [sortable]="false"></eg-grid-column>
-              <eg-grid-column path="invoice_entry" [hidden]="true"></eg-grid-column>
+              <eg-grid-column path="invoice" i18n-label label="Invoice" [cellTemplate]="invTmpl" [filterable]="false" [sortable]="false"></eg-grid-column>
+              <eg-grid-column path="po_id" i18n-label label="PO ID" [hidden]="true"></eg-grid-column>
+              <eg-grid-column path="invoice_id" i18n-label label="Internal Invoice ID" [hidden]="true"></eg-grid-column>
               <eg-grid-column path="id" [hidden]="true"></eg-grid-column>
               <eg-grid-column path="fund" [hidden]="true" [filterable]="false"></eg-grid-column>
             </eg-grid>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.ts
index a078e707f1..f254e608b9 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.ts
@@ -78,9 +78,9 @@ export class FundDetailsDialogComponent
             src_fund: row => row().code(),
             dest_fund: row => row().code(),
             funding_source: row => row().code(),
-            li_id: row => row.li_id,
-            po_id: row => row.po_name,
-            invoice_id: row => row.vendor_invoice_id
+            li: row => row.li_id,
+            po: row => row.po_name,
+            invoice: row => row.vendor_invoice_id
         };
     }
 
-- 
2.11.0