From ceb44d8f28164769ad2e8fb440a3b2ac9849c970 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 16 Sep 2017 19:05:17 +0530 Subject: [PATCH] material master hsn code --- application/controllers/companycontroller.php | 7 +++++-- .../controllers/rawmaterialdetails.php | 20 +++++++++++-------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/application/controllers/companycontroller.php b/application/controllers/companycontroller.php index a6458f2d..a875890a 100755 --- a/application/controllers/companycontroller.php +++ b/application/controllers/companycontroller.php @@ -229,7 +229,10 @@ class companycontroller extends BaseController $createdby = $this->session->userdata ( 'userId' ); $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); $createddt = $dt->format('Y-m-d H:i:s'); - $UpdatedBY = $this->session->userdata ( 'Userid' ); + $updatedby = $this->session->userdata ( 'userId' ); + $date = new DateTime('now', new DateTimeZone('Asia/Kolkata')); + $updateddt = $date->format('Y-m-d H:i:s'); + //$UpdatedBY = $this->session->userdata ( 'Userid' ); //$companywebsite = $this->input->post('companywebsite'); //$ceoname = $this->input->post('ceoname'); //$mdname = $this->input->post('mdname'); @@ -252,7 +255,7 @@ class companycontroller extends BaseController //$createdDate=$this->input->post('createdDate'); //$Company = array('CompID'=>$CompID,'CompanyName'=>$CompanyName,'Address'=>$Address,'ContactNumber'=>$ContactNumber,'AlternateContactNumber'=>$AlternateContactNumber,'EmailAddress'=>$EmailAddress,'TIN'=>$TIN,'PAN'=>$PAN,'GSTNO'=>$GSTNO,'GSTRange'=>$GSTRange,'UANumber'=>$UANumber,'PaymentTerms'=>$Payment ,'PaymentDays'=>$PaymentDays ,'PayableAT'=>$PayableAT ,'Createdby'=>$createdby,'ProfilePic'=>$Picture,'Exiseregistration'=>$Exiseregistration,'CollectrateAddress'=>$CollectrateAddress,'FiscalYearStartOn'=>$financialstart,'FiscalYearEndsOn'=> $financialend); - $Company = array('CompID'=>$CompID,'CompanyName'=>$CompanyName,'Address'=>$Address,'ContactNumber'=>$ContactNumber,'AlternateContactNumber'=>$AlternateContactNumber,'EmailAddress'=>$EmailAddress,'TIN'=>$TIN,'PAN'=>$PAN,'GSTNO'=>$GSTNO,'GSTRange'=>$GSTRange,'UANumber'=>$UANumber,'Createdby'=>$createdby,'ProfilePic'=>$Picture,'Exiseregistration'=>$Exiseregistration,'CollectrateAddress'=>$CollectrateAddress,'FiscalYearStartOn'=>$financialstart,'FiscalYearEndsOn'=> $financialend,'paymentID'=>$PaymentId,'companyWebsite'=>$companywebsite); + $Company = array('CompID'=>$CompID,'CompanyName'=>$CompanyName,'Address'=>$Address,'ContactNumber'=>$ContactNumber,'AlternateContactNumber'=>$AlternateContactNumber,'EmailAddress'=>$EmailAddress,'TIN'=>$TIN,'PAN'=>$PAN,'GSTNO'=>$GSTNO,'GSTRange'=>$GSTRange,'UANumber'=>$UANumber,'Createdby'=>$createdby,'ProfilePic'=>$Picture,'Exiseregistration'=>$Exiseregistration,'CollectrateAddress'=>$CollectrateAddress,'FiscalYearStartOn'=>$financialstart,'FiscalYearEndsOn'=> $financialend,'paymentID'=>$PaymentId,'companyWebsite'=>$companywebsite,'UpdatedBY'=>$updatedby,'Updatedon'=>$updateddt); if(!empty($file)) { diff --git a/application/controllers/rawmaterialdetails.php b/application/controllers/rawmaterialdetails.php index c1de646b..89f03a42 100755 --- a/application/controllers/rawmaterialdetails.php +++ b/application/controllers/rawmaterialdetails.php @@ -360,10 +360,11 @@ class rawmaterialdetails extends BaseController $this->excel->getActiveSheet()->setCellValue('J5', 'CostCenterCode'); $this->excel->getActiveSheet()->setCellValue('K5', 'ConversionFactorUnit'); $this->excel->getActiveSheet()->setCellValue('L5', 'ConversionFactorUOM'); - $this->excel->getActiveSheet()->setCellValue('M5', 'Remarks'); - $this->excel->getActiveSheet()->setCellValue('N5', 'Created by'); - $this->excel->getActiveSheet()->setCellValue('O5', 'Updated By'); - $this->excel->getActiveSheet()->setCellValue('P5', 'IsActive'); + $this->excel->getActiveSheet()->setCellValue('M5', 'HSNCode'); + $this->excel->getActiveSheet()->setCellValue('N5', 'Remarks'); + $this->excel->getActiveSheet()->setCellValue('O5', 'Created by'); + $this->excel->getActiveSheet()->setCellValue('P5', 'Updated By'); + $this->excel->getActiveSheet()->setCellValue('Q5', 'IsActive'); @@ -398,6 +399,8 @@ class rawmaterialdetails extends BaseController $this->excel->getActiveSheet()->getStyle('O5')->getFont()->setBold(true); $this->excel->getActiveSheet()->getStyle('P5')->getFont()->setSize(12); $this->excel->getActiveSheet()->getStyle('P5')->getFont()->setBold(true); + $this->excel->getActiveSheet()->getStyle('Q5')->getFont()->setSize(12); + $this->excel->getActiveSheet()->getStyle('Q5')->getFont()->setBold(true); $exportData = $this->rawmaterialdetails_model->export_excel(); @@ -417,10 +420,11 @@ class rawmaterialdetails extends BaseController $this->excel->getActiveSheet()->setCellValue('J' . $i,$data['CostCenterCode']); $this->excel->getActiveSheet()->setCellValue('K' . $i,$data['ConversionFactorUnit']); $this->excel->getActiveSheet()->setCellValue('L' . $i,$data['ConversionFactorUOM']); - $this->excel->getActiveSheet()->setCellValue('M' . $i,$data['Remarks']); - $this->excel->getActiveSheet()->setCellValue('N' . $i,$data['firstname']); - $this->excel->getActiveSheet()->setCellValue('O' . $i,$data['Updated_By']); - $this->excel->getActiveSheet()->setCellValue('P' . $i,$data['IsActive']); + $this->excel->getActiveSheet()->setCellValue('M' . $i,$data['HSNCODE']); + $this->excel->getActiveSheet()->setCellValue('N' . $i,$data['Remarks']); + $this->excel->getActiveSheet()->setCellValue('O' . $i,$data['firstname']); + $this->excel->getActiveSheet()->setCellValue('P' . $i,$data['Updated_By']); + $this->excel->getActiveSheet()->setCellValue('Q' . $i,$data['IsActive']); $i++;