SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

edit import per

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-09-08 11:54:48 +05:30
parent 6be3e0fa6a
commit 2f2ee5f7c6
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/controllers/purchaseorder.php
View File

@ -1664,7 +1664,9 @@ function addNewImportPurchaseOrder()
$Nosoftrip=$this->input->post('NoOfTrip'.$i); $Nosoftrip=$this->input->post('NoOfTrip'.$i);
$FreightRate=$this->input->post('FreightValue'.$i); $FreightRate=$this->input->post('FreightValue'.$i);
$FreightAmount=$this->input->post('AfterFreightValue'.$i); $FreightAmount=$this->input->post('AfterFreightValue'.$i);
// echo $Totalvalueitem;
$per=$this->input->post('Per'.$i);
echo $per;
//die(); //die();
$LineItemNo = ''; $LineItemNo = '';
//echo "sdsfsd"; //echo "sdsfsd";
@ -1690,7 +1692,7 @@ function addNewImportPurchaseOrder()
{ {
if(strlen($POLineItemNo) == 0) if(strlen($POLineItemNo) == 0)
{ {
$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter); $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'Per'=>$per);
$POLineItem=$this->purchaseorder_model->addPOLineItem($POLineItemList); $POLineItem=$this->purchaseorder_model->addPOLineItem($POLineItemList);
if(count($POLineItem)>0) if(count($POLineItem)>0)
{ {
@ -1707,7 +1709,7 @@ function addNewImportPurchaseOrder()
//echo $LineItemNo; //echo $LineItemNo;
//die(); //die();
$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'UpdatedOn'=>$updateddt,'CostCenterCode'=>$CostCenter); $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'UpdatedOn'=>$updateddt,'CostCenterCode'=>$CostCenter,'Per'=>$per);
$POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO,$POLineItemNo,$POLineItemList); $POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO,$POLineItemNo,$POLineItemList);
} }

2
application/models/purchaseorder_model.php
View File

@ -863,7 +863,7 @@ function GetImportPurchaseOrderDetails($PONO = '')
$subQuery ='SELECT distinct LineItem.LineItemNo,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName, $subQuery ='SELECT distinct LineItem.LineItemNo,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,
Mat.UOM,Quantity,Rate,Req.Status,ROUND((Quantity *Rate),2 ) as BasicValue,ReceivedQuantity, Mat.UOM,Quantity,Rate,Req.Status,ROUND((Quantity *Rate),2 ) as BasicValue,ReceivedQuantity,
QuantityRejected,ROUND(Quantity-ReceivedQuantity)as PendingQty, QuantityRejected,ROUND(Quantity-ReceivedQuantity)as PendingQty,Per,
ROUND((RMCIncludingCustomersPerKG*Quantity),2)as Taxamount,LandingCharge,HighSeasSalesCharge,CustomDuty,ExciseDuty,ExciseDutyEdCess,CustomEdCess,POMast.ExchangeRate,AfterLandingCharge,AfterHighSeasSalesCharge,AfterCustomDuty,AfterExciseDuty,AfterExciseDutyEdCess,AddlExciseDuty,AfterAddlExciseDuty,Grossdutypayable,AvailableModvat,Grossexpensesduetocustomduty,purchaseratePerKG,CustomDutyExpensesPerKG,RMCIncludingCustomersPerKG,QuantityKG,BasicPriceInMTon,ProductPrice,CustomSHCess,AfterCustomSHCess,AfterExciseDutySHCess,ExciseDutySHCess, ROUND((RMCIncludingCustomersPerKG*Quantity),2)as Taxamount,LandingCharge,HighSeasSalesCharge,CustomDuty,ExciseDuty,ExciseDutyEdCess,CustomEdCess,POMast.ExchangeRate,AfterLandingCharge,AfterHighSeasSalesCharge,AfterCustomDuty,AfterExciseDuty,AfterExciseDutyEdCess,AddlExciseDuty,AfterAddlExciseDuty,Grossdutypayable,AvailableModvat,Grossexpensesduetocustomduty,purchaseratePerKG,CustomDutyExpensesPerKG,RMCIncludingCustomersPerKG,QuantityKG,BasicPriceInMTon,ProductPrice,CustomSHCess,AfterCustomSHCess,AfterExciseDutySHCess,ExciseDutySHCess,
AfterCustomEdCess,ROUND((Quantity *Rate),2)as TotalOrderValue,ROUND((POMast.ExchangeRate*BasicPriceInMTon),2) as BasicINRValue,TotalValue,CurrencyType,ReceivedQuantity,Tax.*, AfterCustomEdCess,ROUND((Quantity *Rate),2)as TotalOrderValue,ROUND((POMast.ExchangeRate*BasicPriceInMTon),2) as BasicINRValue,TotalValue,CurrencyType,ReceivedQuantity,Tax.*,

