diff --git a/app/Controllers/Purchaseorder.php b/app/Controllers/Purchaseorder.php index 15046b8e..0d2cce20 100755 --- a/app/Controllers/Purchaseorder.php +++ b/app/Controllers/Purchaseorder.php @@ -1215,8 +1215,6 @@ class Purchaseorder extends BaseController //This used to Edit the Revenue Purchase Order function EditRevenuePurchaseOrder() { - - $PONO = $this->request->getPost('txtPONO'); $POdt = $this->request->getPost('PODate'); $PODate = get_date_time_format($POdt); @@ -1455,10 +1453,11 @@ class Purchaseorder extends BaseController $POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO, $POLineItemNo, $POLineItemList); } + $isExists = $this->purchaseorder_model->LineItemExistsinRevenueTax($LineItemNo); - - if (count($isExists) == 0) { - + + if (is_array($isExists) && count($isExists) == 0) { + } else { $RevenueTaxList = array('DiscountType' => $DiscountType, 'DiscountValue' => $DiscountValue, 'AfterDiscount' => $AfterDiscount, 'PackagingType' => $PackagingType, 'PackagingValue' => $PackagingValue, 'PackagingCalulatedOn' => $PackagingOption, 'AfterPackagingValue' => $AfterPackagingValue, 'FreightType' => $FreightType, 'FreightValue' => $FreightValue, 'AfterFreightValue' => $AfterFreightValue, 'Insurance' => $InsuranceValue, 'TotalValue' => $TotalOrderValue, 'UpdateBY' => $updatedBy, 'UpdatedOn' => $updateddt, 'CGST' => $Cgst, 'AfterCGST' => $AfterCgst, 'SGST' => $Sgst, 'AfterSGST' => $AfterSgst, 'IGST' => $Igst, 'AfterIGST' => $AfterIgst, 'CreatedBy' => $updatedBy, 'NoOfTrip' => $NOOfTrip); $this->purchaseorder_model->updateRevenueTax($LineItemNo, $RevenueTaxList); diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php index b816f0bf..b4fd7bfb 100755 --- a/app/Views/alterpurchaseorder.php +++ b/app/Views/alterpurchaseorder.php @@ -55,17 +55,11 @@ if (!empty($INRSYMBOL)) { .txtSpcialInstruction{ background-color: #f4f9fb; } - #packagingcalmodel { - margin-top: 200px; - z-index: 1080 !important; - } + - #freightmodel { - margin-top: 200px; - z-index: 1080 !important; - } + #ExciseDutyCalModel { margin-top: 200px; @@ -2734,6 +2728,1851 @@ if (!empty($INRSYMBOL)) { Item + + +
| SNo | +Requisition No | +Item Code | +Item Description | +Quantity | +UOM | +Rate | +Basic Amount | +Tax Amount | +Total Order Amount | +Action | +
|---|