SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

header file changes

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-01-23 13:09:44 +05:30
parent d2ce6373f6
commit 48d748a9a8
9 changed files with 840 additions and 631 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
application/controllers/CostCenter.php
View File

@ -243,8 +243,7 @@ class CostCenter extends BaseController
{
if($this->DEPCode == FINANCE )
{
$this->form_validation->set_rules('CostCode','CostCode','trim|required');
$this->form_validation->set_rules('CostName','CostName','trim|required');
@ -331,15 +330,7 @@ class CostCenter extends BaseController
}
}
else
{
//$this->loadViews("access");
$this->load->view('access');
}
}
@ -447,12 +438,12 @@ class CostCenter extends BaseController
*/
function deletecost()
{
if($this->isAdmin() == TRUE)
{
echo(json_encode(array('status'=>'access')));
}
else
{
// if($this->isAdmin() == TRUE)
// {
// echo(json_encode(array('status'=>'access')));
// }
// else
// {
$CostCenterID = $this->input->Costst('CostCentreID');
$cost = array('CreateDate'=>date('Y-m-d H:i:sa'));
@ -460,7 +451,7 @@ class CostCenter extends BaseController
if ($result > 0) { echo(json_encode(array('status'=>TRUE))); }
else { echo(json_encode(array('status'=>FALSE))); }
}
//}
}
function export_cost(){

14
application/controllers/companycontroller.php
View File

@ -221,12 +221,12 @@ class companycontroller extends BaseController
{
//die();
// $data['payment'] = $this->companydetailsmodel->getpayment();
if($this->isAdmin() == TRUE)
{
$this->loadThis();
}
else
{
// if($this->isAdmin() == TRUE)
// {
// $this->loadThis();
// }
// else
// {
$PictureName = $this->input->post('Image');
@ -317,7 +317,7 @@ class companycontroller extends BaseController
// redirect('companyview');
}
//}
}

14
application/controllers/department.php
View File

@ -39,12 +39,12 @@ class department extends BaseController
*/
function departmentListing()
{
if($this->isAdmin() == TRUE)
{
$this->loadThis();
}
else
{
// if($this->isAdmin() == TRUE)
// {
// $this->loadThis();
// }
// else
// {
$this->load->model('department_model');
//$searchText = $this->input->post('searchText');
@ -57,7 +57,7 @@ class department extends BaseController
$this->global['pageTitle'] = 'Siddharth Industries : Department Listing';
$this->loadViews("departmentListing", $this->global, $data, NULL);
}
//}
}
/**
* This function is used to load the add new supplier */

14
application/controllers/employeedetails.php
View File

@ -388,19 +388,19 @@ echo "<script>alert('Record Not Saved!');</script>";redirect('employeeListing','
$data['Department'] = $this->employeedetails_model->getDepartment();
$this->global['pageTitle'] = 'Siddharth : Add New Employee';
if($this->role == ROLE_ADMIN || $this->DEPCode == HR)
{
// if($this->role == ROLE_ADMIN || $this->DEPCode == HR)
// {
$this->loadViews("addemployee", $this->global, $data, NULL);
}
// }
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
// else
// {
// $this->loadViews("access", $this->global, $data, NULL);
// }
}
/**

14
application/controllers/rawmaterialdetails.php
View File

@ -241,12 +241,12 @@ class rawmaterialdetails extends BaseController
*/
function editRawmaterial()
{
if($this->isAdmin() == TRUE)
{
$this->loadThis();
}
else
{
// if($this->isAdmin() == TRUE)
// {
// $this->loadThis();
// }
// else
// {
$RawmaterialID = $this->input->post('MaterialCode');
$this->form_validation->set_rules('MaterialName','Material Name','trim|required|');
$this->form_validation->set_rules('MaterialType','MaterialType','trim');
@ -334,7 +334,7 @@ class rawmaterialdetails extends BaseController
}
}
//}
}
/** this function can be use for excel report **/

