diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index ed0becc6..3478c50f 100755 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -414,6 +414,7 @@ class purchaseorder extends BaseController } //print_r($data['AvlBudAmt']); $data['POItem'] = $this->purchaseorder_model->GetImportPurchaseOrderDetails($PONO); + // print_r($data['POItem']); $data['Currency']=$this->purchaseorder_model->GetCurrencytype(); foreach($data['POMaster'] as $CUR) { diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index e13aaa57..0d7b407b 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -579,7 +579,7 @@ function purchaseorderListing($forwhat='') function GetServicePurchaseOrder($PONO = '') { $this->db->distinct(); - $this->db->select('ReqNo,POMast.PONO,POMast.PaymentTerms,POMast.PaymentOtherDescription,ServiceDescription,supp.SupplierID,supp.SupplierName,supp.Address,PODate,Stat.StatusName,DeliveryOption,DeliverySchedule,DeliveryDate,DeliveryAddress,POMast.PaymentTerms,POMast.ExchangeRate,POMast.UpdatedOn,Stat.StatusCode,POMast.ServiceWorkStatus,POMast.*'); + $this->db->select('ReqNo,POMast.PONO,POMast.PaymentTerms,POMast.PaymentOtherDescription,ServiceDescription,supp.SupplierID,supp.SupplierName,supp.Address,PODate,Stat.StatusName,DeliveryOption,DeliverySchedule,DeliveryDate,DeliveryAddress,POMast.PaymentTerms,POMast.ExchangeRate,POMast.UpdatedOn,Stat.StatusCode,POMast.ServiceWorkStatus,POMast.*,POMast.TotalOrderValue'); $this->db->from('T_PurchaseOrder_Master POMast'); $this->db->join('T_SupplierDetailsN supp', 'supp.SupplierID = POMast.SupplierID'); $this->db->join('T_Status Stat', 'Stat.StatusCode = POMast.Status'); diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php index 6057dbec..71be30ff 100755 --- a/application/views/editimportpo.php +++ b/application/views/editimportpo.php @@ -108,6 +108,7 @@ $StatusName=''; $Import_DispatchDetails=''; $Import_PlaceofOrgin=''; $DeliveryOption=''; +$Orderedsum=''; if(!empty($POMaster)) { @@ -144,10 +145,12 @@ if(!empty($POMaster)) $PaymentTerms=$Req->PaymentTerms; $DeliveryOption=$Req->DeliveryOption; $ServiceDescription=$Req->ServiceDescription; + $Orderedsum=$Req->TotalOrderValue; } } //echo $ServiceDescription; -//echo $PaymentTerms; +$SavedSum=$Orderedsum*$ExchangeRate; +//echo $SavedSum; if(!empty($RequistionDetails)) @@ -2641,6 +2644,8 @@ if($PONOStatus == PO_RELEASED) > + +
@@ -4007,9 +4012,13 @@ return true; var avalbudAmte= ; +var Sum=; +//console.log(Sum) function validateEditExceedLimit() { //var avalbudAmt = parseFloat($('#EditAvlBudAmt').val()); + // var addedamount=parseFloat($('#txtavlbud').val()); + // alert(addedamount); var basicAmountRate = parseFloat($('#EdittxtBasicValue').val()); var totalAmount = parseFloat($('#EditTotalExp').val()); var exchangerate=parseFloat($('#EditExchangeRt').val()); @@ -4231,7 +4240,7 @@ $('.AddImport').click(function() $("#viewimportmodal").on("shown.bs.modal", function(e) { - // alert(); + // alert(); userid = $(e.relatedTarget).data('userid'); //alert(userid); //alert('inadd'); @@ -4256,13 +4265,18 @@ $("#viewimportmodal").on("shown.bs.modal", function(e) { //$('#ViewExchangeRt').val($('#')) //RequistQuantity = $('#quantity'+userid).val(); $('#ViewRate').val($('#itemRate'+userid).val()); - $('#ViewtxtBasicValue').val($('#ProductPrice'+userid).val()); - $('#ViewimBasicPrice').val($("#ProductPrice"+userid).val()); + + var q=parseFloat($('#quantity'+userid).val()); + var r=parseFloat($('#itemRate'+userid).val()); + var p=q*r; + console.log(p); + $('#ViewtxtBasicValue').val(p); + $('#ViewimBasicPrice').val(p); var a=parseFloat($('#ViewtxtBasicValue').val()) var b=parseFloat($('#ExchangeRate').val()); var c=a*b; - console.log(c); + // console.log(c); $('#ViewINRBasicvalue').val(c); @@ -4610,7 +4624,7 @@ $("#editimportpomodel").on("shown.bs.modal", function(e) { var a=parseFloat($('#EdittxtBasicValue').val()) var b=parseFloat($('#ExchangeRate').val()); var c=a*b; - console.log(c); + // console.log(c); $('#EditINRBasicvalue').val(c);