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

import label change,pdf fix

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-09-23 16:47:30 +05:30
parent 2ca2ff86ae
commit a18ccbb054
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/views/editImportAmendPO.php
View File

@ -1418,7 +1418,7 @@ if(!empty($RequistionDetails))
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-12"> <div class="col-md-12">
<label>Special Instructions :</label> <label>Import Description :</label>
<?php <?php
$data = array('name' => 'edittxtInstruction','value' => set_value('edittxtInstruction'),'id'=>'edittxtInstruction', 'class' => 'form-control','rows' => '10', 'cols' => '40' ); $data = array('name' => 'edittxtInstruction','value' => set_value('edittxtInstruction'),'id'=>'edittxtInstruction', 'class' => 'form-control','rows' => '10', 'cols' => '40' );
echo form_textarea($data); echo form_textarea($data);
@ -2063,6 +2063,9 @@ else
}); });
$('#Importoption').attr("style", "pointer-events: none;");
var insureoption=<?php echo json_encode($Insurance,JSON_PRETTY_PRINT)?>; var insureoption=<?php echo json_encode($Insurance,JSON_PRETTY_PRINT)?>;
var insureno=<?php echo json_encode($InsuranceNo,JSON_PRETTY_PRINT)?>; var insureno=<?php echo json_encode($InsuranceNo,JSON_PRETTY_PRINT)?>;
//console.log(insureoption); //console.log(insureoption);

8
application/views/editimportpo.php
View File

@ -1457,7 +1457,7 @@ if($PONOStatus == PO_RELEASED)
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-12"> <div class="col-md-12">
<label>Special Instructions :</label> <label>Import Description : :</label>
<?php <?php
$data = array('name' => 'addtxtInstruction','value' => set_value('addtxtInstruction'),'id'=>'addtxtInstruction', 'class' => 'form-control','rows' => '10', 'cols' => '40' ); $data = array('name' => 'addtxtInstruction','value' => set_value('addtxtInstruction'),'id'=>'addtxtInstruction', 'class' => 'form-control','rows' => '10', 'cols' => '40' );
echo form_textarea($data); echo form_textarea($data);
@ -2096,7 +2096,7 @@ echo form_textarea($data);
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-12"> <div class="col-md-12">
<label>Special Instructions :</label> <label>Import Description : :</label>
<?php <?php
$data = array('name' => 'edittxtInstruction','value' => set_value('edittxtInstruction'),'id'=>'edittxtInstruction', 'class' => 'form-control','rows' => '10', 'cols' => '40' ); $data = array('name' => 'edittxtInstruction','value' => set_value('edittxtInstruction'),'id'=>'edittxtInstruction', 'class' => 'form-control','rows' => '10', 'cols' => '40' );
echo form_textarea($data); echo form_textarea($data);
@ -2720,7 +2720,7 @@ echo form_textarea($data);
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-12"> <div class="col-md-12">
<label>Special Instructions :</label> <label>Import Description : :</label>
<?php <?php
$data = array('name' => 'viewtxtInstruction','value' => set_value('viewtxtInstruction'),'id'=>'viewtxtInstruction', 'class' => 'form-control','rows' => '10', 'cols' => '40' ); $data = array('name' => 'viewtxtInstruction','value' => set_value('viewtxtInstruction'),'id'=>'viewtxtInstruction', 'class' => 'form-control','rows' => '10', 'cols' => '40' );
echo form_textarea($data); echo form_textarea($data);
@ -3258,7 +3258,7 @@ var NilType = '<?php echo NILTYPE;?>';
$('#Importoption').attr("style", "pointer-events: none;");
$('#Insurance').change(function() { $('#Insurance').change(function() {

10
application/views/importpo.php
View File

@ -606,7 +606,7 @@ function vaildateBeforeOpenModal()
<?php <?php
$options1 = array("0"=>'Select Import Option'); // $options1 = array("0"=>'Select Import Option');
@ -614,13 +614,13 @@ function vaildateBeforeOpenModal()
{ {
foreach ($PoTypeOptions as $payment): foreach ($PoTypeOptions as $payment):
$options1[$payment->ConfigValue] = $payment->ConfigValue; $options3[$payment->ConfigValue] = $payment->ConfigValue;
//$options6[$pay->PaymentID] = $pay->PaymentTerms; //$options6[$pay->PaymentID] = $pay->PaymentTerms;
endforeach; endforeach;
} }
echo form_dropdown('Importoption', $options1,set_value('Importoption'),'id="Importoption"' ,'class="form-control"'); ?> echo form_dropdown('Importoption', $options3,set_value('Importoption'),'id="Importoption"' ,'class="form-control"'); ?>
</div> </div>
@ -1289,7 +1289,7 @@ function vaildateBeforeOpenModal()
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-12"> <div class="col-md-12">
<label>Special Instructions :</label> <label>Import Description :</label>
<?php <?php
$data = array('name' => 'addtxtInstruction','value' => set_value('addtxtInstruction'),'id'=>'addtxtInstruction', 'class' => 'form-control','rows' => '10', 'cols' => '40' ); $data = array('name' => 'addtxtInstruction','value' => set_value('addtxtInstruction'),'id'=>'addtxtInstruction', 'class' => 'form-control','rows' => '10', 'cols' => '40' );
echo form_textarea($data); echo form_textarea($data);
@ -1918,7 +1918,7 @@ echo form_textarea($data);
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-12"> <div class="col-md-12">
<label>Special Instructions :</label> <label>Import Description : :</label>
<?php <?php
$data = array('name' => 'edittxtInstruction','value' => set_value('edittxtInstruction'),'id'=>'edittxtInstruction', 'class' => 'form-control','rows' => '10', 'cols' => '40' ); $data = array('name' => 'edittxtInstruction','value' => set_value('edittxtInstruction'),'id'=>'edittxtInstruction', 'class' => 'form-control','rows' => '10', 'cols' => '40' );
echo form_textarea($data); echo form_textarea($data);

3
application/views/importpopdf.php
View File

@ -104,6 +104,7 @@
$supplierGST=$PO->GSTNO; $supplierGST=$PO->GSTNO;
$finCap=$PO->Fincap; $finCap=$PO->Fincap;
$ModeOfShipment=$PO->Mode_Of_Shipment; $ModeOfShipment=$PO->Mode_Of_Shipment;
$Supplier_Reference=$PO->Supplier_Reference;
if($PO->InsuranceStatus=='1') if($PO->InsuranceStatus=='1')
{ {
@ -336,7 +337,7 @@
<br> <br>
<table style="border-collapse: collapse;width:100%;border-left-style:hidden;border-right-style:hidden;border-top-style:hidden;border-bottom-style:hidden;" border="1" cellspacing="0" cellpadding="0"> <table style="border-collapse: collapse;width:100%;border-left-style:hidden;border-right-style:hidden;border-top-style:hidden;border-bottom-style:hidden;" border="1" cellspacing="0" cellpadding="0">
<tr> <tr>
<td colspan="2" style="border: none;"><strong>Contact :</strong> <?php echo $SupplierContact; ?></td> <td colspan="2" style="border: none;"><strong>Contact :</strong> <?php echo $Supplier_Reference; ?></td>
</tr> </tr>
<tr> <tr>
<td style="border: none;"><strong>Mode of Shipment</strong>: <?php echo $ModeOfShipment ?> </td> <td style="border: none;"><strong>Mode of Shipment</strong>: <?php echo $ModeOfShipment ?> </td>