edit import purchase order alignment issue -vadivel J
This commit is contained in:
vadivel J
parent
00ce827d69
commit
a4f3f3ed2c
@ -46,6 +46,14 @@
|
||||
td {
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.th-total-order-value{
|
||||
text-align:"right" !important;
|
||||
width:55%;
|
||||
}
|
||||
|
||||
|
||||
|
||||
</style>
|
||||
|
||||
|
||||
@ -84,7 +92,8 @@
|
||||
<th>PONO</th>
|
||||
<th>PO Type</th>
|
||||
<th>Supplier Name</th>
|
||||
<th>Total Order Value</th>
|
||||
<th class="th th-total-order-value">
|
||||
Total Order Value</th>
|
||||
<th>PO Status</th>
|
||||
<th>Delivery Option</th>
|
||||
<th>Delivery Date</th>
|
||||
|
||||
@ -537,7 +537,7 @@ if (!empty($getlogpodtl)) {
|
||||
<div class="form-group col-md-3">
|
||||
<!-- <label>Exchange Rate </label> -->
|
||||
|
||||
<label id=label1><b><?php echo "Exchange Rate in $Currencycode ($Value)" ?><span class="text-danger">*</span></label>
|
||||
<label id=label1><?php echo "Exchange Rate in $Currencycode ($Value)" ?><span class="text-danger">*</span></label>
|
||||
|
||||
<?php
|
||||
$data = array('name' => 'ExchangeRate', 'value' => set_value('ExchangeRate', $ExchangeRate), 'id' => 'ExchangeRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'USRate()');
|
||||
@ -546,18 +546,19 @@ if (!empty($getlogpodtl)) {
|
||||
|
||||
</div>
|
||||
<div class="form-group col-md-3">
|
||||
<label>Place of Origin<span class="text-danger">*</span></label>
|
||||
<label>Place of Origin
|
||||
<span class="text-danger">*</span>
|
||||
</label>
|
||||
|
||||
<?php
|
||||
// $data = array('name' => 'PlaceOforigin','value' => set_value('PlaceOforigin'),'id'=>'PlaceOforigin', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
|
||||
// echo form_input($data);
|
||||
$data = array('name' => 'PlaceOforigin', 'value' => set_value('PlaceOforigin', $Import_PlaceofOrgin), 'id' => 'PlaceOforigin', 'class' => 'form-control', 'required' => 'true');
|
||||
$data = array('name' => 'PlaceOforigin', 'value' => set_value('PlaceOforigin', $Import_PlaceofOrgin), 'id' => 'PlaceOforigin', 'class' => 'form-control num', 'required' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-3">
|
||||
@ -713,41 +714,27 @@ if (!empty($getlogpodtl)) {
|
||||
<div class="form-group col-md-3">
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<table class="table table-bordered">
|
||||
<div align="right" style="padding-right:10px">
|
||||
<div align="right">
|
||||
<div class="form-row">
|
||||
<div class="col-md-3 col-md-offset-7" align="right" style="padding:10px">
|
||||
<!-- <input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1"> IS THIS OPEN ORDER FORMAT -->
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="form-row" align="right">
|
||||
<div class="col-md-4">
|
||||
|
||||
</div>
|
||||
<div class="form-group col-md-1" align="right">
|
||||
<div class="col-md-4">
|
||||
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == PO_APPROVED) { ?>
|
||||
<a data-toggle="modal" data-target="#importpomodel" class="btn btn-success" data-dismiss="modal" onclick="myFunction();">Add Line Item </a>
|
||||
<?php } ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!--<a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-success" id="abcd" >Select Line Item</button> </a>-->
|
||||
|
||||
|
||||
<!-- <div class="modal fade" id="importpomodel" role="dialog">-->
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<br />
|
||||
<br><br><br>
|
||||
<div class="box-body" style="margin-top: -3%;">
|
||||
<table id="ImportTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
|
||||
<thead>
|
||||
@ -793,6 +780,8 @@ if (!empty($getlogpodtl)) {
|
||||
<!-- <td><?php echo $record->QuantityRejected ?></td> -->
|
||||
<!-- <td><?php echo $record->PendingQty ?></td> -->
|
||||
<!-- <td><?php echo $record->Taxamount ?></td>
|
||||
|
||||
|
||||
<td><?php echo $record->TotalOrderValue ?></td> -->
|
||||
|
||||
<input type="hidden" name="<?php echo 'Reqnumber' . $index ?>" id="<?php echo 'Reqnumber' . $index ?>" value="<?php echo $record->ReqNo; ?>" />
|
||||
@ -1172,7 +1161,7 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-row p-3">
|
||||
<div class="form-group col-md-12">
|
||||
<label>Special Instructions </label> <?php
|
||||
$data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction', strip_tags($ServiceDescription)), 'id' => 'txtSpcialInstruction', 'class' => 'form-control', 'rows' => '10', 'cols' => '40');
|
||||
@ -1221,11 +1210,7 @@ if (!empty($getlogpodtl)) {
|
||||
<a class="btn btn-success" href="<?php echo base_url(); ?>purchaseorderListing">OK</a>
|
||||
<?php } ?>
|
||||
<?php } ?>
|
||||
|
||||
</div>
|
||||
<br />
|
||||
</div>
|
||||
|
||||
<br><br>
|
||||
<label >Request On :</label><?php echo $Reqon; ?><br />
|
||||
<label>Request By :</label><?php echo $RequesterName; ?><br />
|
||||
<label>Status : </label><?php
|
||||
@ -1247,6 +1232,11 @@ if (!empty($getlogpodtl)) {
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
<br />
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@ -1268,15 +1258,17 @@ if (!empty($getlogpodtl)) {
|
||||
<button type="button" class="close" data-dismiss="modal"
|
||||
aria-hidden="true">×</button>
|
||||
</div>
|
||||
<form>
|
||||
<form class="form-control">
|
||||
<div class="modal-body p-4">
|
||||
|
||||
|
||||
<div class="form-row">
|
||||
|
||||
|
||||
<div class="form-group col-md-3">
|
||||
<label>Req No<span class="text-danger" style="color:red;text-align:right;background-color: #fff
|
||||
;">*</span></label>
|
||||
<div>
|
||||
|
||||
<?php
|
||||
$options = array("0" => 'Req No');
|
||||
//echo form_dropdown('ImportMaterialCode', $options,set_value('ImportMaterialCode'),'id="ImportMaterialCode"' ,'class="form-control required"');
|
||||
@ -1290,7 +1282,7 @@ if (!empty($getlogpodtl)) {
|
||||
echo form_dropdown('ReqNo', $RL, set_value('ReqNo'), 'id="ReqNo" class="form-control"');
|
||||
|
||||
?>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-3">
|
||||
@ -1303,6 +1295,8 @@ if (!empty($getlogpodtl)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="form-group col-md-3">
|
||||
<label>Cost Center Code</label>
|
||||
<div >
|
||||
@ -1317,6 +1311,7 @@ if (!empty($getlogpodtl)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-3" style="padding-right: 0px;">
|
||||
<label>Available Budget Amount (<?php echo $INR ?>)</label>
|
||||
<div >
|
||||
@ -1326,9 +1321,12 @@ if (!empty($getlogpodtl)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<!-- second-row starts with item code -->
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-2">
|
||||
<div class="form-group col-md-3">
|
||||
<label>Item Code<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
|
||||
|
||||
<!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div-->
|
||||
@ -1359,7 +1357,7 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="form-group col-md-2">
|
||||
<div class="form-group col-md-3">
|
||||
<label>Item Name</label>
|
||||
<div >
|
||||
<?php
|
||||
@ -1368,14 +1366,15 @@ if (!empty($getlogpodtl)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-md-1">
|
||||
<div class="form-group col-md-3">
|
||||
<label>UOM</label>
|
||||
<?php
|
||||
$data = array('name' => 'UOM', 'value' => set_value('UOM'), 'id' => 'UOM', 'class' => 'form-control', 'readonly' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
<div class="form-group col-md-2">
|
||||
|
||||
<div class="form-group col-md-3">
|
||||
<label>Quantity<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
|
||||
<div >
|
||||
<?php
|
||||
@ -1384,43 +1383,16 @@ if (!empty($getlogpodtl)) {
|
||||
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-md-2">
|
||||
<!-- <label>Rate </label>
|
||||
-->
|
||||
|
||||
<!-- <P id=labelRate> --> <label id=labelRate><?php echo "Rate in $Currencycode ($Value)"; ?><span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span> </label><!-- </P> -->
|
||||
<div >
|
||||
<?php
|
||||
$data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange(),calculateFreight(0)');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-md-1">
|
||||
<label>Per</label> <?php
|
||||
$data = array('name' => 'AddPer', 'value' => set_value('AddPer'), 'id' => 'AddPer', 'class' => 'form-control');
|
||||
echo form_input($data); ?>
|
||||
</div>
|
||||
<div class="form-group col-md-2" style="padding: 0px;">
|
||||
<!-- <label>Basic Amount </label>-->
|
||||
<!-- <p id=labelBasicvalue><label><?php echo "Basic Value In $Currencycode ($Value)"; ?></label></p>
|
||||
-->
|
||||
|
||||
<!-- <p id=label2> --> <label id=label2><?php echo "Basic Value In $Currencycode"; ?></label><!-- </p> -->
|
||||
<div >
|
||||
<?php
|
||||
//$data = array('name' => 'imTotalAmount','value' => set_value('imTotalAmount'),'id'=>'imTotalAmount', 'class' => 'form-control' ,'readonly' => 'true');
|
||||
</div>
|
||||
</div>
|
||||
|
||||
$data = array('name' => 'txtBasicValue', 'value' => set_value('txtBasicValue'), 'id' => 'txtBasicValue', 'class' => 'form-control num', 'readonly' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row ">
|
||||
|
||||
<div class="form-group col-md-3">
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-3">
|
||||
|
||||
<!-- Basic Price in US $ per Ton : -->
|
||||
@ -1434,6 +1406,9 @@ if (!empty($getlogpodtl)) {
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-3">
|
||||
@ -1467,14 +1442,18 @@ if (!empty($getlogpodtl)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<!--<div class="form-group col-md-3">
|
||||
<a href="http://www.xe.com/" target="_blank"><u>Click nere to check Today's Foreign Exchange value</u></a>
|
||||
</div>-->
|
||||
|
||||
|
||||
</div>
|
||||
<div class="form-row" style="padding:0px;">
|
||||
|
||||
|
||||
|
||||
<br>
|
||||
|
||||
<div class="form-row " style="border:1px solid black;">
|
||||
<br />
|
||||
<div class="form-group col-md-6" style="padding:0px;">
|
||||
<div class="form-group col-md-12">
|
||||
<div class="form-group col-md-6 p-2 mt-1" style="padding:0px;">
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-4">
|
||||
<!-- Basic Price: -->
|
||||
<label><?php echo "Basic Price ($INR)"; ?></label>
|
||||
@ -1613,7 +1592,8 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-md-6" style="padding:0px;">
|
||||
|
||||
<div class="form-group col-md-6 p-2 mt-1" style="padding:0px;">
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-4">
|
||||
<!-- Additional Excise duty : (g) -->
|
||||
@ -1637,9 +1617,6 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-4">
|
||||
<!-- Additional Excise duty : (g) -->
|
||||
@ -1663,13 +1640,6 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-8">
|
||||
<!-- Gross duty payable -->
|
||||
@ -1688,8 +1658,8 @@ if (!empty($getlogpodtl)) {
|
||||
|
||||
<!--Start of Adding of Frieght model-->
|
||||
<div class="form-row" style="padding:0px;">
|
||||
<div class="form-group col-md-3">
|
||||
<span>Freight Type </span>
|
||||
<div class="form-group col-md-4">
|
||||
<label>Freight Type </label>
|
||||
<div>
|
||||
<?php
|
||||
$options = array("0" => 'Select Freight Type');
|
||||
@ -1709,8 +1679,8 @@ if (!empty($getlogpodtl)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-md-3" id="AddTripsValue" style="display:none;">
|
||||
<span>NO Of Trips</span>
|
||||
<div class="form-group col-md-4" id="AddTripsValue" style="display:none;">
|
||||
<label>NO Of Trips</label>
|
||||
<div >
|
||||
<?php
|
||||
$data = array('name' => 'addNOOfTrips', 'value' => set_value('addNOOfTrips'), 'id' => 'addNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
|
||||
@ -1718,8 +1688,8 @@ if (!empty($getlogpodtl)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-md-3">
|
||||
<span>Freight Rate </span>
|
||||
<div class="form-group col-md-4">
|
||||
<label>Freight Rate </label>
|
||||
<div >
|
||||
<?php
|
||||
$data = array('name' => 'addtxtFreight', 'value' => set_value('addtxtFreight'), 'id' => 'addtxtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);');
|
||||
@ -1728,8 +1698,8 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-3" style="padding-left: 0px;">
|
||||
<span>Freight Amt In <?php echo $INR; ?></span>
|
||||
<div class="form-group col-md-4" style="padding-left: 0px;">
|
||||
<label>Freight Amt In <?php echo $INR; ?></label>
|
||||
<div >
|
||||
<?php
|
||||
$data = array('name' => 'addtxtAfterFreight', 'value' => set_value('addtxtAfterFreight'), 'id' => 'addtxtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true');
|
||||
@ -1741,11 +1711,12 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
<!--End of Adding of freight in edit model -->
|
||||
|
||||
<br>
|
||||
|
||||
<center> <label>Cost of the product Per UOM</label></center>
|
||||
<hr />
|
||||
<hr>
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-row mt-3">
|
||||
<div class="form-group col-md-4">
|
||||
<label>Duty Impact</label>
|
||||
</div>
|
||||
@ -1757,8 +1728,8 @@ if (!empty($getlogpodtl)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-md-4" style="margin-top: -4.8%">
|
||||
<span>Quantity</span>
|
||||
<div class="form-group col-md-4" style="margin-top: -4.0%">
|
||||
<label>Quantity</label>
|
||||
<div >
|
||||
<?php
|
||||
$data = array('name' => 'PurQuantity', 'value' => set_value('PurQuantity'), 'id' => 'PurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCtable()');
|
||||
@ -1802,11 +1773,11 @@ if (!empty($getlogpodtl)) {
|
||||
|
||||
|
||||
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group col-md-4" style="margin-top: -4.0%">
|
||||
<!-- RMC Including Customers -->
|
||||
<label><?php echo "Nett per UOM($INR)"; ?></label>
|
||||
</div>
|
||||
<div class="form-group col-md-4">
|
||||
<label>
|
||||
<?php echo "Nett per UOM($INR)"; ?>
|
||||
</label>
|
||||
<div >
|
||||
<?php
|
||||
$data = array('name' => 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
|
||||
@ -1817,6 +1788,16 @@ if (!empty($getlogpodtl)) {
|
||||
|
||||
|
||||
|
||||
<div class="form-group col-md-4">
|
||||
|
||||
|
||||
</div>
|
||||
<div class="form-group col-md-4">
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="form-group col-md-4" style="display: none">
|
||||
<!-- Total Amount: -->
|
||||
@ -1837,6 +1818,8 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<br>
|
||||
|
||||
<div class="form-row ">
|
||||
<div class="form-group col-md-12">
|
||||
<label>Import Description :</label>
|
||||
@ -1850,8 +1833,10 @@ if (!empty($getlogpodtl)) {
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div class="modal-footer">
|
||||
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
|
||||
|
||||
<a class="btn btn-success font AddImport" ID="AddImport"> <span class="bold">Add Import</span></a>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user