diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index ab6e2dd3..cb0cb48a 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -77,7 +77,7 @@ class purchaseorder_model extends CI_Model function GetServicePOListforBilling() { - $subQuery ='select POMast.PONO,supp.SupplierName,PODate,POMast.PaymentTerms,POMast.ServiceWorkStatusRemarks, + $subQuery ='select POMast.PONO,supp.SupplierName,PODate,POMast.PaymentTerms,POMast.ServiceWorkStatusRemarks,StatusName,POMast.CapitalRange,POType, LineItem.*,mat.MaterialName,mat.UOM,emp.FirstName,emp.LastName,Tax.TotalValue,Cost.CostCenterName,AdvanceAmount ,Dept.DepartmentName from T_PurchaseOrder_Master POMast join T_PurchaseOrder_LineItem LineItem on LineItem.PONO = POMast.PONO diff --git a/application/views/serviceporeport.php b/application/views/serviceporeport.php index 7ea85830..74c1b666 100755 --- a/application/views/serviceporeport.php +++ b/application/views/serviceporeport.php @@ -13,7 +13,9 @@ $Adv=''; span.highlight { background-color: yellow; } - + span.highlight1{ + background-color: red; + } @@ -29,6 +31,10 @@ $Adv='';