332
application/controllers/report.php
View File

@ -44,18 +44,11 @@ class report extends BaseController
//print_r($data);
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("report_pendingreqst",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
public function releasedPO()
{
@ -81,14 +74,9 @@ class report extends BaseController
$data['finyear']=$this->dahsboard_Model->report_finyear();
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_POreleased",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
public function openorderPO()
@ -116,15 +104,9 @@ class report extends BaseController
$data['finyear']=$this->dahsboard_Model->report_finyear();
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_openorder",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
public function TotalOrd()
@ -141,15 +123,9 @@ class report extends BaseController
}
$data['finyear']=$this->dahsboard_Model->report_finyear();
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_totalorders",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
public function ccr()
@ -169,16 +145,10 @@ class report extends BaseController
}
$data['finyear']=$this->dahsboard_Model->report_finyear();
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_costcenter",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
//print_r($data);
@ -192,16 +162,10 @@ class report extends BaseController
$data['mms']=$this->dahsboard_Model->report_MMSupplier();
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_Material_Master_SupplierWise",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
@ -215,16 +179,8 @@ class report extends BaseController
$data['mmi']=$this->dahsboard_Model->report_MMItem();
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_Material_Master_ItemWise",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
public function MM_ReceiptValue()
{
@ -241,15 +197,9 @@ class report extends BaseController
$data['mmr']=$this->dahsboard_Model->report_MMReceiptValue($fa,$aa,$m);
}
$data['finyear']=$this->dahsboard_Model->report_finyear();
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_Material_Master_ReceiptValue",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
@ -275,15 +225,9 @@ class report extends BaseController
$data['material']=$this->dahsboard_Model->material_name();
$data['cust']=$this->dahsboard_Model->customer_name();
$data['finyear']=$this->dahsboard_Model->report_finyear();
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_purchase",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
@ -330,16 +274,10 @@ class report extends BaseController
$data['purchase']=$this->dahsboard_Model->report_purchase_link($cname,$prod,$fa,$aa,$m,$frm,$t,$sid,$mid,$d);
}
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_purchase",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
@ -361,16 +299,10 @@ class report extends BaseController
}
$data['finyear']=$this->dahsboard_Model->report_finyear();
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_year_wise",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
@ -387,15 +319,9 @@ class report extends BaseController
$data['mont']=$mon;
$data['month']=$this->dahsboard_Model->report_month_wise($month);
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_month_wise",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
@ -412,15 +338,9 @@ class report extends BaseController
$data['year']=$month;
$data['ytotal']=$this->dahsboard_Model->report_year_wise_total($a,$b);
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_year_wise_total",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
@ -446,16 +366,10 @@ class report extends BaseController
$data['cust']=$this->dahsboard_Model->customer_name();
$data['finyear']=$this->dahsboard_Model->report_finyear();
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_supplier",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
public function consolidate()
@ -476,16 +390,10 @@ class report extends BaseController
$data['material']=$this->dahsboard_Model->material_name();
$data['cust']=$this->dahsboard_Model->customer_name();
$data['finyear']=$this->dahsboard_Model->report_finyear();
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_consolidate",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
@ -510,14 +418,9 @@ class report extends BaseController
$data['finyear']=$this->dahsboard_Model->report_finyear();
$data['spurchse']=$this->dahsboard_Model->consolidate_month($m,$sid,$mid,$fa,$aa);
// print_r( $data['spurchse']);
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_consolidate_m",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
public function consolidate_year()
@ -539,14 +442,9 @@ class report extends BaseController
$data['finyear']=$this->dahsboard_Model->report_finyear();
$data['spurchse']=$this->dahsboard_Model->consolidate_year($sid,$mid,$fa,$aa);
// print_r( $data['spurchse']);
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_consolidate_y",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
public function cumulative()
@ -558,15 +456,9 @@ class report extends BaseController
$data['cum']=$this->dahsboard_Model->report_cumulative();
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_cumulative",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
@ -636,15 +528,9 @@ class report extends BaseController
$data['material']=$this->dahsboard_Model->material_name();
$data['cust']=$this->dahsboard_Model->customer_name();
$data['finyear']=$this->dahsboard_Model->report_finyear();
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_purchase_inward",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
@ -715,16 +601,10 @@ class report extends BaseController
}
$data['finyear']=$this->dahsboard_Model->report_finyear();
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_year_wise_inward",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
public function imonth_wise()
@ -779,17 +659,11 @@ class report extends BaseController
$data['cust']=$this->dahsboard_Model->customer_name();
$data['finyear']=$this->dahsboard_Model->report_finyear();
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_supplier_inward",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
@ -812,15 +686,9 @@ class report extends BaseController
$data['material']=$this->dahsboard_Model->material_name();
$data['cust']=$this->dahsboard_Model->customer_name();
$data['finyear']=$this->dahsboard_Model->report_finyear();
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_consolidate_inward",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
public function i_consolidate_month()
{
@ -842,14 +710,9 @@ class report extends BaseController
$data['finyear']=$this->dahsboard_Model->report_finyear();
$data['spurchse']=$this->dahsboard_Model->i_consolidate_month($m,$sid,$mid,$fa,$aa);
// print_r( $data['spurchse']);
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_consolidate_month_inward",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
public function i_consolidate_year()
@ -871,14 +734,13 @@ class report extends BaseController
$data['finyear']=$this->dahsboard_Model->report_finyear();
$data['spurchse']=$this->dahsboard_Model->i_consolidate_year($sid,$mid,$fa,$aa);
// print_r( $data['spurchse']);
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_consolidate_year_inward",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
// }
// else
// {
// $this->loadViews("access", $this->global, $data, NULL);
// }
}
public function icumulative()
@ -890,15 +752,9 @@ class report extends BaseController
$data['cum']=$this->dahsboard_Model->ireport_cumulative();
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_cumulative_inward",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
@ -954,15 +810,9 @@ class report extends BaseController
$data['cum']=$this->dahsboard_Model->rawi_report_cumulative();
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_cumulative_raw",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
@ -1021,14 +871,9 @@ class report extends BaseController
$data['material']=$this->dahsboard_Model->category();
$data['cust']=$this->dahsboard_Model->customer_name();
$data['finyear']=$this->dahsboard_Model->report_finyear();
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_consolidate_raw",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
public function rawi_consolidate_month()
@ -1049,14 +894,9 @@ class report extends BaseController
$data['finyear']=$this->dahsboard_Model->report_finyear();
$data['spurchse']=$this->dahsboard_Model->rawi_consolidate_month($m,$cat,$sup,$fa,$aa);
// print_r( $data['spurchse']);
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_consolidate_month",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
public function rawi_consolidate_year()
@ -1076,14 +916,9 @@ class report extends BaseController
$data['finyear']=$this->dahsboard_Model->report_finyear();
$data['spurchse']=$this->dahsboard_Model->rawi_consolidate_year($cat,$sup,$fa,$aa);
// print_r( $data['spurchse']);
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_consolidate_year",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
public function pending_purchase()
@ -1111,14 +946,9 @@ class report extends BaseController
$data['finyear']=$this->dahsboard_Model->report_finyear();
// print_r( $data['spurchse']);
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("Report_pending_purchase",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
public function per()
@ -1139,14 +969,9 @@ class report extends BaseController
$data['per']=$this->dahsboard_Model->per($fa,$aa,$m);
// print_r( $data['spurchse']);
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("report_emp",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
public function cashbook()
@ -1179,16 +1004,9 @@ class report extends BaseController
// $data['todayincome']=$this->dahsboard_Model->today_data_income();
// $data['todayexpense']=$this->dahsboard_Model->today_data_expense();
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("reportcashbook",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
public function monthexpenses()
@ -1202,15 +1020,9 @@ class report extends BaseController
// $data['monthlyincreport']=$this->dahsboard_Model->monthincomereport();
$data['Indiancurrency']=$this->dahsboard_Model->INRSymbol();
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("cashbookmonthlyexpenses",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
@ -1230,15 +1042,9 @@ class report extends BaseController
//print_r($data['finyear']);
$data['Indiancurrency']=$this->dahsboard_Model->INRSymbol();
if($this->DEPCode == MANAGEMENT)
{
$this->loadviews("cashbookyearlyexpenses",$this->global,$data, NULL);
}
else
{
$this->loadViews("access", $this->global, $data, NULL);
}
}
public function cashbookdepartment()

56
application/controllers/user.php
View File

@ -990,19 +990,19 @@ function attendanceyear($empID ='')
*/
function userListing()
{
if($this->isAdmin() == TRUE)
{
$this->loadThis();
}
else
{
// if($this->isAdmin() == TRUE)
// {
// $this->loadThis();
// }
// else
// {
$data['userRecords'] = $this->user_model->userListing();
$this->global['pageTitle'] = 'Siddharth : User Listing';
$this->loadViews("users", $this->global, $data, NULL);
}
//}
}
@ -1011,12 +1011,12 @@ function attendanceyear($empID ='')
*/
function addNew()
{
if($this->isAdmin() == TRUE)
{
$this->loadThis();
}
else
{
// if($this->isAdmin() == TRUE)
// {
// $this->loadThis();
// }
// else
// {
$data['EmpList'] = $this->user_model->getAllEmployees();
$data['roles'] = $this->user_model->getUserRoles();
@ -1026,7 +1026,7 @@ function attendanceyear($empID ='')
$this->global['pageTitle'] = 'Siddharth : Add New User';
$this->loadViews("addNew", $this->global, $data, NULL);
}
// }
}
/**
@ -1197,12 +1197,12 @@ function Adduserdepartment()
*/
function editOld($UserId = '')
{
if($this->isAdmin() == TRUE )
{
$this->loadThis();
}
else
{
// if($this->isAdmin() == TRUE )
// {
// $this->loadThis();
// }
// else
// {
if($UserId == '')
{
// redirect('userListing');
@ -1227,7 +1227,7 @@ function Adduserdepartment()
$this->global['pageTitle'] = 'Siddharth : Edit User';
$this->loadViews("editOld", $this->global, $data, NULL);
}
//}
}
@ -1236,12 +1236,12 @@ function Adduserdepartment()
*/
function editUser()
{
if($this->isAdmin() == TRUE)
{
$this->loadThis();
}
else
{
// if($this->isAdmin() == TRUE)
// {
// $this->loadThis();
// }
// else
// {
$userId = $this->input->post('EmpList');
$this->form_validation->set_rules('EmpList','EmpList','trim|callback_Employee_validateS');
$this->form_validation->set_rules('role','role','trim|callback_Role_validate');
@ -1283,7 +1283,7 @@ function Adduserdepartment()
redirect('userListing');
}
}
//}
}

997
application/views/includes/header.php
View File

File diff suppressed because it is too large Load Diff

3
application/views/revenuepopdf.php
View File

@ -305,12 +305,13 @@ $OrderValue = (( $SubTotalAmount + $AfterCGST +$AfterIGST+$AfterSGST +$Insuranc
{
echo $rec->LineAmend ;
}
} }?>
} ?>
<tr>
<td style="text-align: center;"><strong>Total</strong></td>
<td style="text-align: center;" rowspan="2"><b>Current Total Order :<?php echo $AmendmentPDF[0]->partenttotalorder ?></b></td>
<td style="text-align: center;" rowspan="2"><b>Revised Total Order :<?php echo $AmendmentPDF[0]->TotalOrderValue ?></b></td>
</tr>
<?php } ?>
</tbody>