RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'CI4-Application' of bitbucket.org:venbainformationtechnology/ria into CI4-Application

Browse Source
This commit is contained in:
bitbucket 2024-08-02 13:49:22 +05:30
commit a960f2f051
26 changed files with 257 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
app/Controllers/Amendmentpurchaseorder.php
View File

@ -291,19 +291,25 @@ class Amendmentpurchaseorder extends BaseController
$POMaster = array('PONO' =>$AmendmentNewPoNo,'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, 'PORange' => $PoRange, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => PO_RELEASED, 'PaymentTerms' => $PaymentTerms, 'PaymentOtherDescription' => $Otherpayment, 'Mode_Of_Shipment' => $Modeofshipment, 'Supplier_Reference' => $supplierreference, 'Supplier_Offer_No' => $supplieroffno, 'Other_Reference' => $otherreference, 'Fincap' => $fincap, 'InsuranceStatus' => $insurancestatus, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $revenuetype, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $SpecialInstruction, 'CreatedBy' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'UpdatedOn' => $updateddt, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'AmendedDetails' => $MAD, 'IsQualityChkReqired' => $qtycheckresult);
$file = $this->request->getFile('POFile');
$requestfilename = $file->getName();
$requestfilename = $file->getName();
$PrePOFile = $this->request->getPost('PrePOFile');
if (!empty($requestfilename)) {
if ($file && $file->isValid() && !$file->hasMoved()) {
$path = ROOTPATH.'public/uploads/POfiles/';
if(!is_dir($path)) { mkdir($path, 0777, true); }
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
log_message('error', 'File already exists in the database'.$requestfilename);
}
else{
$file->move($path, $requestfilename);
$POMaster['POFile'] = $requestfilename;
}
}
if ($file && $file->isValid() && !$file->hasMoved()) {
$path = ROOTPATH.'public/uploads/POfiles/';
if(!is_dir($path)) { mkdir($path, 0777, true); }
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
log_message('error', 'File already exists in the database'.$requestfilename);
$POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
}
else{
$file->move($path, $requestfilename);
$POMaster['POFile'] = $requestfilename;
}
}else{
$POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
}
}else{
$POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
}
$LastPO = $this->purchaseorder_model->addAmendPOMaster($POMaster, $updatedBy, $PONO);
if (count($LastPO) > 0) {
@ -636,21 +642,27 @@ class Amendmentpurchaseorder extends BaseController
}
$AmendmentNewPoNo = generate_amendment_po_number($PONO);
$POMaster = array('PONO' =>$AmendmentNewPoNo,'ParentPO' => $PONO, 'POType' => $POType, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => PO_RELEASED, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $scopeofwork, 'CreatedBy' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $updateddt, 'PaymentTerms' => $PaymentTerms, 'PaymentOtherDescription' => $Otherpayment, 'ServiceWorkStatus' => $WorkStatus, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'AmendedDetails' => $MAD, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'Description_Of_Service' => $DescriptionOfPo, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'IsQualityChkReqired' => $qtycheckresult);
$POMaster = array('PONO' =>$AmendmentNewPoNo,'ParentPO' => $PONO, 'POType' => $POType, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => PO_RELEASED, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $scopeofwork, 'CreatedBy' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $updateddt, 'PaymentTerms' => $PaymentTerms, 'PaymentOtherDescription' => $Otherpayment, 'ServiceWorkStatus' => $WorkStatus, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'AmendedDetails' => $MAD, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'Description_Of_Service' => strip_tags((string)$DescriptionOfPo), 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'IsQualityChkReqired' => $qtycheckresult);
$file = $this->request->getFile('POFile');
$PrePOFile = $this->request->getPost('PrePOFile');
$requestfilename = $file->getName();
if (!empty($requestfilename)) {
if ($file && $file->isValid() && !$file->hasMoved()) {
$path = ROOTPATH.'public/uploads/POfiles/';
if(!is_dir($path)) { mkdir($path, 0777, true); }
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
log_message('error', 'File already exists in the database'.$requestfilename);
}
else{
$file->move($path, $requestfilename);
$POMaster['POFile'] = $requestfilename;
}
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
log_message('error', 'File already exists in the database'.$requestfilename);
$POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
}
else{
$file->move($path, $requestfilename);
$POMaster['POFile'] = $requestfilename;
}
}else{
$POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
}
}else{
$POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
}
$LastPO = $this->purchaseorder_model->addAmendPOMaster($POMaster, $updatedBy, $PONO);
@ -953,18 +965,24 @@ class Amendmentpurchaseorder extends BaseController
$POMaster = array('PONO' =>$AmendmentNewPoNo,'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $FinalTotalOrder, 'POType' => $POType, 'PODate' => $PODate, 'Status' => PO_RELEASED, 'CapitalRange' => $PoRange, 'ExchangeRate' => $ExchangeRate, 'ExchangeRateCalculatedon' => $ExchangeRateOn, 'PaymentTerms' => $PaymentMethod, 'PaymentOtherDescription' => $Otherpayment, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'CurrencyType' => $currencytypeID, 'AmendedDetails' => $MAD, 'Import_DispatchDetails' => $curdispatch, 'Import_PlaceofOrgin' => $PlaceOforigin, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'IsQualityChkReqired' => $qtycheckresult);
$file = $this->request->getFile('POFile');
$requestfilename = $file->getName();
$PrePOFile = $this->request->getPost('PrePOFile');
if (!empty($requestfilename)) {
if ($file && $file->isValid() && !$file->hasMoved()) {
$path = ROOTPATH.'public/uploads/POfiles/';
if(!is_dir($path)) { mkdir($path, 0777, true); }
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
log_message('error', 'File already exists in the database'.$requestfilename);
}
else{
$file->move($path, $requestfilename);
$POMaster['POFile'] = $requestfilename;
}
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
log_message('error', 'File already exists in the database'.$requestfilename);
$POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
}
else{
$file->move($path, $requestfilename);
$POMaster['POFile'] = $requestfilename;
}
}else{
$POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
}
}else{
$POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
}
@ -1341,6 +1359,27 @@ class Amendmentpurchaseorder extends BaseController
}
$AmendmentNewPoNo = generate_amendment_po_number($PONO);
$POMaster = array('PONO' =>$AmendmentNewPoNo,'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, 'TotalOrderValue' => $TotalOrder, 'PODate' => $PODate, 'Status' => $POStatus, 'PORange' => $PoRange, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'Import_DispatchDetails' => $Dispatch, 'CreatedDate' => $createddt, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ExchangeRate' => $Exchangerate, 'ExchangeRateCalculatedon' => $ExchangeRateCalculatedon, 'CurrencyType' => $CurrencyType, 'PaymentTerms' => $PaymentTerms, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'Import_PlaceofOrgin' => $Palaceoforigin, 'Mode_Of_Shipment' => $Shipmentmode, 'Supplier_Reference' => $SupplierRef, 'Supplier_Offer_No' => $SupplierOffer, 'Other_Reference' => $otherRef, 'Fincap' => $finCap, 'AmendedDetails' => $MAD, 'PaymentOtherDescription' => $OtherPayment, 'InsuranceStatus' => $insurestatus, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $importoption, 'IsQualityChkReqired' => $qtycheckresult);
$file = $this->request->getFile('POFile');
$requestfilename = $file->getName();
$PrePOFile = $this->request->getPost('PrePOFile');
if (!empty($requestfilename)) {
if ($file && $file->isValid() && !$file->hasMoved()) {
$path = ROOTPATH.'public/uploads/POfiles/';
if(!is_dir($path)) { mkdir($path, 0777, true); }
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
log_message('error', 'File already exists in the database'.$requestfilename);
$POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
}
else{
$file->move($path, $requestfilename);
$POMaster['POFile'] = $requestfilename;
}
}else{
$POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
}
}else{
$POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
}
$LastPO = $this->purchaseorder_model->addAmendPOMaster($POMaster, $CreateBy, $PONO);
$NewPO = '';
// if (count($LastPO) > 0) {

