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

done po format number

Browse Source
This commit is contained in:
gandhimathi 2017-09-20 11:54:00 +05:30
parent 819f8cc5de
commit 142f3b3f1a
6 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/controllers/purchaseorder.php
View File

@ -1150,6 +1150,7 @@ class purchaseorder extends BaseController
//$PONO = $_GET['PO'];
$data['CompanyDetails'] = $this->purchaseorder_model->getCompanyInformation();
$data['GetPoFormat'] = $this->purchaseorder_model->GetPoFormat($PONO);
$data['POItem'] = $this->purchaseorder_model->GetRevenuePurchaseOrderDetailsForPDF($PONO);
$data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO);
$data['CurrencySymbol']=$this->purchaseorder_model->GerCurrencyCodeName('INR');
@ -1206,6 +1207,7 @@ $AdvanceAmount=0.00;
// Load the pdf page with multiviews
$data['CompanyDetails'] = $this->purchaseorder_model->getCompanyInformation();
$data['GetPoFormat'] = $this->purchaseorder_model->GetPoFormat($PONO);
$data['POItem'] = $this->purchaseorder_model->GetServicePurchaseOrderDetailsForpdf($PONO);
@ -2558,7 +2560,7 @@ function addNewImportPurchaseOrder()
// Load the pdf page with multiviews
$data['CompanyDetails'] = $this->purchaseorder_model->getCompanyInformation();
$data['GetPoFormat'] = $this->purchaseorder_model->GetPoFormat($PONO);
$data['POItem'] = $this->purchaseorder_model->GetCapitalPurchaseOrderDetailsForPDF($PONO);
$data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO);

7
application/models/purchaseorder_model.php
View File

@ -1623,4 +1623,11 @@ join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
}
}
// get po format for acedamic year based
function GetPoFormat($PONO=''){
$poQuery ='select GetPO(PONO) from T_PurchaseOrder_Master where PONO=?';
$query = $this->db->query($poQuery,array($PONO));
return $query->result();
}
}

8
application/views/EditservicePurchaseorder.php
View File

@ -2055,7 +2055,7 @@ $(document).ready(function () {
</div>
<!--start new fields 1 sep-->
<div class="col-md-12">
<label>Description Of Service</label>
<label>Description Of Service <span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</label>
<div class="form-group">
<?php
$data = array('name' => 'editdescofpo','value' => set_value('editdescofpo',$DescriptionOfPo),'id'=>'editdescofpo', 'class' => 'form-control' ,'rows' => '3', 'cols' => '40' );
@ -2771,6 +2771,11 @@ var txtTotalOrderValueSummary = $('#txtTotBasicAmount').val();
$('#Otherpayment').focus();
return false;
}
else if($('#Editdescofpo').val().trim()==''){
alert('Please Enter Description Of Service');
$('#Editdescofpo').focus();
return false;
}
else
{
$('#content').loader('show');
@ -3224,3 +3229,4 @@ $('#insuranceNo').val('');
});
</script>

12
application/views/alterpurchaseorder.php
View File

@ -3031,7 +3031,7 @@ function populateValueMainFormForDeleteItem(rowid)
</div>
</div>
<div class="col-md-12" style="padding: 0px 30px 10px 30px;">
<label>Service Description</label> <?php
<label>Service Description<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</label> <?php
$data = array('name' => 'EdittxtSpcialInstructionSingle','value' => set_value('EdittxtSpcialInstructionSingle'),'id'=>'EdittxtSpcialInstructionSingle', 'class' => 'form-control' ,'rows' => '3', 'cols' => '40');
echo form_textarea($data); ?>
</div>
@ -4039,7 +4039,7 @@ function populateValueMainFormForDeleteItem(rowid)
</div>
<div class="col-md-12" style="padding: 0px 30px 10px 30px;">
<label>Service Description</label> <?php
<label>Service Description<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</label> <?php
$data = array('name' => 'txtSpcialInstructionSingle','value' => set_value('txtSpcialInstructionSingle'),'id'=>'txtSpcialInstructionSingle', 'class' => 'form-control' ,'rows' => '3', 'cols' => '40' );
echo form_textarea($data); ?>
</div>
@ -5231,7 +5231,7 @@ function populateValueMainFormForDeleteItem(rowid)
</div>
<!--start new fields 1 sep-->
<div class="col-md-12" id="emergdescofpo" style="display:none;">
<label>Description Of Service</label>
<label>Description Of Service<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</label>
<div class="form-group">
<?php
$data = array('name' => 'emergdescofpo','value' => set_value('emergdescofpo'),'id'=>'emergdescofpo', 'class' => 'form-control' ,'rows' => '3', 'cols' => '40' );
@ -6812,6 +6812,11 @@ $('#content').loader('hide');
$('#Otherpayment').focus();
return false;
}
else if($('#emergdescofpo').val().trim()==''){
alert('Please Enter Description Of Service');
$('#emergdescofpo').focus();
return false;
}
else
{
$('#content').loader('show');
@ -7595,3 +7600,4 @@ $("#PaymentMethod").change(function() {
});
</script>

10
application/views/editServiceAmendPO.php
View File

@ -1324,7 +1324,7 @@ $(document).ready(function () {
</div>
</div>
<div class="col-md-12" style="padding: 0px 30px 10px 30px;">
<label>Service Description</label> <?php
<label>Service Description<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</label> <?php
$data = array('name' => 'EdittxtSpcialInstruction','value' => set_value('EdittxtSpcialInstruction',$ServiceMaterialDescription),'id'=>'EdittxtSpcialInstruction', 'class' => 'form-control' ,'rows' => '3', 'cols' => '40');
echo form_textarea($data);
?> <input type="hidden" name="beforeEdittxtSpcialInstruction" id="beforeSpcialInstruction" value="<?php echo $ServiceMaterialDescription;?>">
@ -1532,7 +1532,7 @@ $(document).ready(function () {
</div>
<!--start new fields 1 sep-->
<div class="col-md-12">
<label>Description Of Service</label>
<label>Description Of Service<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</label>
<div class="form-group">
<?php
$data = array('name' => 'amenddescofpo','value' => set_value('amenddescofpo',$DescriptionOfPo),'id'=>'amenddescofpo', 'class' => 'form-control' ,'rows' => '3', 'cols' => '40' );
@ -2174,6 +2174,11 @@ var txtTotalOrderValueSummary = $('#txtTotBasicAmount').val();
$('#Otherpayment').focus();
return false;
}
else if($('#amenddescofpo').val().trim()==''){
alert('Please Enter Description Of Service');
$('#amenddescofpo').focus();
return false;
}
else{
$('#content').loader('show');
$.ajax({
@ -2279,3 +2284,4 @@ $("#PaymentTerms").change(function() {
}
});
</script>

8
application/views/servicePurchaseorder.php
View File

@ -1590,7 +1590,7 @@ function clearEditTaxField()
</div>
<!--start new fields 1 sep-->
<div class="col-md-12">
<label>Description Of Service</label>
<label>Description Of Service<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</label>
<div class="form-group">
<?php
$data = array('name' => 'descofpo','value' => set_value('descofpo'),'id'=>'descofpo', 'class' => 'form-control' ,'rows' => '3', 'cols' => '40' );
@ -2315,6 +2315,11 @@ var AvlBudAmt = '<?php echo $AvlAmount ?>';
$('#Otherpayment').focus();
return false;
}
else if($('#descofpo').val().trim()==''){
alert('Please Enter Description Of Service');
$('#descofpo').focus();
return false;
}
else
{
$('#content').loader('show');
@ -2505,3 +2510,4 @@ $('#insuranceNo').val('');
</script>