diff --git a/AstuteClient2/src/app/invoice/invoice.component.html b/AstuteClient2/src/app/invoice/invoice.component.html
index c444ad8..57f8a46 100644
--- a/AstuteClient2/src/app/invoice/invoice.component.html
+++ b/AstuteClient2/src/app/invoice/invoice.component.html
@@ -199,23 +199,23 @@
                                            (change)="onSelectedCellChange(i, 'qty', qty.value); updateSelectedBillAmt()" #qty [disabled]="chosenInv.invoiceStatus !== 1">
                 </td>
             </tr>
-            <!--<tr class="p-0 m-0" *ngIf="inDet.poLineItemNum != -1">-->
-                <!--<th class="align-content-center">-->
-                    <!--<p>{{getPerc(qty.value, inDet.remainingQty)}}%</p>-->
-                <!--</th>-->
-                <!--<td colspan="4">-->
-                    <!--<div class="progress" style="height: 25px;">-->
-                        <!--<div class="progress-bar bg-success" role="progressbar"-->
-                             <!--[ngStyle]="{'width': getPerc(qty.value, inDet.remainingQty) + '%'}">-->
-                            <!--{{qty.value}}-->
-                        <!--</div>-->
-                        <!--<div class="progress-bar bg-danger" role="progressbar"-->
-                             <!--[ngStyle]="{'width': (100 - getPerc(qty.value, inDet.remainingQty)) + '%'}">-->
-                            <!--{{inDet.remainingQty - (qty.value)}}-->
-                        <!--</div>-->
-                    <!--</div>-->
-                <!--</td>-->
-            <!--</tr>-->
+            <tr class="p-0 m-0" *ngIf="inDet.poLineItemNum != -1">
+                <th class="align-content-center">
+                    <p>{{getPerc(qty.value, inDet.remainingQty)}}%</p>
+                </th>
+                <td colspan="4">
+                    <div class="progress" style="height: 25px;">
+                        <div class="progress-bar bg-success" role="progressbar"
+                             [ngStyle]="{'width': getPerc(qty.value, inDet.remainingQty) + '%'}">
+                            {{qty.value}}
+                        </div>
+                        <div class="progress-bar bg-danger" role="progressbar"
+                             [ngStyle]="{'width': (100 - getPerc(qty.value, inDet.remainingQty)) + '%'}">
+                            {{inDet.remainingQty - (qty.value)}}
+                        </div>
+                    </div>
+                </td>
+            </tr>
             <!--<tr class="p-0 m-0">-->
                 <!--&lt;!&ndash;INV Detail Items: invoiceNum, lineItemNum, poLineItemNum, serviceTypeId, desc, qty, fee&ndash;&gt;-->
                 <!--<td class="p-0 m-0"><input type="text" class="form-control cell" [value]="inDet.lineItemNum" disabled>-->
diff --git a/AstuteClient2/src/app/invoice/invoice.component.ts b/AstuteClient2/src/app/invoice/invoice.component.ts
index 8cdb3cc..86e4ccd 100644
--- a/AstuteClient2/src/app/invoice/invoice.component.ts
+++ b/AstuteClient2/src/app/invoice/invoice.component.ts
@@ -497,7 +497,7 @@ export class InvoiceComponent implements OnInit {
 
     setCorrespondingPos() {
         this.correspondingPos = this.pos.filter((po, index, array) => {
-            return po.customerId === this.chosenCustomerID && !po.oneInvInDraft;
+            return po.customerId === this.chosenCustomerID && !po.oneInvInDraft && po.final;
         });
     }
 
diff --git a/AstuteClient2/src/app/sales-order/sales-order.component.html b/AstuteClient2/src/app/sales-order/sales-order.component.html
index bec6264..88627da 100644
--- a/AstuteClient2/src/app/sales-order/sales-order.component.html
+++ b/AstuteClient2/src/app/sales-order/sales-order.component.html
@@ -23,10 +23,10 @@
       <button class="btn btn-info" style="width: 100%" (click)="open(edit)">Edit</button>
     </div>
     <div class="col-3">
-      <button class="btn btn-primary" style="width: 100%" (click)="finalizePO(selected.ponum)" [disabled]="selected.final === 1">Finalize</button>
+      <button class="btn btn-primary" style="width: 100%" (click)="finalizePO(selected.ponum)" [disabled]="!selected?true:selected.final === 1">Finalize</button>
     </div>
     <div class="col-3">
-      <button class="btn btn-danger" style="width: 100%" (click)="deletePO(selected.ponum)" [disabled]="selected.final === 0">Delete</button>
+      <button class="btn btn-danger" style="width: 100%" (click)="deletePO(selected.ponum)" [disabled]="!selected?true:selected.final === 0">Delete</button>
     </div>
   </div>
 </div>
diff --git a/AstuteSystem/src/main/java/com/astute/service/CustomerService.java b/AstuteSystem/src/main/java/com/astute/service/CustomerService.java
index e0ca7b2..fb07cf9 100644
--- a/AstuteSystem/src/main/java/com/astute/service/CustomerService.java
+++ b/AstuteSystem/src/main/java/com/astute/service/CustomerService.java
@@ -13,8 +13,9 @@ public class CustomerService extends Service{
         super();
     }
 
-    public List<Customer> getCustomers(String customerId)
+    public List<Customer> getCustomers(String sessionId, String customerId)
             throws AstuteException {
+
         return getDao().getCustomers(customerId);
     }