43
app/Controllers/Emergencypurchaseorder.php
View File

@ -208,7 +208,26 @@ class Emergencypurchaseorder extends BaseController
$newPONO = generate_po_number($lastPONO);
// PO Master
$POList = array('PONO'=>$newPONO,'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => $POStatus, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'PaymentTerms' => $PaymentTerms, 'ServiceWorkStatus' => $ServiceWorkStatus, 'POType' => $POType, 'PaymentOtherDescription' => $OtherPayment, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'Description_Of_Service' => $DescriptionOfPo, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'BudgetType' => $BudgetType,'IsOpenOrder'=>$IsOpenOrder);
$file = $this->request->getFile('POFile');
$requestfilename = $file->getName();
if (!empty($requestfilename)) {
if ($file->isValid() && !$file->hasMoved()) {
$path = ROOTPATH.'public/uploads/POfiles/';
if(!is_dir($path)) { mkdir($path, 0777, true); }
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
log_message('error', 'File already exists in the database'.$requestfilename);
$POList['POFile'] = NULL;
}else{
$file->move($path, $requestfilename);
$POList['POFile'] = $requestfilename;
}
}else{
$POList['POFile'] = NULL;
}
}
$POMaster = $this->purchaseorder_model->addPOMaster($POList, $POType, $ServiceTypeOptions);
$PONO = $POMaster ? $newPONO : "";
@ -463,7 +482,25 @@ class Emergencypurchaseorder extends BaseController
$lastPONO = $this->purchaseorder_model->lastPONO();
$newPONO = generate_po_number($lastPONO);
$POList = array('PONO'=>$newPONO,'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => $POStatus, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'PORange' => $Local_Interstate, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'PaymentTerms' => $PaymentTerms, 'POType' => $POType, 'CapitalRange' => $Local_Interstate, 'PaymentOtherDescription' => $OtherPayment, 'Mode_Of_Shipment' => $Modeofshipment, 'Supplier_Offer_No' => $supplieroffno, 'Supplier_Reference' => $supplierreference, 'Other_Reference' => $otherreference, 'InsuranceNumber' => $InsuranceNumber, 'InsuranceStatus' => $insurancestatus, 'Fincap' => $fincap, 'POSubType' => $revenuetype, 'IsQualityChkReqired' => $Qualitycheck, 'BudgetType' => $BudgetType,'IsOpenOrder'=>$IsOpenOrder);
//print_r($POList);
$file = $this->request->getFile('POFiles');
$requestfilename = $file->getName();
if (!empty($requestfilename)) {
if ($file->isValid() && !$file->hasMoved()) {
$path = ROOTPATH.'public/uploads/POfiles/';
if(!is_dir($path)) { mkdir($path, 0777, true); }
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
log_message('error', 'File already exists in the database'.$requestfilename);
$POList['POFile'] = NULL;
}else{
$file->move($path, $requestfilename);
$POList['POFile'] = $requestfilename;
}
}else{
$POList['POFile'] = NULL;
}
}
$POMaster = $this->purchaseorder_model->addPOMaster($POList, $POType, $revenuetype);
$PONO = $POMaster ? $newPONO : "";
// $PONO = '';
@ -847,7 +884,7 @@ class Emergencypurchaseorder extends BaseController
//$this->purchaseorder_model->UpdateRequistItemStatus();
$this->purchaseorder_model->UpdateRequistionStatus();
$data['POData'] = $this->purchaseorder_model->purchaseorderListing();
print_r($data['POData']);die;
$this->global['pageTitle'] = 'Purchase Orders';
$this->loadViews("POlist", $this->global, $data, NULL);

7
app/Controllers/Purchaseorder.php
View File

@ -2436,8 +2436,11 @@ $mpdf->use_kwt = true;
// $data['Status']= $this->purchaseorder_model->getStatus();
$userID = $this->session->get('userId');
//print_r($data['Status']);echo "CON";
$data['AppList'] = $this->purchaseorder_model->getPOList($q);
$appList = $this->purchaseorder_model->getPOList($q);
$filteredAppList = array_filter($appList, function($item) {
return $item->Status !== PO_DRAFT;
});
$data['AppList'] = $filteredAppList;
$this->loadViews("porelease_view", $this->global, $data, NULL);
}

23
app/Views/EditservicePurchaseorder.php
View File

