diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index f6eba7ca..5c0738ec 100755 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -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); diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index bf63e13b..b50c2ea7 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -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(); +} } diff --git a/application/views/EditservicePurchaseorder.php b/application/views/EditservicePurchaseorder.php index ada2a4c0..4976aa4c 100755 --- a/application/views/EditservicePurchaseorder.php +++ b/application/views/EditservicePurchaseorder.php @@ -2055,7 +2055,7 @@ $(document).ready(function () {
- +
'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(''); }); + diff --git a/application/views/alterpurchaseorder.php b/application/views/alterpurchaseorder.php index 7f27d3ad..e3414d47 100755 --- a/application/views/alterpurchaseorder.php +++ b/application/views/alterpurchaseorder.php @@ -3031,7 +3031,7 @@ function populateValueMainFormForDeleteItem(rowid)
- Service Description* 'EdittxtSpcialInstructionSingle','value' => set_value('EdittxtSpcialInstructionSingle'),'id'=>'EdittxtSpcialInstructionSingle', 'class' => 'form-control' ,'rows' => '3', 'cols' => '40'); echo form_textarea($data); ?>
@@ -4039,7 +4039,7 @@ function populateValueMainFormForDeleteItem(rowid)
- Service Description* 'txtSpcialInstructionSingle','value' => set_value('txtSpcialInstructionSingle'),'id'=>'txtSpcialInstructionSingle', 'class' => 'form-control' ,'rows' => '3', 'cols' => '40' ); echo form_textarea($data); ?>
@@ -5231,7 +5231,7 @@ function populateValueMainFormForDeleteItem(rowid)
- Service Description* 'EdittxtSpcialInstruction','value' => set_value('EdittxtSpcialInstruction',$ServiceMaterialDescription),'id'=>'EdittxtSpcialInstruction', 'class' => 'form-control' ,'rows' => '3', 'cols' => '40'); echo form_textarea($data); ?> @@ -1532,7 +1532,7 @@ $(document).ready(function () {
- +
'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() { } }); + diff --git a/application/views/servicePurchaseorder.php b/application/views/servicePurchaseorder.php index 7f89fd9e..66bb0852 100755 --- a/application/views/servicePurchaseorder.php +++ b/application/views/servicePurchaseorder.php @@ -1590,7 +1590,7 @@ function clearEditTaxField()
- +
'descofpo','value' => set_value('descofpo'),'id'=>'descofpo', 'class' => 'form-control' ,'rows' => '3', 'cols' => '40' ); @@ -2315,6 +2315,11 @@ var AvlBudAmt = ''; $('#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(''); +