From b0a30fbf5e3d9881b92559f32798463d506d8a9f Mon Sep 17 00:00:00 2001 From: velz2020 Date: Fri, 21 Jul 2017 17:22:09 +0530 Subject: [PATCH] Service amend PO --- .../controllers/amendmentpurchaseorder.php | 188 ++- application/models/purchaseorder_model.php | 34 +- application/views/Amendervicepopdf.php | 335 ++++ application/views/Amendrevenuepopdf.php | 33 +- application/views/editRevenueAmendPO.php | 12 +- application/views/editServiceAmendPO.php | 1474 +++++++++++------ 6 files changed, 1553 insertions(+), 523 deletions(-) create mode 100644 application/views/Amendervicepopdf.php diff --git a/application/controllers/amendmentpurchaseorder.php b/application/controllers/amendmentpurchaseorder.php index 5146e01f..11713e38 100755 --- a/application/controllers/amendmentpurchaseorder.php +++ b/application/controllers/amendmentpurchaseorder.php @@ -458,14 +458,15 @@ function UpdateAmendServicePurchaseOrder() { $PONO =$this->input->post('txtPONO'); - + $MAD=''; $POdt =$this->input->post('PODate'); $PODate = $this->getDateformat($POdt); - + //echo $PODate; $SupplierID = $this->input->post('drpSupplier'); $DeliveryAddr = $this->input->post('txtDeliveryAddress'); $dt = $this->input->post('Deliverydt'); $DeliveryOption = $this->input->post('DateRange'); + if($DeliveryOption==1){ $Deliverydt = ''; $DeliverySchedule = $this->input->post('Scheduleby'); @@ -474,29 +475,60 @@ function UpdateAmendServicePurchaseOrder() $Deliverydt = $this->getDateformat($dt); $DeliverySchedule = ''; } + + $ddate=$this->input->post('Deliverydt'); + $beforeddate=$this->input->post('beforeDeliverydt'); + + $dschedule=$this->input->post('Scheduleby'); + $beforedschedule=$this->input->post('beforeScheduleby'); + + if($ddate != $beforeddate) + { + $MAD.="Amended Delivery Date :  " . $beforeddate . "
"; + } + + if($dschedule != $beforedschedule) + { + $MAD.="Amended Delivery Schedule :  " . $beforedschedule . "
"; + } + // if(($ddate != $beforeddate) || ($dschedule != $beforedschedule) ) + // { + // $beforeddate2=new DateTime($beforeddate, new DateTimeZone('Asia/Kolkata')); + // $beforeddate3 = $beforeddate2->format('d-m-Y'); + // echo $beforeddate3; + + // //die(); + // $MAD.="Amended Delivery Option :  " . $beforeddate ."".$beforedschedule. "
"; + // } $PaymentTerms=$this->input->post('PaymentTerms'); - + $beforePaymentTerms=$this->input->post('beforePaymentTerms'); + if($PaymentTerms != $beforePaymentTerms) + { + $MAD.="Amended PaymentTerms :  ". $beforePaymentTerms ."
"; + } + //echo "MAD IS" . $MAD . "
"; $POType = $this->input->post('POType'); - $SpcialInstruction = $this->input->post('SpcialInstruction'); + $scopeofwork = $this->input->post('ScopeofWork'); $TotalOrderValueSummary = $this->input->post('txtTotalOrderValueSummary'); $POStatus = $this->input->post('txtStatus'); $updatedBy = $this->session->userdata ( 'userId' ); $RowCount = $this->input->post('txtRowCount'); - + //echo 'RowCount is' . $RowCount; $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); $updateddt = $dt->format('Y-m-d H:i:s'); $WorkStatus=$this->input->post('workstatus'); // PO Master - $POMaster = array('ParentPO'=>$PONO,'POType'=>$POType,'SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$updateddt,'PaymentTerms'=>$PaymentTerms,'ServiceWorkStatus'=>$WorkStatus,'ReleasedBy'=>$updatedBy,'ReleasedOn'=>$updateddt); + $POMaster = array('ParentPO'=>$PONO,'POType'=>$POType,'SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>PO_RELEASED,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$scopeofwork,'CreatedBy'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$updateddt,'PaymentTerms'=>$PaymentTerms,'ServiceWorkStatus'=>$WorkStatus,'ReleasedBy'=>$updatedBy,'ReleasedOn'=>$updateddt,'AmendedDetails'=>$MAD); //print_r($POMaster); + $LastPO = $this->purchaseorder_model->addAmendPOMaster($POMaster,$updatedBy,$PONO); //print_r($LastPO); $NewPO = ''; @@ -517,32 +549,87 @@ function UpdateAmendServicePurchaseOrder() { //echo "Inside Loop"; - + $CAD=''; $MaterialCode = $this->input->post('materialCode'.$i); $Quantity = $this->input->post('quantity'.$i); + $beforeQuantity = $this->input->post('beforequantity'.$i); $Reqnumber = $this->input->post('Reqnumber'.$i); $itemRate = $this->input->post('itemRate'.$i); - $ServiceTax = $this->input->post('ServiceTax'.$i); - $EduCess = $this->input->post('EduCess'.$i); - $SecHighTax = $this->input->post('SecHighTax'.$i); - $KrishiTax = $this->input->post('KrishiTax'.$i); - $SwachhTax = $this->input->post('SwachhTax'.$i); + $beforeitemRate = $this->input->post('beforeitemRate'.$i); + + $AfterSGST = $this->input->post('AfterSgst'.$i); + $beforeSGSTvalue = $this->input->post('beforeSgstvalue'.$i); + $AfterCGST = $this->input->post('AfterCgst'.$i); + $beforeCGSTvalue = $this->input->post('beforeCgstvalue'.$i); + $AfterIGST = $this->input->post('AfterIgst'.$i); + $beforeIGSTvalue = $this->input->post('beforeIgstvalue'.$i); + $SGST = $this->input->post('Sgst'.$i); + $beforeSGST = $this->input->post('beforeSgst'.$i); + $CGST = $this->input->post('Cgst'.$i); + $beforeCGST = $this->input->post('beforeCgst'.$i); + $IGST = $this->input->post('Igst'.$i); + $beforeIGST = $this->input->post('beforeIgst'.$i); + $otherallowance = $this->input->post('otherallowance'.$i); + $beforeotherallowance = $this->input->post('beforeotherallowance'.$i); + $servicematerialdescription = $this->input->post('servicematerialdescription'.$i); + $CostCenter = $this->input->post('costCode'.$i); $POLineItemNo = $this->input->post('LineItemNo'.$i); $TotalOrderValue = $this->input->post('TotalOrderValue'.$i); $ServiceFrequency=$this->input->post('Frequency'.$i); - $LineItemNo = ''; $RecQtyvalue=0; - $ReceivedQty = $this->purchaseorder_model->GetLineItemReceivedQty($PONO,$MaterialCode); + $rowspanvalue=0; + $ReceivedQty = $this->purchaseorder_model->GetLineItemReceivedQty($PONO,$MaterialCode); + if(count($ReceivedQty)>0) + { + $RecQtyvalue = $ReceivedQty[0]['ReceivedQuantity']; + } + + if($Quantity != $beforeQuantity) + { + $rowspanvalue++; + $CAD.="Amended Qty : " . $beforeQuantity ."Current Qty : " . $Quantity . ""; + } + if($itemRate != $beforeitemRate) + { + $rowspanvalue++; + $CAD.="Amended Rate : " . $beforeitemRate ."Current Rate : " . $itemRate . ""; + } + if(($SGST != $beforeSGST) && ($AfterSGST != $beforeSGSTvalue)) + { + $rowspanvalue+=2; + $CAD.="Amended SGST : " . $beforeSGST ."Current SGST : " . $SGST . "Amended SGST value : " . $beforeSGSTvalue ."Current SGST value: " . $AfterSGST . ""; + } + if(($CGST != $beforeCGST) && ($AfterCGST != $beforeCGSTvalue)) + { + $rowspanvalue+=2; + $CAD.="Amended CGST : " . $beforeCGST ."Current CGST : " . $CGST . "Amended CGST value : " . $beforeCGSTvalue ."Current CGST value: " . $AfterCGST . ""; + } + if(($IGST != $beforeIGST) && ($AfterIGST != $beforeIGSTvalue)) + { + $rowspanvalue+=2; + $CAD.="Amended IGST : " . $beforeIGST ."Current IGST : " . $IGST . "Amended IGST value : " . $beforeIGSTvalue ."Current IGST value: " . $AfterIGST . ""; + } + if($otherallowance != $beforeotherallowance) + { + $rowspanvalue++; + $CAD.="Amended OtherAllowances : " . $beforeotherallowance ."Current OtherAllowances : " . $otherallowance . ""; + } + if($rowspanvalue>0) + { + $rowspanvalue++; + $CAD2=''; + $CAD2=$CAD; + $CAD=''; + $CAD="".$MaterialCode.""; + $CAD.=$CAD2; + } + + // echo "
CAD IS" . $CAD . "
"; - if(count($ReceivedQty)>0) - { - $RecQtyvalue = $ReceivedQty[0]['ReceivedQuantity']; - } - - $POLineItemList = array('PONO'=>$NewPO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt,'CostCenterCode'=>$CostCenter,'ServiceFrequency'=>$ServiceFrequency,'ReceivedQuantity'=>$RecQtyvalue); - + $POLineItemList = array('PONO'=>$NewPO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'ServiceMaterialDescription'=>$servicematerialdescription,'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt,'CostCenterCode'=>$CostCenter,'ServiceFrequency'=>$ServiceFrequency,'ReceivedQuantity'=>$RecQtyvalue,'AmendedDetails'=>$CAD); + //print_r($POLineItemList); $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList); @@ -553,9 +640,9 @@ function UpdateAmendServicePurchaseOrder() - $ServiceTaxList = array('LineItemNo'=>$LineItemNo, 'ServiceTax'=>$ServiceTax,'EducessTax'=>$EduCess,'SecHigherEducessTax'=>$SecHighTax,'KrishiKalyantax'=>$KrishiTax,'SwachhBharattax'=>$SwachhTax,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt); - - $ServiceList =$this->purchaseorder_model->addServiceTax($ServiceTaxList); + $ServiceTaxList = array('LineItemNo'=>$LineItemNo,'CGST'=>$CGST,'After_CGST'=>$AfterCGST,'SGST'=>$SGST,'After_SGST'=>$AfterSGST,'IGST'=>$IGST,'After_IGST'=>$AfterIGST,'otherallowance'=>$otherallowance, 'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt); + //print_r($ServiceTaxList); + $ServiceList =$this->purchaseorder_model->addServiceTax($ServiceTaxList); } echo 'PO Number is'.$PONO . ' is Amended Successfully! - New Amended PO Number is '.$NewPO; @@ -1289,6 +1376,59 @@ function CreateAmendPOPrint() $this->dompdf->stream("Amendrevenuepopdf.pdf",$data,$php); } +public function servicepoprint($PONO) + { + + // $this->load->view('includes/pdfheader'); + + // Load the pdf page with multiviews + $data['CompanyDetails'] = $this->purchaseorder_model->getCompanyInformation(); + $data['POItem'] = $this->purchaseorder_model->GetServicePurchaseOrderAmendDetailsforPdfprint($PONO); + + + $data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO); + + $data['CurrencySymbol']=$this->purchaseorder_model->GerCurrencyCodeName('INR'); + + //print_r( $data['CurrencySymbol']); + + $TotalOrderValue=0; + $Currencycode=''; + foreach ($data['POItem'] as $POValue) + { + + $TotalOrderValue=$TotalOrderValue + $POValue->TotalValue; + + + } + + + + $totalAmt=sprintf("%.2f", $TotalOrderValue); + + $data['TotalAmountInWords']= $this->convertNumber($totalAmt); + + $data['RequistionDetails'] = $this->purchaseorder_model->GetPdfRequistionDetails($PONO); + + $this->load->View("Amendervicepopdf", $data); + + // Add header to pdf + //$this->load->view('includes/pdffooter'); + + // Get output html + $php = $this->output->get_output(); + + // Load library + $this->load->library('dompdf_gen'); + + // Convert to PDF + $this->dompdf->load_html($php); + $this->dompdf->render(); + $data['Attachment'] = FALSE; + $this->dompdf->stream("Amendservicepopdf.pdf",$data,$php); + +} + public function convertNumber($number) diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index e5a3c20e..d105c43d 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -580,11 +580,35 @@ function purchaseorderListing($forwhat='') } + function GetServicePurchaseOrderAmendDetailsforPdfprint($PONO = '') + { + + + + $subQuery ='SELECT distinct LineItem.LineItemNo,LineItem.ServiceMaterialDescription,ReqNo,Mat.MaterialCode,Mat.MaterialName, + Mat.UOM,Quantity,Rate,ROUND((Quantity *Rate),2 ) as BasicValue ,POMaster.AmendedDetails,LineItem.AmendedDetails as lineamenddetails, + ROUND(( Tax.After_SGST + Tax.After_CGST + Tax.After_IGST ) ,2)as Taxamount , + TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.Address + FROM T_PurchaseOrder_LineItem LineItem + join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode + join T_Service_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo + join T_PurchaseOrder_Master POMaster on POMaster.PONO = LineItem.PONO + join T_SupplierDetailsN sup on sup.SupplierID = POMaster.SupplierID + where LineItem.PONO =?'; + + $query = $this->db->query($subQuery,array($PONO)); + + return $query->result(); + + + } + // This Method to get the Revenue PO Child Details for Edit the Item function GetRevenuePurchaseOrderDetails($PONO = '') { - $subQuery ='SELECT distinct LineItem.LineItemNo,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,Mat.UOM,Quantity,Rate,Req.Status,ROUND((Quantity *Rate),2 ) as BasicValue , ROUND(((AfterPackagingValue + AfterFreightValue + AfterExciseDuty + AfterVAT + AfterCST + AfterGST + AfterOtherTaxes + Insurance) - AfterDiscount ),2)as Taxamount ,TotalValue,Tax.*,Req.CostCenterCode,Dept.DepartmentName + $subQuery ='SELECT distinct LineItem.LineItemNo,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,Mat.UOM,Quantity,Rate,Req.Status,ROUND((Quantity *Rate),2 ) as BasicValue , ROUND(((AfterPackagingValue + AfterFreightValue + AfterSGST + AfterCGST + + AfterIGST + Insurance)) ,2)as Taxamount ,TotalValue,Tax.*,Req.CostCenterCode,Dept.DepartmentName FROM T_PurchaseOrder_LineItem LineItem join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode join T_Revenue_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo @@ -606,8 +630,8 @@ function purchaseorderListing($forwhat='') $subQuery ='SELECT distinct LineItem.LineItemNo,ReqNo,Mat.MaterialCode,Mat.MaterialName, Mat.UOM,Quantity,Rate,ROUND((Quantity *Rate),2 ) as BasicValue , - ROUND(((AfterPackagingValue + AfterFreightValue + AfterExciseDuty + AfterVAT + AfterCST + - AfterGST + AfterOtherTaxes + Insurance)) ,2)as Taxamount , + ROUND(((AfterPackagingValue + AfterFreightValue + AfterSGST + AfterCGST + + AfterIGST + Insurance)) ,2)as Taxamount , TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.Address FROM T_PurchaseOrder_LineItem LineItem join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode @@ -628,8 +652,8 @@ function purchaseorderListing($forwhat='') $subQuery ='SELECT distinct LineItem.LineItemNo,ReqNo,Mat.MaterialCode,Mat.MaterialName, Mat.UOM,Quantity,Rate,ROUND((Quantity *Rate),2 ) as BasicValue , - ROUND(((AfterPackagingValue + AfterFreightValue + AfterExciseDuty + AfterVAT + AfterCST + - AfterGST + AfterOtherTaxes + Insurance)) ,2)as Taxamount , + ROUND(((AfterPackagingValue + AfterFreightValue + AfterSGST + AfterCGST + + AfterIGST + Insurance)) ,2)as Taxamount, TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.Address,LineItem.AmendedDetails as LineAmend FROM T_PurchaseOrder_LineItem LineItem join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode diff --git a/application/views/Amendervicepopdf.php b/application/views/Amendervicepopdf.php new file mode 100644 index 00000000..98c161fa --- /dev/null +++ b/application/views/Amendervicepopdf.php @@ -0,0 +1,335 @@ +CompanyName; + $CompanyAddress = $CO->Address; + + } + } + + $currencyName='INR'; + $currencyCode =''; + if(!empty($CurrencySymbol)) + { + foreach ($CurrencySymbol as $Curr) + { + + $currencyCode = $Curr->FontCode2000; + //$currencyName = $currencyName; + + + } + + } + + + + + if(!empty($POItem)) + { + + foreach ($POItem as $PO) + { + + $PONO = $PO->PONO; + $postatus= $PO->Status; + $SuplierName = $PO->SupplierName; + $SuplierAddress = $PO->Address; + $DeliveryAddress = $PO->DeliveryAddress; + $dt = new DateTime($PO->PODate, new DateTimeZone('Asia/Kolkata')); + $Podt = $dt->format('d-m-Y'); + $dtDe = new DateTime($PO->DeliveryDate, new DateTimeZone('Asia/Kolkata')); + + $DeliveryDate = $dtDe->format('d-m-Y'); + if($DeliveryDate == '30-11--0001' || $DeliveryDate == '0001-11-30'){$DeliveryDate='';} + $ServiceDescription =$PO->ServiceDescription; + $PaymentTerms = $PO->PaymentTerms; + $PaymentDays=$PO->PaymentDays; + $PayableAT=$PO->PayableAT; + $DeliverySchedule=$PO->DeliverySchedule; + } +} + + ?> + +
Page:
+ +
+
+ DRAFT
'; + + } + + ?> +
+
 
+
PURCHASE ORDER - PO NO:
+ + + + + + + + + + + + + + + + + + +
+

+

+
+

Vendor Address :

+


+		 +

Delivery To :

+

+
PO DATE :DELIVERY DATE / SCHEDULE BY :
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
Requistion NumberRequested ByRequested DepartmentCost Center
+
+ + + + + + + + + + + + + + + + + BasicValue + $record->Taxamount + $record->otherallowance; + ?> + + + + + + + + + + + + + + + + + BasicValue; + $AfterSGST =$AfterSGST + $record->After_SGST; + $AfterCGST =$AfterCGST + $record->After_CGST; + $AfterIGST = $AfterIGST + $record->After_IGST; + $otherallowances =$otherallowances + $record->otherallowance; + $totaltaxamount=$totaltaxamount+$record->Taxamount; + + } + $OrderValue = $SubTotalAmount + $AfterSGST + $AfterCGST+$AfterIGST+$otherallowances; + } + + ?> +
#Item CodeService DescriptionQtyUOMRate In INRBasic Amount In INRSGST In INRCGST In INRIGST In INROther Allow In INRTotal Amount In INR
MaterialName ; ?>ServiceMaterialDescription ; ?>Quantity ; ?>UOM ; ?>Rate ; ?>BasicValue ; ?>After_SGST ; ?>After_CGST ; ?>After_IGST ; ?>otherallowance ; ?>
+ + + + + + + + + + + + + + + + lineamenddetails ; + } + } ?> + +
+