@ -1418,8 +1418,8 @@ if (!empty($getlogpodtl)) {
<div class="modal-footer">
<div class="col-md-12">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font AddService" ID="AddService"><span class="bold">Add Service</span></a>
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
</div>
</div>
</div>
@ -2429,21 +2429,26 @@ if (!empty($getlogpodtl)) {
<div class="col-md-12">
<div align="right"><br />
<input type="file" name="POFile" id="POFile"><br>
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
<div>
<input type="file" name="POFile" id="POFile">
<?php if($PrePOFile){ ?>
<label><a title="previously uploaded PO File" href="<?php echo base_url().'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
<?php } ?>
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>"/><br>
</div> <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
<input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo $index; ?>">
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED) {
if ($PONOStatus == PO_DRAFT) { ?>
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
<a class="btn btn-cancel Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<?php if ($PONOStatus == PO_DRAFT) { ?>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save</span></a>
<?php } ?>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve and Release</span></a>
<a class="btn btn-success Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<?php } else if ($PONOStatus == SPECIAL_PO) { ?>
<a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
<a class="btn btn-success Save" ID="Submit" onclick="Save(3)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
@ -2461,8 +2466,8 @@ if (!empty($getlogpodtl)) {
<label>Request By : </label><?php echo $RequesterName; ?><br />
<?php
} ?>
<label>Status : </label><?php echo $StatusName; ?>
<!-- <label>Status : </label><?php
<!-- <label>Status : </label><?php echo $StatusName; ?> -->
<label>Status : </label><?php
$statusMappings = [
'PO APPROVED' => 'AWAITING APPROVE',
'AWAITING RELEASE' => 'AWAITING APPROVE',
@ -2479,7 +2484,7 @@ if (!empty($getlogpodtl)) {
} else {
echo "Status not provided";
}
?> -->
?>
</div>
</div>

24
app/Views/addCostCenter.php
View File

@ -75,13 +75,13 @@ $(function() {
</section>
<section class="content">
<div style="text-align:right;">
<a href="<?php echo base_url() ?>costListing" class="btn btn-primary" value="Back">Back</a>
<a href="<?php echo base_url() ?>costListing" class="btn btn-cancel" value="Back">Back</a>
</div>
<br>
<div class="row">
<!-- left column -->
<div class="col-md-12">
<div class="box box-primary">
<div class="box box-success">
<!-- form start -->
<?php
@ -145,8 +145,8 @@ $(function() {
</div>
<div class="col-md-4">
<center>
<a style="color:white" href="javascript:void(0);" id="addPop"><button type="button" style="margin: 30px 0px 0px 15px;" class="btn btn-primary">Add</button></a><br>
<a style="color:white" href="javascript:void(0);" id="removePop"><button type="button" style="margin: 10px 0px 0px 15px;" class="btn btn-primary">Remove</button></a><br>
<a style="color:white" href="javascript:void(0);" id="addPop"><button type="button" style="margin: 30px 0px 0px 15px;" class="btn btn-success">Add</button></a><br>
<a style="color:white" href="javascript:void(0);" id="removePop"><button type="button" style="margin: 10px 0px 0px 15px;" class="btn btn-success">Remove</button></a><br>
</center>
</div>
@ -193,7 +193,7 @@ $(function() {
<br>
<div col="row">
<div style="text-align:right">
<a onclick="OpenModal()" class="btn btn-primary"><i class="fa fa-plus"></i>&nbsp;&nbsp;Add Budget</a>
<a onclick="OpenModal()" class="btn btn-success"><i class="fa fa-plus"></i>&nbsp;&nbsp;Add Budget</a>
<!-- Modal -->
@ -285,8 +285,8 @@ $(function() {
<!-- Modal Footer -->
<div class="modal-footer">
<a class="btn btn-primary font tempClick" ID="tempClick" style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add</span></a>
<a class="btn btn-primary" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">cancel</a>
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success font tempClick" ID="tempClick" style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add</span></a>
</div>
</div>
</div>
@ -394,8 +394,8 @@ $(function() {
</div>
<!-- Modal Footer -->
<div class="modal-footer">
<a class="btn btn-primary font tempClickEdit" ID="tempClickEdit" style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Edit</span></a>
<a class="btn btn-primary" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">cancel</a>
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success font tempClickEdit" ID="tempClickEdit" style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Edit</span></a>
</div>
</div>
</div>
@ -408,9 +408,9 @@ $(function() {
<div class="box-footer" style="text-align:right">
<input type="hidden" name="txtSelectedDepartment" id="txtSelectedDepartment" />
<input type="hidden" name="txtRowCount" id="txtRowCount" />
<input type="submit" class="btn btn-primary" value="Submit" />
<!-- <input type="reset" class="btn btn-primary" value="Cancel" />-->
<a href="<?php echo base_url() ?>costListing" class="btn btn-primary" id="cancel" value="Cancel">Cancel</a>
<!-- <input type="reset" class="btn btn-success" value="Cancel" />-->
<a href="<?php echo base_url() ?>costListing" class="btn btn-cancel" id="cancel" value="Cancel">Cancel</a>
<input type="submit" class="btn btn-success" value="Submit" />
</div>

4
app/Views/addRawMaterial.php
View File

@ -29,7 +29,7 @@
<section class="content" id="content">
<div style="text-align:right;">
<a href="<?php echo base_url() ?>rawmaterialListing" class="btn btn-success" value="Back" />Back</a>
<a href="<?php echo base_url() ?>rawmaterialListing" class="btn btn-cancel" value="Back" />Back</a>
</div>
<br />
<div class="row">
@ -142,7 +142,7 @@
</div>
</div>
<div class="box-footer" style="text-align:right">
<input type="reset" class="btn btn-success" value="Reset" />
<input type="reset" class="btn btn-reset" value="Reset" />
<input type="submit" onclick="Validate();" value="Submit" class="btn btn-success">
</div>

4
app/Views/addSupplier.php
View File

@ -204,7 +204,7 @@
<!-- <small>Preview</small> -->
</center>
<ol class="breadcrumb">
<a class="btn btn-success" href="<?php echo base_url(); ?>supplierlisting">&nbsp;&nbsp;<span class="bold">Back</span></a>
<a class="btn btn-cancel" href="<?php echo base_url(); ?>supplierlisting">&nbsp;&nbsp;<span class="bold">Back</span></a>
</ol>
</section>
@ -348,7 +348,7 @@
</div>
</div>
<div class="col-md-12 text-right">
<input type="reset" id="reset" class="btn btn-success" value="Reset" />
<input type="reset" id="reset" class="btn btn-reset" value="Reset" />
<input type="submit" onclick="return Validate();" value="Submit" class="btn btn-success">
</div>
</div>

4
app/Views/addasset.php
View File

@ -55,7 +55,7 @@ $(function() {
<section class="content">
<div style="text-align:right;">
<a href="<?php base_url() ?>assetListing" class="btn btn-success" value="Back"/>Back</a>
<a href="<?php base_url() ?>assetListing" class="btn btn-cancel" value="Back"/>Back</a>
</div>
<br>
<div class="row">
@ -293,8 +293,8 @@ $(function() {
</div><!-- /.box-body -->
<div class="box-footer" style="text-align:right">
<input type="reset" class="btn btn-reset" value="Reset" />
<input type="submit" onclick="validate();"class="btn btn-success" value="Submit" />
<input type="reset" class="btn btn-success" value="Reset" />
</div>
</div>

10
app/Views/addconfig.php
View File

@ -9,7 +9,7 @@
<div style="text-align:right;">
<a href="<?php echo base_url() ?>configlisting" class="btn btn-success" value="Back">Back</a>
<a href="<?php echo base_url() ?>configlisting" class="btn btn-cancel" value="Back">Back</a>
</div>
<br>
<div class="row">
@ -120,8 +120,8 @@
<!-- Modal Footer -->
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success font tempClickAdd" ID="tempClickAdd" style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">cancel</a>
</div>
</div>
</div>
@ -186,9 +186,8 @@
</div>
<!-- Modal Footer -->
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success font tempClickEdit" ID="tempClickEdit" style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Edit</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">cancel</a>
</div>
</div>
</div>
@ -201,9 +200,8 @@
<div class="box-footer" style="text-align:right">
<!--<input type="text" name="txtRowCount" id="txtRowCount" />-->
<input type="hidden" name="txtRowCount" id="txtRowCount" />
<a href="" class="btn btn-cancel" id="cancel" value="Cancel">Cancel</a>
<input type="submit" class="btn btn-success" value="Submit" />
<a href="" class="btn btn-success" id="cancel" value="Cancel">Cancel</a>
</div>

6
app/Views/adddepartment.php
View File

@ -62,12 +62,12 @@
<div class="content-wrapper">
<!-- Content Header (Page header) -->
<section class="content-header">
<center><b><h3 class="box-title">Add Employee</h3></b></center>
<center><b><h3 class="box-title">Add Department Details</h3></b></center>
</section>
<section class="content">
<div style="text-align:right;">
<a href="<?php echo base_url() ?>departmentListing" class="btn btn-success" value="Back"/>Back</a>
<a href="<?php echo base_url() ?>departmentListing" class="btn btn-cancel" value="Back"/>Back</a>
</div>
<br/>
<div class="row">
@ -148,7 +148,7 @@
<div class="form-group">
<div class="col-md-3 col-md-offset-9">
<div class="pull-right">
<input type="reset" id="reset" class="btn btn-success" value="Reset" />
<input type="reset" id="reset" class="btn btn-reset" value="Reset" />
<input type="submit" onclick="return Validat();" class="btn btn-success" value="Submit"/>
</div>
</div>

58
app/Views/alterpurchaseorder.php
View File

@ -2120,7 +2120,7 @@ if (!empty($INRSYMBOL)) {
if (!empty($Suplist)) {
foreach ($Suplist as $SID) :
$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName . (!empty($SID->MSME) ? ' ( MSME - ' . $SID->MSME.' )' : '');
$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName ;
endforeach;
}
@ -2521,9 +2521,8 @@ if (!empty($INRSYMBOL)) {
</form>
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="PackagingOption" onclick="SetPackagingOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
</div>
</div>
@ -2550,9 +2549,8 @@ if (!empty($INRSYMBOL)) {
</form>
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="PackagingOption" onclick="SetPackagingOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
</div>
</div>
@ -2579,9 +2577,8 @@ if (!empty($INRSYMBOL)) {
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="PackagingOption" onclick="submitoption();dropdownselect();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
</div>
</form>
</div>
@ -2718,9 +2715,8 @@ if (!empty($INRSYMBOL)) {
<div class="col-md-4 col-md-offset-8">
<a class="btn btn-cancel" data-dismiss="modal" onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
<a class="btn btn-success ok" ID="ExciseOption12" onclick="rfilealert();">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-success" data-dismiss="modal" onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
</div>
</div>
</div>
@ -2777,9 +2773,8 @@ if (!empty($INRSYMBOL)) {
<div class="col-md-12 text-right">
<div class="col-md-4 col-md-offset-8">
<a class="btn btn-cancel" data-dismiss="modal" onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
<a class="btn btn-success ok" ID="ExciseOption12" onclick="sfilealert();">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-success" data-dismiss="modal" onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
</div>
</div>
</div>
@ -2814,9 +2809,8 @@ if (!empty($INRSYMBOL)) {
</form>
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="freightOption" onclick="setfreightOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
</div>
</div>
@ -2851,8 +2845,8 @@ if (!empty($INRSYMBOL)) {
</form>
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" onclick="SetExciseCalculationCancel();" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="ExciseOption" onclick="SetExciseCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-success" data-dismiss="modal" onclick="SetExciseCalculationCancel();" style="margin-top: -24px;" value="Cancel">Cancel</a>
</div>
</div>
@ -2882,8 +2876,8 @@ if (!empty($INRSYMBOL)) {
</form>
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="VatOption" onclick="SetVatCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
</div>
</div>
@ -2911,8 +2905,8 @@ if (!empty($INRSYMBOL)) {
</form>
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="CSTOption" onclick="SetCSTCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
</div>
</div>
@ -3229,8 +3223,8 @@ if (!empty($INRSYMBOL)) {
<div class="modal-footer">
<div class="col-md-12">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
</div>
</div>
</div>
@ -3588,9 +3582,8 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
<div class="col-md-offset-9 col-md-3">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success EditRevenue" ID="EditRevenue"> &nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
</div>
</div>
@ -3928,12 +3921,8 @@ if (!empty($INRSYMBOL)) {
</div>
<div class="col-md-offset-9 col-md-3">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font AddRevenue" ID="AddRevenue"> &nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
</div>
</div>
@ -4234,8 +4223,8 @@ if (!empty($INRSYMBOL)) {
<div class="modal-footer">
<div class="col-md-12">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font AddService" ID="AddService"> &nbsp;&nbsp;<span class="bold">Add Service</span></a>
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
</div>
</div>
</div>
@ -4738,9 +4727,8 @@ if (!empty($INRSYMBOL)) {
</div>
<div class="modal-footer">
<a class="btn btn-info font AddImport" ID="AddImport"> &nbsp;&nbsp;<span class="bold">Add Import</span></a>
<a class="btn btn-info" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font AddImport" ID="AddImport"> &nbsp;&nbsp;<span class="bold">Add Import</span></a>
</div>
</div>
</form>
@ -5198,9 +5186,8 @@ if (!empty($INRSYMBOL)) {
</div>
<div class="modal-footer">
<a class="btn btn-info font AddImport" ID="AddImport"> &nbsp;&nbsp;<span class="bold">Add Capital</span></a>
<a class="btn btn-info" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font AddImport" ID="AddImport"> &nbsp;&nbsp;<span class="bold">Add Capital</span></a>
</div>
</div>
</form>
@ -5337,7 +5324,7 @@ if (!empty($INRSYMBOL)) {
</div>
<div class="col-md-12">
<div class="col-md-3 col-md-offset-9"><br />
<input type="file" name="POFile" id="POFile"><br>
<input type="file" name="POFiles" id="POFiles"><br>
<input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus1" id="txtStatus1" />
@ -5348,9 +5335,8 @@ if (!empty($INRSYMBOL)) {
<input type="hidden" name="txtSpecial" id="txtSpecial" />
<input type="hidden" name="txtQuality" id="txtQuality" />
<!-- <a class="btn btn-success Save" ID="Save" onclick="Save()" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
<a class="btn btn-reset Save" ID="Cancel" href="<?php echo base_url() . 'EmergencyPO'; ?>">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="showsubmit()">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-success Save" ID="Cancel" href="<?php echo base_url() . 'EmergencyPO'; ?>">&nbsp;&nbsp;<span class="bold">Reset</span></a>
</div>
@ -5436,6 +5422,7 @@ if (!empty($INRSYMBOL)) {
<div class="row">
<br />
<div align="right" style="padding-right:10px">
<input type="file" name="POFile" id="POFile"><br>
<input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtRowCount" id="txtRowCount" />
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
@ -5446,9 +5433,8 @@ if (!empty($INRSYMBOL)) {
<input type="hidden" name="txtSpecialservice" id="txtSpecialservice" />
<input type="hidden" name="txtworkstatus" id="txtworkstatus" />
<a class="btn btn-reset Save" ID="Cancel" href="<?php echo base_url() . 'EmergencyPO'; ?>">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="showsubmit()">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-success Save" ID="Cancel" href="<?php echo base_url() . 'EmergencyPO'; ?>">&nbsp;&nbsp;<span class="bold">Reset</span></a>
</div><br />
</div>
</div>

25
app/Views/capitalpurchaseorder.php
View File

@ -316,7 +316,7 @@ function vaildateBeforeOpenModal()
<center><b><h2> Capital Purchase Order</h2></b></center>
<div class="col-md-12 text-right" style="padding:0px;">
<a href="<?php echo base_url() ?>CreatePO" class="btn btn-success" id="back" value="Back">Back</a>
<a href="<?php echo base_url() ?>CreatePO" class="btn btn-cancel" id="back" value="Back">Back</a>
</div>
<!-- <div class="col-md-1"><br/>
<a class="btn btn-success" href="<?php echo base_url(); ?>purchaseorder/CreatecapitalPOPrint" target="_blank">Print</a>
@ -780,9 +780,8 @@ function vaildateBeforeOpenModal()
</form>
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="PackagingOption" onclick="calculateFreightlocaddper();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
</div>
</div>
@ -813,9 +812,8 @@ function vaildateBeforeOpenModal()
</form>
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="editPackagingOption" onclick="calculateFreightloceditper();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
</div>
</div>
@ -1604,9 +1602,8 @@ function vaildateBeforeOpenModal()
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font AddCapital" ID="AddCapital" ></i>&nbsp;&nbsp;<span class="bold">Add Capital</span></a>
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
</div>
</div>
</form>
@ -2336,9 +2333,8 @@ function vaildateBeforeOpenModal()
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font EditCapital" ID="UpdateCapital" >&nbsp;&nbsp;<span class="bold">Update Capital</span></a>
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
</div>
</div>
</form>
@ -2551,10 +2547,9 @@ function vaildateBeforeOpenModal()
<!--<input type="hidden" name="CapitalToatlOrder" id="CapitalToatlOrder" /> -->
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Draft</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<a class="btn btn-success Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-reset Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-approve Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
</div>
<br/>
@ -2581,9 +2576,9 @@ function vaildateBeforeOpenModal()
</div>
<div class="modal-footer">
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="CapitalForCheck" onclick="SetCapitalPo();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
</div>
</div>

21
app/Views/editCapitalAmendPO.php
View File

@ -469,10 +469,10 @@ document.getElementById('dispatchinternational').style.display = 'block';
{
// $currentCurrencyType=$CurrencyDetail[0]->CurrencyCode;
$options1[$CurrencyDetail[0]->Currency_Code] = $CurrencyDetail[0]->Currency_Code.' '.' - '.' '.$CurrencyDetail[0]->Country_and_Currency;
$options1[$Currency[0]->Currency_Code] = $Currency[0]->Currency_Code.' '.' - '.' '.$Currency[0]->Country_and_Currency;
foreach ($Currency as $Cur)
if($CurrencyDetail[0]->Currency_Code!=$Cur->Currency_Code){
if($Currency[0]->Currency_Code!=$Cur->Currency_Code){
$options1[$Cur->Currency_Code] = $Cur->Currency_Code.' '.' - '.' '.$Cur->Country_and_Currency;
}
@ -924,9 +924,8 @@ document.getElementById('dispatchinternational').style.display = 'block';
</form>
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="editPackagingOption" onclick="calculateFreightloceditper();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
</div>
</div>
@ -2042,9 +2041,8 @@ document.getElementById('dispatchinternational').style.display = 'block';
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font EditCapital" ID="UpdateCapital" > &nbsp;&nbsp;<span class="bold">Update Capital</span></a>
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
</div>
</div>
</form>
@ -2291,10 +2289,8 @@ document.getElementById('dispatchinternational').style.display = 'block';
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<a class="btn btn-success Save" ID="Submit" onclick="Save()" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<input type="button" class="btn btn-success" value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
<input type="button" class="btn btn-cancel" value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
<a class="btn btn-success Save" ID="Submit" onclick="Save()" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
@ -2305,8 +2301,8 @@ document.getElementById('dispatchinternational').style.display = 'block';
<?php if ($RequesterName != '' || $RequesterName != null) { ?>
<label>Request By : </label><?php echo $RequesterName; ?><br />
<?php } ?>
<label>Status :</label><?php echo $PoStatusName;?>
<!-- <label>Status : </label><?php
<!-- <label>Status :</label><?php echo $PoStatusName;?> -->
<label>Status : </label><?php
$statusMappings = [
'PO APPROVED' => 'AWAITING APPROVE',
'AWAITING RELEASE' => 'AWAITING APPROVE',
@ -2324,7 +2320,6 @@ document.getElementById('dispatchinternational').style.display = 'block';
echo "Status not provided";
}
?>
-->
<br/>
</div>

90
app/Views/editCapitalPo.php
View File

@ -961,9 +961,8 @@ $("#PaymentMethod").select2();
</form>
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="PackagingOption" onclick="calculateFreightlocaddper();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
</div>
</div>
@ -996,9 +995,8 @@ $("#PaymentMethod").select2();
</form>
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="editPackagingOption" onclick="calculateFreightloceditper();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
</div>
</div>
@ -1030,9 +1028,8 @@ $("#PaymentMethod").select2();
</form>
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="viewPackagingOption" onclick="calculateFreightlocviewper();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
</div>
</div>
@ -2105,9 +2102,8 @@ $("#PaymentMethod").select2();
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font AddCapital" ID="AddCapital" > &nbsp;&nbsp;<span class="bold">Add Capital</span></a>
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
</div>
</div>
</form>
@ -2846,9 +2842,8 @@ $("#PaymentMethod").select2();
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font EditCapital" ID="UpdateCapital" >&nbsp;&nbsp;<span class="bold">Update Capital</span></a>
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
</div>
</div>
</form>
@ -3596,6 +3591,7 @@ $("#PaymentMethod").select2();
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<?php if($CapitalRange==1|| $CapitalRange==0){ ?>
<a class="btn btn-success font ViewCapital" ID="ViewUpdateCapital" >&nbsp;&nbsp;<span class="bold">Update Capital</span></a>
<?php } ?>
@ -3603,7 +3599,6 @@ $("#PaymentMethod").select2();
<!-- <a class="btn btn-success font UpdateViewCapital" ID="UpdateViewCapital" > &nbsp;&nbsp;<span class="bold">Update</span></a> -->
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
</div>
</div>
@ -3899,63 +3894,34 @@ $("#PaymentMethod").select2();
<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
<?php if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED )
{
if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED)
{?>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> <?php
}?>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-success Save" ID="Submit" onclick="Save(4)" >&nbsp;&nbsp;<span class="bold">Approve and Release</span></a>
<a class="btn btn-success Save" ID="Cancel" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<?php }
else
{
if($DEPCode== FINANCE){?>
<a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
<?php }
else if($DEPCode!= FINANCE){
if(($CapitalRange!=1))
{?>
<?php if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED ){ ?>
<a class="btn btn-cancel Save" ID="Cancel" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<?php if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED) {?>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<?php }?>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-approve Save" ID="Submit" onclick="Save(4)" >&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else {
if($DEPCode== FINANCE){?>
<a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
<?php }
else if($DEPCode!= FINANCE){
if(($CapitalRange!=1)){?>
<a class="btn btn-success Save" ID="Save" onclick="Save(2)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-success" ID="OK" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
<?php
}
else { ?>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(2)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-success" ID="OK" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
<?php } } ?>
<!-- <a class="btn btn-success" ID="OK" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a> --> <?php
} ?>
<?php } else { ?>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(2)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-success" ID="OK" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
<?php } } ?>
<!-- <a class="btn btn-success" ID="OK" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a> -->
<?php } ?>
</div>
<label>Request On :</label><?php echo $UpdatedOn;?><br/>
<label>Request By :</label><?php echo $requestedBy;?><br/>
<label>Status :</label><?php echo $PoStatusName;?>
<!-- <label>Status : </label><?php
<!--<label>Status :</label><?php echo $PoStatusName;?> -->
<label>Status : </label><?php
$statusMappings = [
'PO APPROVED' => 'AWAITING APPROVE',
'AWAITING RELEASE' => 'AWAITING APPROVE',
@ -3972,7 +3938,7 @@ $("#PaymentMethod").select2();
} else {
echo "Status not provided";
}
?> -->
?>
</div>

13
app/Views/editCostCenter.php
View File

@ -174,7 +174,7 @@ for ($i = 1; $i < 5; $i++) {
<section class="content">
<div style="text-align:right;">
<a href="<?php echo base_url() ?>costListing" class="btn btn-primary" value="Back">Back</a>
<a href="<?php echo base_url() ?>costListing" class="btn btn-cancel" value="Back">Back</a>
</div>
<br>
@ -430,8 +430,8 @@ for ($i = 1; $i < 5; $i++) {
<!-- Modal Footer -->
<div class="modal-footer">
<a class="btn btn-primary font tempClick" ID="tempClick" style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add</span></a>
<a class="btn btn-primary" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">cancel</a>
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">cancel</a>
<a class="btn btn-success font tempClick" ID="tempClick" style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add</span></a>
</div>
</div>
</div>
@ -577,8 +577,7 @@ for ($i = 1; $i < 5; $i++) {
</div>
<!-- Modal Footer -->
<div class="modal-footer">
<a class="btn btn-primary font tempClickEdit" ID="tempClickEdit" style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Edit</span></a>
<a class="btn btn-primary" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">cancel</a>
<a class="btn btn-success font tempClickEdit" ID="tempClickEdit" style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Edit</span></a>
</div>
</div>
</div>
@ -590,8 +589,8 @@ for ($i = 1; $i < 5; $i++) {
<div id="content"></div>
<div class="box-footer" style="text-align:right">
<input type="hidden" name="txtSelectedDepartment" id="txtSelectedDepartment" />
<input type="submit" class="btn btn-primary" value="Update" />
<a href="<?php echo base_url() ?>costListing" class="btn btn-primary" id="cancel" value="Cancel">Cancel</a>
<a href="<?php echo base_url() ?>costListing" class="btn btn-cancel" id="cancel" value="Cancel">Cancel</a>
<input type="submit" class="btn btn-success" value="Update" />
</div>

4
app/Views/editEmployee.php
View File

@ -655,7 +655,7 @@ function onlyAlphabets(evt) {
<section class="content">
<div style="text-align:right;">
<a href="<?php echo base_url() ?>employeeListing" class="btn btn-success" value="Back">Back</a>
<a href="<?php echo base_url() ?>employeeListing" class="btn btn-cancel" value="Back">Back</a>
</div>
<br/>
<div class="row">
@ -1025,8 +1025,8 @@ function onlyAlphabets(evt) {
<div class="form-group">
<div class="col-md-3 col-md-offset-9" style="padding: 10px;">
<div class="pull-right">
<a href="<?php echo base_url() ?>employeeListing" class="btn btn-cancel" id="cancel" value="Cancel">Cancel</a>
<input type="submit" id="submit" onclick="Validate();" class="btn btn-success" value="Submit" />
<a href="<?php echo base_url() ?>employeeListing" class="btn btn-success" id="cancel" value="Cancel">Cancel</a>
</div>
</div>
</div>

4
app/Views/editRawmaterial.php
View File

@ -111,7 +111,7 @@ if ($total <= $reorder) {
<section class="content">
<div style="text-align:right;margin-right:17px">
<a href="<?php echo base_url() ?>rawmaterialListing" class="btn btn-success" value="Back" />Back</a>
<a href="<?php echo base_url() ?>rawmaterialListing" class="btn btn-cancel" value="Back" />Back</a>
</div>
<br />
<!-- <div class="row"> -->
@ -289,8 +289,8 @@ if ($total <= $reorder) {
</div>
<div class="box-footer" style="text-align:right">
<a href="<?php echo base_url() ?>rawmaterialListing" class="btn btn-cancel" value="Cancel" />Cancel</a>
<input type="submit" class="btn btn-success" value="Submit" />
<a href="<?php echo base_url() ?>rawmaterialListing" class="btn btn-success" value="Cancel" />Cancel</a>
</div>
</form>
</div><!-- /.box-body -->

16
app/Views/editRevenueAmendPO.php
View File

@ -427,13 +427,13 @@ function calculateDiscount()
var basicValue = parseFloat($('#txtEditBasicValue').val());
var DiscountType =$("#EditDiscountType").val();
if(DiscountType == "0")
/* if(DiscountType == "0")
{
alert('Please Select the discount Type');
$('#txtEditDiscount').val('');
$("#EditDiscountType").focus();
}
else if ($('#txtEditDiscount').val() != '' && $('#txtEditDiscount').val() != '0')
else */ if ($('#txtEditDiscount').val() != '' && $('#txtEditDiscount').val() != '0')
{
var AfterDiscount = 0.0;
var Discountval = parseFloat($('#txtEditDiscount').val());
@ -524,14 +524,14 @@ function calculatePackaging()
var PackagingType =$("#EditPackagingType").val();
if(PackagingType == "0")
/* if(PackagingType == "0")
{
alert('Please select the Packaging Type');
$('#txtEditPackaging').val('');
$("#EditPackagingType").focus();
}
else if($('#txtEditPackaging').val() != '' && $('#txtEditPackaging').val() !='0')
else */ if($('#txtEditPackaging').val() != '' && $('#txtEditPackaging').val() !='0')
{
var Packagingvalue = parseFloat($('#txtEditPackaging').val());
var AfterPackaging = 0.0;
@ -621,7 +621,7 @@ function calculatePackaging()
if($('#txtEditVat').val() != '')
{
var vatValue = parseFloat($('#txtEditVat').val());
var vatValue = parseFloat($('#txtEditVat').val()).toFixed(2);
var basicValue2 = parseFloat($('#txtEditBasicValue').val());
var discount=parseFloat($('#txtEditAfterDiscount').val());
basicValue1=basicValue2-discount;
@ -632,7 +632,7 @@ function calculatePackaging()
//alert(packfreight);
basicValue=parseFloat(basicValue1+packfreight);
//alert(vatValue);
$('#txtEditGST').val(vatValue);
$('#txtEditGST').val(parseFloat(vatValue).toFixed(2));
//$('#txtEditOtherTax').val(0.00);
AfterVat = <?php echo VAT_ONBASICVALUE; ?>;
Vatval = parseFloat(AfterVat).toFixed(2);
@ -754,13 +754,13 @@ function calculatePackaging()
var basicValue = parseFloat($('#txtEditBasicValue').val());
var FreightType =$("#drpEditFreight").val();
if(FreightType == "0")
/* if(FreightType == "0")
{
alert('Please select Freight Type');
$('#txtEditFreight').val('');
$("#drpEditFreight").focus();
}
else if( $('#txtEditFreight').val() != "0" && $('#txtEditFreight').val() != '')
else */if( $('#txtEditFreight').val() != "0" && $('#txtEditFreight').val() != '')
{
var FreightValue = parseFloat($('#txtEditFreight').val());
var UOM = parseFloat($('#EditUOM').val());

5
app/Views/editServiceAmendPO.php
View File

@ -1596,8 +1596,7 @@ foreach ($PaymentTerms as $TER) {
$Reqon = $Reqon->format('d-m-Y'); ?>
<label>Request On :</label><?php echo $Reqon; ?><br />
<label>Request By :</label><?php echo $RequesterName; ?><br />
<label>Status :</label><?php echo $StatusName; ?>
<!-- <label>Status : </label><?php
<label>Status : </label><?php
$statusMappings = [
'PO APPROVED' => 'AWAITING APPROVE',
'AWAITING RELEASE' => 'AWAITING APPROVE',
@ -1614,7 +1613,7 @@ foreach ($PaymentTerms as $TER) {
} else {
echo "Status not provided";
}
?> -->
?>
</div>
</div>

4
app/Views/editSupplier.php
View File

@ -252,7 +252,7 @@ if (!empty($supplier)) {
<center> Edit <?php echo $SupplierName; ?> Details</center>
</h1>
<ol class="breadcrumb">
<a class="btn btn-success" href="<?php echo base_url(); ?>supplierlisting">&nbsp;&nbsp;<span class="bold">Back</span></a>
<a class="btn btn-cancel" href="<?php echo base_url(); ?>supplierlisting">&nbsp;&nbsp;<span class="bold">Back</span></a>
</ol>
</section>
<br/>
@ -413,10 +413,10 @@ if (!empty($supplier)) {
</div>
</div>
<div class="col-md-12 text-right">
<a href="<?php echo base_url() ?>supplierlisting" class="btn btn-cancel" value="Cancel" />Cancel</a>
<?php if((int)$chk){ ?>
<input type="submit" onclick="validate();" value="Submit" class="btn btn-success">
<?php } ?>
<a href="<?php echo base_url() ?>supplierlisting" class="btn btn-success" value="Cancel" />Cancel</a>
</div>
</div>
</form>

4
app/Views/editasset.php
View File

@ -112,7 +112,7 @@ if(!empty($assetList))
<section class="content">
<div style="text-align:right;">
<a href="<?php echo base_url()?>assetListing" class="btn btn-success"value="Back">Back</a>
<a href="<?php echo base_url()?>assetListing" class="btn btn-cancel"value="Back">Back</a>
</div>
<br>
<div class="row">
@ -347,8 +347,8 @@ if(!empty($assetList))
</div><!-- /.box-body -->
<div class="box-footer" style="text-align:right">
<a href="<?php echo base_url()?>assetListing" class="btn btn-cancel" id="cancel" value="Cancel">Cancel</a>
<input type="submit" class="btn btn-success" value="Submit" />
<a href="<?php echo base_url()?>assetListing" class="btn btn-success" id="cancel" value="Cancel">Cancel</a>
</div>
</div>

8
app/Views/editconfig.php
View File

@ -27,7 +27,7 @@ if (!empty($master)) {
<section class="content">
<div style="text-align:right;">
<a href="<?php echo base_url() ?>configlisting" class="btn btn-success" value="Back">Back</a>
<a href="<?php echo base_url() ?>configlisting" class="btn btn-cancel" value="Back">Back</a>
</div>
<br>
@ -150,8 +150,8 @@ if (!empty($master)) {
<!-- Modal Footer -->
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success font tempClickAdd" ID="tempClickAdd" style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">cancel</a>
</div>
</div>
</div>
@ -258,16 +258,16 @@ if (!empty($master)) {
</div>
<!-- Modal Footer -->
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success font tempClickEdit" ID="tempClickEdit" style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Update</span></a>
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
</div>
</div>
</div>
</div>
</div>
<div class="box-footer" style="text-align:right">
<a href="<?php echo base_url() ?>configlisting" class="btn btn-cancel" id="cancel" value="Cancel">Cancel</a>
<input type="submit" class="btn btn-success" value="Update" />
<a href="<?php echo base_url() ?>configlisting" class="btn btn-success" id="cancel" value="Cancel">Cancel</a>
</div>
</div>
</div>

2
app/Views/editdepartment.php
View File

@ -102,7 +102,7 @@ if(!empty($department))
<section class="content">
<div style="text-align:right;">
<a href="<?php echo base_url() ?>departmentListing" class="btn btn-success" value="Back"/>Back</a>
<a href="<?php echo base_url() ?>departmentListing" class="btn btn-cancel" value="Back"/>Back</a>
</div>
<br/>
<div class="row">

14
app/Views/editimportpo.php
View File

@ -375,9 +375,9 @@ else
<div class="col-md-12">
<div class="col-md-11">
<?php if ($parentPO == '') { ?>
<center><b><h2> Edit Import Purchase Order-<?php echo "$PONO"?></h2></b></center>
<center><b><h2> Edit Import Purchase Order-<?php echo "$PONO"?></h2></b></center>
<?php } else {?>
<center><b><h2> Amended Purchase Order-<?php echo "$PONO"?></h2></b></center>
<center><b><h2> Amended Import Purchase Order-<?php echo "$PONO"?></h2></b></center>
<?php } ?>
</div>
<!--<div class="col-md-1"><br/>
@ -1500,10 +1500,10 @@ echo form_textarea($data);
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font AddImport" ID="AddImport" > &nbsp;&nbsp;<span class="bold">Add Import</span></a>
<!--<a class="btn btn-success font AddService" ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
</div>
</div>
@ -2102,10 +2102,10 @@ echo form_textarea($data);
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font EditImport" ID="EditImport" > &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
<!--<a class="btn btn-success font AddService" ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
</div>
</div>
@ -2691,10 +2691,9 @@ echo form_textarea($data);
<div class="modal-footer">
<!-- <a class="btn btn-success font EditImport" ID="EditImport" ><i class="fa fa-plus" ></i>&nbsp;&nbsp;<span class="bold">Edit Import</span></a> -->
<!--<a class="btn btn-success font AddService" ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font UpdateImport" ID="UpdateImport" > &nbsp;&nbsp;<span class="bold">Update</span></a>
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
</div>
</div>
@ -3166,7 +3165,7 @@ echo form_textarea($data);
<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
<a class="btn btn-cancel Save" ID="Cancel" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<?php if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED ) {
if($PONOStatus == PO_DRAFT){?>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a>
@ -3174,7 +3173,6 @@ echo form_textarea($data);
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(4)" >&nbsp;&nbsp;<span class="bold">Approve and Release</span></a>
<!-- <input type="reset" class="btn btn-success" value="Reset"> -->
<a class="btn btn-success Save" ID="Cancel" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<?php }else {?>

6
app/Views/editrequisitionform.php
View File

@ -91,7 +91,7 @@ if (!empty($ReqPOType)) {
</script>
<div class="content-wrapper" style="min-height:537px;">
<section class="content">
<center><b><h3 class="box-title"><?= "Edit Requisition"; ?></h3></b></center>
<center><b><h3 class="box-title"><?= "Edit Requisition"; ?><b><?= $ReqNo ? " - ".$ReqNo : ""; ?></b></h3></b></center>
<div class="container-fluid">
<div id="content"></div>
<?php
@ -474,16 +474,16 @@ if (!empty($ReqPOType)) {
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo $RowCount; ?>" />
<?php if ($Status == REQ_DRAFT) { ?>
<input type="reset" class="btn btn-reset">
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save As Draft</span></a>
<a class="btn btn-success submit" ID="submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-approved submit" ID="submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<input type="reset" class="btn btn-reset">
<?php } else if ($Status == REQ_PENDING_APPROVAL) { ?>
<input type="reset" class="btn btn-reset">
<!--<a class="btn btn-success" ID="update" onclick="update()" >&nbsp;&nbsp;<span class="bold">Update</span></a>
<a class="btn btn-success" href="<?php echo base_url(); ?>Requisition" ID="cancel">&nbsp;&nbsp;<span class="bold">Cancel</span></a> -->
<a class="btn btn-success Save" ID="submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-approved submit" ID="submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<input type="reset" class="btn btn-reset">
<?php } ?>

16
app/Views/servicePurchaseorder.php
View File

@ -115,19 +115,6 @@ if (!empty($INRSYMBOL)) {
}
});
$.each(Payment, function(idx, obj) {
if (obj.PaymentID == 'PT05') {
} else {
$("#PaymentTerms").append($('<option></option>').val(obj.PaymentID).html(obj.PaymentTerms));
}
});
}
});
@ -158,13 +145,12 @@ if (!empty($INRSYMBOL)) {
} else {
$("#SupAddress").val(obj.Address);
}
PaymentID = obj.PaymentID;
console.log(obj.PaymentID);
}
});
if (PaymentID != 'PT08') {
$('#otheroptiondiv').hide();
$('#Otherpayment').val('');