From 1c09c70e3de87166100eefa19ebc38239e5d42aa Mon Sep 17 00:00:00 2001 From: venbatechnologies Date: Fri, 7 Jul 2017 10:47:31 +0530 Subject: [PATCH] store requisition,po pdf --- application/config/constants.php | 2 +- application/controllers/MRIRcontroller.php | 0 .../controllers/storerequisitionlist.php | 13 +- application/logs/log-2017-07-06.php | 0 application/logs/log-2017-07-07.php | 68 ++++++++ application/models/mrir_model.php | 0 application/models/purchaseorder_model.php | 32 ++-- application/models/storerequistion_model.php | 42 +++++ .../third_party/dompdf/lib/fonts/log.htm | 155 +++++++++++++++++- .../views/Editmaterialinspectionreport.php | 0 .../views/approvalstorerequisitionslip.php | 11 +- application/views/importpopdf.php | 16 +- .../views/materialinspectionreport.php | 0 application/views/revenuepopdf.php | 2 +- application/views/servicepopdf.php | 13 +- application/views/storerequisition.php | 23 ++- application/views/storerequisitionlisting.php | 2 +- .../views/viewmaterialinspectionreport.php | 0 18 files changed, 334 insertions(+), 45 deletions(-) mode change 100644 => 100755 application/controllers/MRIRcontroller.php mode change 100644 => 100755 application/logs/log-2017-07-06.php create mode 100644 application/logs/log-2017-07-07.php mode change 100644 => 100755 application/models/mrir_model.php mode change 100644 => 100755 application/views/Editmaterialinspectionreport.php mode change 100755 => 100644 application/views/importpopdf.php mode change 100644 => 100755 application/views/materialinspectionreport.php mode change 100644 => 100755 application/views/viewmaterialinspectionreport.php diff --git a/application/config/constants.php b/application/config/constants.php index df8547e2..57800b73 100755 --- a/application/config/constants.php +++ b/application/config/constants.php @@ -101,7 +101,7 @@ define('PO_APPROVED', 'ST025'); /*store Status*/ -define('STORE_DRAFT', 'ST014'); +define('STORE_DRAFT', 'ST043'); define('STORE_CREATED', 'ST015'); /*store requisition*/ diff --git a/application/controllers/MRIRcontroller.php b/application/controllers/MRIRcontroller.php old mode 100644 new mode 100755 diff --git a/application/controllers/storerequisitionlist.php b/application/controllers/storerequisitionlist.php index d9a5cb35..47123697 100755 --- a/application/controllers/storerequisitionlist.php +++ b/application/controllers/storerequisitionlist.php @@ -115,7 +115,7 @@ class storerequisitionlist extends BaseController function addNewRequistion() { $Status= $_GET['ID']; - $Requestedby = $_GET['RequestedBy']; + // $Requestedby = $_GET['RequestedBy']; $CostCenter = $_GET['CostCenter']; $DEPCode = $_GET['DEPCode']; $CreateBy = $this->session->userdata ( 'userId' ); @@ -124,6 +124,7 @@ class storerequisitionlist extends BaseController $DeletedRow = $this->input->post('txtDeletedRow'); $RowCount = $_GET['txtRowCount']; //echo $RowCount; die(); + $Requestedby = $this->session->userdata ( 'EmpID' ); $comma_separated = explode(':', $DeletedRow); $IsExists = $this->storerequistion_model->RequistionIsExists($Requestedby); @@ -408,7 +409,7 @@ class storerequisitionlist extends BaseController $Request = array('MaterialCode'=>$MaterialCode,'Status'=>$Status,'QuantityRequired'=>$QuantityRequired,'Remarks'=>$Remarks); //print_r($Request);die(); - $addReq = $this->storerequistion_model->addstoreRequistion($Request); + $addReq = $this->storerequistion_model->upstoreRequistion($Request); $SkipInsert = "False"; if(count($comma_separated) > 0) @@ -425,25 +426,27 @@ class storerequisitionlist extends BaseController } } + if($SkipInsert == "False") { //echo "string"; die(); $MaterialCode = $this->input->post('EditMaterialCode'.$i); - echo"MaterialCode"; die(); + //echo"MaterialCode"; die(); $QuantityRequired=$this->input->post('Quantity'.$i); $Remarks=$this->input->post('Remarks'.$i); $Request = array('MaterialCode'=>$MaterialCode,'Status'=>$Status,'QuantityRequired'=>$QuantityRequired,'Remarks'=>$Remarks,'StoreReqNo'=>$StoreReqNo); - //print_r($Request);die(); + //print_ + r($Request);die(); $IsExists = $this->storerequistion_model->LineItemIsExists($StoreReqNo,$MaterialCode); if(count( $IsExists) == 0) { $ReqDetails = array('StoreReqNo'=>$StoreReqNo, 'MaterialCode'=>$MaterialCode,'QuantityRequired'=>$QuantityRequired,'UpdatedBy'=>$UpdatedBy,'UpdatedOn'=>$updatedDate); - $this->storerequistion_model->addRequistionDetails($ReqDetails); + $this->storerequistion_model->upRequistionDetails($ReqDetails); } else { diff --git a/application/logs/log-2017-07-06.php b/application/logs/log-2017-07-06.php old mode 100644 new mode 100755 diff --git a/application/logs/log-2017-07-07.php b/application/logs/log-2017-07-07.php new file mode 100644 index 00000000..19496e2a --- /dev/null +++ b/application/logs/log-2017-07-07.php @@ -0,0 +1,68 @@ + + +ERROR - 2017-07-07 06:48:22 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/storerequisitionlisting.php 53 +ERROR - 2017-07-07 06:48:22 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/storerequisitionlisting.php 53 +ERROR - 2017-07-07 06:48:22 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/storerequisitionlisting.php 53 +ERROR - 2017-07-07 06:48:22 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/storerequisitionlisting.php 53 +ERROR - 2017-07-07 06:48:22 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/storerequisitionlisting.php 53 +ERROR - 2017-07-07 06:48:22 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/storerequisitionlisting.php 53 +ERROR - 2017-07-07 06:48:48 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/approvalstorerequisitionslip.php 33 +ERROR - 2017-07-07 06:48:48 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/approvalstorerequisitionslip.php 33 +ERROR - 2017-07-07 06:48:48 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/approvalstorerequisitionslip.php 33 +ERROR - 2017-07-07 06:48:48 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/approvalstorerequisitionslip.php 33 +ERROR - 2017-07-07 06:48:48 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/approvalstorerequisitionslip.php 33 +ERROR - 2017-07-07 06:48:48 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/approvalstorerequisitionslip.php 33 +ERROR - 2017-07-07 06:49:09 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/approvalstorerequisitionslip.php 33 +ERROR - 2017-07-07 06:49:09 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/approvalstorerequisitionslip.php 33 +ERROR - 2017-07-07 06:49:09 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/approvalstorerequisitionslip.php 33 +ERROR - 2017-07-07 06:49:09 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/approvalstorerequisitionslip.php 33 +ERROR - 2017-07-07 06:49:09 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/approvalstorerequisitionslip.php 33 +ERROR - 2017-07-07 06:49:09 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/approvalstorerequisitionslip.php 33 +ERROR - 2017-07-07 06:49:25 --> Severity: Notice --> Undefined property: stdClass::$StatusName /opt/lampp/htdocs/siddharth_application/application/views/editstorerequisition.php 353 +ERROR - 2017-07-07 06:49:43 --> Query error: Cannot add or update a child row: a foreign key constraint fails (`kasiram9_SiddharthIndustries`.`T_Store_Requestion_Details`, CONSTRAINT `T_StoreRequestion_DetailsReqNo` FOREIGN KEY (`StoreReqNo`) REFERENCES `T_Store_Requestion_Master` (`StoreReqNo`) ON UPD) +ERROR - 2017-07-07 06:59:56 --> Severity: Notice --> Undefined property: stdClass::$StatusName /opt/lampp/htdocs/siddharth_application/application/views/editstorerequisition.php 353 +ERROR - 2017-07-07 07:00:39 --> Severity: Notice --> Undefined property: stdClass::$StatusName /opt/lampp/htdocs/siddharth_application/application/views/editstorerequisition.php 353 +ERROR - 2017-07-07 07:01:02 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/storerequisitionlisting.php 53 +ERROR - 2017-07-07 07:01:02 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/storerequisitionlisting.php 53 +ERROR - 2017-07-07 07:01:02 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/storerequisitionlisting.php 53 +ERROR - 2017-07-07 07:01:02 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/storerequisitionlisting.php 53 +ERROR - 2017-07-07 07:01:02 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/storerequisitionlisting.php 53 +ERROR - 2017-07-07 07:01:02 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/storerequisitionlisting.php 53 +ERROR - 2017-07-07 07:01:23 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/approvalstorerequisitionslip.php 33 +ERROR - 2017-07-07 07:01:23 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/approvalstorerequisitionslip.php 33 +ERROR - 2017-07-07 07:01:23 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/approvalstorerequisitionslip.php 33 +ERROR - 2017-07-07 07:01:23 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/approvalstorerequisitionslip.php 33 +ERROR - 2017-07-07 07:01:23 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/approvalstorerequisitionslip.php 33 +ERROR - 2017-07-07 07:01:23 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/approvalstorerequisitionslip.php 33 +ERROR - 2017-07-07 07:01:40 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/storerequisitionlisting.php 53 +ERROR - 2017-07-07 07:01:40 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/storerequisitionlisting.php 53 +ERROR - 2017-07-07 07:01:40 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/storerequisitionlisting.php 53 +ERROR - 2017-07-07 07:01:40 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/storerequisitionlisting.php 53 +ERROR - 2017-07-07 07:01:40 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/storerequisitionlisting.php 53 +ERROR - 2017-07-07 07:01:40 --> Severity: Notice --> Undefined index: RequisitionStatus /opt/lampp/htdocs/siddharth_application/application/views/storerequisitionlisting.php 53 +ERROR - 2017-07-07 07:13:25 --> Severity: Warning --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given /opt/lampp/htdocs/siddharth_application/system/database/drivers/mysqli/mysqli_result.php 38 +ERROR - 2017-07-07 07:13:32 --> Severity: Warning --> explode() expects parameter 2 to be string, array given /opt/lampp/htdocs/siddharth_application/application/third_party/dompdf/include/style.cls.php 948 +ERROR - 2017-07-07 07:13:32 --> Severity: Warning --> A non-numeric value encountered /opt/lampp/htdocs/siddharth_application/application/third_party/dompdf/include/fixed_positioner.cls.php 78 +ERROR - 2017-07-07 07:13:32 --> Severity: Warning --> A non-numeric value encountered /opt/lampp/htdocs/siddharth_application/application/third_party/dompdf/include/fixed_positioner.cls.php 87 +ERROR - 2017-07-07 07:13:32 --> Severity: Warning --> A non-numeric value encountered /opt/lampp/htdocs/siddharth_application/application/third_party/dompdf/include/fixed_positioner.cls.php 95 +ERROR - 2017-07-07 07:13:32 --> Severity: Warning --> A non-numeric value encountered /opt/lampp/htdocs/siddharth_application/application/third_party/dompdf/include/page_frame_decorator.cls.php 464 +ERROR - 2017-07-07 07:13:32 --> Severity: Warning --> A non-numeric value encountered /opt/lampp/htdocs/siddharth_application/application/third_party/dompdf/include/page_frame_decorator.cls.php 464 +ERROR - 2017-07-07 07:13:32 --> Severity: Warning --> A non-numeric value encountered /opt/lampp/htdocs/siddharth_application/application/third_party/dompdf/include/inline_renderer.cls.php 157 +ERROR - 2017-07-07 07:13:41 --> Severity: Warning --> explode() expects parameter 2 to be string, array given /opt/lampp/htdocs/siddharth_application/application/third_party/dompdf/include/style.cls.php 948 +ERROR - 2017-07-07 07:13:41 --> Severity: Warning --> A non-numeric value encountered /opt/lampp/htdocs/siddharth_application/application/third_party/dompdf/include/page_frame_decorator.cls.php 464 +ERROR - 2017-07-07 07:13:41 --> Severity: Warning --> A non-numeric value encountered /opt/lampp/htdocs/siddharth_application/application/third_party/dompdf/include/page_frame_decorator.cls.php 464 +ERROR - 2017-07-07 07:13:41 --> Severity: Warning --> A non-numeric value encountered /opt/lampp/htdocs/siddharth_application/application/third_party/dompdf/include/page_frame_decorator.cls.php 464 +ERROR - 2017-07-07 07:13:41 --> Severity: Warning --> A non-numeric value encountered /opt/lampp/htdocs/siddharth_application/application/third_party/dompdf/include/page_frame_decorator.cls.php 464 +ERROR - 2017-07-07 07:13:41 --> Severity: Warning --> A non-numeric value encountered /opt/lampp/htdocs/siddharth_application/application/third_party/dompdf/include/page_frame_decorator.cls.php 464 +ERROR - 2017-07-07 07:13:41 --> Severity: Warning --> A non-numeric value encountered /opt/lampp/htdocs/siddharth_application/application/third_party/dompdf/include/page_frame_decorator.cls.php 464 +ERROR - 2017-07-07 07:13:41 --> Severity: Warning --> A non-numeric value encountered /opt/lampp/htdocs/siddharth_application/application/third_party/dompdf/include/page_frame_decorator.cls.php 464 +ERROR - 2017-07-07 07:13:41 --> Severity: Warning --> A non-numeric value encountered /opt/lampp/htdocs/siddharth_application/application/third_party/dompdf/include/page_frame_decorator.cls.php 464 +ERROR - 2017-07-07 07:13:41 --> Severity: Warning --> A non-numeric value encountered /opt/lampp/htdocs/siddharth_application/application/third_party/dompdf/include/table_cell_frame_reflower.cls.php 131 +ERROR - 2017-07-07 07:13:41 --> Severity: Warning --> A non-numeric value encountered /opt/lampp/htdocs/siddharth_application/application/third_party/dompdf/include/page_frame_decorator.cls.php 464 +ERROR - 2017-07-07 07:13:41 --> Severity: Warning --> A non-numeric value encountered /opt/lampp/htdocs/siddharth_application/application/third_party/dompdf/include/page_frame_decorator.cls.php 464 +ERROR - 2017-07-07 07:13:41 --> Severity: Warning --> A non-numeric value encountered /opt/lampp/htdocs/siddharth_application/application/third_party/dompdf/include/page_frame_decorator.cls.php 464 +ERROR - 2017-07-07 07:13:41 --> Severity: Warning --> A non-numeric value encountered /opt/lampp/htdocs/siddharth_application/application/third_party/dompdf/include/page_frame_decorator.cls.php 464 +ERROR - 2017-07-07 07:13:41 --> Severity: Warning --> A non-numeric value encountered /opt/lampp/htdocs/siddharth_application/application/third_party/dompdf/include/page_frame_decorator.cls.php 464 +ERROR - 2017-07-07 07:13:41 --> Severity: Warning --> A non-numeric value encountered /opt/lampp/htdocs/siddharth_application/application/third_party/dompdf/include/page_frame_decorator.cls.php 464 +ERROR - 2017-07-07 07:13:41 --> Severity: Warning --> A non-numeric value encountered /opt/lampp/htdocs/siddharth_application/application/third_party/dompdf/include/page_frame_decorator.cls.php 464 +ERROR - 2017-07-07 07:13:41 --> Severity: Warning --> A non-numeric value encountered /opt/lampp/htdocs/siddharth_application/application/third_party/dompdf/include/page_frame_decorator.cls.php 464 diff --git a/application/models/mrir_model.php b/application/models/mrir_model.php old mode 100644 new mode 100755 diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index 4c486b9c..d3e62195 100755 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -490,9 +490,10 @@ function purchaseorderListing($forwhat='') function GetServicePurchaseOrderDetailsForPrint($PONO = '') { - $subQuery ='SELECT distinct LineItem.LineItemNo,ReqNo,Mat.MaterialCode,Mat.MaterialName,Mat.UOM, + $subQuery ='SELECT distinct LineItem.LineItemNo,LineItem.ReqNo,Mat.MaterialCode,Mat.MaterialName,Mat.UOM, Quantity,Rate,ROUND((Quantity *Rate),2 ) as BasicValue ,ROUND((ServiceTax + EducessTax + SecHigherEducessTax + KrishiKalyantax + SwachhBharattax),2)as Taxamount - ,TotalValue,ServiceTax,EducessTax,SecHigherEducessTax,KrishiKalyantax,SwachhBharattax,CostCenterCode ,sup.SupplierName,sup.Address,POMaster.DeliveryAddress,POMaster.DeliveryDate,POMaster.Status,POMaster.PODate,POMaster.PONO,POMaster.ServiceDescription FROM T_PurchaseOrder_LineItem LineItem + ,TotalValue,ServiceTax,EducessTax,SecHigherEducessTax,KrishiKalyantax,SwachhBharattax,LineItem.CostCenterCode,sup.SupplierName,sup.Address,POMaster.DeliveryAddress,POMaster.DeliveryDate,POMaster.Status,POMaster.PODate,POMaster.PONO,POMaster.ServiceDescription,ReqMas.Requestedby FROM T_PurchaseOrder_LineItem LineItem + join T_Requestion_Master ReqMas on ReqMas.ReqNo=LineItem.ReqNo join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode join T_Service_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo join T_PurchaseOrder_Master POMaster on POMaster.PONO = LineItem.PONO @@ -530,17 +531,18 @@ function purchaseorderListing($forwhat='') function GetRevenuePurchaseOrderDetailsForPDF($PONO = '') { - $subQuery ='SELECT distinct LineItem.LineItemNo,ReqNo,Mat.MaterialCode,Mat.MaterialName, - Mat.UOM,Quantity,Rate,ROUND((Quantity *Rate),2 ) as BasicValue , - ROUND(((AfterPackagingValue + AfterFreightValue + AfterExciseDuty + AfterVAT + AfterCST + - AfterGST + AfterOtherTaxes + Insurance)) ,2)as Taxamount , - TotalValue,Tax.*,CostCenterCode , POMaster.*,sup.SupplierName,sup.Address - FROM T_PurchaseOrder_LineItem LineItem - join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode - join T_Revenue_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo - join T_PurchaseOrder_Master POMaster on POMaster.PONO = LineItem.PONO - join T_SupplierDetailsN sup on sup.SupplierID = POMaster.SupplierID - where LineItem.PONO =?'; + $subQuery ='SELECT distinct LineItem.LineItemNo,LineItem.ReqNo,Mat.MaterialCode,Mat.MaterialName, + Mat.UOM,Quantity,Rate,ROUND((Quantity *Rate),2 ) as BasicValue , + ROUND(((AfterPackagingValue + AfterFreightValue + AfterExciseDuty + AfterVAT + AfterCST + + AfterGST + AfterOtherTaxes + Insurance)) ,2)as Taxamount , + TotalValue,Tax.*,LineItem.CostCenterCode , POMaster.*,sup.SupplierName,sup.Address,ReqMas.Requestedby + FROM T_PurchaseOrder_LineItem LineItem + join T_Requestion_Master ReqMas on ReqMas.ReqNo=LineItem.ReqNo + join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode + join T_Revenue_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo + join T_PurchaseOrder_Master POMaster on POMaster.PONO = LineItem.PONO + join T_SupplierDetailsN sup on sup.SupplierID = POMaster.SupplierID + where LineItem.PONO =?'; $query = $this->db->query($subQuery,array($PONO)); @@ -553,9 +555,9 @@ function purchaseorderListing($forwhat='') function GetImportPurchaseOrderDetailsForPDF($PONO = '') { - $subQuery ='SELECT distinct LineItem.LineItemNo,ReqNo,Mat.MaterialCode,Mat.MaterialName, + $subQuery ='SELECT distinct LineItem.LineItemNo,LineItem.ReqNo,Mat.MaterialCode,Mat.MaterialName, Mat.UOM,Quantity,ReqMas.Requestedby,Rate,ROUND((RMCIncludingCustomersPerKG*Quantity),2)as Taxamount , - ProductPrice,Tax.*,CostCenterCode , POMaster.*,sup.SupplierName,sup.Address + ProductPrice,Tax.*,LineItem.CostCenterCode , POMaster.*,sup.SupplierName,sup.Address FROM T_PurchaseOrder_LineItem LineItem join T_Requestion_Master ReqMas on ReqMas.ReqNo=LineItem.ReqNo join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode diff --git a/application/models/storerequistion_model.php b/application/models/storerequistion_model.php index 3fb73e86..970b8859 100755 --- a/application/models/storerequistion_model.php +++ b/application/models/storerequistion_model.php @@ -110,6 +110,31 @@ class storerequistion_model extends CI_Model } + +/*this function used to Update Store Requistion*/ + function upstoreRequistion($Request) + { + //print_r($Request); + $this->db->trans_start(); + $this->db->update('T_Store_Requestion_Details',$Request); + $insert_id = $this->db->affected_rows(); + $this->db->trans_complete(); + if($insert_id>0) + { + $subQuery = 'select max(StoreReqLineItemNo) as StoreReqLineItemNo from T_Store_Requestion_Details'; + + $query = $this->db->query($subQuery); + + return $query->result_array(); + } + + + } + + + + + /** * This function is used to add the Line item details to the Database @@ -128,6 +153,23 @@ class storerequistion_model extends CI_Model } + /** + * This function is used to update the Line item details to the Database + * @return array $result : This is result of the query + */ + function upRequistionDetails($StoreReqLineItemNo) + { + //echo "nsmdnsjkkjasdf"; die(); + $this->db->trans_start(); + $this->db->update('T_Store_Requestion_Details', $StoreReqLineItemNo + ); + $insert_id = $this->db->affected_rows(); + $this->db->trans_complete(); + //print_r($this->db->last_query()); + return $insert_id; + + } + /** diff --git a/application/third_party/dompdf/lib/fonts/log.htm b/application/third_party/dompdf/lib/fonts/log.htm index 3180f355..bb51b983 100755 --- a/application/third_party/dompdf/lib/fonts/log.htm +++ b/application/third_party/dompdf/lib/fonts/log.htm @@ -1,4 +1,4 @@ -10,240 KB 232.5711 ms
+8,192 KB 126.3251 ms

A PHP Error was encountered

@@ -7,4 +7,157 @@

Filename: include/style.cls.php

Line Number: 948

+
+ +

A PHP Error was encountered

+ +

Severity: Warning

+

Message: A non-numeric value encountered

+

Filename: include/page_frame_decorator.cls.php

+

Line Number: 464

+ +
+ +

A PHP Error was encountered

+ +

Severity: Warning

+

Message: A non-numeric value encountered

+

Filename: include/page_frame_decorator.cls.php

+

Line Number: 464

+ +
+ +

A PHP Error was encountered

+ +

Severity: Warning

+

Message: A non-numeric value encountered

+

Filename: include/page_frame_decorator.cls.php

+

Line Number: 464

+ +
+ +

A PHP Error was encountered

+ +

Severity: Warning

+

Message: A non-numeric value encountered

+

Filename: include/page_frame_decorator.cls.php

+

Line Number: 464

+ +
+ +

A PHP Error was encountered

+ +

Severity: Warning

+

Message: A non-numeric value encountered

+

Filename: include/page_frame_decorator.cls.php

+

Line Number: 464

+ +
+ +

A PHP Error was encountered

+ +

Severity: Warning

+

Message: A non-numeric value encountered

+

Filename: include/page_frame_decorator.cls.php

+

Line Number: 464

+ +
+ +

A PHP Error was encountered

+ +

Severity: Warning

+

Message: A non-numeric value encountered

+

Filename: include/page_frame_decorator.cls.php

+

Line Number: 464

+ +
+ +

A PHP Error was encountered

+ +

Severity: Warning

+

Message: A non-numeric value encountered

+

Filename: include/page_frame_decorator.cls.php

+

Line Number: 464

+ +
+ +

A PHP Error was encountered

+ +

Severity: Warning

+

Message: A non-numeric value encountered

+

Filename: include/table_cell_frame_reflower.cls.php

+

Line Number: 131

+ +
+ +

A PHP Error was encountered

+ +

Severity: Warning

+

Message: A non-numeric value encountered

+

Filename: include/page_frame_decorator.cls.php

+

Line Number: 464

+ +
+ +

A PHP Error was encountered

+ +

Severity: Warning

+

Message: A non-numeric value encountered

+

Filename: include/page_frame_decorator.cls.php

+

Line Number: 464

+ +
+ +

A PHP Error was encountered

+ +

Severity: Warning

+

Message: A non-numeric value encountered

+

Filename: include/page_frame_decorator.cls.php

+

Line Number: 464

+ +
+ +

A PHP Error was encountered

+ +

Severity: Warning

+

Message: A non-numeric value encountered

+

Filename: include/page_frame_decorator.cls.php

+

Line Number: 464

+ +
+ +

A PHP Error was encountered

+ +

Severity: Warning

+

Message: A non-numeric value encountered

+

Filename: include/page_frame_decorator.cls.php

+

Line Number: 464

+ +
+ +

A PHP Error was encountered

+ +

Severity: Warning

+

Message: A non-numeric value encountered

+

Filename: include/page_frame_decorator.cls.php

+

Line Number: 464

+ +
+ +

A PHP Error was encountered

+ +

Severity: Warning

+

Message: A non-numeric value encountered

+

Filename: include/page_frame_decorator.cls.php

+

Line Number: 464

+ +
+ +

A PHP Error was encountered

+ +

Severity: Warning

+

Message: A non-numeric value encountered

+

Filename: include/page_frame_decorator.cls.php

+

Line Number: 464

+
\ No newline at end of file diff --git a/application/views/Editmaterialinspectionreport.php b/application/views/Editmaterialinspectionreport.php old mode 100644 new mode 100755 diff --git a/application/views/approvalstorerequisitionslip.php b/application/views/approvalstorerequisitionslip.php index f00c3026..b2e64781 100755 --- a/application/views/approvalstorerequisitionslip.php +++ b/application/views/approvalstorerequisitionslip.php @@ -90,7 +90,7 @@
-

Store Requisition Details - REQNo

+

Store Requisition Details - STORE REQNo

@@ -366,7 +366,7 @@ function saveToDatabase(ReqId,Index,option,com) else if (option == 1 ) { alert(' The Approval '); - Status='ST036'; + Status='' ; var strMsg='Do YOu want to Approve this requisition?'; } @@ -374,7 +374,8 @@ function saveToDatabase(ReqId,Index,option,com) { alert('The Rejects' ); - Status='ST039'; + + Status='' ; var strMsg='Do You want to Reject this requisition?'; } @@ -382,7 +383,7 @@ function saveToDatabase(ReqId,Index,option,com) var answer = confirm(strMsg); if (answer) { - //$('#content').loader('show'); + $('#content').loader('show'); $.ajax({ data:{id:id,newcomments:newcomments}, type:"POST", @@ -392,7 +393,7 @@ function saveToDatabase(ReqId,Index,option,com) { $('#content').loader('hide'); alert(data); - location.reload(); + window.location = "storerequisitionlisting"; } else { diff --git a/application/views/importpopdf.php b/application/views/importpopdf.php old mode 100755 new mode 100644 index 54c5e324..0f9bd441 --- a/application/views/importpopdf.php +++ b/application/views/importpopdf.php @@ -70,6 +70,18 @@ } + // echo $CurrencyCode; + + $DEPNAME=''; + + if(!empty($DEPCODE)) + { + foreach ($DEPCODE as $DEP) + { + $DEPNAME=$DEP->DepartmentName; + } + } + ?>