Amended Details

+
+" . $v->AmendedDetails . ""; + break; + } +}?> +
Item DescriptionPrevious DetailsCurrent Details
+
+ + + + + + + + + + + + + + + + + + + +
Total Amount In Words

Total Amount Before Tax In INR -
Total Tax Amount In INR -
Total Amount After Tax In INR -
+

Payment Terms

+

+ 		+

Certified that the particulars given above are true and correct

+

+

 

+

Authorized Signatory

+
+

 

+
Scope Of Work :
+ + ReleasedOn, new DateTimeZone('Asia/Kolkata')); + + + ?> + + + +

 

+
Released By : FirstName;?>
+
Released On : format('d-m-Y');?>
+ + + + +
+
+ + + \ No newline at end of file diff --git a/application/views/Amendrevenuepopdf.php b/application/views/Amendrevenuepopdf.php index 137ab514..d19b4b6a 100644 --- a/application/views/Amendrevenuepopdf.php +++ b/application/views/Amendrevenuepopdf.php @@ -15,7 +15,7 @@ $PaymentTerms = ''; /* $PaymentDays=''; $PayableAT=''; */ - + $totaltaxonly=0; if(!empty($CompanyDetails)) { foreach ($CompanyDetails as $CO) @@ -206,10 +206,10 @@ $index = 0; $TotalAmount = 0; $OrderValue = 0; - $AfterExciseDuty = 0; - $AfterVAT = 0;//SGST - $AfterGST = 0;//CGST - $AfterOtherTaxes = 0;//IGST + + $AfterSGST = 0; + $AfterCGST = 0; + $AfterIGST = 0; $Insurance = 0; $AfterFreightValue = 0; $AfterDiscount = 0; @@ -231,25 +231,25 @@ AfterDiscount; ?> - AfterVAT ; ?> + AfterCGST ; ?> - AfterGST ; ?> - AfterOtherTaxes ; ?> + AfterSGST ; ?> + AfterIGST ; ?> Insurance ; ?> AfterPackagingValue ; ?> AfterFreightValue ; ?> - BasicValue+$record->AfterExciseDuty - + $record->AfterVAT+$record->AfterCST+$record->AfterGST + $record->AfterOtherTaxes + $record->Insurance+ $record->AfterFreightValue+$record->AfterPackagingValue)- $record->AfterDiscount); + BasicValue+ $record->AfterCGST+$record->AfterIGST+$record->AfterSGST + $record->Insurance+ $record->AfterFreightValue+$record->AfterPackagingValue)- ($record->AfterDiscount)); echo number_format($TotalAmount,2) ; ?> BasicValue; - $AfterExciseDuty =$AfterExciseDuty + $record->AfterExciseDuty; - $AfterVAT =$AfterVAT + $record->AfterVAT; - $AfterGST =$AfterGST + $record->AfterGST; - $AfterOtherTaxes =$AfterOtherTaxes + $record->AfterOtherTaxes; + + $AfterCGST =$AfterCGST + $record->AfterCGST; + $AfterSGST =$AfterSGST + $record->AfterSGST; + $AfterIGST =$AfterIGST + $record->AfterIGST; + $totaltaxonly=($AfterCGST+$AfterSGST+$AfterIGST); $Insurance =$Insurance + $record->Insurance; $AfterFreightValue =$AfterFreightValue + $record->AfterFreightValue; $AfterDiscount = $AfterDiscount + $record->AfterDiscount ; @@ -266,7 +266,7 @@
@@ -283,6 +283,7 @@ $OrderValue = (( $SubTotalAmount + $AfterVAT +$AfterGST+$AfterOtherTaxes +$Insu " . $v->AmendedDetails . ""; @@ -315,7 +316,7 @@ $OrderValue = (( $SubTotalAmount + $AfterVAT +$AfterGST+$AfterOtherTaxes +$Insu  Total Amount Before Tax In INR : -  Total Tax Amount In INR : +  Total Tax Amount In INR :  Total Amount After Tax In INR : diff --git a/application/views/editRevenueAmendPO.php b/application/views/editRevenueAmendPO.php index 9bbdedd0..88893772 100755 --- a/application/views/editRevenueAmendPO.php +++ b/application/views/editRevenueAmendPO.php @@ -45,9 +45,9 @@ foreach ($PaymentTerms as $TER) $totDiscountAmt = 0.0; $totPackagingAmt = 0.0; $totExciseAmt = 0.0; - $totVATAmt = 0.0; - $totCSTAmt = 0.0; - $totGSTAmt = 0.0; + $totVATAmt = 0.0; //FOR SGST + $totCSTAmt = 0.0;//FOR CGST + $totGSTAmt = 0.0;//FOR IGST $totOtherTaxAmt = 0.0; $totFreightAmt = 0.0; @@ -168,8 +168,8 @@ $('#Scheduleby').val(SchName); var PackagingCalculation = ''; var ExciseCalculation = ''; var StateTaxCheck = ''; - var VatCalculation = ''; - var CSTCalculation = ''; + var VatCalculation = ''; //FOR SGST + var RequistQuantity = ''; var IsEdit = '0'; var d = new Date(POMaxDate); @@ -2155,7 +2155,7 @@ $('#txtDeliveryAddress').val(deladd); $('#txtStatus').val(''); $('#SpcialInstruction').val(''); $('#txtDeliveryAddress').val('') - //window.location = "amendmentpurchaseorder"; + window.location = "amendmentpurchaseorder"; } else diff --git a/application/views/editServiceAmendPO.php b/application/views/editServiceAmendPO.php index f87ddaeb..2cc22297 100755 --- a/application/views/editServiceAmendPO.php +++ b/application/views/editServiceAmendPO.php @@ -9,21 +9,22 @@ $DeliverOption=''; $DeliveryAddress =''; $PONOStatus = ''; $PONO = ''; - $TotalServiceTax = 0; - $TotalEducessTax = 0.0; - $TotalSecHigherEducessTax = 0.0; - $TotalKrishiKalyantax = 0.0; - $TotalSwachhBharattax = 0.0; + + $TotalCgst = 0.0; + $TotalSgst = 0.0; + $TotalIgst = 0.0; $TotalSummary = 0.0; + $Totalotherallowance=0.0; $TotalBasicAmount = 0.0; $ServiceDescription = ''; + $ServiceMaterialDescription=''; $Deliverydt=''; $DeliverSchedule=''; $MaxPoDate = ''; $AvlAmount = 0; $Value="₹"; -$Rowcount=0; + $StatusName=''; @@ -45,9 +46,10 @@ if(!empty($MaxPODate)) } } + + if(!empty($POMaster)) { - foreach ($POMaster as $Req) { @@ -65,9 +67,8 @@ if(!empty($POMaster)) $PONOStatus = $Req->StatusCode; $PONO = $Req->PONO; $ServiceDescription = $Req->ServiceDescription; - //$PaymentTerms=$Req->PaymentTerms; - $PayableAT=$Req->PayableAT; - $PaymentDays=$Req->PaymentDays; + //Terms=$Req->PaymentTerms; + $WrkStatus=$Req->ServiceWorkStatus; $StatusName=$Req->StatusName; } @@ -93,14 +94,17 @@ if(!empty($RequistionDetails)) if(!empty($AvlBudAmt)) { - $AvlAmount = $AvlBudAmt; + $AvlAmount = number_format($AvlBudAmt, 2, '.', ''); } foreach ($PaymentTerms as $TER) { + //print_r($PaymentTerms); + //print_r($Payment); $Terms=$TER->PaymentTerms; + //echo "CURRENT TERMS :" . $Terms; } @@ -173,10 +177,10 @@ $('#drpSupplier').change(function() { if(obj.SupplierID === id) { $("#SupAddress").val(obj.Address); - $("#PayableAT").val(obj.PayableAT); - var a=obj.PaymentDays; - //console.log(a); + $("#PaymentTerms").val(obj.PaymentID); + + } @@ -191,10 +195,252 @@ $('#drpSupplier').change(function() { }); +$('#ReqNo').change(function() { + + var id = $('#ReqNo').val(); + $("#AvlBudAmt").val(''); + $("#CostCenter").val(''); + $("#MaterialCode").empty(); + $("#deptName").val(''); + $("#UOM").val(''); +$("#Quantity").val(''); +$("#ItemName").val(''); +$("#Rate").val(''); +$("#txtBasicValue").val(''); + clearTaxField(); + if(id != '0') + { + var y = ; + + var Material = ; + var AvlBudAmt = ''; + //ServiceTable + var rows = document.getElementById('ServiceTable').rows.length; +if(DeletedMaterialCode!=undefined && DeletedMaterialCode!=''){ + + $("#MaterialCode").append( $('').val(DeletedMaterialCode).html(DeletedMaterialCode + "-" + DeletedMaterialName)); + +} + +for(i=2;i<=rows;i++){ + +//var j=1; + $.each(Material[i], function(idx, obj) { + + // j=j+1; + var materialCode = $('#materialCode'+i); + + + + + if(obj.materialCode == materialCode ) + { + $("#MaterialCode").val(''); + } + + + + else{ + $("#MaterialCode").append( $('').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName)); + + } + + + }); + + + + +} // For Binding DepartmentName + $.each(y, function(idx, obj) { + if(obj.ReqNo === id) + { + $("#deptName").val(obj.DepartmentName); + $("#CostCenter").val(obj.CostCenterCode); + if(obj.Service_Period!='' && obj.Service_Period!=null){ + $("#Frequency").val(obj.Service_Period +'-' + obj.NumberOfService); + $("#FrequencyNo").val(obj.NumberOfService); + + } + else{ + var text='One Time'; + $("#Frequency").val(text); + $("#FrequencyNo").val(1); + } + } + }); + $("#AvlBudAmt").val(parseFloat(AvlBudAmt).toFixed(2)); + // For Binding Material list center for the selected Requistion Number + $("#MaterialCode").append( $('').val("0").html("Select Material Code") ); + var isAdded = "0"; + for(i=0;i').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName)); + } + + } + + + }); + } + } + else + { + alert('Please select the Requisition Number'); + return false; + } + id = ''; + +}); + +$('#MaterialCode').change(function() { + + var id = $('#MaterialCode').val(); + RequistQuantity = ''; + clearTaxField(); + if(id != '0') + { + var y = ; + + for(i=0;i; + + for(i=0;i ReqQuantity) - { - //alert('Your exceeding the Quantity from the Requisition Quantity:'+ RequistQuantity +'.Please adjust the Quantity to proceed further.'); + // function EditExceedQuantityCheck() + // { + // // RequistQuantity + // var EnterQuantity = $("#EditQuantity").val()== '' ? "0.00" : parseFloat($("#EditQuantity").val()); + // var ReqQuantity = parseFloat(RequistQuantity); + // //alert(ReqQuantity); + // if(EnterQuantity > ReqQuantity) + // { + // alert('Your exceeding the Quantity from the Requisition Quantity:'+ RequistQuantity +'.Please adjust the Quantity to proceed further.'); - $('#EditQuantity').focus(); - return true; - } - } + // $('#EditQuantity').focus(); + // return false; + // } + // } function ExceedBudget(ValuetoCheck,budgetAmount) { @@ -266,127 +502,37 @@ function EditRatechange(){ return true; } } - function calculateServiceTax(varBasicValue) - { - - var basicValue = parseFloat(varBasicValue); - - var ServiceTaxValue = 0.0; - - ServiceTaxValue = ; - - var TAXval = parseFloat(ServiceTaxValue).toFixed(2); - - return TAXval;// $('#AfterServiceTax').val(TAXval); - - } - function calculateEduess(varAfterServiceTax) - { - var ServiceTaxAmount = parseFloat(varAfterServiceTax); - - var ServiceTaxValue = 0.0; - - ServiceTaxValue = ; - - var TAXval = parseFloat(ServiceTaxValue).toFixed(2); - - return TAXval;// $('#AfterEduCess').val(TAXval); - } - function calculateHigherEdu(varAfterServiceTax) - { - var ServiceTaxAmount = parseFloat(varAfterServiceTax); - - var ServiceTaxValue = 0.0; - - ServiceTaxValue = ; - - var TAXval = parseFloat(ServiceTaxValue).toFixed(2); - - return TAXval;//$('#AfterSecHighTax').val(TAXval); - } - function calculateKrishiKalyantax(varBasicValue) - { - var basicValue = parseFloat(varBasicValue); - - var ServiceTaxValue = 0.0; - - ServiceTaxValue = ; - - var TAXval = parseFloat(ServiceTaxValue).toFixed(2); - - return TAXval;//$('#AfterKrishiTax').val(TAXval); - } - function calculateSwachhBharattax(varBasicValue) - { - var basicValue = parseFloat(varBasicValue); - - var ServiceTaxValue = 0.0; - - ServiceTaxValue = ; - - var TAXval = parseFloat(ServiceTaxValue).toFixed(2); - - return TAXval; //$('#AfterSwachhTax').val(TAXval); - } - function calculateTotalOrdervalue() - { - var basicValue = parseFloat($('#txtBasicValue').val()); - var ServiceTaxAmount = parseFloat($('#AfterServiceTax').val()); - var EduCessTaxAmount = parseFloat($('#AfterEduCess').val()); - var SecHighTaxAmount = parseFloat($('#AfterSecHighTax').val()); - var KrishiTaxAmount = parseFloat($('#AfterKrishiTax').val()); - var SwachhTaxAmount = parseFloat($('#AfterSwachhTax').val()); - - var TotAmt = basicValue + ServiceTaxAmount+ EduCessTaxAmount + SecHighTaxAmount+ KrishiTaxAmount + SwachhTaxAmount; - - $('#TotalOrderValue').val( parseFloat(TotAmt).toFixed(2)); - - } + + function calculateTotalEditOrdervalue() { var basicValue = parseFloat($('#txtEditBasicValue').val()); - var ServiceTaxAmount = parseFloat($('#EditAfterServiceTax').val()); - var EduCessTaxAmount = parseFloat($('#EditAfterEduCess').val()); - var SecHighTaxAmount = parseFloat($('#EditAfterSecHighTax').val()); - var KrishiTaxAmount = parseFloat($('#EditAfterKrishiTax').val()); - var SwachhTaxAmount = parseFloat($('#EditAfterSwachhTax').val()); + var Cgst = parseFloat($('#EditAfterCgst').val()); + var Sgst = parseFloat($('#EditAfterSgst').val()); + var Igst = parseFloat($('#EditAfterIgst').val()); + var otherallowance= parseFloat($('#otherallowance').val()); - var TotAmt = basicValue + ServiceTaxAmount+ EduCessTaxAmount + SecHighTaxAmount+ KrishiTaxAmount + SwachhTaxAmount; + var TotAmt = basicValue + Cgst+ Sgst + Igst +otherallowance; + + + + $('#EditTotalOrderValue').val( parseFloat(TotAmt).toFixed(2)); - $('#EditTotalOrderValue').val( parseFloat(TotAmt).toFixed(2)); } function calculateTaxValue() { - var ServiceTaxAmount = parseFloat($('#AfterServiceTax').val()); - var EduCessTaxAmount = parseFloat($('#AfterEduCess').val()); - var SecHighTaxAmount = parseFloat($('#AfterSecHighTax').val()); - var KrishiTaxAmount = parseFloat($('#AfterKrishiTax').val()); - var SwachhTaxAmount = parseFloat($('#AfterSwachhTax').val()); + var Cgst = parseFloat($('#AfterCgst').val()); + var Sgst = parseFloat($('#AfterSgst').val()); + var Igst = parseFloat($('#AfterIgst').val()); - var TottaxAmt = ServiceTaxAmount+ EduCessTaxAmount + SecHighTaxAmount+ KrishiTaxAmount + SwachhTaxAmount; - return parseFloat(TottaxAmt.toFixed(2)); + var TottaxAmt = Cgst+ Sgst + Igst; + return parseFloat(TottaxAmt).toFixed(2); } -function clearTaxField() -{ - $('#txtBasicValue').val(''); - $('#AfterServiceTax').val(''); - $('#AfterEduCess').val(''); - $('#AfterSecHighTax').val(''); - $('#AfterKrishiTax').val(''); - $('#AfterSwachhTax').val(''); - $('#TotalOrderValue ').val(''); - $('#Rate').val(''); - - $("#ItemName").val(''); - $("#UOM").val(''); - $("#Quantity").val(''); - RequistQuantity = ''; - -} + function clearEditTaxField() { $('#txtEditBasicValue').val(''); @@ -435,7 +581,7 @@ $(document).ready(function () {
-

Siddharth Industries - Edit Service Purchase Order - - For Amendment

+

Siddharth Industries - Amendment Service Purchase Order -

@@ -469,7 +615,7 @@ $(document).ready(function () {
-
+
@@ -524,8 +670,8 @@ $(document).ready(function () {
-
-
+
+
Select Delivery By
@@ -542,24 +688,35 @@ $(document).ready(function () { $WrkStatus); - //print_r( $options); + if(!empty($WorkStatus)) { + //print_r($WorkStatus); + foreach ($WorkStatus as $WorkSID): + if($WrkStatus==$WorkSID->ConfigValue){ + + $optionsWork[$WorkSID->ConfigValue] = $WorkSID->ConfigValue; + } + + + endforeach; foreach ($WorkStatus as $SID): - - $options[$SID->ConfigValue] = $SID->ConfigValue; + if($WrkStatus!=$SID->ConfigValue){ + $optionsWork[$SID->ConfigValue] = $SID->ConfigValue; + } + endforeach; } - echo form_dropdown('workstatus', $options,set_value('workstatus'),'id="workstatus"' ,'required="true"' ,'class="form-control select2'); + echo form_dropdown('workstatus', $optionsWork,set_value('workstatus'),'id="workstatus"' ,'required="true"' ,'class="form-control select2'); ?>

+
'Deliverydt','value' => set_value('Deliverydt',$Deliverydt),'id'=>'Deliverydt', 'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;'); @@ -568,9 +725,10 @@ $(document).ready(function () {
- + + -
- +
'EditAvlBudAmt','value' => set_value('EditAvlBudAmt'),'id'=>'EditAvlBudAmt', 'class' => 'form-control num' ,'readonly' => 'true'); @@ -673,10 +843,11 @@ $(document).ready(function () {
- 'EditMaterialCode','value' => set_value('EditMaterialCode'),'id'=>'EditMaterialCode', 'class' => 'form-control num' ,'readonly' => 'true'); - echo form_input($data); - + 'Item Code'); + //print_r( $options); + echo form_dropdown('EditMaterialCode', $options,set_value('EditMaterialCode'),'id="EditMaterialCode"' ,'class="form-control"'); ?>
@@ -690,7 +861,16 @@ $(document).ready(function () { ?>
-
+
+ 'EdittxtSpcialInstruction','value' => set_value('EdittxtSpcialInstruction',$ServiceMaterialDescription),'id'=>'EdittxtSpcialInstruction', 'class' => 'form-control'); + echo form_input($data); + ?> +
+ +
+
+
-
+
'EditFrequency','value' => set_value('EditFrequency'),'id'=>'EditFrequency', 'class' => 'form-control' ); + $data = array('name' => 'EditFrequency','value' => set_value('EditFrequency'),'id'=>'EditFrequency', 'class' => 'form-control' ,'readonly' => 'true'); echo form_input($data); - ?> + ?> +
-
-
-
+
-
+
-
+
-
-
-
- - Service Tax @14% : -
- -
-
- 'EditAfterServiceTax','value' => set_value('EditAfterServiceTax'),'id'=>'EditAfterServiceTax', 'class' => 'form-control num','readonly' => 'true'); - echo form_input($data); - ?> -
- -
-
+
+
+ + CGST In % +
+ +
+
+ + 'EditCgst','value' => set_value('EditCgst'),'id'=>'EditCgst', 'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','onchange'=>'EditRatechange()'); + echo form_input($data); + ?> +
+ +
+
+
+ + 'EditAfterCgst','value' => set_value('EditAfterCgst'),'id'=>'EditAfterCgst', 'class' => 'form-control num' ,'placeholder' => 'After CGST','readonly' => 'true'); + echo form_input($data); + ?> +
+ +
+ +
+
+
+ + SGST In % +
+ +
+
+ + 'EditSgst','value' => set_value('EditSgst'),'id'=>'EditSgst', 'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'EditRatechange()'); + echo form_input($data); + ?> +
+ +
+
+
+ + 'EditAfterSgst','value' => set_value('EditAfterSgst'),'id'=>'EditAfterSgst', 'class' => 'form-control num' ,'placeholder' => 'After SGST','readonly' => 'true'); + echo form_input($data); + ?> +
+ +
+ +
+ +
+
+ + IGST In % +
+ +
+
+ + 'EditIgst','value' => set_value('EditIgst'),'id'=>'EditIgst', 'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','onchange'=>'EditRatechange()'); + echo form_input($data); + ?> +
+ +
+
+
+ + 'EditAfterIgst','value' => set_value('EditAfterIgst'),'id'=>'EditAfterIgst', 'class' => 'form-control num' ,'placeholder' => 'After IGST','readonly' => 'true'); + echo form_input($data); + ?> +
+ +
+ +
+
+
+ +
+
+
+ 'otherallowance','value' => set_value('otherallowance'),'id'=>'otherallowance', 'class' => 'form-control num','onchange'=>'EditRatechange()'); + echo form_input($data); + ?> +
+
+
-
- Edu. cess @2% on service Tax : - -
- -
-
- 'EditAfterEduCess','value' => set_value('EditAfterEduCess'),'id'=>'EditAfterEduCess', 'class' => 'form-control num' ,'readonly' => 'true'); - echo form_input($data); - ?> -
- -
- -
-
- -
- Sec. & Higher Edu. cess @1 % on service Tax : - -
- -
-
- 'EditAfterSecHighTax','value' => set_value('EditAfterSecHighTax'),'id'=>'EditAfterSecHighTax', 'class' => 'form-control num' ,'readonly' => 'true'); - echo form_input($data); - ?> -
- -
-
-
- -
- Krishi Kalyan tax @.5 % on Basic Amount: - -
- -
-
- 'EditAfterKrishiTax','value' => set_value('EditAfterKrishiTax'),'id'=>'EditAfterKrishiTax', 'class' => 'form-control num' ,'readonly' => 'true'); - echo form_input($data); - ?> -
- -
-
-
- -
- Swachh Bharat tax @.5 % on Basic Amount: - -
- -
-
- 'EditAfterSwachhTax','value' => set_value('EditAfterSwachhTax'),'id'=>'EditAfterSwachhTax', 'class' => 'form-control num' ,'readonly' => 'true'); - echo form_input($data); - ?> -
- -
-
- -
>
@@ -839,16 +1030,17 @@ $(document).ready(function () {
+ -

-
+
+
  Update Service Cancel - +
@@ -865,83 +1057,123 @@ $(document).ready(function () { SNo Requisition No - Item Name + Item Code + Item Description Quantity - UOM + UOM Rate Basic Amount Tax Amount Total Order Amount + Actual Quantity + Received Quantity + Pending Quantity Action Schedule_Type!='Recurring'){ + $FrequencyNo=intval(1); + $Frequency='One Time'; + } + else{ + $FrequencyNo=$record->NumberOfService; + $Frequency=$record->Service_Period; + } + ?> ReqNo ?> + MaterialCode ?> MaterialName ?> Quantity ?> - UOM ?> + UOM ?> + Rate ?> - BasicValue ?> + BasicValue * $FrequencyNo, 2, '.', ''); ?> Taxamount ?> TotalValue ?> + Quantity ?> + ReceivedQuantity ?> + Quantity - $record->ReceivedQuantity, 2, '.', ''); ?> - + + + + - - - - - - + + + + + + + + + + + + + + + + + - + + + + + + -     +     - + ServiceTax; - $TotalEducessTax = $TotalEducessTax + $record->EducessTax; - $TotalSecHigherEducessTax = $TotalSecHigherEducessTax + $record->SecHigherEducessTax; - $TotalKrishiKalyantax = $TotalKrishiKalyantax + $record->KrishiKalyantax; - $TotalSwachhBharattax = $TotalSwachhBharattax + $record->SwachhBharattax; + $TotalCgst = $TotalCgst + $record->After_CGST; + $TotalSgst = $TotalSgst + $record->After_SGST; + $TotalIgst = $TotalIgst + $record->After_IGST; + $Totalotherallowance=$Totalotherallowance+ $record->otherallowance; $TotalSummary = $TotalSummary + $record->TotalValue; $TotalBasicAmount = $TotalBasicAmount + $record->BasicValue; } - ?> + ?> @@ -951,88 +1183,85 @@ $(document).ready(function () {
-
- - 'txtTotBasicAmount','value' => set_value('txtTotBasicAmount',number_format($TotalBasicAmount,2)),'id'=>'txtTotBasicAmount', 'class' => 'form-control num' ,'readonly' => 'true'); - echo form_input($data); - ?> -
-
- + +
+ + 'txtTotBasicAmount','value' => set_value('txtTotBasicAmount',number_format($TotalBasicAmount, 2, '.', '')),'id'=>'txtTotBasicAmount', 'class' => 'form-control num' ,'readonly' => 'true'); + echo form_input($data); + ?> +
+
+ + 'txtTotCgst','value' => set_value('txtTotCgst',number_format($TotalCgst, 2, '.', '')),'id'=>'txtTotCgst', 'class' => 'form-control num' ,'readonly' => 'true'); + echo form_input($data); + ?> +
+ + +
+ + 'txtTotSgst','value' => set_value('txtTotSgst',number_format($TotalSgst, 2, '.', '')),'id'=>'txtTotSgst', 'class' => 'form-control num' ,'readonly' => 'true'); + echo form_input($data); + ?> +
+
+ + 'txtTotIgst','value' => set_value('txtTotIgst',number_format($TotalIgst, 2, '.', '')),'id'=>'txtTotIgst', 'class' => 'form-control num' ,'readonly' => 'true'); + echo form_input($data); + ?> +
+ +
+ 'txtTotalServiceTax','value' => set_value('txtTotalServiceTax',$TotalServiceTax),'id'=>'txtTotalServiceTax', 'class' => 'form-control num' ,'readonly' => 'true'); - echo form_input($data); - ?> -
-
- - 'txtTotalEducess','value' => set_value('txtTotalEducess',$TotalEducessTax),'id'=>'txtTotalEducess', 'class' => 'form-control num' ,'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
- - 'txtTotHigherEdu','value' => set_value('txtTotHigherEdu',$TotalSecHigherEducessTax),'id'=>'txtTotHigherEdu', 'class' => 'form-control num' ,'readonly' => 'true'); - echo form_input($data); - ?> -
-
- + $data = array('name' => 'ToatalOtherAllowances','value' => set_value('ToatalOtherAllowances',number_format($Totalotherallowance, 2, '.', '')),'id'=>'ToatalOtherAllowances', 'class' => 'form-control num' ,'readonly' => 'true'); + echo form_input($data); + ?> + +
+
+ 'txtTotalKrishiKalyan','value' => set_value('txtTotalKrishiKalyan',$TotalKrishiKalyantax),'id'=>'txtTotalKrishiKalyan', 'class' => 'form-control num' ,'readonly' => 'true'); - echo form_input($data); - ?> -
-
- - 'txtTotSwachhBharat','value' => set_value('txtTotSwachhBharat',$TotalSwachhBharattax),'id'=>'txtTotSwachhBharat', 'class' => 'form-control num' ,'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
-
-
- 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary',$TotalSummary),'id'=>'txtTotalOrderValueSummary', 'class' => 'form-control num' ,'readonly' => 'true'); + $data = array('name' => 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary',number_format($TotalSummary, 2, '.', '')),'id'=>'txtTotalOrderValueSummary', 'class' => 'form-control num' ,'readonly' => 'true'); echo form_input($data); ?>
+
+ +
- 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction',$ServiceDescription),'id'=>'txtSpcialInstruction', 'class' => 'form-control', 'rows' => '10', 'cols' => '40' ); + 'ScopeofWork','value' => set_value('ScopeofWork',$ServiceDescription),'id'=>'ScopeofWork', 'class' => 'form-control', 'rows' => '10', 'cols' => '40' ); echo form_textarea($data); - ?> + ?>
+




-
+
Request On
Status - 'Select Status'); + // echo form_dropdown('Status', $options,set_value('Status'),'id="Status"' ,'required="true"' ,'class="form-control select2') + // $options = array("0"=>$PONOStatus); + // echo form_dropdown('Status', $options,set_value('Status',$StatusName),'id="Status"' ,'required="true"' ,'class="form-control select2') $data = array('name' => 'Status','value' => set_value('Status',$StatusName),'id'=>'Status', 'class' => 'form-control' ,'readonly' => 'true'); echo form_input($data); ?> -

+
@@ -1064,7 +1297,30 @@ $(document).ready(function () {
+ + \ No newline at end of file