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

view changes

Browse Source
This commit is contained in:
venbatechnologies 2018-03-23 11:43:18 +05:30
parent ef7c0ca459
commit 5c6219d307
9 changed files with 338 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
application/controllers/emergencypurchaseorder.php
View File

@ -67,14 +67,9 @@ class emergencypurchaseorder extends BaseController
$data['PoTypeOptions'] = $this->purchaseorder_model->getConfigValue('C026'); $data['PoTypeOptions'] = $this->purchaseorder_model->getConfigValue('C026');
if($this->DEPCode == PURCHASE )
{
$this->loadViews("alterpurchaseorder", $this->global, $data, Null); $this->loadViews("alterpurchaseorder", $this->global, $data, Null);
}
else
{
$this->loadViews("access", $this->global, $data, Null);
}
} }
@ -679,14 +674,9 @@ class emergencypurchaseorder extends BaseController
$data['POData'] = $this->purchaseorder_model->purchaseorderListing(); $data['POData'] = $this->purchaseorder_model->purchaseorderListing();
$this->global['pageTitle'] = 'Resico : Purchase Orders'; $this->global['pageTitle'] = 'Resico : Purchase Orders';
if($this->DEPCode == PURCHASE )
{
$this->loadViews("POlist", $this->global, $data, NULL); $this->loadViews("POlist", $this->global, $data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
} }
/** /**

81
application/controllers/purchaseorder.php
View File

@ -8,7 +8,7 @@ require APPPATH . '/third_party/mpdf/mpdf.php';
* purchaseorder Class to control all po related operations. * purchaseorder Class to control all po related operations.
* @author : Venba InfoTech * @author : Venba InfoTech
* @version : 1.1 * @version : 1.1
* @since : 18 November 2017 * @since : 18 November 2017
*/ */
class purchaseorder extends BaseController class purchaseorder extends BaseController
@ -915,7 +915,7 @@ class purchaseorder extends BaseController
$POdt =$this->input->post('PODate'); $POdt =$this->input->post('PODate');
$PODate = $this->getDateformat($POdt); $PODate = $this->getDateformat($POdt);
$SupplierID = $this->input->post('drpSupplier'); $SupplierID = $this->input->post('drpSupplier');
$DeliveryAddr = $this->input->post('DeliveryAddr'); $DeliveryAddr = $this->input->post('DeliveryAddr');
$dt = $this->input->post('Deliverydt'); $dt = $this->input->post('Deliverydt');
$POType = $this->input->post('POType'); $POType = $this->input->post('POType');
@ -931,7 +931,7 @@ class purchaseorder extends BaseController
$POType = $this->input->post('POType'); $POType = $this->input->post('POType');
$BudgetType = $this->input->post('Budget');
$Modeofshipment=$this->input->post('addmodeofshipment'); $Modeofshipment=$this->input->post('addmodeofshipment');
$supplierreference=$this->input->post('addsupplierreference'); $supplierreference=$this->input->post('addsupplierreference');
@ -961,8 +961,9 @@ class purchaseorder extends BaseController
$PaymentTerms=$this->input->post('PaymentTerms'); $PaymentTerms=$this->input->post('PaymentTerms');
$OtherPayment=$this->input->post('Otherpayment'); $OtherPayment=$this->input->post('Otherpayment');
$Local_Interstate=$this->input->post('Range'); $Local_Interstate=$this->input->post('Range');
$Qualitycheck=1;
// PO Master // PO Master
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'Status'=>$POStatus,'PORange'=>$Local_Interstate,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'CapitalRange'=>$Local_Interstate,'PaymentOtherDescription'=>$OtherPayment,'Supplier_Reference'=>$supplierreference,'Mode_Of_Shipment'=>$Modeofshipment,'Supplier_Offer_No'=>$supplieroffno,'Other_Reference'=>$otherreference,'Fincap'=>$fincap,'InsuranceStatus'=>$insurancestatus,'POSubType'=>$revenuetype,'InsuranceNumber'=>$insuranceno); $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'Status'=>$POStatus,'PORange'=>$Local_Interstate,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'CapitalRange'=>$Local_Interstate,'PaymentOtherDescription'=>$OtherPayment,'Supplier_Reference'=>$supplierreference,'Mode_Of_Shipment'=>$Modeofshipment,'Supplier_Offer_No'=>$supplieroffno,'Other_Reference'=>$otherreference,'Fincap'=>$fincap,'InsuranceStatus'=>$insurancestatus,'POSubType'=>$revenuetype,'InsuranceNumber'=>$insuranceno,'IsQualityChkReqired'=>$Qualitycheck,'BudgetType'=>$BudgetType);
@ -999,8 +1000,8 @@ class purchaseorder extends BaseController
$FreightType = $this->input->post('FreightType'.$i); $FreightType = $this->input->post('FreightType'.$i);
$FreightValue = $this->input->post('FreightVal'.$i); $FreightValue = $this->input->post('FreightVal'.$i);
$AfterFreightValue = $this->input->post('AfterFreightVal'.$i); $AfterFreightValue = $this->input->post('AfterFreightVal'.$i);
$NOOfTrip = $this->input->post('NoOfTrip'.$i); $NOOfTrip = $this->input->post('NoOfTrip'.$i);
$InsuranceValue = $this->input->post('Insval'.$i); $InsuranceValue = $this->input->post('Insval'.$i);
$TotalOrderValue = $this->input->post('TotalOrderValue'.$i); $TotalOrderValue = $this->input->post('TotalOrderValue'.$i);
$revenuedescription = $this->input->post('Service_Description'.$i); $revenuedescription = $this->input->post('Service_Description'.$i);
$CostCenter = $this->input->post('costCode'.$i); $CostCenter = $this->input->post('costCode'.$i);
@ -1093,7 +1094,7 @@ class purchaseorder extends BaseController
$POType = $this->input->post('POType'); $POType = $this->input->post('POType');
$PoRange = $this->input->post('txtPoRange'); $PoRange = $this->input->post('txtPoRange');
$BudgetType = $this->input->post('Budget');
$SpcialInstruction = $this->input->post('SpcialInstruction'); $SpcialInstruction = $this->input->post('SpcialInstruction');
$TotalOrderValueSummary = $this->input->post('txtTotalOrderValueSummary'); $TotalOrderValueSummary = $this->input->post('txtTotalOrderValueSummary');
$POStatus = $this->input->post('txtStatus'); $POStatus = $this->input->post('txtStatus');
@ -1109,9 +1110,12 @@ class purchaseorder extends BaseController
$PaymentTerms=$this->input->post('PaymentTerms'); $PaymentTerms=$this->input->post('PaymentTerms');
$OtherPayment=$this->input->post('Otherpayment'); $OtherPayment=$this->input->post('Otherpayment');
$Local_Interstate=$this->input->post('Range'); $Local_Interstate=$this->input->post('Range');
$Qualitycheck=1;
// PO Master // PO Master
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'Status'=>$POStatus,'PORange'=>$Local_Interstate,'ServiceDescription'=>$SpcialInstruction,'UpdateBY'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'CapitalRange'=>$Local_Interstate,'PaymentOtherDescription'=>$OtherPayment,'Supplier_Reference'=>$supplierreference,'Mode_Of_Shipment'=>$Modeofshipment,'Supplier_Offer_No'=>$supplieroffno,'Other_Reference'=>$otherreference,'Fincap'=>$fincap,'InsuranceStatus'=>$insurancestatus,'POSubType'=>$revenuetype,'InsuranceNumber'=>$insuranceno); $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'Status'=>$POStatus,'PORange'=>$Local_Interstate,'ServiceDescription'=>$SpcialInstruction,'UpdateBY'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'CapitalRange'=>$Local_Interstate,'PaymentOtherDescription'=>$OtherPayment,'Supplier_Reference'=>$supplierreference,'Mode_Of_Shipment'=>$Modeofshipment,'Supplier_Offer_No'=>$supplieroffno,'Other_Reference'=>$otherreference,'Fincap'=>$fincap,'InsuranceStatus'=>$insurancestatus,'POSubType'=>$revenuetype,'InsuranceNumber'=>$insuranceno,'
IsQualityChkReqired'=>$Qualitycheck,'BudgetType'=>$BudgetType);
$POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList); $POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList);
$LineItemStatus = REQITEM_NEW; $LineItemStatus = REQITEM_NEW;
@ -1240,6 +1244,7 @@ class purchaseorder extends BaseController
$data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO); $data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO);
$data['CurrencySymbol']=$this->purchaseorder_model->GerCurrencyCodeName('INR'); $data['CurrencySymbol']=$this->purchaseorder_model->GerCurrencyCodeName('INR');
$data['reveuetax']=$this->purchaseorder_model->getRevenueTaxinforforpdf($PONO); $data['reveuetax']=$this->purchaseorder_model->getRevenueTaxinforforpdf($PONO);
$data['AmendmentPDF'] = $this->purchaseorder_model->amendpdf($PONO);
$Currencycode=''; $Currencycode='';
$TotalOrderValue=$data['POItem'][0]->TotalOrderValue; $TotalOrderValue=$data['POItem'][0]->TotalOrderValue;
@ -1314,6 +1319,7 @@ $AdvanceAmount=0.00;
$data['CompanyDetails'] = $this->purchaseorder_model->getCompanyInformationforPDF(); $data['CompanyDetails'] = $this->purchaseorder_model->getCompanyInformationforPDF();
$data['GetPoFormat'] = $this->purchaseorder_model->GetPoFormat($PONO); $data['GetPoFormat'] = $this->purchaseorder_model->GetPoFormat($PONO);
$data['POItem'] = $this->purchaseorder_model->GetServicePurchaseOrderDetailsForpdf($PONO); $data['POItem'] = $this->purchaseorder_model->GetServicePurchaseOrderDetailsForpdf($PONO);
$data['AmendmentPDF'] = $this->purchaseorder_model->amendpdf($PONO);
$data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO); $data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO);
@ -1410,6 +1416,8 @@ public function importpoprint($PONO)
$data['POItem'] = $this->purchaseorder_model->GetImportPurchaseOrderDetailsForPDF($PONO); $data['POItem'] = $this->purchaseorder_model->GetImportPurchaseOrderDetailsForPDF($PONO);
$data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO); $data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO);
$data['AmendmentPDF'] = $this->purchaseorder_model->amendpdf($PONO);
$data['RequistionDetails'] = $this->purchaseorder_model->GetPdfRequistionDetails($PONO); $data['RequistionDetails'] = $this->purchaseorder_model->GetPdfRequistionDetails($PONO);
foreach ($data['POItem'] as $Reqdby) foreach ($data['POItem'] as $Reqdby)
@ -1497,7 +1505,7 @@ public function importpoprint($PONO)
$mpdf->showWatermarkImage = true; $mpdf->showWatermarkImage = true;
$mpdf->SetDisplayMode('fullpage'); $mpdf->SetDisplayMode('fullpage');
if($PoStatus == PO_RELEASED || $PoStatus == PO_SERVICE_COMPLETED || $PoStatus == MRIR_APPROVED || $PoStatus == MRIR_REJECTED || $PoStatus == IGR_CREATED || $PoStatus==''){ if($PoStatus == PO_RELEASED || $PoStatus == PO_SERVICE_COMPLETED || $PoStatus == MRIR_APPROVED || $PoStatus == MRIR_REJECTED || $PoStatus == IGR_CREATED || $PoStatus==''||$PoStatus==SPECIAL_PO){
$mpdf->SetWatermarkText(''); $mpdf->SetWatermarkText('');
} }
@ -1611,6 +1619,7 @@ function addNewImportPurchaseOrder()
$POStatus = $this->input->post('textStatus'); $POStatus = $this->input->post('textStatus');
$BudgetType = $this->input->post('Budget');
$CreateBy = $this->session->userdata ( 'userId' ); $CreateBy = $this->session->userdata ( 'userId' );
$RowCount = $this->input->post('txtRowCount'); $RowCount = $this->input->post('txtRowCount');
@ -1653,8 +1662,11 @@ function addNewImportPurchaseOrder()
$Qualitycheck=1;
$POList = array('SupplierID'=>$SupplierID, '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,'POType'=>$POType,'Import_PlaceofOrgin'=>$Palaceoforigin,'PaymentOtherDescription'=>$OtherPayment,'Mode_Of_Shipment'=>$Shipmentmode,'Supplier_Reference'=>$SupplierRef,'Supplier_Offer_No'=>$SupplierOffer,'Other_Reference'=>$otherRef,'Fincap'=>$finCap,'InsuranceStatus'=>$Insurance,'InsuranceNumber'=>$Insurancenumber,'POSubType'=>$importoption); $POList = array('SupplierID'=>$SupplierID, '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,'POType'=>$POType,'Import_PlaceofOrgin'=>$Palaceoforigin,'PaymentOtherDescription'=>$OtherPayment,'Mode_Of_Shipment'=>$Shipmentmode,'Supplier_Reference'=>$SupplierRef,'Supplier_Offer_No'=>$SupplierOffer,'Other_Reference'=>$otherRef,'Fincap'=>$finCap,'InsuranceStatus'=>$Insurance,'InsuranceNumber'=>$Insurancenumber,'POSubType'=>$importoption);
// ,'IsQualityChkReqired'=>$Qualitycheck,'BudgetType'=>$BudgetType
$POMaster = $this->purchaseorder_model->addPOMaster($POList,$POType,$importoption); $POMaster = $this->purchaseorder_model->addPOMaster($POList,$POType,$importoption);
@ -1813,6 +1825,8 @@ function addNewImportPurchaseOrder()
$TotalOrder = $this->input->post('txttot'); $TotalOrder = $this->input->post('txttot');
$POStatus = $this->input->post('txtStatus'); $POStatus = $this->input->post('txtStatus');
$BudgetType = $this->input->post('Budget');
$CreateBy = $this->session->userdata ( 'userId' ); $CreateBy = $this->session->userdata ( 'userId' );
$RowCount = $this->input->post('txtRowCount'); $RowCount = $this->input->post('txtRowCount');
@ -1850,9 +1864,10 @@ function addNewImportPurchaseOrder()
{ {
$Insurancenumber=''; $Insurancenumber='';
$insurestatus='0'; $insurestatus='0';
} }
$Qualitycheck=1;
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'Import_DispatchDetails'=>$Dispatch,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'Import_PlaceofOrgin'=>$Palaceoforigin,'PaymentOtherDescription'=>$OtherPayment,'Mode_Of_Shipment'=>$Shipmentmode,'Supplier_Reference'=>$SupplierRef,'Supplier_Offer_No'=>$SupplierOffer,'Other_Reference'=>$otherRef,'Fincap'=>$finCap,'InsuranceStatus'=>$insurestatus,'InsuranceNumber'=>$Insurancenumber,'POSubType'=>$importoption); $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'Import_DispatchDetails'=>$Dispatch,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'Import_PlaceofOrgin'=>$Palaceoforigin,'PaymentOtherDescription'=>$OtherPayment,'Mode_Of_Shipment'=>$Shipmentmode,'Supplier_Reference'=>$SupplierRef,'Supplier_Offer_No'=>$SupplierOffer,'Other_Reference'=>$otherRef,'Fincap'=>$finCap,'InsuranceStatus'=>$insurestatus,'InsuranceNumber'=>$Insurancenumber,'POSubType'=>$importoption,'IsQualityChkReqired'=>$Qualitycheck,'BudgetType'=>$BudgetType);
$POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList); $POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList);
@ -2031,15 +2046,15 @@ function addNewImportPurchaseOrder()
$userID = $this->session->userdata ( 'userId' ); $userID = $this->session->userdata ( 'userId' );
$data['AppList'] = $this->purchaseorder_model->getPOList($q); $data['AppList'] = $this->purchaseorder_model->getPOList($q);
if($this->DEPCode == FINANCE) // if($this->DEPCode == FINANCE)
{ // {
$this->loadViews("poapproval_view", $this->global,$data, NULL); $this->loadViews("poapproval_view", $this->global,$data, NULL);
} // }
else // else
{ // {
$this->loadViews("access", $this->global, $data, NULL); // $this->loadViews("access", $this->global, $data, NULL);
} // }
} }
@ -2102,14 +2117,14 @@ function addNewImportPurchaseOrder()
$userID = $this->session->userdata ( 'userId' ); $userID = $this->session->userdata ( 'userId' );
$data['AppList'] = $this->purchaseorder_model->getPOList($q); $data['AppList'] = $this->purchaseorder_model->getPOList($q);
if($this->DEPCode == MANAGEMENT) //if($this->DEPCode == MANAGEMENT)
{ // {
$this->loadViews("porelease_view", $this->global,$data, NULL); $this->loadViews("porelease_view", $this->global,$data, NULL);
} // }
else // else
{ // {
$this->loadViews("access", $this->global, $data, NULL); // $this->loadViews("access", $this->global, $data, NULL);
} // }
} }
@ -2208,6 +2223,8 @@ function addNewImportPurchaseOrder()
$PaymentMethod = $this->input->post('PaymentMethod'); $PaymentMethod = $this->input->post('PaymentMethod');
$OtherPayment=$this->input->post('Otherpayment'); $OtherPayment=$this->input->post('Otherpayment');
$BudgetType = $this->input->post('Budget');
@ -2227,8 +2244,11 @@ function addNewImportPurchaseOrder()
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$createddt = $dt->format('Y-m-d H:i:s'); $createddt = $dt->format('Y-m-d H:i:s');
$currencytypeID = $this->input->post('currencytype'); $currencytypeID = $this->input->post('currencytype');
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ExchangeRateCalculatedon'=>$ExchangeRateOn,'ExchangeRate'=>$ExchangeRate,'PaymentTerms'=>$PaymentMethod,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'CapitalRange'=>$CapitalRange,'POType'=>$POType,'CurrencyType'=>$currencytypeID,'DeliverySchedule'=>$DeliverySchedule,'Import_PlaceofOrgin'=>$Palaceoforigin,'Import_DispatchDetails'=>$Dispatch,'DeliveryDate'=>$Deliverydt,'PaymentOtherDescription'=>$OtherPayment,'Supplier_Reference'=>$SupplierReference,'Mode_Of_Shipment'=>$ModeOfShipment,'Supplier_Offer_No'=>$SuppliersOfferNo,'Other_Reference'=>$OtherReferences,'Fincap'=>$Fincap,'InsuranceStatus'=>$InsuranceOptions,'InsuranceNumber'=>$InsuranceNo,'POSubType'=>$ServiceTypeOptions);
$Qualitycheck=1;
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ExchangeRateCalculatedon'=>$ExchangeRateOn,'ExchangeRate'=>$ExchangeRate,'PaymentTerms'=>$PaymentMethod,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'CapitalRange'=>$CapitalRange,'POType'=>$POType,'CurrencyType'=>$currencytypeID,'DeliverySchedule'=>$DeliverySchedule,'Import_PlaceofOrgin'=>$Palaceoforigin,'Import_DispatchDetails'=>$Dispatch,'DeliveryDate'=>$Deliverydt,'PaymentOtherDescription'=>$OtherPayment,'Supplier_Reference'=>$SupplierReference,'Mode_Of_Shipment'=>$ModeOfShipment,'Supplier_Offer_No'=>$SuppliersOfferNo,'Other_Reference'=>$OtherReferences,'Fincap'=>$Fincap,'InsuranceStatus'=>$InsuranceOptions,'InsuranceNumber'=>$InsuranceNo,'POSubType'=>$ServiceTypeOptions,'IsQualityChkReqired'=>$Qualitycheck,'BudgetType'=>$BudgetType);
@ -2470,9 +2490,10 @@ function addNewImportPurchaseOrder()
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$createddt = $dt->format('Y-m-d H:i:s'); $createddt = $dt->format('Y-m-d H:i:s');
$updateddt = $dt->format('Y-m-d H:i:s'); $updateddt = $dt->format('Y-m-d H:i:s');
$Qualitycheck=1;
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ExchangeRate'=>$ExchangeRate,'ExchangeRateCalculatedon'=>$ExchangeRateOn,'PaymentTerms'=>$PaymentMethod,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'CurrencyType'=>$currencytypeID,'DeliverySchedule'=>$DeliverySchedule,'Import_PlaceofOrgin'=>$Palaceoforigin,'Import_DispatchDetails'=>$Dispatch,'DeliveryDate'=>$Deliverydt,'PaymentOtherDescription'=>$OtherPayment,'Supplier_Reference'=>$SupplierReference,'Mode_Of_Shipment'=>$ModeOfShipment,'Supplier_Offer_No'=>$SuppliersOfferNo,'Other_Reference'=>$OtherReferences,'Fincap'=>$Fincap,'InsuranceStatus'=>$InsuranceOptions,'InsuranceNumber'=>$InsuranceNo,'POSubType'=>$ServiceTypeOptions);
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ExchangeRate'=>$ExchangeRate,'ExchangeRateCalculatedon'=>$ExchangeRateOn,'PaymentTerms'=>$PaymentMethod,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'CurrencyType'=>$currencytypeID,'DeliverySchedule'=>$DeliverySchedule,'Import_PlaceofOrgin'=>$Palaceoforigin,'Import_DispatchDetails'=>$Dispatch,'DeliveryDate'=>$Deliverydt,'PaymentOtherDescription'=>$OtherPayment,'Supplier_Reference'=>$SupplierReference,'Mode_Of_Shipment'=>$ModeOfShipment,'Supplier_Offer_No'=>$SuppliersOfferNo,'Other_Reference'=>$OtherReferences,'Fincap'=>$Fincap,'InsuranceStatus'=>$InsuranceOptions,'InsuranceNumber'=>$InsuranceNo,'POSubType'=>$ServiceTypeOptions,'IsQualityChkReqired'=>$Qualitycheck,'BudgetType'=>$BudgetType);
$POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList); $POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList);
@ -2665,6 +2686,8 @@ function addNewImportPurchaseOrder()
$data['CompanyDetails'] = $this->purchaseorder_model->getCompanyInformationforPDF(); $data['CompanyDetails'] = $this->purchaseorder_model->getCompanyInformationforPDF();
$data['GetPoFormat'] = $this->purchaseorder_model->GetPoFormat($PONO); $data['GetPoFormat'] = $this->purchaseorder_model->GetPoFormat($PONO);
$data['POItem'] = $this->purchaseorder_model->GetCapitalPurchaseOrderDetailsForPDF($PONO); $data['POItem'] = $this->purchaseorder_model->GetCapitalPurchaseOrderDetailsForPDF($PONO);
$data['AmendmentPDF'] = $this->purchaseorder_model->amendpdf($PONO);
$data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO); $data['releasedetails'] = $this->purchaseorder_model->GetReleasedDetails($PONO);
$CurrencyType=''; $CurrencyType='';

