SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

import po issues

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-08-09 17:20:34 +05:30
parent 54c96e89e7
commit a0bd6198d6
3 changed files with 51 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/models/purchaseorder_model.php
View File

@ -869,7 +869,9 @@ QuantityRejected,ROUND(ReceivedQuantity-QuantityRejected)as PendingQty,
join T_Requestion_Master Req on Req.ReqNo = LineItem.ReqNo
join T_Employee_Details emp on Req.Requestedby = emp.EmpID
left join T_MRIR_Details Det on Det.MaterialCode=LineItem.MaterialCode
left join T_MRIR_Master Mast on POMast.PONO=Mast.PONO
left join T_MRIR_Details Det on Det.MaterialCode=LineItem.MaterialCode and Mast.MRIRNO=Det.MRIRNO
join T_DepartmentDetails Dept on emp.Departmentcode = Dept.DEPCode where LineItem.PONO =?';
//print_r($subQuery);

4
application/views/editimportpo.php
View File

@ -2465,7 +2465,7 @@ if($PONOStatus == PO_RELEASED)
$totgrossexpense=$totgrossexpense+$record->Grossexpensesduetocustomduty;
$ExchangeRate=$record->ExchangeRate;
//$totorder=$totorder+$record->ProductPrice;
$totorder=$totorder+$record->BasicValue;
$totorder=$totorder+$record->ProductPrice;
//$ServiceDescription=$record->ServiceDescription;
//alert($totorder);
@ -4086,7 +4086,7 @@ $('.AddImport').click(function()
//alert('in');
var template = jQuery("#ImportList").html();
$('#ImportAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,MaterialCode:materialCode,Description:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:BasicAmt,Taxvalue:taxamt,TotalValue:totalexp,ReceivedQty:receivedqty,RejectedQty:rejectedqty,PendingQty:pendingqty}));
$('#ImportAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,Description:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:BasicAmt,Taxvalue:taxamt,TotalValue:totalexp,ReceivedQty:receivedqty,RejectedQty:rejectedqty,PendingQty:pendingqty}));
//alert(JSON.strigify(BasicAmt));

79
application/views/importpo.php
View File

@ -1855,52 +1855,63 @@ var NilType = '<?php echo NILTYPE;?>';
$('#drpSupplier').change(function() {
var supPaymentTerms='';
var supPaymentAT='';
var subPaymentDate='';
var id = $('#drpSupplier').val();
var id = $('#drpSupplier').val();
$("#SupAddress").val('');
if(id != '0')
{
var y = <?php echo json_encode($Suplist, JSON_PRETTY_PRINT) ?>;
var Payment = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
var PaymentID='';
$('#PaymentTerms').empty();
$.each(y, function(idx, obj) {
if(obj.SupplierID === id)
{
// $("#SupAddress").val(obj.Address);
// // $("#PayableAT").val(obj.PayableAT);
// $("#PaymentTerms").val(obj.PaymentTerms);
// var a=obj.PaymentTerms;
// console.log(a);
// // if (a=="After")
// // {
// // //alert();
// // document.getElementById("After").checked = true;
$.each(y, function(idx, obj)
{
if(obj.SupplierID === id)
{
$("#SupAddress").val(obj.Address);
PaymentID = obj.PaymentID;
}
});
// // }
// // else
// // document.getElementById("Before").checked = true;
// //var a=$("PayableAT").val();
// $("#PaymentTerms").append( $('<option></option>').val(obj.PaymentTerms).html(obj.PaymentTerms) );
if(PaymentID!='PT08')
{
$('#otheroptiondiv').hide();
$('#Otherpayment').val('');
}
$("#SupAddress").val(obj.Address);
supPaymentTerms=obj.PaymentTerms;
supPaymentAT=obj.PayableAT;
subPaymentDate=obj.PaymentDays;
$.each(Payment, function(pay, payobj)
{
if(payobj.PaymentID == PaymentID)
{
}
else
{
$("#PaymentTerms").append( $('<option></option>').val(payobj.PaymentID).html(payobj.PaymentTerms));
}
});
}
});
}
else
{
@ -1912,6 +1923,8 @@ $('#drpSupplier').change(function() {
$('#currencytype').change(function(){
$('#ExchangeRate').val('');
});