diff --git a/application/controllers/amendmentpurchaseorder.php b/application/controllers/amendmentpurchaseorder.php
index 11713e38..6656151b 100755
--- a/application/controllers/amendmentpurchaseorder.php
+++ b/application/controllers/amendmentpurchaseorder.php
@@ -1309,17 +1309,17 @@ function CreateAmendPOPrint()
//s $this->load->view('includes/pdffooter');
// Get output html
- ///$php = $this->output->get_output();
+ $php = $this->output->get_output();
// Load library
- ///$this->load->library('dompdf_gen');
+ $this->load->library('dompdf_gen');
// Convert to PDF
//$this->dompdf->set_paper(array(0, 0, 841.89, 1190.55), 'landscape');
- ///$this->dompdf->load_html($php);
- ///$this->dompdf->render();
- ///$data['Attachment'] = FALSE;
- ///$this->dompdf->stream("ImportPOReport.pdf",$data,$php);
+ $this->dompdf->load_html($php);
+ $this->dompdf->render();
+ $data['Attachment'] = FALSE;
+ $this->dompdf->stream("ImportPOReport.pdf",$data,$php);
}
diff --git a/application/views/Amendedimportpopdf.php b/application/views/Amendedimportpopdf.php
index fc1ffccc..72591141 100644
--- a/application/views/Amendedimportpopdf.php
+++ b/application/views/Amendedimportpopdf.php
@@ -51,12 +51,12 @@
//$ReqBy=$PO->Requestedby;
$TotalOrderValue1=$PO->TotalOrderValue;
- $PaymentTerms = $PO->PaymentTerms;
- $PaymentDays=$PO->PaymentDays;
- $PayableAT=$PO->PayableAT;
+ $PaymentTerms = $PO->PaymentTerms;
+ $PaymentDays=$PO->PaymentDays;
+ $PayableAT=$PO->PayableAT;
}
}
-
+//echo $SuplierName;
if(!empty($Requestername))
diff --git a/application/views/editImportAmendPO.php b/application/views/editImportAmendPO.php
index 67009ca0..e3e9744e 100755
--- a/application/views/editImportAmendPO.php
+++ b/application/views/editImportAmendPO.php
@@ -23,6 +23,15 @@ foreach ($CurrencyDetail as $Detail)
$CurCode = $Detail->Currency_Code;
}
+
+
+if(!empty($AvlBudAmt))
+{
+
+ $AvlAmount = $AvlBudAmt;
+
+}
+//echo $AvlBudAmt;
foreach ($PaymentTerms as $TER)
@@ -124,6 +133,7 @@ if(!empty($POMaster))
$Import_DispatchDetails=$Req->Import_DispatchDetails;
$Import_PlaceofOrgin=$Req->Import_PlaceofOrgin;
$DeliverySchedule=$Req->DeliverySchedule;
+ $ServiceDescription=$Req->ServiceDescription;
}
}
@@ -624,7 +634,10 @@ body {
'EditAvlBudAmt','value' => set_value('EditAvlBudAmt'),'id'=>'EditAvlBudAmt', 'class' => 'form-control' ,'readonly' => 'true');
+ // $data = array('name' => 'EditAvlBudAmt','value' => set_value('EditAvlBudAmt',),'id'=>'EditAvlBudAmt', 'class' => 'form-control' ,'readonly' => 'true');
+ // echo form_input($data);
+
+ $data = array('name' => 'EditAvlBudAmt','value' => set_value('EditAvlBudAmt','dsfd'),'id'=>'EditAvlBudAmt', 'class' => 'form-control' ,'readonly' => 'true');
echo form_input($data);
?>
@@ -1162,7 +1175,7 @@ body {
-
+
@@ -1423,15 +1436,15 @@ body {
$TotalLanding = $TotalLanding + $record->AfterLandingCharge;
$tothighseas = $tothighseas + $record->AfterHighSeasSalesCharge;
$totcustom = $totcustom + $record->AfterCustomDuty;
- $totexciseduty = $totexciseduty + $record->ExciseDuty;
- $totexcisedutyED = $totexcisedutyED + $record->ExciseDutyEdCess;
+ $totexciseduty = $totexciseduty + $record->AfterExciseDuty;
+ $totexcisedutyED = $totexcisedutyED + $record->AfterExciseDutyEdCess;
$totexciseSH = $totexciseSH + $record->AfterExciseDutySHCess;
$totcustomED = $totcustomED +$record->AfterCustomEdCess;
- $totcustomSH = $totcustomSH + $record->CustomSHCess;
- $totaddtnlexcise= $totaddtnlexcise + $record->AddlExciseDuty;
- $totgrossduty = $totgrossduty + $record->Grossdutypayable;
- $totavlmodvat = $totavlmodvat +$record->AvailableModvat;
+ $totcustomSH = $totcustomSH + $record->AfterCustomSHCess;
+ $totaddtnlexcise= $totaddtnlexcise + $record->AfterAddlExciseDuty;
+ //$totgrossduty = $totgrossduty + $record->Grossdutypayable;
+ //$totavlmodvat = $totavlmodvat +$record->AvailableModvat;
$totgrossduty=$totgrossduty+$record->Grossdutypayable;
$totavlmodvat=$totavlmodvat+$record->AvailableModvat;
$totgrossexpense=$totgrossexpense+$record->Grossexpensesduetocustomduty;
@@ -1599,7 +1612,7 @@ body {
'txtSpcialInstruction','value' => set_value('txtSpcialInstruction'),'id'=>'txtSpcialInstruction', 'class' => 'form-control','rows' => '10', 'cols' => '40' );
+ $data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction',$ServiceDescription),'id'=>'txtSpcialInstruction', 'class' => 'form-control','rows' => '10', 'cols' => '40' );
echo form_textarea($data);
?>
@@ -1700,10 +1713,12 @@ var NilType = '';
};
+var AvlBudAmt = '';
+//alert(AvlBudAmt);
+ $('#EditAvlBudAmt').val(AvlBudAmt);
-
-$('#EditAvlBudAmt').val();
+//$('#EditAvlBudAmt').val();
@@ -1806,10 +1821,9 @@ $("#txtBasicValue").val('');
var Material = ;
// console.log(Material);
- var AvlBudAmt = '';
+ //var AvlBudAmt = '';
//alert(JSON.stringify(Material));
-
-
+
// For Binding DepartmentName
$.each(y, function(idx, obj) {
if(obj.ReqNo === id)
@@ -1819,7 +1833,7 @@ $("#txtBasicValue").val('');
}
});
- $("#AvlBudAmt").val(AvlBudAmt);
+ //$("#EditAvlBudAmt").val(AvlBudAmt);
// For Binding Material list center for the selected Requistion Number
$("#MaterialCode").append( $('
').val("0").html("Select Material Code") );
@@ -3011,7 +3025,9 @@ $('.EditImport').click(function(){
var editQuantity = $('#EditQuantity').val();
var itemRate = $("#EditRate").val();
var BasicValue=$("#EdittxtBasicValue").val();
+ //console.log(BasicValue);
var BasicUSPrice=$("#EditimBasicPrice").val();
+ var basicinr=$('#EditINRBasicvalue').val();
//var BasicValue=$("#EdittxtBasicValue").val();
var BasicPrice=$("#EditBasicPriceTax").val();
var AfterBasicPrice=$("#EditAfterBasicPriceTax").val();
@@ -3059,7 +3075,9 @@ $('.EditImport').click(function(){
$('#uom'+userid).val(editUOM);
$('#quantity'+userid).val(editQuantity);
$('#itemRate'+userid).val(itemRate);
+ $('#ProductPrice'+userid).val(BasicValue);
$('#BasicAmt'+userid).val(BasicValue);
+ $('#BasicINRValue'+userid).val(basicinr);
$('#BasicPriceInMTon'+userid).val(BasicUSPrice);
$('#BasicPriceTax'+userid).val(BasicPrice);
$('#AfterBasicPriceTax'+userid).val(AfterBasicPrice);
@@ -3089,8 +3107,8 @@ $('.EditImport').click(function(){
$('#RMCIncludingCustomersPerKG'+userid).val(RMC);
$('#TotalValue'+userid).val(TotalExp);
$('#AvailableModvat'+userid).val(AvailaleModvat);
- //var a=parseFloat($('#HighSeasSalesCharge'+userid).val());
- //console.log(a);
+ var a=parseFloat($('#ProductPrice'+userid).val());
+ console.log(a);
populateValueMainFormForEditImportTax();
diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
index c2c7a4f2..785f430e 100644
--- a/application/views/editimportpo.php
+++ b/application/views/editimportpo.php
@@ -141,6 +141,7 @@ if(!empty($POMaster))
$Import_PlaceofOrgin=$Req->Import_PlaceofOrgin;
$PaymentTerms=$Req->PaymentTerms;
$DeliveryOption=$Req->DeliveryOption;
+ $ServiceDescription=$Req->ServiceDescription;
}
}
//echo $DeliveryOption;
@@ -2632,7 +2633,7 @@ if($PONOStatus == PO_RELEASED)
- Total Order Value: 'txtToatlOrder','value' => set_value('txtToatlOrder',$totorder),'id'=>'txtToatlOrder', 'class' => 'form-control' ,'required' => 'true','readonly' => 'true','style'=>'text-align:right;');
echo form_input($data);
?>
@@ -4562,6 +4563,8 @@ if(validateEditExceedLimit() && ExceedEditQuantityCheck())
var itemRate = $("#EditRate").val();
var BasicValue=$("#EdittxtBasicValue").val();
var BasicUSPrice=$("#EditimBasicPrice").val();
+ var basicinr=$('#EditINRBasicvalue').val();
+ //console.log(basicinr);
//var BasicValue=$("#EdittxtBasicValue").val();
var BasicPrice=$("#EditBasicPriceTax").val();
var AfterBasicPrice=$("#EditAfterBasicPriceTax").val();
@@ -4609,8 +4612,11 @@ if(validateEditExceedLimit() && ExceedEditQuantityCheck())
$('#uom'+userid).val(editUOM);
$('#quantity'+userid).val(editQuantity);
$('#itemRate'+userid).val(itemRate);
+ $('#ProductPrice'+userid).val(BasicValue);
$('#BasicAmt'+userid).val(BasicValue);
$('#BasicPriceInMTon'+userid).val(BasicUSPrice);
+ $('#BasicINRValue'+userid).val(basicinr);
+
$('#BasicPriceTax'+userid).val(BasicPrice);
$('#AfterBasicPriceTax'+userid).val(AfterBasicPrice);
$('#LandingCharge'+userid).val(Landingcharge);
@@ -4639,8 +4645,8 @@ if(validateEditExceedLimit() && ExceedEditQuantityCheck())
$('#RMCIncludingCustomersPerKG'+userid).val(RMC);
$('#TotalValue'+userid).val(TotalExp);
$('#AvailableModvat'+userid).val(AvailaleModvat);
- //var a=parseFloat($('#AfterAddlExciseDuty'+userid).val());
- //console.log(a);
+ // var a=parseFloat($('#ProductPrice'+userid).val());
+ // console.log(a);
populateValueMainFormForEditImportTax();
}