From 7c7ed9c07c7a2d2e832bbf54f12dced19b225156 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 21 Jun 2017 11:35:32 +0530 Subject: [PATCH] polist issues corrected --- application/controllers/purchaseorder.php | 16 +++++++---- application/views/editimportpo.php | 33 +++++++++-------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index 7bfc3fb8..11bca868 100755 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -1073,7 +1073,7 @@ public function importpoprint($PONO) $SpcialInstruction = $this->input->post('txtSpcialInstruction'); - $TotalOrder = $this->input->post('txtTotalOrder'); + $TotalOrder = $this->input->post('txtToatlOrder'); $POStatus = $this->input->post('txtStatus'); $CreateBy = $this->session->userdata ( 'userId' ); @@ -1086,6 +1086,10 @@ public function importpoprint($PONO) // PO Master // PO Master $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption ); + //echo $PONO; + //echo $TotalOrder; + //print_r($POList); + //die(); $POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList); @@ -1183,15 +1187,18 @@ public function importpoprint($PONO) if(count($isExists) == 0) { $ImportTaxList = array('LineItemNo'=>$LineItemNo, 'ExchangeRate'=>$Exchangerate,'BasicPriceInMTon'=>$BasicPriceinmton,'ProductPrice'=>$Productprice,'LandingCharge'=>$LandingCharge,'AfterLandingCharge'=>$AfterLandingCharge,'AfterHighSeasSalesCharge'=>$AfterHighSeas,'HighSeasSalesCharge'=>$HighSeas,'CustomDuty'=>$CustomDuty,'AfterCustomDuty'=>$AfterCustomDuty,'ExciseDuty'=>$ExciseDuty,'AfterExciseDuty'=>$AfterExciseDuty,'ExciseDutyEdCess'=>$ExciseDutyEd,'AfterExciseDutyEdCess'=>$AfterExciseDutyEd,'ExciseDutySHCess'=>$ExciseDutySH,'CustomEdCess'=>$CustomEd,'CustomSHCess'=>$CustomSH,'AddlExciseDuty'=>$AddAdtional,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'AfterExciseDutySHCess'=>$AfterExciseDutySH,'AfterAddlExciseDuty'=>$AfterAddAdtional,'Grossdutypayable'=>$Grossdutypayable,'AvailableModvat'=>$AvailableModvat,'Grossexpensesduetocustomduty'=>$Grossexpensesduetocustomduty,'purchaseratePerKG'=>$purchaseratePerKG,'CustomDutyExpensesPerKG'=>$CustomDutyExpensesPerKG,'RMCIncludingCustomersPerKG'=>$RMCIncludingCustomersPerKG,'QuantityKG'=>$QuantityKG,'AfterCustomSHCess'=>$AfterCustomSH,'AfterCustomEdCess'=>$AfterCustomEd,'CurrencyType'=>$currencytypeID,'TotalValue'=>$Totalvalueitem); - - $ImportList = $this->purchaseorder_model->addImportTax($RevenueTaxList); + //print_r($ImportTaxList); + //die(); + $ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList); } else { $ImportTaxList = array('LineItemNo'=>$LineItemNo, 'ExchangeRate'=>$Exchangerate,'BasicPriceInMTon'=>$BasicPriceinmton,'ProductPrice'=>$Productprice,'LandingCharge'=>$LandingCharge,'AfterLandingCharge'=>$AfterLandingCharge,'AfterHighSeasSalesCharge'=>$AfterHighSeas,'HighSeasSalesCharge'=>$HighSeas,'CustomDuty'=>$CustomDuty,'AfterCustomDuty'=>$AfterCustomDuty,'ExciseDuty'=>$ExciseDuty,'AfterExciseDuty'=>$AfterExciseDuty,'ExciseDutyEdCess'=>$ExciseDutyEd,'AfterExciseDutyEdCess'=>$AfterExciseDutyEd,'ExciseDutySHCess'=>$ExciseDutySH,'CustomEdCess'=>$CustomEd,'CustomSHCess'=>$CustomSH,'AddlExciseDuty'=>$AddAdtional,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'AfterExciseDutySHCess'=>$AfterExciseDutySH,'AfterAddlExciseDuty'=>$AfterAddAdtional,'Grossdutypayable'=>$Grossdutypayable,'AvailableModvat'=>$AvailableModvat,'Grossexpensesduetocustomduty'=>$Grossexpensesduetocustomduty,'purchaseratePerKG'=>$purchaseratePerKG,'CustomDutyExpensesPerKG'=>$CustomDutyExpensesPerKG,'RMCIncludingCustomersPerKG'=>$RMCIncludingCustomersPerKG,'QuantityKG'=>$QuantityKG,'AfterCustomSHCess'=>$AfterCustomSH,'AfterCustomEdCess'=>$AfterCustomEd,'CurrencyType'=>$currencytypeID,'TotalValue'=>$Totalvalueitem); - $this->purchaseorder_model->updateImportTax($LineItemNo,$RevenueTaxList); + //print_r($ImportTaxList); + //die(); + $this->purchaseorder_model->updateImportTax($LineItemNo,$ImportTaxList); } } @@ -1202,7 +1209,6 @@ public function importpoprint($PONO) } - /* All Function following This command for FINANCE TEAM PO APPROVAL SCREEN*/ function poapproval(){ $q="A"; diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php index 556b5a20..c1c7c8a3 100755 --- a/application/views/editimportpo.php +++ b/application/views/editimportpo.php @@ -1573,7 +1573,7 @@ if(!empty($POMaster)) $totavlmodvat=$totavlmodvat+$record->AvailableModvat; $totgrossexpense=$totgrossexpense+$record->Grossexpensesduetocustomduty; $ExchangeRate=$record->ExchangeRate; - $$totorder=$totorder+$record->TotalOrderValue; + $totorder=$totorder+$record->TotalOrderValue; @@ -1706,7 +1706,7 @@ if(!empty($POMaster))
'txtToatlOrder','value' => set_value('txtToatlOrder',$$totorder),'id'=>'txtToatlOrder', 'class' => 'form-control' ,'required' => 'true','readonly' => 'true'); + $data = array('name' => 'txtToatlOrder','value' => set_value('txtToatlOrder',$totorder),'id'=>'txtToatlOrder', 'class' => 'form-control' ,'required' => 'true','readonly' => 'true'); echo form_input($data); ?>
@@ -1729,10 +1729,16 @@ if(!empty($POMaster)) - + + + + +   Save   Submit + +
@@ -3507,28 +3513,15 @@ else } $('#txtStatus').val(stat); -/*var MaterialCode= $("#MaterialCode").val(); -var Quantity= $("#quantity").val(); -var Reqnumber= $("#Reqnumber").val(); -var itemRate= $("#itemRate").val(); -var Exchangerate= $("#ExchangeRate").val(); -var BasicPriceinmton= $("#imBasicPrice").val(); -var Productprice= $("#txtBasicValue").val(); -var LandingCharge= $("#txttotallanding").val(); -var HighSeas = $("#txttotalhighseas").val(); -var CustomDuty= $("#txttotalcustom").val(); -var ExciseDuty= $("#txttotalexcise").val(); -var ExciseDutyEd= $("#txttotalexciseED").val(); -var ExciseDutySH= $("#txttotalexciseSH").val(); -var CustomEd= $("#txttotalcustomED").val(); -var CustomSH= $("#txttotalcustomSH").val(); -var AddAdtional= $("#txttotalAdditionalExciseduty").val();*/ var txtRowCount = $('#txtRowCount').val(); var txtDeletedRow = $('#txtDeletedRow').val(); //alert(stat); //alert(JSON.stringify(txtStatus)); //exit(); +//var TotalOrder=$('#txtToatlOrder').val(); +//alert(TotalOrder); +//exit(); if(validate()) { if(document.getElementById('ImportTax').rows.length <= 0) @@ -3547,7 +3540,7 @@ if(validate()) //data:$('.CreatealterPO').serialize()+"&TextRowCount="+TextRowCount+"&TextDeQletedRowCount="+TextDeletedRowCount+"&TextTotalOrderValueSummaryService="+TextTotalOrderValueSummaryService+"&TextSpcialInstruction="+TextSpcialInstruction+"&TextExchangerate"+ExcLandingCharge="+hangerate+"Status="+TextStatus, type:"POST", - url:"purchaseorder/EditRevenuePurchaseOrder", + url:"purchaseorder/EditImportPurchaseOrder", success:function(data) { if(data) {