23
application/views/editimportpo.php
View File

@ -2731,6 +2731,10 @@ if($PONOStatus == PO_RELEASED)
<input type="hidden" name="<?php echo 'AfterFreightValue'.$index ?>" id="<?php echo 'AfterFreightValue'.$index ?>" value="<?php echo $record->AfterFreightValue; ?>" /> <input type="hidden" name="<?php echo 'AfterFreightValue'.$index ?>" id="<?php echo 'AfterFreightValue'.$index ?>" value="<?php echo $record->AfterFreightValue; ?>" />
<input type="hidden" name="<?php echo 'Per'.$index ?>" id="<?php echo 'Per'.$index ?>" value="<?php echo $record->Per; ?>" />
<?php <?php
if($PONOStatus != PO_RELEASED) if($PONOStatus != PO_RELEASED)
@ -4511,7 +4515,13 @@ $('.AddImport').click(function()
var Nooftrip=$('#addNOOfTrips').val(); var Nooftrip=$('#addNOOfTrips').val();
var Freightrate=$('#addtxtFreight').val(); var Freightrate=$('#addtxtFreight').val();
var AfterFreightAmount=$('#addtxtAfterFreight').val(); var AfterFreightAmount=$('#addtxtAfterFreight').val();
var per=$('#AddPer').val();
if(per=='')
{
var per=$('#UOM').val();
}
// console.log(FreightType); // console.log(FreightType);
// console.log(Nooftrip); // console.log(Nooftrip);
// console.log(Freightrate); // console.log(Freightrate);
@ -4604,6 +4614,8 @@ $('.AddImport').click(function()
addHidden(theForm,"FreightValue"+temp,Freightrate); addHidden(theForm,"FreightValue"+temp,Freightrate);
addHidden(theForm,"AfterFreightValue"+temp,AfterFreightAmount); addHidden(theForm,"AfterFreightValue"+temp,AfterFreightAmount);
addHidden(theForm,"Per"+temp,per.trim());
//var a=parseFloat($('#AfterCustomEDcess').val()); //var a=parseFloat($('#AfterCustomEDcess').val());
//console.log(a); //console.log(a);
@ -4726,7 +4738,7 @@ $("#viewimportmodal").on("shown.bs.modal", function(e) {
$('#ViewTripsValue').hide(); $('#ViewTripsValue').hide();
} }
$('#ViewPer').val($("#Per"+userid).val());
$('#ViewTotalOrderValue').val(cellval[6].innerHTML); $('#ViewTotalOrderValue').val(cellval[6].innerHTML);
$("#ViewMaterialCode").empty(); $("#ViewMaterialCode").empty();
@ -5110,6 +5122,8 @@ $("#editimportpomodel").on("shown.bs.modal", function(e) {
$('#edittxtFreight').val($("#FreightValue"+userid).val()); $('#edittxtFreight').val($("#FreightValue"+userid).val());
$('#edittxtAfterFreight').val($("#AfterFreightValue"+userid).val()); $('#edittxtAfterFreight').val($("#AfterFreightValue"+userid).val());
$('#EditPer').val($("#Per"+userid).val());
var FreightType = $('#drpeditFreight').val(); var FreightType = $('#drpeditFreight').val();
@ -5237,7 +5251,12 @@ if(validateEditExceedLimit() && ExceedEditQuantityCheck()&&EditQtyZerocheck())
// console.log(FreightRate); // console.log(FreightRate);
// console.log(FreightRateAmount); // console.log(FreightRateAmount);
var per=$('#EditPer').val();
if(per=='')
{
var per=$('#EditUOM').val();
}
var tr= document.getElementById(userid); var tr= document.getElementById(userid);
var cellval = tr.cells; var cellval = tr.cells;
@ -5291,6 +5310,8 @@ if(validateEditExceedLimit() && ExceedEditQuantityCheck()&&EditQtyZerocheck())
$('#NoOfTrip'+userid).val(Nooftrip); $('#NoOfTrip'+userid).val(Nooftrip);
$('#FreightValue'+userid).val(FreightRate); $('#FreightValue'+userid).val(FreightRate);
$('#AfterFreightValue'+userid).val(FreightRateAmount); $('#AfterFreightValue'+userid).val(FreightRateAmount);
$('#Per'+userid).val(per.trim());
// var a=parseFloat($('#ProductPrice'+userid).val()); // var a=parseFloat($('#ProductPrice'+userid).val());
// console.log(a); // console.log(a);
// var a=$('#FreightType'+userid).val(); // var a=$('#FreightType'+userid).val();