diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php old mode 100755 new mode 100644 index 3ed40997..157b8b31 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -4275,8 +4275,8 @@ function addloadfile() { $pono= $this->input->post('PONO'); - $new_file_name =$_FILES['param1']['name']; - //echo $new_file_name; + $new_file_name =$_FILES['file']['name']; + //echo $new_file_name;die; if(!empty($new_file_name)) { $Picture = $this->adfile(); @@ -4303,18 +4303,26 @@ $filelist =array('PONO'=>$pono,'FilePath'=>$Picture); function adfile() { $picture = ''; - if(!empty($_FILES['param1']['name'])) + if(!empty($_FILES['file']['name'])) { $config['upload_path'] = 'uploads/BillFiles/'; $config['allowed_types'] = 'docx|pdf|doc|png|jpg'; - $config['file_name'] = $_FILES['param1']['name']; - // print_r($config) ; + $config['file_name'] = $_FILES['file']['name']; + // print_r($config);die; //Load upload library and initialize configuration $this->load->library('upload',$config); $this->upload->initialize($config); + if($this->upload->do_upload('file')) + { $uploadData = $this->upload->data(); $picture = $uploadData['file_name']; + } + else + { + $error = array('error' => $this->upload->display_errors()); + $picture = ''; + } } else diff --git a/application/models/cashbook_model.php b/application/models/cashbook_model.php index 08d7650b..76d1d0cc 100755 --- a/application/models/cashbook_model.php +++ b/application/models/cashbook_model.php @@ -295,12 +295,12 @@ $query = $this->db->query($sql); //die(); //$Supplierid; $this->db->distinct(); - $this->db->select('POM.PONO,POM.Paymentstatus,supp.SupplierName, + $this->db->select('POM.PONO,POM.Paymentstatus,supp.SupplierName,igr.CreatedDate, POM.TotalOrderValue,POM.ServiceDescription,BR.Balancetopay,BR.Amountpaid, - POM.PODate,POM.POType,POM.ReleasedBy,POM.IsQualityChkReqired,POM.POType,POM.CapitalRange,POM.Status, + POM.POType,POM.ReleasedBy,POM.IsQualityChkReqired,POM.POType,POM.CapitalRange,POM.Status, PUADV.AdvanceAmount'); $this->db->from ('T_PurchaseOrder_Master POM'); - + $this->db->join('T_IGR_Master igr','igr.PONO = POM.PONO'); $this->db->join('T_SupplierDetailsN supp','supp.SupplierID = POM.SupplierID'); $this->db->join('T_PurchaseOrder_AdvanceRequest PUADV','POM.PONO=PUADV.PONO','left'); diff --git a/application/views/bankdebit.php b/application/views/bankdebit.php index 350da7ed..bcb0002f 100644 --- a/application/views/bankdebit.php +++ b/application/views/bankdebit.php @@ -150,7 +150,7 @@ foreach($financialyear as $item)