9
application/controllers/storestatus.php
View File

@ -50,14 +50,9 @@ class storestatus extends BaseController
$data['Stock'] = $this->store_model->viewStock(); $data['Stock'] = $this->store_model->viewStock();
$data['MaterialList'] = $this->store_model->GetAllMaterialList(); $data['MaterialList'] = $this->store_model->GetAllMaterialList();
$data['StockStatus'] = $this->store_model->GetConfigValue('C021'); $data['StockStatus'] = $this->store_model->GetConfigValue('C021');
if($this->DEPCode == STORE)
{
$this->loadViews("storestatus", $this->global, $data,null); $this->loadViews("storestatus", $this->global, $data,null);
}
else
{
$this->loadViews("access", $this->global, $data,null);
}
} }

45
application/controllers/supplier.php
View File

@ -47,22 +47,10 @@ class supplier extends BaseController
$this->global['pageTitle'] = 'Resico : Supplier Listing'; $this->global['pageTitle'] = 'Resico : Supplier Listing';
if($this->role == ROLE_ADMIN || $this->DEPCode == SALES || $this->DEPCode == FINANCE ||$this->DEPCode == HR)
{
if($this->DEPCode != FINANCE && $this->DEPCode != HR)
{
//Load the view supplierListing.php //Load the view supplierListing.php
$this->loadViews("supplierListing", $this->global, $data, NULL); $this->loadViews("supplierListing", $this->global, $data, NULL);
}
}
else
{
//Load the view access.php
$this->loadViews("access", $this->global, $data, NULL);
}
} }
@ -74,21 +62,11 @@ class supplier extends BaseController
$data['payment'] = $this->supplier_model->getPaymentTerms(); $data['payment'] = $this->supplier_model->getPaymentTerms();
$this->global['pageTitle'] = 'Resico : Add New Supplier'; $this->global['pageTitle'] = 'Resico : Add New Supplier';
if($this->role == ROLE_ADMIN || $this->DEPCode == SALES || $this->DEPCode == FINANCE ||$this->DEPCode == HR)
{
if($this->DEPCode != FINANCE && $this->DEPCode != HR)
{
//Load the view addsupplier.php //Load the view addsupplier.php
$this->loadViews("addsupplier", $this->global,$data, NULL); $this->loadViews("addsupplier", $this->global,$data, NULL);
}
}
else
{
//Load the view access.php
$this->loadViews("access", $this->global,$data, NULL);
}
} }
@ -464,22 +442,11 @@ class supplier extends BaseController
$data['supplier'] = $this->supplier_model->getSupplierInfo($supplierID); $data['supplier'] = $this->supplier_model->getSupplierInfo($supplierID);
$data['payment'] = $this->supplier_model->getPaymentTerms($Payment); $data['payment'] = $this->supplier_model->getPaymentTerms($Payment);
$this->global['pageTitle'] = 'Resico : Edit Supplier'; $this->global['pageTitle'] = 'Resico : Edit Supplier';
if($this->role == ROLE_ADMIN || $this->DEPCode == SALES || $this->DEPCode == FINANCE ||$this->DEPCode == HR)
{
if($this->DEPCode != FINANCE && $this->DEPCode != HR)
{
//Load the view editSupplier.php //Load the view editSupplier.php
$this->loadViews("editSupplier", $this->global,$data, NULL); $this->loadViews("editSupplier", $this->global,$data, NULL);
}
}
else
{
//Load the view access.php
$this->loadViews("access", $this->global,$data, NULL);
}
} }
/** /**

15
application/models/purchaseorder_model.php
View File

@ -18,7 +18,7 @@ class purchaseorder_model extends CI_Model
$query = $this->db->get(); $query = $this->db->get();
return $query->result(); return $query->result();
} }
@ -185,6 +185,19 @@ function purchaseorderListing($forwhat='')
return $query->result(); return $query->result();
} }
function getqtycheck($PONO)
{
$this->db->select('IsQualityChkReqired');
$this->db->from('T_PurchaseOrder_Master');
$this->db->where('PONO',$PONO);
$query = $this->db->get();
return $query->result();
}
/** /**
* This function is used to get the Raw Material information * This function is used to get the Raw Material information
* @return array $result : This is result of the query * @return array $result : This is result of the query

101
application/views/capitalpurchaseorder.php
View File

@ -255,7 +255,15 @@ function vaildateBeforeOpenModal()
$('#PoTypeOptions').focus(); $('#PoTypeOptions').focus();
return false; return false;
} }
else if($('#BudgetType').val()=="0")
{
alert('Please Select Budget Type');
$('#BudgetType').focus();
return false;
}
else if($('#Deliverydt').val() == '' && $('#Scheduleby').val() == '') else if($('#Deliverydt').val() == '' && $('#Scheduleby').val() == '')
{ {
alert('Please Enter the Dispatch Instruction'); alert('Please Enter the Dispatch Instruction');
@ -736,6 +744,18 @@ function vaildateBeforeOpenModal()
</div> </div>
<div class="col-md-2" style="padding-right: 0px;">
<label for="BudgetType">Budget Type</label>
<?php
$optionsnew=array('0'=>'Select','1'=>'REVENUE','2'=>'CAPITAL');
echo form_dropdown('BudgetType', $optionsnew,set_value('BudgetType'),'id="BudgetType"' ,'required="true"' ,'class="form-control select2');
?>
</div>
</div> </div>
</div><!--End new fields 1 sep--> </div><!--End new fields 1 sep-->
@ -2525,10 +2545,8 @@ function vaildateBeforeOpenModal()
<input type="hidden" name="txtStatus" id="txtStatus" /> <input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtRowCount" id="txtRowCount" /> <input type="hidden" name="txtRowCount" id="txtRowCount" />
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" /> <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<!--<input type="hidden" name="CapitalToatlOrder" id="CapitalToatlOrder" /> -->
<input type="hidden" name="Budget" id="Budget" />
<a class="btn btn-primary Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save</span></a> <a class="btn btn-primary Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save</span></a>
<a class="btn btn-primary Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-primary Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-primary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a> <a class="btn btn-primary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
@ -2604,6 +2622,16 @@ function vaildateBeforeOpenModal()
}; };
$("#BudgetType").change(function(){
var aa = $("#BudgetType option:selected").text();
$('#Budget').val(aa);
});
$(function() { $(function() {
$("#PODate").datepicker({ $("#PODate").datepicker({
@ -3501,16 +3529,16 @@ CalculateCtable()
var ReqAmount = parseFloat(ValuetoCheck); var ReqAmount = parseFloat(ValuetoCheck);
var BudAmount = parseFloat(budgetAmount); var BudAmount = parseFloat(budgetAmount);
if(ReqAmount > BudAmount ) // if(ReqAmount > BudAmount )
{ // {
alert('Your exceeding the Avaiable Budget :'+ BudAmount +'.Please adjust the Product to proceed further.'); // alert('Your exceeding the Avaiable Budget :'+ BudAmount +'.Please adjust the Product to proceed further.');
return false; // return false;
} // }
else // else
{ // {
return true; return true;
} // }
} }
var index=1; var index=1;
/* This is used add capital po line item */ /* This is used add capital po line item */
@ -3759,16 +3787,16 @@ CalculateCtable()
else{ else{
basicAmountRate=parseFloat(basicAmountRate) - parseFloat(discountRate); basicAmountRate=parseFloat(basicAmountRate) - parseFloat(discountRate);
} }
if(basicAmountRate > avalbudAmt) // if(basicAmountRate > avalbudAmt)
{ // {
alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.'); // alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.');
$('#CPRate').focus(); // $('#CPRate').focus();
return false; // return false;
} // }
else // else
{ // {
return true; return true;
} //}
} }
function validateCapitalTax() function validateCapitalTax()
@ -4674,11 +4702,16 @@ var basicAmountRate = parseFloat($('#CapitalToatlOrder').val());
$('#Otherpayment').focus(); $('#Otherpayment').focus();
return false; return false;
} }
else if(parseInt(AvlBudAmt) < parseInt(basicAmountRate)) { // else if(parseInt(AvlBudAmt) < parseInt(basicAmountRate)) {
alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.'); // alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
return false; else if($('#PoTypeOptions').val()== "0")
} {
alert('Please Select POType');
$('#PoTypeOptions').focus();
return false;
}
else else
{ {
$('#content').loader('show'); $('#content').loader('show');
@ -5266,16 +5299,16 @@ var Freight=parseFloat($('#txtAfterFreightlocedit').val() == '' ? '0.00' : $('#t
else{ else{
basicAmountRate=parseFloat(basicAmountRate)- parseFloat(discountRate); basicAmountRate=parseFloat(basicAmountRate)- parseFloat(discountRate);
} }
if(basicAmountRate > avalbudAmt) // if(basicAmountRate > avalbudAmt)
{ // {
alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.'); // alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.');
$('#EditCPRate').focus(); // $('#EditCPRate').focus();
return false; // return false;
} // }
else // else
{ // {
return true; return true;
} // }
} }

94
application/views/importpo.php
View File

@ -230,6 +230,13 @@ function vaildateBeforeOpenModal()
return false; return false;
} }
else if($('#BudgetType').val()=="0")
{
alert('Please Select Budget Type');
$('#BudgetType').focus();
return false;
}
@ -677,9 +684,20 @@ function vaildateBeforeOpenModal()
</div> </div>
<div class="col-md-2" style="padding-right: 0px;">
<label for="BudgetType">Budget Type</label>
<?php
$optionsnew=array('0'=>'Select','1'=>'REVENUE','2'=>'CAPITAL');
echo form_dropdown('BudgetType', $optionsnew,set_value('BudgetType'),'id="BudgetType"' ,'required="true"' ,'class="form-control select2');
?>
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
@ -2024,7 +2042,8 @@ echo form_textarea($data);
<input type="hidden" name="isEdit" id="isEdit" value="0" /> <input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus" id="txtStatus" /> <input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtRowCount" id="txtRowCount" /> <input type="hidden" name="txtRowCount" id="txtRowCount" />
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" /> <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="Budget" id="Budget" />
<a class="btn btn-primary Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> <a class="btn btn-primary Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a>
<a class="btn btn-primary Submit" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-primary Submit" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<input type="reset" class="btn btn-primary" value="Reset" onclick="window.location.reload()"> <input type="reset" class="btn btn-primary" value="Reset" onclick="window.location.reload()">
@ -2096,7 +2115,14 @@ $(document).on('change',".changetodecimal", function(){
}); });
$("#BudgetType").change(function(){
var aa = $("#BudgetType option:selected").text();
$('#Budget').val(aa);
});
var SelectedMaterialCode = []; var SelectedMaterialCode = [];
var RequistQuantity = ''; var RequistQuantity = '';
var AvilBudAmt = ''; var AvilBudAmt = '';
@ -2291,6 +2317,15 @@ $("#txtBasicValue").val('');
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>; var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
var AvlBudAmt ='<?php echo $AvlimportBudAmt ?>'; var AvlBudAmt ='<?php echo $AvlimportBudAmt ?>';
if(AvlBudAmt == '')
{
$("#AvlBudAmt").val(parseFloat(0).toFixed(2));
}
else
{
$("#AvlBudAmt").val(parseFloat(AvlBudAmt).toFixed(2));
}
//alert(Material); //alert(Material);
// For Binding DepartmentName // For Binding DepartmentName
@ -2304,7 +2339,7 @@ $("#txtBasicValue").val('');
}); });
//$("#AvlBudAmt").val(AvlBudAmt); //$("#AvlBudAmt").val(AvlBudAmt);
$("#AvlBudAmt").val(parseFloat(AvlBudAmt).toFixed(2)); // $("#AvlBudAmt").val(parseFloat(AvlBudAmt).toFixed(2));
// For Binding Cost center for the selected department // For Binding Cost center for the selected department
/* $("#CostCenter").append( $('<option></option>').val("0").html("Select Cost Center") ); /* $("#CostCenter").append( $('<option></option>').val("0").html("Select Cost Center") );
$.each(cost, function(idx, obj) { $.each(cost, function(idx, obj) {
@ -2672,16 +2707,16 @@ function validateEditExceedLimit()
exp=basicAmountRate*exchangerate; exp=basicAmountRate*exchangerate;
//console.log(exp); //console.log(exp);
if(exp > avalbudAmte || totalAmount > avalbudAmte) // if(exp > avalbudAmte || totalAmount > avalbudAmte)
{ // {
swal('Basic amount is exceeding the Budget Limit.Please adjust the product value.'); // swal('Basic amount is exceeding the Budget Limit.Please adjust the product value.');
$('#EditRate').focus(); // $('#EditRate').focus();
return false; // return false;
} // }
else // else
{ // {
return true; return true;
} // }
} }
@ -2704,16 +2739,16 @@ var avalbudAmt= <?php echo json_encode($AvlAmount, JSON_PRETTY_PRINT) ?>;
exp=basicAmountRate*exchangerate; exp=basicAmountRate*exchangerate;
//console.log(exp); //console.log(exp);
if(exp > avalbudAmt || totalAmount > avalbudAmt) // if(exp > avalbudAmt || totalAmount > avalbudAmt)
{ // {
swal('Basic amount is exceeding the Budget Limit.Please adjust the product value.'); // swal('Basic amount is exceeding the Budget Limit.Please adjust the product value.');
$('#Rate').focus(); // $('#Rate').focus();
return false; // return false;
} // }
else // else
{ // {
return true; return true;
} // }
} }
@ -3353,7 +3388,14 @@ $('#drpFreight').change(function() {
{ {
$('#TripsValue').show(); $('#TripsValue').show();
} } }
else if($('#Importoption').val()== "0")
{
alert('Please Select POType');
$('#Importoption').focus();
return false;
else { else {
$('#TripsValue').hide(); $('#TripsValue').hide();
@ -4538,7 +4580,15 @@ if(validate()&&Budgetcheck())
swal('Please Select Line item to Create PO'); swal('Please Select Line item to Create PO');
$('#Deliverydt').focus(); $('#Deliverydt').focus();
return false; return false;
} }
else if($('#Importoption').val()== "0")
{
alert('Please Select POType');
$('#Importoption').focus();
return false;
}
else else
{ {

74
application/views/purchaseorder.php
View File

@ -180,7 +180,14 @@ function vaildateBeforeOpenModal()
$('#PoTypeOptions').focus(); $('#PoTypeOptions').focus();
return false; return false;
} }
else if($('#BudgetType').val()=="0")
{
swal('Please Select Budget Type');
$('#BudgetType').focus();
return false;
}
else else
{ {
return true; return true;
@ -2128,16 +2135,16 @@ function validateEditExceedLimit()
//swal(basicAmountRate); //swal(basicAmountRate);
// var totalAmount = parseFloat($('#txtEditTotalOrderValue').val()); // var totalAmount = parseFloat($('#txtEditTotalOrderValue').val());
if(basicAmountRate > avalbudAmt)// || totalAmount > avalbudAmt) // if(basicAmountRate > avalbudAmt)// || totalAmount > avalbudAmt)
{ // {
swal('Basic amount is exceeding the Budget Limit.Please adjust the product value.'); // swal('Basic amount is exceeding the Budget Limit.Please adjust the product value.');
$('#EditRate').focus(); // $('#EditRate').focus();
return false; // return false;
} // }
else // else
{ // {
return true; return true;
} // }
} }
function calculateEditTotalValue() function calculateEditTotalValue()
@ -2432,8 +2439,8 @@ function calculateEditTaxValue()
<div class="col-md-3"> <div class="col-md-3">
<div class="col-md-6" style="padding: 0px;"> <div class="col-md-6" style="padding: 0px;">
<label>Revenue Type Options</label>
<label>Revenue Options<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label> <!-- <label>Revenue Options<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label> -->
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2514,6 +2521,20 @@ function calculateEditTaxValue()
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-2" style="padding-right: 0px;">
<label for="BudgetType">Budget Type</label>
<?php
$optionsnew=array('0'=>'Select','1'=>'REVENUE','2'=>'CAPITAL');
echo form_dropdown('BudgetType', $optionsnew,set_value('BudgetType'),'id="BudgetType"' ,'required="true"' ,'class="form-control select2');
?>
</div>
</div> </div>
</div> </div>
@ -3578,7 +3599,8 @@ function calculateEditTaxValue()
<input type="hidden" name="isEdit" id="isEdit" value="0" /> <input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus" id="txtStatus" /> <input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtRowCount" id="txtRowCount" /> <input type="hidden" name="txtRowCount" id="txtRowCount" />
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" /> <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="Budget" id="Budget" />
<a class="btn btn-primary Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> <a class="btn btn-primary Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a>
<a class="btn btn-primary Submit" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-primary Submit" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-primary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a> <a class="btn btn-primary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
@ -3635,7 +3657,14 @@ $("#insurance").change(function(){
$("#insurancenodiv").show(); $("#insurancenodiv").show();
$("#insuranceno").val('Yes');} $("#insuranceno").val('Yes');}
}); });
$("#BudgetType").change(function(){
var aa = $("#BudgetType option:selected").text();
$('#Budget').val(aa);
});
$("#EDITREVENUE").on("shown.bs.modal", function(e) { $("#EDITREVENUE").on("shown.bs.modal", function(e) {
userid = $(e.relatedTarget).data('userid'); userid = $(e.relatedTarget).data('userid');
@ -3752,7 +3781,7 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
}); });
$('.AddRevenue').click(function(){ $('.AddRevenue').click(function(){
tinyMCE.triggerSave(); tinyMCE.triggerSave();
if(validateRevenueTax() && validateExceedLimit() && ExceedQuantityCheck()) if(validateRevenueTax() && ExceedQuantityCheck())
{ {
var temp = index; var temp = index;
var Reqnumber = $('#ReqNo').val(); var Reqnumber = $('#ReqNo').val();
@ -4270,11 +4299,11 @@ var AvlBudAmt = '<?php echo $AvlAmount ?>';
$('#Deliverydt').focus(); $('#Deliverydt').focus();
return false; return false;
} }
else if(parseInt(AvlBudAmt) < parseInt(finalBasicAmount)) { // else if(parseInt(AvlBudAmt) < parseInt(finalBasicAmount)) {
swal('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.'); // swal('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
return false; // return false;
} // }
else if($('#Otherpayment').val()=='' && $('#PaymentTerms').val()=='PT08'){ else if($('#Otherpayment').val()=='' && $('#PaymentTerms').val()=='PT08'){
swal('Please Enter Payable Terms Description'); swal('Please Enter Payable Terms Description');
$('#Otherpayment').focus(); $('#Otherpayment').focus();
@ -4285,6 +4314,15 @@ var AvlBudAmt = '<?php echo $AvlAmount ?>';
$('#insurance').focus(); $('#insurance').focus();
return false; return false;
} }
else if($('#PoTypeOptions').val()=="0")
{
alert('Please Select POType');
$('#PoTypeOptions').focus();
return false;
}
else else
{ {

80
application/views/servicePurchaseorder.php
View File

@ -516,15 +516,15 @@ function ExceedQuantityCheck()
var ReqAmount = parseFloat(ValuetoCheck); var ReqAmount = parseFloat(ValuetoCheck);
var BudAmount = parseFloat(budgetAmount); var BudAmount = parseFloat(budgetAmount);
if(ReqAmount > BudAmount ) // if(ReqAmount > BudAmount )
{ // {
alert('Your exceeding the Avaiable Budget :'+ AvilBudAmt +'.Please adjust the Product to proceed further.'); // alert('Your exceeding the Avaiable Budget :'+ AvilBudAmt +'.Please adjust the Product to proceed further.');
return false; // return false;
} // }
else // else
{ // {
return true; return true;
} // }
} }
@ -989,6 +989,20 @@ function clearEditTaxField()
</div> </div>
<div class="col-md-2" style="padding-right: 0px;">
<label for="BudgetType">Budget Type</label>
<?php
$optionsnew=array('0'=>'Select','1'=>'REVENUE','2'=>'CAPITAL');
echo form_dropdown('BudgetType', $optionsnew,set_value('BudgetType'),'id="BudgetType"' ,'required="true"' ,'class="form-control select2');
?>
</div>
</div> </div>
</div><!--End new fields 1 sep--> </div><!--End new fields 1 sep-->
@ -1684,7 +1698,8 @@ function clearEditTaxField()
<input type="hidden" name="txtRowCount" id="txtRowCount" /> <input type="hidden" name="txtRowCount" id="txtRowCount" />
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" /> <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="SpcialInstruction" id="SpcialInstruction" > <input type="hidden" name="SpcialInstruction" id="SpcialInstruction" >
<input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress" > <input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress" >
<input type="hidden" name="Budget" id="Budget" />
<a class="btn btn-primary Save" ID="Save"onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> <a class="btn btn-primary Save" ID="Save"onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a>
<a class="btn btn-primary Submit" ID="Submit"onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-primary Submit" ID="Submit"onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-primary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a> <a class="btn btn-primary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
@ -1721,8 +1736,19 @@ function clearEditTaxField()
</tr> </tr>
</script> </script>
<script> <script>
$('#otherdescription').hide();
var index = '1'; var index = '1';
var userid = ''; var userid = '';
$("#BudgetType").change(function(){
var aa = $("#BudgetType option:selected").text();
$('#Budget').val(aa);
});
$("#EDITSERVICE").on("shown.bs.modal", function(e) { $("#EDITSERVICE").on("shown.bs.modal", function(e) {
userid = $(e.relatedTarget).data('userid'); userid = $(e.relatedTarget).data('userid');
@ -1763,6 +1789,19 @@ $("#EDITSERVICE").on("shown.bs.modal", function(e) {
$('#EditTotalOrderValue').val(cellval[9].innerHTML); $('#EditTotalOrderValue').val(cellval[9].innerHTML);
$('#EditOtherAllowances').val($('#OtherAmt'+userid).val()); $('#EditOtherAllowances').val($('#OtherAmt'+userid).val());
$('#EditOtheritemDescription').val($('#OtherServiceDescription'+userid).val());
var desval= $('#OtherServiceDescription'+userid).val();
//alert(desval)
if(desval=='')
{
$('#EditotherDescription').hide();
}
else
{
$('#EditotherDescription').show();
}
tinyMCE.get('EdittxtSpcialInstruction').setContent($('#ItemDescription'+userid).val()); tinyMCE.get('EdittxtSpcialInstruction').setContent($('#ItemDescription'+userid).val());
//$('#EdittxtSpcialInstruction').val($('#ItemDescription'+userid).val()); //$('#EdittxtSpcialInstruction').val($('#ItemDescription'+userid).val());
@ -1856,7 +1895,8 @@ $('.AddService').click(function(){
var basicval = $("#txtBasicValue").val(); var basicval = $("#txtBasicValue").val();
var otherdescription= $('#OtheritemDescription').val();
var TotalTaxValue = calculateTaxValue(); var TotalTaxValue = calculateTaxValue();
$('#MaterialCode option[value='+materialCode+']').remove(); $('#MaterialCode option[value='+materialCode+']').remove();
@ -1907,9 +1947,11 @@ $('.AddService').click(function(){
addHidden(theForm,"ItemDescription"+temp,ServiceDescription); addHidden(theForm,"ItemDescription"+temp,ServiceDescription);
addHidden(theForm,"OtherAmt"+temp,OtherAmt); addHidden(theForm,"OtherAmt"+temp,OtherAmt);
addHidden(theForm,"OtherServiceDescription"+temp,otherdescription);
$('#txtRowCount').val(temp); $('#txtRowCount').val(temp);
clearServiceModalFields(); clearServiceModalFields();
$('#otherdescription').hide();
} }
@ -2375,11 +2417,11 @@ var AvlBudAmt = '<?php echo $AvlAmount ?>';
$('#Deliverydt').focus(); $('#Deliverydt').focus();
return false; return false;
} }
else if(parseInt(AvlBudAmt) < parseInt(txtTotalOrderValueSummary)) { // else if(parseInt(AvlBudAmt) < parseInt(txtTotalOrderValueSummary)) {
alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.'); // alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
return false; // return false;
} // }
else if($('#Otherpayment').val()=='' && $('#PaymentTerms').val()=='PT08'){ else if($('#Otherpayment').val()=='' && $('#PaymentTerms').val()=='PT08'){
alert('Please Enter Other Payable Terms Description'); alert('Please Enter Other Payable Terms Description');
$('#Otherpayment').focus(); $('#Otherpayment').focus();
@ -2390,6 +2432,14 @@ var AvlBudAmt = '<?php echo $AvlAmount ?>';
$('#descofpo').focus(); $('#descofpo').focus();
return false; return false;
} }
else if($('#PoTypeOptions').val()=="0")
{
alert('Please Select POType');
$('#PoTypeOptions').focus();
return false;
}
else else
{ {
$('#content').loader('show'); $('#content').loader('show');