diff --git a/application/controllers/amendmentpurchaseorder.php b/application/controllers/amendmentpurchaseorder.php index a8aae2ae..477618b2 100755 --- a/application/controllers/amendmentpurchaseorder.php +++ b/application/controllers/amendmentpurchaseorder.php @@ -800,11 +800,11 @@ function UpdateAmendServicePurchaseOrder() - $PONO =$this->input->post('txtPONO'); + $PONO =$this->input->post('txtPONO'); //echo $PONO."--"; - $MAD=''; - $DeliverySchedule = ''; - $POdt =$this->input->post('PODate'); + $MAD=''; + $DeliverySchedule = ''; + $POdt =$this->input->post('PODate'); $PODate = $this->getDateformat($POdt); $SupplierID = $this->input->post('drpSupplier'); $DeliveryAddr = $this->input->post('DeliveryAddr'); @@ -967,19 +967,11 @@ function UpdateAmendServicePurchaseOrder() $Productprice = $this->input->post('basicvalInINR'.$i); $LandingCharge = $this->input->post('beforeLanding'.$i); $AfterLandingCharge = $this->input->post('landingCharge'.$i); - $HighSeas = $this->input->post('beforeHighSeasSalesCharge'.$i); - $AfterHighSeas = $this->input->post('HighSeasSalesCharge'.$i); + $CustomDuty = $this->input->post('beforeCustomDuty'.$i); $AfterCustomDuty = $this->input->post('CustomDuty'.$i); - $ExciseDuty = $this->input->post('beforeExciseDuty'.$i); - $AfterExciseDuty = $this->input->post('ExciseDuty'.$i); - $ExciseDutyEd = $this->input->post('beforeExciseDutyEDCess'.$i); - $AfterExciseDutyEd = $this->input->post('ExciseDutyEDCess'.$i); - - $ExciseDutySH = $this->input->post('beforeExciseDutySHCess'.$i); - $AfterExciseDutySH = $this->input->post('ExciseDutySHCess'.$i); $CustomEd= $this->input->post('beforeCustomEDCess'.$i); $AfterCustomEd= $this->input->post('CustomEDCess'.$i); @@ -987,20 +979,46 @@ function UpdateAmendServicePurchaseOrder() $CustomSH = $this->input->post('beforeCustomSHCess'.$i); $AfterCustomSH = $this->input->post('CustomSHCess'.$i); - $AddAdtional = $this->input->post('beforeAdditionalExciseDuty'.$i); - $AfterAddAdtional = $this->input->post('AdditionalExciseDuty'.$i); + $Grossdutypayable = $this->input->post('GrossDutyPayable'.$i); - $AvailableModvat = $this->input->post('AvailableModvat'.$i); - $Grossexpensesduetocustomduty = $this->input->post('GrossExpensesDuetoCustom'.$i); + $purchaseratePerKG = $this->input->post('purchaseRate'.$i); $CustomDutyExpensesPerKG = $this->input->post('CustomDutyExpenses'.$i); - $RMCIncludingCustomersPerKG = $this->input->post('RMCIncludingCustomers'.$i); + $QuantityKG = $this->input->post('PurQuantity'.$i); $Totalvalueitem=$this->input->post('PerKgExpense'.$i); + + + + $Assable=$this->input->post('AssessableValue'.$i); + $beforeAssable=$this->input->post('beforeAssessableValue'.$i); + + + + $Subtotal=$this->input->post('SubTotal'.$i); + $beforeSubtotal=$this->input->post('beforeSubTotal'.$i); + + + + $Igst=$this->input->post('IGSTInt'.$i); + $beforeIgst=$this->input->post('beforeIGSTInt'.$i); + $AfterIgst=$this->input->post('AfterIGSTInt'.$i); + + + $ClearingCharge = $this->input->post('ClearingCharge'.$i); + + $NetValue = $this->input->post('NetValue'.$i); + + $DutyImpact=$this->input->post('DutyImpact'.$i); + + + + + //echo $BasicPriceinmton; $CostCenter = $this->input->post('CPCostCode'.$i); @@ -1125,6 +1143,35 @@ function UpdateAmendServicePurchaseOrder() } + if(($Assable-$beforeAssable)!=0) + { + //$CAD=$CAD."Amended CustomDuty :".$beforeCustomDuty ."
"; + $rowspanvalue++; + $CAD=$CAD."Amended Assessable : ".$beforeAssable ."Current CustomDuty:".$Assable.""; + } + + + + if(($Subtotal-$beforeSubtotal)!=0) + { + //$CAD=$CAD."Amended CustomDuty :".$beforeCustomDuty ."
"; + $rowspanvalue++; + $CAD=$CAD."Amended Subtotal : ".$beforeSubtotal ."Current Subtotal:".$Subtotal.""; + } + + + + if(($Igst-$beforeIgst)!=0) + { + //$CAD=$CAD."Amended CustomDuty :".$beforeCustomDuty ."
"; + $rowspanvalue++; + $CAD=$CAD."Amended IGST Percentage : ".$beforeIgst ."Current IGST Percentage:".$Igst.""; + } + + + + + } if($rowspanvalue>0) { @@ -1158,7 +1205,9 @@ function UpdateAmendServicePurchaseOrder() $ServiceTax = $this->purchaseorder_model->addServiceTax($ServiceTaxList); } //echo "Service"; else if($capitalType=='0'){ //print_r($ServiceTax); - $ImportTaxList = array('LineItemNo'=>$LineItemNo, '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,'TotalValue'=>$Totalvalueitem,'FreightType'=>$FreightType,'NoOfTrip'=>$NOOfTrip,'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue); + $ImportTaxList = array('LineItemNo'=>$LineItemNo, 'BasicPriceInMTon'=>$BasicPriceinmton,'ProductPrice'=>$Productprice,'LandingCharge'=>$LandingCharge,'AfterLandingCharge'=>$AfterLandingCharge,'CustomDuty'=>$CustomDuty,'AfterCustomDuty'=>$AfterCustomDuty,'CustomEdCess'=>$CustomEd,'CustomSHCess'=>$CustomSH,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'Grossdutypayable'=>$Grossdutypayable,'CustomDutyExpensesPerKG'=>$CustomDutyExpensesPerKG,'QuantityKG'=>$QuantityKG,'AfterCustomSHCess'=>$AfterCustomSH,'AfterCustomEdCess'=>$AfterCustomEd,'TotalValue'=>$Totalvalueitem,'FreightType'=>$FreightType,'NoOfTrip'=>$NOOfTrip,'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue,'AssessableValue'=>$Assable,'SubTotal'=>$Subtotal,'IGST'=>$Igst,'AfterIGST'=>$AfterIgst,'DutyImpact'=>$DutyImpact,'NetValue'=>$NetValue,'ClearingCharge'=>$ClearingCharge); + + $ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList); } diff --git a/application/views/capitalpurchaseorder.php b/application/views/capitalpurchaseorder.php index 48906b7f..14745a5f 100755 --- a/application/views/capitalpurchaseorder.php +++ b/application/views/capitalpurchaseorder.php @@ -1253,7 +1253,7 @@ function vaildateBeforeOpenModal()
- High seas sales charge + Assessable Value (A)
- Custom duty : (a) + Custom duty : (B)
@@ -1298,7 +1298,7 @@ function vaildateBeforeOpenModal()
- Custom ED_cess : (e) + Custom ED_cess : (C)
@@ -1319,7 +1319,7 @@ function vaildateBeforeOpenModal()
- Custom S & H cess : (f) + Custom S & H cess : (D)
@@ -2009,7 +2009,7 @@ function vaildateBeforeOpenModal()
- Custom duty: (a) + Custom duty: (B)
@@ -2033,7 +2033,7 @@ function vaildateBeforeOpenModal()
- Custom ED_cess : (e) + Custom ED_cess : (C)
@@ -2054,7 +2054,7 @@ function vaildateBeforeOpenModal()
- Custom S & H cess : (f) + Custom S & H cess : (D)
@@ -2254,7 +2254,7 @@ function vaildateBeforeOpenModal()
'EditClearingCharges','value' => set_value('EditClearingCharges'),'id'=>'EditClearingCharges', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();','readonly' => 'true'); + $data = array('name' => 'EditClearingCharges','value' => set_value('EditClearingCharges'),'id'=>'EditClearingCharges', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();'); echo form_input($data); ?>
diff --git a/application/views/editCapitalAmendPO.php b/application/views/editCapitalAmendPO.php index cbf80c02..aa463275 100755 --- a/application/views/editCapitalAmendPO.php +++ b/application/views/editCapitalAmendPO.php @@ -27,6 +27,11 @@ $TotalDiscountedAmt=0.0; $TotalFreightvalue=0.0; + + + $totigst=0; + $totSubtotal=0; + $totassesable=0; $TotalSummary = 0.0; $TotalBasicAmount = 0.0; @@ -1034,6 +1039,57 @@ document.getElementById('dispatchinternational').style.display = 'block'; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1177,6 +1233,11 @@ document.getElementById('dispatchinternational').style.display = 'block'; $totgrossexpense=$totgrossexpense+$record->Grossexpensesduetocustomduty; $ExchangeRate=$record->ExchangeRate; + + $totassesable=$totassesable+$record->AssessableValue; + $totSubtotal=$totSubtotal+$record->SubTotal; + $totigst=$totigst+$record->AfterIGST; + } @@ -1629,10 +1690,10 @@ document.getElementById('dispatchinternational').style.display = 'block';
- High seas sales charge + Assessable Value (A)
-
+