diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index a56d708e..40536921 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -418,6 +418,9 @@ $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_Material_Supplier', 'Re
$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_Material_Item', 'Report::MM_Item');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_Material_ReceiptValue', 'Report::MM_ReceiptValue');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_purchase', 'Report::purchase');
+$routes->get('report/consolidate_month', 'Report::consolidate_month');
+$routes->get('report/link_purchase', 'Report::link_purchase');
+$routes->get('report/consolidate_year', 'Report::consolidate_year');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_year_wise', 'Report::year_wise');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_supplier', 'Report::purchase_supplier');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_consolidate', 'Report::consolidate');
@@ -429,12 +432,25 @@ $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'cashbookmonthlyexpenses', 'Rep
$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'cashbookyearlyexpenses', 'Report::yearexpenses');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_purchase_inward', 'Report::ipurchase');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_year_wise_inward', 'Report::iyear_wise');
+$routes->get('report/imonth_wise', 'Report::imonth_wise');
+$routes->get('report/iyear_wise_total/(:any)', 'Report::iyear_wise_total/$1');
+$routes->get('report/ilink_purchase', 'Report::ilink_purchase');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_supplier_inward', 'Report::ipurchase_supplier');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_supplier_summary', 'Report::suppliersummary');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_consolidate_inward', 'Report::iconsolidate');
+$routes->get('report/i_consolidate_month', 'Report::i_consolidate_month');
+$routes->get('report/i_consolidate_year', 'Report::i_consolidate_year');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_cumulative_inward', 'Report::icumulative');
+$routes->get('report/icum_day/(:any)/(:any)', 'Report::icum_day/$1/$2');
+$routes->get('report/icum_month/(:any)/(:any)', 'Report::icum_month/$1/$2');
+$routes->get('report/icum_year/(:any)/(:any)', 'Report::icum_year/$1/$2');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_cumulative_raw', 'Report::rawi_cumulative');
+$routes->get('report/rawi_cum_day', 'Report::rawi_cum_day');
+$routes->get('report/rawi_cum_month', 'Report::rawi_cum_month');
+$routes->get('report/rawi_cum_year', 'Report::rawi_cum_year');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_consolidate_category', 'Report::rawi_consolidate');
+$routes->get('report/rawi_consolidate_month', 'Report::rawi_consolidate_month');
+$routes->get('report/rawi_consolidate_year', 'Report::rawi_consolidate_year');
$routes->match(['GET', 'POST'], 'Report_pending_purchase', 'Report::pending_purchase');
$routes->match(['GET', 'POST'], '/Report_pending_purchase', 'Report::pending_purchase');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'Report_purchase_attach', 'Report::iattach');
@@ -547,18 +563,4 @@ $routes->post('updateAbstractDetails','StockController::updateAbstractDetails');
//Reports Module
-$routes->get('allReports','Report::allReports');
-
-// Material Report Links
-$routes->get('MM_Supplier', 'Report::MM_Supplier');
-$routes->get('MM_Item','Report::MM_Item');
-$routes->match(['GET', 'POST'],'MM_ReceiptValue','Report::MM_ReceiptValue');
-
-//Inward Report Links
-$routes->match(['GET', 'POST'],'ipurchase','Report::ipurchase');
-$routes->match(['GET', 'POST'],'iyear_wise', 'Report::iyear_wise');
-$routes->match(['GET', 'POST'],'ipurchase_supplier' , 'Report::ipurchase_supplier');
-$routes->match(['GET', 'POST'],'iconsolidate' , 'Report::iconsolidate');
-$routes->match(['GET', 'POST'],'icumulative' , 'Report::icumulative');
-$routes->match(['GET', 'POST'],'rawi_cumulative' , 'Report::rawi_cumulative');
-$routes->match(['GET', 'POST'],'rawi_consolidate' , 'Report::rawi_consolidate');
\ No newline at end of file
+$routes->get('allReports','Report::allReports');
\ No newline at end of file
diff --git a/app/Controllers/Report.php b/app/Controllers/Report.php
index b2d01671..6575f62f 100755
--- a/app/Controllers/Report.php
+++ b/app/Controllers/Report.php
@@ -284,13 +284,19 @@ class Report extends BaseController
$this->global['pageTitle'] = 'Reports';
//$this->request->getPost('btn_submit');
$cname = $this->request->getPost('client_name');
+ $data['cname'] = $cname;
$prod = $this->request->getPost('item_name');
+ $data['prod'] = $prod;
$ab = $this->request->getPost('financialyear');
+ $data['ab'] = $ab;
$fa = substr((string)$ab, 0, -5);
$aa = substr((string)$ab, 5, 5);
$m = $this->request->getPost('month');
+ $data['m'] = $m;
$frm = $this->request->getPost('from_date');
+ $data['frm'] = $frm;
$t = $this->request->getPost('to_date');
+ $data['t'] = $t;
//print_r($prod);
$data['material'] = $this->dahsboard_Model->material_name();
$data['cust'] = $this->dahsboard_Model->customer_name();
@@ -300,13 +306,19 @@ class Report extends BaseController
$this->global['pageTitle'] = 'Reports';
//$this->request->getPost('btn_submit');
$cname = $this->request->getVar('cname');
+ $data['cname'] = $cname;
$prod = $this->request->getVar('prod');
+ $data['prod'] = $prod;
$ab = $this->request->getVar('ab');
+ $data['ab'] = $ab;
$fa = substr((string)$ab, 0, -5);
$aa = substr((string)$ab, 5, 5);
$m = $this->request->getVar('month');
+ $data['m'] = $m;
$frm = $this->request->getVar('frm');
+ $data['frm'] = $frm;
$t = $this->request->getVar('t');
+ $data['t'] = $t;
$sid = $this->request->getVar('sid');
$mid = $this->request->getVar('mid');
$d = $this->request->getVar('d');
@@ -448,7 +460,9 @@ class Report extends BaseController
$prod = $this->request->getVar('prod');
//$mat = $this->request->getVar('mid');
$m = $this->request->getVar('m');
+ $data['month'] = $m;
$ab = $this->request->getVar('ab');
+ $data['financialyear'] = $ab;
$fa = substr((string)$ab, 0, -5);
$aa = substr((string)$ab, 5, 5);
//print_r($prod);
@@ -471,6 +485,7 @@ class Report extends BaseController
$prod = $this->request->getVar('prod');
//$mat = $this->request->getVar('mid');
$ab = $this->request->getVar('ab');
+ $data['financialyear'] = $ab;
$fa = substr((string)$ab, 0, -5);
$aa = substr((string)$ab, 5, 5);
//print_r($prod);
diff --git a/app/Controllers/User.php b/app/Controllers/User.php
index 2f55a36d..606ef723 100755
--- a/app/Controllers/User.php
+++ b/app/Controllers/User.php
@@ -897,22 +897,22 @@ class User extends BaseController
*/
function userListing()
{
-
- $isDeleted = 0 ; // default showing active data
- $showArchive = 0 ; //
+
+ $isDeleted = 0; // default showing active data
+ $showArchive = 0; //
if ($this->request->getMethod() === 'POST') {
$showArchive = $this->request->getPost('showArchive');
//reversing condition that when user wants deleted data to be shown then we are making active filter 0
- if($showArchive){
- $isDeleted = 1;
- }
- }
+ if ($showArchive) {
+ $isDeleted = 1;
+ }
+ }
$data['showArchive'] = $showArchive;
- // dd($data);
+ // dd($data);
$data['userRecords'] = $this->user_model->userListing($isDeleted);
@@ -1024,7 +1024,7 @@ class User extends BaseController
$password = (string)$this->request->getPost('password');
$Createddt = date('Y-m-d H:i:s');
$email = $this->request->getPost('MailID');
-
+
$userInfo = [
'email' => $email,
'EmpID' => $EmpID,
@@ -1036,7 +1036,7 @@ class User extends BaseController
$result = $this->user_model->addNewUser($userInfo);
-
+
if ($result > 0) {
// return redirect()->to('userListing')->with('success', 'New user created successfully!');
$this->session->setFlashdata('success', 'New user created successfully!');
@@ -1059,25 +1059,25 @@ class User extends BaseController
};
}
- function isEmailExists(){
-
-
+ function isEmailExists()
+ {
+
+
$MailID = $this->request->getPost('MailID');
- $empID = $this->request->getPost('EmpID');
+ $empID = $this->request->getPost('EmpID');
if (!$MailID) {
return $this->response->setJSON(['success' => false, 'message' => 'Mail ID not provided']);
}
- $isEmailExists = $this->user_model->isEmailExists($MailID,$empID);
+ $isEmailExists = $this->user_model->isEmailExists($MailID, $empID);
if ($isEmailExists) {
return $this->response->setJSON(['success' => true, 'message' => 'Email Already Exsiting']);
} else {
return $this->response->setJSON(['success' => false, 'message' => '']);
}
-
}
@@ -1161,7 +1161,7 @@ class User extends BaseController
$userInfo = array();
// $userInfo = array('password' => getHashedPassword($password), 'roleId' => $role, 'EmpId' => $EmpID, 'updatedDtm' => $updatedDate);
- $userInfo = array('roleId' => $role, 'EmpId' => $EmpID, 'updatedDtm' => $updatedDate , 'email'=> $this->request->getPost('MailID'));
+ $userInfo = array('roleId' => $role, 'EmpId' => $EmpID, 'updatedDtm' => $updatedDate, 'email' => $this->request->getPost('MailID'));
$result = $this->user_model->editUser($userInfo, $EmpID);
@@ -1183,16 +1183,16 @@ class User extends BaseController
*/
function deleteUser()
{
-
+
$Uid = $this->request->getGet('UID');
$updatedDate = get_current_date_time();
$updateInfo = array('isDeleted' => 1, 'updatedBy' => $this->vendorId, 'updatedDtm' => $updatedDate);
-
+
$result = $this->user_model->userActivation($Uid, $updateInfo);
- return redirect()->route('userListing');
+ return redirect()->route('userListing');
}
function reActivateUser()
@@ -1208,31 +1208,31 @@ class User extends BaseController
$result = $this->user_model->userActivation($Uid, $updateInfo);
- return redirect()->route('userListing');
+ return redirect()->route('userListing');
}
-
+
function userChangePassword()
{
- helper('form');
+ helper('form');
$userId = $this->request->getPost('userId');
$newPassword = $this->request->getPost('password');
$cNewPassword = $this->request->getPost('cpassword');
if ($newPassword == $cNewPassword) {
- $usersData = array(
- 'password' => getHashedPassword($newPassword),
- 'updatedBy' => $userId,
- 'updatedDtm' => date('Y-m-d H:i:sa')
- );
- $result = $this->user_model->changePassword($userId, $usersData);
- if ($result > 0) {
- $this->session->setFlashdata('success', 'Password updation successful');
- } else {
- $this->session->setFlashdata('error', 'Password updation failed');
- }
+ $usersData = array(
+ 'password' => getHashedPassword($newPassword),
+ 'updatedBy' => $userId,
+ 'updatedDtm' => date('Y-m-d H:i:sa')
+ );
+ $result = $this->user_model->changePassword($userId, $usersData);
+ if ($result > 0) {
+ $this->session->setFlashdata('success', 'Password updation successful');
+ } else {
+ $this->session->setFlashdata('error', 'Password updation failed');
+ }
- return redirect()->route('userListing');
+ return redirect()->route('userListing');
} else {
$this->session->setFlashdata('error', 'New Password and Confirm Password Not Same');
return redirect()->route('userListing');
@@ -1300,10 +1300,12 @@ class User extends BaseController
if ($this->request->getPost('btn_submit')) {
$ab = (string)$this->request->getPost('financialyear');
+ $data['financialyear'] = $ab;
$fa = substr($ab, 0, -5);
$aa = substr($ab, 5, 5);
$m = $this->request->getPost('month');
+ $data['month'] = $m;
$data['fy'] = $this->user_model->fincalYear();
$data['per'] = $this->user_model->deliver_perform($fa, $aa, $m);
@@ -1355,9 +1357,9 @@ class User extends BaseController
function zohobooks_api_fetch_all()
{
-
+
try {
-
+
helper('zohobook');
$Zohobook_model = model('Zohobook_api_model');
if (isset($_GET['from']) && $_GET['from'] != null && isset($_GET['to']) && $_GET['to'] != null) {
@@ -1367,13 +1369,13 @@ class User extends BaseController
$date_today = date('Y-m-d');
$date_yesterday = date('Y-m-d', strtotime('-3 day', strtotime($date_today)));
}
-
+
$chk_acc_token_val = $Zohobook_model->get_data('zohobook_accesstoken', 'id', 1);
-
+
$date = new \DateTime($chk_acc_token_val[0]['created_at']);
-
+
$date->add(new \DateInterval('PT1H'));
-
+
$token = 0;
if ($date->format('Y-m-d H:i:s') > date('Y-m-d H:i:s')) {
$token = $chk_acc_token_val[0]['token'];
@@ -1385,7 +1387,7 @@ class User extends BaseController
// $token = generateNewToken(); $tokendata['token'] = $token;
//$Zohobook_model->update($tokendata , 1,'zohobook_accesstoken');
$result = getheringInvoiceDetails($date_today, $date_yesterday, $token);
-
+
$headers_new = $result['headers_new'];
$res = json_decode($result['data'], true);
$inv_array = $res['invoices'];
@@ -1393,16 +1395,15 @@ class User extends BaseController
$tokenWithCreditNoteScope = generateNewTokenForCreditNoteScope();
$cteditNotesRes = getAllCreditNotes($date_today, $date_yesterday, $tokenWithCreditNoteScope);
-
- $cteditNotesData = json_decode($cteditNotesRes['data'],true);
-
- if(count($cteditNotesData['creditnotes']))
- {
- $this->saveOrUpdateCreditNote($cteditNotesData['creditnotes'] , $tokenWithCreditNoteScope);
+
+ $cteditNotesData = json_decode($cteditNotesRes['data'], true);
+
+ if (count($cteditNotesData['creditnotes'])) {
+ $this->saveOrUpdateCreditNote($cteditNotesData['creditnotes'], $tokenWithCreditNoteScope);
}
// dd($cteditNotesData);
-
-
+
+
foreach ($inv_array as $inv) {
$invoice_id = $inv['invoice_id'];
//filter only einvoice status pushed invoices only
@@ -1419,7 +1420,7 @@ class User extends BaseController
// dd($res2);
foreach ($res2 as $rs) {
-
+
$gst_no = $rs['gst_no'];
$customer_id = $rs['customer_id'];
$customer_name = $rs['customer_name'];
@@ -1440,16 +1441,14 @@ class User extends BaseController
if ($sql_invoice_chk <= 0) {
//this check only for ASHOK LEYLAND LIMITED
- if($customer_id == '3215000000000082604' || $customer_id == '3215000000000082724')
- {
+ if ($customer_id == '3215000000000082604' || $customer_id == '3215000000000082724') {
//this combination of customer_id & gst_no search only for client ASHOK LEYLAND
- $gst_sql = $Zohobook_model->ip_client_ashok_leyland($gst_no,$customer_id);
+ $gst_sql = $Zohobook_model->ip_client_ashok_leyland($gst_no, $customer_id);
if ($gst_sql) {
$client_id = $gst_sql[0]['client_id'];
log_message('error', 'Data fetch success DB : ip_clients , client_id : ' . $client_id);
}
-
- }else{
+ } else {
$gst_sql = $Zohobook_model->ip_clients($gst_no);
if ($gst_sql) {
@@ -1464,13 +1463,12 @@ class User extends BaseController
$client_id = $gst_inserted_id;
log_message('error', 'New Data Created : DB : ip_clients , client_id : ' . $client_id);
}
-
}
-
-
+
+
$characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
@@ -1656,7 +1654,7 @@ class User extends BaseController
$ip_invoice_items['Sgst_item_tax_rate_id'] = $sgsttaxid;
$ip_invoice_items['Cgst_item_tax_rate_id'] = $cgsttaxid;
$ip_invoice_items['hsn_or_sac'] = $hsn_or_sac;
-
+
$item_insert_id = $Zohobook_model->customInsert($ip_invoice_items, 'ip_invoice_items');
if ($item_insert_id)
log_message('error', 'Data insert success DB : ip_invoice_items => Sgst_item_tax_rate_id :' . $sgsttaxid);
@@ -1726,54 +1724,44 @@ class User extends BaseController
}
// END zoho API
- public function saveOrUpdateCreditNote($data , $tokenWithCreditNoteScope )
+ public function saveOrUpdateCreditNote($data, $tokenWithCreditNoteScope)
{
-
+
foreach ($data as $key => $value) {
-
+
$existingCreditNote = $this->CreditNoteModel->where('creditnote_id', $value['creditnote_id'])->first();
-
+
if ($existingCreditNote) {
// Update existing record
- $this->CreditNoteModel->update($value['creditnote_id'], $value);
-
+ $this->CreditNoteModel->update($value['creditnote_id'], $value);
} else {
// Insert new record
- $this->CreditNoteModel->insert($value);
-
+ $this->CreditNoteModel->insert($value);
}
//credit note line item api call
$cteditNotesLineItemsRes = getCreditNotesItemDetails($value['creditnote_id'], $tokenWithCreditNoteScope);
-
- $lineItemData = json_decode($cteditNotesLineItemsRes['data'],true);
- if(count($lineItemData['creditnote']['line_items']))
- {
- foreach ($lineItemData['creditnote']['line_items'] as $itemkey => $itemvalue)
- {
+ $lineItemData = json_decode($cteditNotesLineItemsRes['data'], true);
+
+ if (count($lineItemData['creditnote']['line_items'])) {
+ foreach ($lineItemData['creditnote']['line_items'] as $itemkey => $itemvalue) {
$itemvalue['creditnote_id'] = $value['creditnote_id'];
-
+
$existingCreditNoteItems = $this->CreditNotesItemsModel->where('line_item_id', $itemvalue['line_item_id'])->first();
-
+
if ($existingCreditNoteItems) {
// Update existing record
$this->CreditNotesItemsModel->update($itemvalue['line_item_id'], $itemvalue);
-
} else {
// Insert new record
$this->CreditNotesItemsModel->insert($itemvalue);
-
}
-
-
}
-
}
}
-
}
diff --git a/app/Models/Dashboard_model.php b/app/Models/Dashboard_model.php
index b2a4fcb2..459771d8 100755
--- a/app/Models/Dashboard_model.php
+++ b/app/Models/Dashboard_model.php
@@ -943,33 +943,33 @@ where pm.PODate != 0 ";
where
pm.Status != 'ST030' and pm.Status != 'ST056' and pm.Status != 'ST027'";
- if ($cname != '') {
+ if ($cname != '') {
- $sql .= "and sd.SupplierName = '" . $cname . "'";
- }
+ $sql .= "and sd.SupplierName = '" . $cname . "'";
+ }
- if ($fa and $aa != '') {
+ if ($fa and $aa != '') {
- $sql .= " and (pm.PODate >= '" . $fa . "-04-01' and pm.PODate <= '" . $aa . "-03-31')";
- }
- if ($m != '') {
+ $sql .= " and (pm.PODate >= '" . $fa . "-04-01' and pm.PODate <= '" . $aa . "-03-31')";
+ }
+ if ($m != '') {
- $sql .= "and monthname(pm.PODate) = '" . $m . "'";
- }
+ $sql .= "and monthname(pm.PODate) = '" . $m . "'";
+ }
- if ($frm and $t != '') {
- $fromd = date("Y-m-d", strtotime($frm));
- $tod = date("Y-m-d", strtotime($t));
+ if ($frm and $t != '') {
+ $fromd = date("Y-m-d", strtotime($frm));
+ $tod = date("Y-m-d", strtotime($t));
- $sql .= "and date(pm.PODate) >= '" . $fromd . "'
+ $sql .= "and date(pm.PODate) >= '" . $fromd . "'
and date(pm.PODate) <= '" . $tod . "'";
- }
- if ($prod != '') {
+ }
+ if ($prod != '') {
- $sql .= " and mm.MaterialName = '" . $prod . "' ";
- }
+ $sql .= " and mm.MaterialName = '" . $prod . "' ";
+ }
@@ -2032,7 +2032,8 @@ group by supplier_name,material_name";
$ab = $yearl;
$fa = substr($ab, 0, -5);
$aa = substr($ab, 5, 5);
- $sql = "SELECT year.category as category,year.quantity as quantity,year.total as total,month.mquantity as mquantity,month.mtotal as mtotal,today.tquantity as tquantity,today.ttotal as ttotal
+ $sql = "SELECT cd.ConfigValue as category_id,
+ cd.key, year.category,year.quantity as quantity,year.total as total,month.mquantity as mquantity,month.mtotal as mtotal,today.tquantity as tquantity,today.ttotal as ttotal
FROM (SELECT category,sum(Quantity) as quantity,sum(value) as total
FROM igr
where status != 'ST030' and
@@ -2052,6 +2053,7 @@ where status != 'ST030' and
date(materialrcvddate) = current_date()
group by category
) as today on today.category=month.category
+left join t_configdetails cd on cd.key = year.category
group by category ";
$query = $this->db->query($sql);
return $query->getResult();
@@ -2238,7 +2240,7 @@ where po.Status != 'ST030' and po.Status = 'ST026'
// }
- if($purchaseorder_number != ''){
+ if ($purchaseorder_number != '') {
$sql .= " and po.PONO = '" . $purchaseorder_number . "' ";
}
$sql .= "order by date(po.PODate) desc";
@@ -3044,5 +3046,4 @@ function daybeforetotal($yesterday){
$query = $this->db->query($sql);
return $query->getResult();
}
-
}
\ No newline at end of file
diff --git a/app/Views/Report_Material_Master_ItemWise.php b/app/Views/Report_Material_Master_ItemWise.php
index c0fe1625..557f8db1 100755
--- a/app/Views/Report_Material_Master_ItemWise.php
+++ b/app/Views/Report_Material_Master_ItemWise.php
@@ -1,147 +1,113 @@
-
-
-
-
+
-
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Material Code
- Material Name
- UOM
- Category
- HSNCODE
-
-
-
-
-
-
-
-
- MaterialCode?>
- MaterialName?>
- UOM?>
- Category?>
- HSNCODE?>
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Material Code
+ Material Name
+ UOM
+ Category
+ HSNCODE
+
+
+
+
+
+
+
+ MaterialCode ?>
+ MaterialName ?>
+ UOM ?>
+ Category ?>
+ HSNCODE ?>
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+ });
+
\ No newline at end of file
diff --git a/app/Views/Report_Material_Master_ReceiptValue.php b/app/Views/Report_Material_Master_ReceiptValue.php
index c16e6d0c..af89330c 100755
--- a/app/Views/Report_Material_Master_ReceiptValue.php
+++ b/app/Views/Report_Material_Master_ReceiptValue.php
@@ -1,267 +1,236 @@
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+ // Initialize the DataTable
+ var table = $('#cc').DataTable({
+ dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+ buttons: [
+ 'excel' // Export buttons
+ ],
+ pageLength: 10, // Default rows per page
+ lengthMenu: [
+ [10, 20, 30, 50, -1],
+ [10, 20, 30, 50, "All"]
+ ], // Rows per page options
+ responsive: true, // Responsive table
+ ordering: false,
+ language: {
+ paginate: {
+ next: '
', // Next button icon
+ previous: '
' // Previous button icon
+ },
+ emptyTable: '
Data Not Found!
'
+ }
+ });
+ });
+
\ No newline at end of file
diff --git a/app/Views/Report_Material_Master_SupplierWise.php b/app/Views/Report_Material_Master_SupplierWise.php
index 43a1b8fb..e431761f 100755
--- a/app/Views/Report_Material_Master_SupplierWise.php
+++ b/app/Views/Report_Material_Master_SupplierWise.php
@@ -1,154 +1,119 @@
-
-
-
-
+
-
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Material Date
- Supplier ID
- Supplier Name
- Material Code
- Material Name
- Material Type
- UOM
- HSNCODE
-
-
-
-
-
-
- Material_Date);echo $date->format('d-m-Y');?>
- SupplierID?>
- SupplierName?>
- MaterialCode?>
- MaterialName?>
- MaterialType?>
- UOM?>
- HSNCODE?>
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Material Date
+ Supplier ID
+ Supplier Name
+ Material Code
+ Material Name
+ Material Type
+ UOM
+ HSNCODE
+
+
+
+
+
+
+ Material_Date);
+ echo $date->format('d-m-Y'); ?>
+ SupplierID ?>
+ SupplierName ?>
+ MaterialCode ?>
+ MaterialName ?>
+ MaterialType ?>
+ UOM ?>
+ HSNCODE ?>
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+ });
+
\ No newline at end of file
diff --git a/app/Views/Report_attach_inward.php b/app/Views/Report_attach_inward.php
index 652b5607..e0ff9db2 100755
--- a/app/Views/Report_attach_inward.php
+++ b/app/Views/Report_attach_inward.php
@@ -1,582 +1,606 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SNo
- BillNO
- PONO
- FileName
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
\ No newline at end of file
+ $(document).ready(function() {
+
+
+ // Initialize the DataTable
+ var table = $('#cc').DataTable({
+ dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+ buttons: [
+ 'excel' // Export buttons
+ ],
+ pageLength: 10, // Default rows per page
+ lengthMenu: [
+ [10, 20, 30, 50, -1],
+ [10, 20, 30, 50, "All"]
+ ], // Rows per page options
+ responsive: true, // Responsive table
+ ordering: false,
+ language: {
+ paginate: {
+ next: '
', // Next button icon
+ previous: '
' // Previous button icon
+ },
+ emptyTable: '
Data Not Found!
'
+ }
+ });
+ });
+
\ No newline at end of file
diff --git a/app/Views/Report_consolidate_inward.php b/app/Views/Report_consolidate_inward.php
index d50aed65..c25c141d 100755
--- a/app/Views/Report_consolidate_inward.php
+++ b/app/Views/Report_consolidate_inward.php
@@ -1,737 +1,686 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
">
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Supplier Name
+ Material Name
+ Apr
+ May
+ Jun
+ Jul
+ Aug
+ Sep
+ Oct
+ Nov
+ Dec
+ Jan
+ Feb
+ Mar
+ Total
+
+
+
+
+
+ $result) { ?>
+
+
+ supplier_name; ?>
+
+ material_name)) {
+ echo $result->material_name;
+ } else {
+ echo "-";
+ }
+ ?>
+ April);
+ ?>
+ April); ?>
+
+ May);
+ ?>
+ May); ?>
+
+ June);
+ ?>
+ June); ?>
+
+ July);
+ ?>
+ July); ?>
+
+ August);
+ ?>
+ August); ?>
+
+ September);
+ ?>
+ September); ?>
+
+ October);
+ ?>
+ October); ?>
+
+ November);
+ ?>
+ November); ?>
+
+ December);
+ ?>
+ December); ?>
+
+ January);
+ ?>
+ January); ?>
+
+ February);
+ ?>
+ February); ?>
+
+ March);
+ ?>
+ March); ?>
+
+ qtotal);
+ ?>
+ qtotal); ?>
+
+
+
+
+
+
+
+ Total
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Supplier Name
+ Material Name
+ Apr (₹)
+ May (₹)
+ Jun (₹)
+ Jul (₹)
+ Aug (₹)
+ Sep (₹)
+ Oct (₹)
+ Nov (₹)
+ Dec (₹)
+ Jan (₹)
+ Feb (₹)
+ Mar (₹)
+ Total (₹)
+
+
+
+
+
+ $result) { ?>
+
+
+ supplier_name; ?>
+
+ material_name)) {
+ echo $result->material_name;
+ } else {
+ echo "-";
+ }
+ ?>
+ vApril, 2, '.', '');
+ ?>
+ vApril, 2, '.', ''); ?>
+
+ vMay, 2, '.', '');
+ ?>
+ vMay, 2, '.', ''); ?>
+
+ vJune, 2, '.', '');
+ ?>
+ vJune, 2, '.', ''); ?>
+
+ vJuly, 2, '.', '');
+ ?>
+ vJuly, 2, '.', ''); ?>
+
+ vAugust, 2, '.', '');
+ ?>
+ vAugust, 2, '.', ''); ?>
+
+ vSeptember, 2, '.', '');
+ ?>
+ vSeptember, 2, '.', ''); ?>
+
+ vOctober, 2, '.', '');
+ ?>
+ vOctober, 2, '.', ''); ?>
+
+ vNovember, 2, '.', '');
+ ?>
+ vNovember, 2, '.', ''); ?>
+
+ vDecember, 2, '.', '');
+ ?>
+ vDecember, 2, '.', ''); ?>
+
+ vJanuary, 2, '.', '');
+ ?>
+ vJanuary, 2, '.', ''); ?>
+
+ vFebruary, 2, '.', '');
+ ?>
+ vFebruary, 2, '.', ''); ?>
+
+ vMarch, 2, '.', '');
+ ?>
+ vMarch, 2, '.', ''); ?>
+
+ vtotal, 2, '.', '');
+ ?>
+ vtotal, 2, '.', ''); ?>
+
+
+
+
+
+
+
+ Total
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Supplier Name
- Material Name
- Apr
- May
- Jun
- Jul
- Aug
- Sep
- Oct
- Nov
- Dec
- Jan
- Feb
- Mar
- Total
-
-
-
-
-
- input->post('financialyear');
- foreach ($spurchse as $index=>$result) { ?>
-
-
- supplier_name;?>
-
- material_name)) { echo $result->material_name ; } else {echo "-";}
- ?>
- April);
- ?>
- April);?>
-
- May);
- ?>
- May);?>
-
- June);
- ?>
- June);?>
-
- July);
- ?>
- July);?>
-
- August);
- ?>
- August);?>
-
- September);
- ?>
- September);?>
-
- October);
- ?>
- October);?>
-
- November);
- ?>
- November);?>
-
- December);
- ?>
- December);?>
-
- January);
- ?>
- January);?>
-
- February);
- ?>
- February);?>
-
- March);
- ?>
- March);?>
-
- qtotal);
- ?>
- qtotal);?>
-
-
-
-
-
-
-
- Total
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Supplier Name
- Material Name
- Apr ( )
- May ( )
- Jun ( )
- Jul ( )
- Aug ( )
- Sep ( )
- Oct ( )
- Nov ( )
- Dec ( )
- Jan ( )
- Feb ( )
- Mar ( )
- Total ( )
-
-
-
-
-
- $result) { ?>
-
-
- supplier_name;?>
-
- material_name)) { echo $result->material_name ; } else {echo "-";}
- ?>
- vApril,2,'.','');
- ?>
- vApril,2,'.','');?>
-
- vMay,2,'.','');
- ?>
- vMay,2,'.','');?>
-
- vJune,2,'.','');
- ?>
- vJune,2,'.','');?>
-
- vJuly,2,'.','');
- ?>
- vJuly,2,'.','');?>
-
- vAugust,2,'.','');
- ?>
- vAugust,2,'.','');?>
-
- vSeptember,2,'.','');
- ?>
- vSeptember,2,'.','');?>
-
- vOctober,2,'.','');
- ?>
- vOctober,2,'.','');?>
-
- vNovember,2,'.','');
- ?>
- vNovember,2,'.','');?>
-
- vDecember,2,'.','');
- ?>
- vDecember,2,'.','');?>
-
- vJanuary,2,'.','');
- ?>
- vJanuary,2,'.','');?>
-
- vFebruary,2,'.','');
- ?>
- vFebruary,2,'.','');?>
-
- vMarch,2,'.','');
- ?>
- vMarch,2,'.','');?>
-
- vtotal,2,'.','');
- ?>
- vtotal,2,'.','');?>
-
-
-
-
-
-
-
- Total
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/Views/Report_consolidate_m.php b/app/Views/Report_consolidate_m.php
index 28bc1ca3..da36ed6b 100755
--- a/app/Views/Report_consolidate_m.php
+++ b/app/Views/Report_consolidate_m.php
@@ -1,231 +1,218 @@
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Supplier Name
- Material Name
-
-
-
- Quantity
- Value (₹)
-
-
-
-
-
- input->get('ab');
- $month=date('F');
- $m = $this->input->get('m');
- //echo $month;
- foreach($spurchse as $rel)
- {
- ?>
-
-
-
- supplier_name;?>
-
- material_name;?>
- quantity);
- echo round($rel->quantity);?>
- total,2,'.','');
- echo number_format($rel->total,2,'.','');?>
-
-
-
-
-
-
-
- Total
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Supplier Name
+ Material Name
+
+
+
+ Quantity
+ Value (₹)
+
+
+
+
+
+
+
+
+
+ supplier_name; ?>
+
+ material_name; ?>
+ quantity);
+ echo round($rel->quantity); ?>
+ total, 2, '.', '');
+ echo number_format($rel->total, 2, '.', ''); ?>
+
+
+
+
+
+
+
+ Total
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
\ No newline at end of file
+ }
+ }
+
\ No newline at end of file
diff --git a/app/Views/Report_consolidate_month.php b/app/Views/Report_consolidate_month.php
index 0cbf0d49..c597d03f 100755
--- a/app/Views/Report_consolidate_month.php
+++ b/app/Views/Report_consolidate_month.php
@@ -1,239 +1,208 @@
-
-
- }
- .btn-success {
- background-color: #00d976;;
- border-color: #00d976;;
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Category
- Supplier Name
- Material Name
-
-
-
- Quantity
- Value (₹)
-
-
-
-
-
- input->get('ab');
- $month=date('F');
- $m = $this->input->get('m');
- //echo $month;
- foreach($spurchse as $rel)
- {
- ?>
-
-
- category;?>
-
-
- supplier_name;?>
-
- material_name;?>
- quantity);
- echo round($rel->quantity);?>
- total,2,'.','');
- echo number_format($rel->total,2,'.','');?>
-
-
-
-
-
-
-
- Total
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ Report
+ Inward
+
+ Consolidate Category-Wise
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Category
+ Supplier Name
+ Material Name
+
+
+
+ Quantity
+ Value (₹)
+
+
+
+
+
+
+
+
+ category; ?>
+
+
+ supplier_name; ?>
+
+ material_name; ?>
+ quantity);
+ echo round($rel->quantity); ?>
+ total, 2, '.', '');
+ echo number_format($rel->total, 2, '.', ''); ?>
+
+
+
+
+
+
+
+ Total
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+// "footerCallback": function ( row, data, start, end, display ) {
+// var api = this.api(), data;
-
-
-
-
\ No newline at end of file
+// // Remove the formatting to get integer data for summation
+// var intVal = function ( i ) {
+// return typeof i === 'string' ?
+// parseFloat(i.replace(/[^0.00-9.00]+/g,"")*1) :
+// typeof i === 'number' ?
+// parseFloat(i) : 0;
+// };
+
+// TotalQTY = api
+// .column( 3, { search:'applied' } )
+// .data()
+// .reduce( function (a, b) {
+// return intVal(a) + intVal(b);
+// }, 0 );
+
+// $( api.column( 3 ).footer() ).html( TotalQTY.toFixed().bold() );
+
+// TotalVALUE = api
+// .column( 4, { search:'applied' } )
+// .data()
+// .reduce( function (a, b) {
+// return intVal(a) + intVal(b);
+// }, 0 );
+
+// $( api.column( 4 ).footer() ).html( TotalVALUE.toFixed(2).bold() );
+
+
+// }
+
\ No newline at end of file
diff --git a/app/Views/Report_consolidate_month_inward.php b/app/Views/Report_consolidate_month_inward.php
index 2c932fa2..159ad76f 100755
--- a/app/Views/Report_consolidate_month_inward.php
+++ b/app/Views/Report_consolidate_month_inward.php
@@ -1,232 +1,178 @@
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Supplier Name
- Material Name
-
-
-
- Quantity
- Value (₹)
-
-
-
-
-
- input->get('ab');
- $month=date('F');
- $m = $this->input->get('m');
- //echo $month;
- foreach($spurchse as $rel)
- {
- ?>
-
-
-
- supplier_name;?>
-
- material_name;?>
- quantity);
- echo round($rel->quantity);?>
- total,2,'.','');
- echo number_format($rel->total,2,'.','');?>
-
-
-
-
-
-
-
- Total
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Supplier Name
+ Material Name
+
+
+
+ Quantity
+ Value (₹)
+
+
+
+
+
+
+
+
+
+ supplier_name; ?>
+
+ material_name; ?>
+ quantity);
+ echo round($rel->quantity); ?>
+ total, 2, '.', '');
+ echo number_format($rel->total, 2, '.', ''); ?>
+
+
+
+
+
+
+
+ Total
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+ // Initialize the DataTable
+ var table = $('#cc').DataTable({
+ dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+ buttons: [
+ 'excel' // Export buttons
+ ],
+ pageLength: 10, // Default rows per page
+ lengthMenu: [
+ [10, 20, 30, 50, -1],
+ [10, 20, 30, 50, "All"]
+ ], // Rows per page options
+ responsive: true, // Responsive table
+ ordering: false,
+ language: {
+ paginate: {
+ next: '
', // Next button icon
+ previous: '
' // Previous button icon
+ },
+ emptyTable: '
Data Not Found!
'
+ }
+ });
+ });
+
\ No newline at end of file
diff --git a/app/Views/Report_consolidate_raw.php b/app/Views/Report_consolidate_raw.php
index 611be826..9299fdec 100755
--- a/app/Views/Report_consolidate_raw.php
+++ b/app/Views/Report_consolidate_raw.php
@@ -1,700 +1,681 @@
-
-
+
+
+$qapr = 0;
+$qmay = 0;
+$qjun = 0;
+$qjul = 0;
+$qaug = 0;
+$qsep = 0;
+$qoct = 0;
+$qnov = 0;
+$qdec = 0;
+$qjan = 0;
+$qfeb = 0;
+$qmar = 0;
+$qtot = 0;
+$vapr = 0;
+$vmay = 0;
+$vjun = 0;
+$vjul = 0;
+$vaug = 0;
+$vsep = 0;
+$voct = 0;
+$vnov = 0;
+$vdec = 0;
+$vjan = 0;
+$vfeb = 0;
+$vmar = 0;
+$vtot = 0;
+?>
-
-table.dataTable thead > tr > th.sorting_asc,
-table.dataTable thead > tr > th.sorting_desc,
-table.dataTable thead > tr > th.sorting,
-table.dataTable thead > tr > td.sorting_asc,
-table.dataTable thead > tr > td.sorting_desc,
-table.dataTable thead > tr > td.sorting {
- padding-right: inherit;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
diff --git a/app/Views/Report_consolidate_y.php b/app/Views/Report_consolidate_y.php
index 0a42bb12..af8ce618 100755
--- a/app/Views/Report_consolidate_y.php
+++ b/app/Views/Report_consolidate_y.php
@@ -1,231 +1,215 @@
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Supplier Name
- Material Name
-
-
-
- Quantity
- Value (₹)
-
-
-
-
-
- input->get('ab');
-
- $month=date('F');
- //echo $month;
- foreach($spurchse as $rel)
- {
- ?>
-
-
-
- supplier_name;?>
-
-
- material_name;?>
- quantity);
- echo round($rel->quantity);?>
- total,2,'.','');
- echo number_format($rel->total,2,'.','');?>
-
-
-
-
-
-
-
- Total
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ .dataTables_filter input {
+ padding: 4px;
+ }
+
+ .dataTables_filter {
+ /* width: 50%; */
+ float: right;
+ text-align: right;
+ }
+
+ .dataTables_paginate {
+ width: 50%;
+ float: right;
+ text-align: right;
+ }
+
+ div.dt-buttons {
+ position: relative;
+ /* float: right; */
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Supplier Name
+ Material Name
+
+
+
+ Quantity
+ Value (₹)
+
+
+
+
+
+
+
+
+
+ supplier_name; ?>
+
+ material_name; ?>
+ quantity);
+ echo round($rel->quantity); ?>
+ total, 2, '.', '');
+ echo number_format($rel->total, 2, '.', ''); ?>
+
+
+
+
+
+
+
+ Total
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
\ No newline at end of file
+ }
+ }
+
\ No newline at end of file
diff --git a/app/Views/Report_consolidate_year.php b/app/Views/Report_consolidate_year.php
index 84104ae7..ba56771b 100755
--- a/app/Views/Report_consolidate_year.php
+++ b/app/Views/Report_consolidate_year.php
@@ -1,249 +1,207 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Report
+ Inward
+
+ Consolidate Category-Wise
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Category
- Supplier Name
- Material Name
-
-
-
- Quantity
- Value (₹)
-
-
-
-
-
- input->get('ab');
-
- $month=date('F');
- //echo $month;
- foreach($spurchse as $rel)
- {
- ?>
-
-
- category;?>
-
-
- supplier_name;?>
-
-
- material_name;?>
- quantity);
- echo round($rel->quantity);?>
- total,2,'.','');
- echo number_format($rel->total,2,'.','');?>
-
-
-
-
-
-
-
- Total
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ Category
+ Supplier Name
+ Material Name
+
+
+
+ Quantity
+ Value (₹)
+
+
+
+
+
+
+
+
+ category; ?>
+
+
+ supplier_name; ?>
+
+
+ material_name; ?>
+ quantity);
+ echo round($rel->quantity); ?>
+ total, 2, '.', '');
+ echo number_format($rel->total, 2, '.', ''); ?>
+
+
+
+
+
+
+
+ Total
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/Views/Report_consolidate_year_inward.php b/app/Views/Report_consolidate_year_inward.php
index cff6d1ce..e310c3f3 100755
--- a/app/Views/Report_consolidate_year_inward.php
+++ b/app/Views/Report_consolidate_year_inward.php
@@ -1,233 +1,183 @@
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Supplier Name
- Material Name
-
-
-
- Quantity
- Value (₹)
-
-
-
-
-
- input->get('ab');
- $month=date('F');
- $m = $this->input->get('m');
- //echo $month;
- foreach($spurchse as $rel)
- {
- ?>
-
-
-
- supplier_name;?>
-
- material_name;?>
- quantity);
- echo round($rel->quantity);?>
- total,2,'.','');
- echo number_format($rel->total,2,'.','');?>
-
-
-
-
-
-
-
- Total
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Supplier Name
+ Material Name
+
+
+
+ Quantity
+ Value (₹)
+
+
+
+
+
+
+
+
+
+ supplier_name; ?>
+
+ material_name; ?>
+ quantity);
+ echo round($rel->quantity); ?>
+ total, 2, '.', '');
+ echo number_format($rel->total, 2, '.', ''); ?>
+
+
+
+
+
+
+
+ Total
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+ // Initialize the DataTable
+ var table = $('#cc').DataTable({
+ dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+ buttons: [
+ 'excel' // Export buttons
+ ],
+ pageLength: 10, // Default rows per page
+ lengthMenu: [
+ [10, 20, 30, 50, -1],
+ [10, 20, 30, 50, "All"]
+ ], // Rows per page options
+ responsive: true, // Responsive table
+ ordering: false,
+ language: {
+ paginate: {
+ next: '
', // Next button icon
+ previous: '
' // Previous button icon
+ },
+ emptyTable: '
Data Not Found!
'
+ }
+ });
+ });
+
\ No newline at end of file
diff --git a/app/Views/Report_cumulative_day_inward.php b/app/Views/Report_cumulative_day_inward.php
index 1ad032d5..8db34487 100755
--- a/app/Views/Report_cumulative_day_inward.php
+++ b/app/Views/Report_cumulative_day_inward.php
@@ -1,149 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Report
+ Inward
+
+ Cumulative Month ()
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Supplier Name
- Material Name
-
-
-
- Quantity
- Value (₹)
-
-
-
-
-
-
-
-
- supplier_name;?>
-
- material_name;?>
- tquantity);
- echo round($rel->tquantity);?>
- ttotal,2,'.','');
- echo number_format($rel->ttotal,2,'.','');?>
-
-
-
-
-
-
-
- Total
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Supplier Name
+ Material Name
+
+
+
+ Quantity
+ Value (₹)
+
+
+
+
+
+
+
+
+ supplier_name; ?>
+
+ material_name; ?>
+ tquantity);
+ echo round($rel->tquantity); ?>
+ ttotal, 2, '.', '');
+ echo number_format($rel->ttotal, 2, '.', ''); ?>
+
+
+
+
+
+
+
+ Total
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
@@ -152,78 +134,32 @@ if(!empty($mms))
+
+
-
-
-
\ No newline at end of file
+ }
+ });
+ });
+
\ No newline at end of file
diff --git a/app/Views/Report_cumulative_day_raw.php b/app/Views/Report_cumulative_day_raw.php
index 6d8dbe63..f049c331 100755
--- a/app/Views/Report_cumulative_day_raw.php
+++ b/app/Views/Report_cumulative_day_raw.php
@@ -1,151 +1,140 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Report
+ Inward
+
+ Cumulative-Category-Wise()
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Category
- Supplier Name
- Material Name
-
-
-
- Quantity
- Value (₹)
-
-
-
-
-
-
-
- category;?>
-
- supplier_name;?>
-
- material_name;?>
- tquantity);
- echo round($rel->tquantity);?>
- ttotal,2,'.','');
- echo number_format($rel->ttotal,2,'.','');?>
-
-
-
-
-
-
-
- Total
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Category
+ Supplier Name
+ Material Name
+
+
+
+ Quantity
+ Value (₹)
+
+
+
+
+
+
+
+ category; ?>
+
+ supplier_name; ?>
+
+ material_name; ?>
+ tquantity);
+ echo round($rel->tquantity); ?>
+ ttotal, 2, '.', '');
+ echo number_format($rel->ttotal, 2, '.', ''); ?>
+
+
+
+
+
+
+
+ Total
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
@@ -154,78 +143,32 @@
+
+
-
-
-
\ No newline at end of file
+ }
+ });
+ });
+
\ No newline at end of file
diff --git a/app/Views/Report_cumulative_inward.php b/app/Views/Report_cumulative_inward.php
index 8ef2ce04..a0e1beac 100755
--- a/app/Views/Report_cumulative_inward.php
+++ b/app/Views/Report_cumulative_inward.php
@@ -1,233 +1,205 @@
-
-
+
+
= 4) {
+ $yearl = date('Y') . '-' . (date('Y') + 1);
+} else {
+ $yearl = (date('Y') - 1) . '-' . date('Y');
}
?>
+
+
+
+
+
+
+
+
+
+
+
+ Report
+ Inward
+
+ Cumulative ( )
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- = 4) {
- $yearl = date('Y').'-'.(date('Y')+1);
- } else {
- $yearl = (date('Y')-1).'-'.date('Y');
- }
- $ab=$yearl;
- ?>
- Supplier Name
- Material Name
-
-
-
-
-
- Quantity
- Value ( )
- Quantity
- Value ( )
- Quantity
- Value ( )
-
-
-
-
- = 4) {
- $yearl = date('Y').'-'.(date('Y')+1);
- } else {
- $yearl = (date('Y')-1).'-'.date('Y');
- }
- $ab=$yearl;
-
- foreach($cum as $index=>$rel)
- {
- ?>
-
-
- supplier_name;?>
-
- material_name;?>
- tquantity);
- echo anchor('report/icum_day/'.$rel->sid . '/' . $rel->mid,round($rel->tquantity));?>
- ttotal,2,'.','');
- echo anchor('report/icum_day/'.$rel->sid . '/' . $rel->mid,number_format($rel->ttotal,2,'.',''));?>
- mquantity);
- echo anchor('report/icum_month/'.$rel->sid . '/' . $rel->mid,round($rel->mquantity));?>
- mtotal,2,'.','');
- echo anchor('report/icum_month/'.$rel->sid . '/' . $rel->mid,number_format($rel->mtotal,2,'.',''));?>
- quantity);
- echo anchor('report/icum_year/'.$rel->sid . '/' . $rel->mid,round($rel->quantity));?>
- total,2,'.','');
- echo anchor('report/icum_year/'.$rel->sid . '/' . $rel->mid,number_format($rel->total,2,'.',''));?>
-
-
-
-
-
-
-
-
- Total
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ = 4) {
+ $yearl = date('Y') . '-' . (date('Y') + 1);
+ } else {
+ $yearl = (date('Y') - 1) . '-' . date('Y');
+ }
+ $ab = $yearl;
+ ?>
+ Supplier Name
+ Material Name
+
+
+
+
+
+ Quantity
+ Value (₹)
+ Quantity
+ Value (₹)
+ Quantity
+ Value (₹)
+
+
+
+
+ = 4) {
+ $yearl = date('Y') . '-' . (date('Y') + 1);
+ } else {
+ $yearl = (date('Y') - 1) . '-' . date('Y');
+ }
+ $ab = $yearl;
+
+ foreach ($cum as $index => $rel) {
+ ?>
+
+
+ supplier_name; ?>
+
+ material_name; ?>
+ tquantity);
+ echo anchor('report/icum_day/' . $rel->sid . '/' . $rel->mid, round($rel->tquantity)); ?>
+ ttotal, 2, '.', '');
+ echo anchor('report/icum_day/' . $rel->sid . '/' . $rel->mid, number_format($rel->ttotal, 2, '.', '')); ?>
+ mquantity);
+ echo anchor('report/icum_month/' . $rel->sid . '/' . $rel->mid, round($rel->mquantity)); ?>
+ mtotal, 2, '.', '');
+ echo anchor('report/icum_month/' . $rel->sid . '/' . $rel->mid, number_format($rel->mtotal, 2, '.', '')); ?>
+ quantity);
+ echo anchor('report/icum_year/' . $rel->sid . '/' . $rel->mid, round($rel->quantity)); ?>
+ total, 2, '.', '');
+ echo anchor('report/icum_year/' . $rel->sid . '/' . $rel->mid, number_format($rel->total, 2, '.', '')); ?>
+
+
+
+
+
+
+
+
+ Total
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
@@ -236,155 +208,207 @@ if(!empty($mms))
+
+
-
-
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/app/Views/Report_cumulative_month_inward.php b/app/Views/Report_cumulative_month_inward.php
index 5adb549b..6a12d364 100755
--- a/app/Views/Report_cumulative_month_inward.php
+++ b/app/Views/Report_cumulative_month_inward.php
@@ -1,145 +1,136 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+ Report
+ Inward
+
+ Cumulative Month ()
+
+
+
- }
- .btn-success {
- background-color: #00d976;;
- border-color: #00d976;;
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Supplier Name
- Material Name
-
-
-
- Quantity
- Value (₹)
-
-
-
-
- = 4) {
- $yearl = date('Y').'-'.(date('Y')+1);
- } else {
- $yearl = (date('Y')-1).'-'.date('Y');
- }
- $ab=$yearl;
- $month=date('F');
- //echo $month;
- foreach($cum_month as $rel)
- {
- ?>
-
-
- supplier_name;?>
-
- material_name;?>
- tquantity);
- echo round($rel->tquantity);?>
- ttotal,2,'.','');
- echo number_format($rel->ttotal,2,'.','');?>
-
-
-
-
-
-
-
- Total
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Supplier Name
+ Material Name
+
+
+
+ Quantity
+ Value (₹)
+
+
+
+
+ = 4) {
+ $yearl = date('Y') . '-' . (date('Y') + 1);
+ } else {
+ $yearl = (date('Y') - 1) . '-' . date('Y');
+ }
+ $ab = $yearl;
+ $month = date('F');
+ //echo $month;
+ foreach ($cum_month as $rel) {
+ ?>
+
+
+ supplier_name; ?>
+
+ material_name; ?>
+ tquantity);
+ echo round($rel->tquantity); ?>
+ ttotal, 2, '.', '');
+ echo number_format($rel->ttotal, 2, '.', ''); ?>
+
+
+
+
+
+
+
+ Total
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
@@ -148,81 +139,31 @@
+
+
-
-
-
\ No newline at end of file
+ $.fn.dataTable.moment('DD-MM-YYYY');
+ // Initialize the DataTable
+ var table = $('#cc').DataTable({
+ dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+ buttons: [
+ 'excel' // Export buttons
+ ],
+ pageLength: 10, // Default rows per page
+ lengthMenu: [
+ [10, 20, 30, 50, -1],
+ [10, 20, 30, 50, "All"]
+ ], // Rows per page options
+ responsive: true, // Responsive table
+ ordering: false,
+ language: {
+ paginate: {
+ next: '
', // Next button icon
+ previous: '
' // Previous button icon
+ },
+ emptyTable: '
Data Not Found!
'
+ }
+ });
+ });
+
\ No newline at end of file
diff --git a/app/Views/Report_cumulative_month_raw.php b/app/Views/Report_cumulative_month_raw.php
index 18f27430..9bd3fbef 100755
--- a/app/Views/Report_cumulative_month_raw.php
+++ b/app/Views/Report_cumulative_month_raw.php
@@ -1,157 +1,145 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Report
+ Inward
+
+ Cumulative Month-Category-Wise()
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Category
- Supplier Name
- Material Name
-
-
-
- Quantity
- Value (₹)
-
-
-
-
- = 4) {
- $yearl = date('Y').'-'.(date('Y')+1);
- } else {
- $yearl = (date('Y')-1).'-'.date('Y');
- }
- $ab=$yearl;
- $month=date('F');
- //echo $month;
- foreach($cum_month as $rel)
- {
- ?>
-
- category;?>
-
- supplier_name;?>
-
- material_name;?>
- tquantity);
- echo round($rel->tquantity);?>
- ttotal,2,'.','');
- echo number_format($rel->ttotal,2,'.','');?>
-
-
-
-
-
-
-
- Total
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Category
+ Supplier Name
+ Material Name
+
+
+
+ Quantity
+ Value (₹)
+
+
+
+
+ = 4) {
+ $yearl = date('Y') . '-' . (date('Y') + 1);
+ } else {
+ $yearl = (date('Y') - 1) . '-' . date('Y');
+ }
+ $ab = $yearl;
+ $month = date('F');
+ //echo $month;
+ foreach ($cum_month as $rel) {
+ ?>
+
+ category; ?>
+
+ supplier_name; ?>
+
+ material_name; ?>
+ tquantity);
+ echo round($rel->tquantity); ?>
+ ttotal, 2, '.', '');
+ echo number_format($rel->ttotal, 2, '.', ''); ?>
+
+
+
+
+
+
+
+ Total
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
@@ -160,78 +148,64 @@
+
+
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/Views/Report_cumulative_raw.php b/app/Views/Report_cumulative_raw.php
index 60bfe74b..cf2bf7d1 100755
--- a/app/Views/Report_cumulative_raw.php
+++ b/app/Views/Report_cumulative_raw.php
@@ -1,241 +1,221 @@
-
-
+
= 4) {
+ $yearl = date('Y') . '-' . (date('Y') + 1);
+} else {
+ $yearl = (date('Y') - 1) . '-' . date('Y');
}
+
?>
+
+
+
+
+
+
+
+
+
+
+
+
+ Report
+ Inward
+
+ Cumulative-Category-Wise ()
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- = 4) {
- $yearl = date('Y').'-'.(date('Y')+1);
- } else {
- $yearl = (date('Y')-1).'-'.date('Y');
- }
- $ab=$yearl;
- ?>
- Category
-
-
-
-
-
- Quantity
- Value ( )
- Quantity
- Value ( )
- Quantity
- Value ( )
-
-
-
-
- = 4) {
- $yearl = date('Y').'-'.(date('Y')+1);
- } else {
- $yearl = (date('Y')-1).'-'.date('Y');
- }
- $ab=$yearl;
-
-
- foreach($cum as $index=>$rel)
- {
- $cat = $rel->category;
- ?>
-
-
-
- category;?>
-
-
- tquantity);
- ?>
- tquantity);?>
-
- ttotal,2,'.','');
- ?>
- ttotal,2,'.','');?>
-
- mquantity);
- ?>
- mquantity);?>
-
- mtotal,2,'.','');
- ?>
- mtotal,2,'.','');?>
-
- quantity);
- ?>
- quantity);?>
-
- total,2,'.','');
- ?>
- total,2,'.','');?>
-
-
-
-
-
-
-
-
-
- Total
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ = 4) {
+ $yearl = date('Y') . '-' . (date('Y') + 1);
+ } else {
+ $yearl = (date('Y') - 1) . '-' . date('Y');
+ }
+ $ab = $yearl;
+ ?>
+ Category
+
+
+
+
+
+ Quantity
+ Value (₹)
+ Quantity
+ Value (₹)
+ Quantity
+ Value (₹)
+
+
+
+
+ = 4) {
+ $yearl = date('Y') . '-' . (date('Y') + 1);
+ } else {
+ $yearl = (date('Y') - 1) . '-' . date('Y');
+ }
+ $ab = $yearl;
+
+
+ foreach ($cum as $index => $rel) {
+ $cat = $rel->category;
+ ?>
+
+
+
+ category; ?>
+
+
+ tquantity);
+ ?>
+ tquantity); ?>
+
+ ttotal, 2, '.', '');
+ ?>
+ ttotal, 2, '.', ''); ?>
+
+ mquantity);
+ ?>
+ mquantity); ?>
+
+ mtotal, 2, '.', '');
+ ?>
+ mtotal, 2, '.', ''); ?>
+
+ quantity);
+ ?>
+ quantity); ?>
+
+ total, 2, '.', '');
+ ?>
+ total, 2, '.', ''); ?>
+
+
+
+
+
+
+
+
+
+ Total
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
@@ -244,58 +224,37 @@ if(!empty($mms))
+
+
+
\ No newline at end of file
diff --git a/app/Views/Report_cumulative_year_inward.php b/app/Views/Report_cumulative_year_inward.php
index a52bce32..80f034bc 100755
--- a/app/Views/Report_cumulative_year_inward.php
+++ b/app/Views/Report_cumulative_year_inward.php
@@ -1,250 +1,215 @@
-
-
+
= 4) {
+ $yearl = date('Y') . '-' . (date('Y') + 1);
+} else {
+ $yearl = (date('Y') - 1) . '-' . date('Y');
}
+$yearl;
?>
+
+
+
+
+
+
+
+
+
+
+
+
+ Report
+ Inward
+
+ Cumulative Year ()
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- = 4) {
- $yearl = date('Y').'-'.(date('Y')+1);
- } else {
- $yearl = (date('Y')-1).'-'.date('Y');
- }
- $ab=$yearl;
- ?>
- Supplier Name
- Material Name
-
-
-
- Quantity
- Value ( )
-
-
-
-
-
- = 4) {
- $yearl = date('Y').'-'.(date('Y')+1);
- } else {
- $yearl = (date('Y')-1).'-'.date('Y');
- }
- $ab=$yearl;
- foreach($cum_year as $rel)
- {
- ?>
-
-
- supplier_name;?>
-
- material_name;?>
- tquantity);
- echo round($rel->tquantity);?>
- ttotal,2,'.','');
- echo number_format($rel->ttotal,2,'.','');?>
-
-
-
-
-
-
-
- Total
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ = 4) {
+ $yearl = date('Y') . '-' . (date('Y') + 1);
+ } else {
+ $yearl = (date('Y') - 1) . '-' . date('Y');
+ }
+ $ab = $yearl;
+ ?>
+ Supplier Name
+ Material Name
+
+
+
+ Quantity
+ Value (₹)
+
+
+
+
+
+ = 4) {
+ $yearl = date('Y') . '-' . (date('Y') + 1);
+ } else {
+ $yearl = (date('Y') - 1) . '-' . date('Y');
+ }
+ $ab = $yearl;
+ foreach ($cum_year as $rel) {
+ ?>
+
+
+ supplier_name; ?>
+
+ material_name; ?>
+ tquantity);
+ echo round($rel->tquantity); ?>
+ ttotal, 2, '.', '');
+ echo number_format($rel->ttotal, 2, '.', ''); ?>
+
+
+
+
+
+
+
+ Total
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/Views/Report_cumulative_year_raw.php b/app/Views/Report_cumulative_year_raw.php
index aea8f26b..dbeee1bd 100755
--- a/app/Views/Report_cumulative_year_raw.php
+++ b/app/Views/Report_cumulative_year_raw.php
@@ -1,253 +1,223 @@
+
+= 4) {
+ $yearl = date('Y') . '-' . (date('Y') + 1);
+} else {
+ $yearl = (date('Y') - 1) . '-' . date('Y');
+}
+$yearl;
+?>
+
+
+
+
+
+
+
+
+
+
+
+
+ Report
+ Inward
+
+ Cumulative Year-Category-Wise ()
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- = 4) {
- $yearl = date('Y').'-'.(date('Y')+1);
- } else {
- $yearl = (date('Y')-1).'-'.date('Y');
- }
- $ab=$yearl;
- ?>
- Category
- Supplier Name
- Material Name
-
-
-
- Quantity
- Value ( ₹ )
-
-
-
-
-
- = 4) {
- $yearl = date('Y').'-'.(date('Y')+1);
- } else {
- $yearl = (date('Y')-1).'-'.date('Y');
- }
- $ab=$yearl;
- foreach($cum_year as $rel)
- {
- ?>
-
- category;?>
-
- supplier_name;?>
-
- material_name;?>
- tquantity);
- echo round($rel->tquantity);?>
- ttotal,2,'.','');
- echo number_format($rel->ttotal,2,'.','');?>
-
-
-
-
-
-
-
- Total
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ = 4) {
+ $yearl = date('Y') . '-' . (date('Y') + 1);
+ } else {
+ $yearl = (date('Y') - 1) . '-' . date('Y');
+ }
+ $ab = $yearl;
+ ?>
+ Category
+ Supplier Name
+ Material Name
+
+
+
+ Quantity
+ Value (₹)
+
+
+
+
+
+ = 4) {
+ $yearl = date('Y') . '-' . (date('Y') + 1);
+ } else {
+ $yearl = (date('Y') - 1) . '-' . date('Y');
+ }
+ $ab = $yearl;
+ foreach ($cum_year as $rel) {
+ ?>
+
+ category; ?>
+
+ supplier_name; ?>
+
+ material_name; ?>
+ tquantity);
+ echo round($rel->tquantity); ?>
+ ttotal, 2, '.', '');
+ echo number_format($rel->ttotal, 2, '.', ''); ?>
+
+
+
+
+
+
+
+ Total
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+ $.fn.dataTable.moment('DD-MM-YYYY');
+ // Initialize the DataTable
+ var table = $('#cc').DataTable({
+ dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+ buttons: [
+ 'excel' // Export buttons
+ ],
+ pageLength: 10, // Default rows per page
+ lengthMenu: [
+ [10, 20, 30, 50, -1],
+ [10, 20, 30, 50, "All"]
+ ], // Rows per page options
+ responsive: true, // Responsive table
+ ordering: false,
+ language: {
+ paginate: {
+ next: '
', // Next button icon
+ previous: '
' // Previous button icon
+ },
+ emptyTable: '
Data Not Found!
'
+ }
+ });
+ });
+
+
-
-
-
\ No newline at end of file
+ // $( api.column( 3 ).footer() ).html( TotalVALUE.toFixed(2).bold() );
+
\ No newline at end of file
diff --git a/app/Views/Report_month_wise_inward.php b/app/Views/Report_month_wise_inward.php
index 8c3c8994..3fef32de 100755
--- a/app/Views/Report_month_wise_inward.php
+++ b/app/Views/Report_month_wise_inward.php
@@ -1,252 +1,190 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Supplier Name
- Material Name
- Quantity
- Total Value (₹)
-
-
-
-
- input->get('ab');
- $last = $this->input->get('dat');
- $new = date("F", strtotime($last)) . "\n";
- foreach ($month as $rel) {
- ?>
-
-
- supplier_name; ?>
-
- material_name; ?>
- quantity);
- echo round($rel->quantity); ?>
- total, 2, '.', '');
- echo number_format($rel->total, 2, '.', ''); ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+ Supplier Name
+ Material Name
+ Quantity
+ Total Value (₹)
+
+
+
+
+
+
+ supplier_name; ?>
+
+ material_name; ?>
+ quantity);
+ echo round($rel->quantity); ?>
+ total, 2, '.', '');
+ echo number_format($rel->total, 2, '.', ''); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/Views/Report_purchase_inward.php b/app/Views/Report_purchase_inward.php
index b6891477..78cc0849 100755
--- a/app/Views/Report_purchase_inward.php
+++ b/app/Views/Report_purchase_inward.php
@@ -1,820 +1,435 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SNo
- BillNO
- PONO
- FileName
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
+ });
+ });
+
\ No newline at end of file
diff --git a/app/Views/Report_supplier_inward.php b/app/Views/Report_supplier_inward.php
index 6478c8a3..2df2f81a 100755
--- a/app/Views/Report_supplier_inward.php
+++ b/app/Views/Report_supplier_inward.php
@@ -1,420 +1,314 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+ Report
+ Inward
+
+ Supplier-Wise
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Supplier Name
- PO Count
- Quantity
- Value (₹)
-
-
-
-
-
- input->post('financialyear');
- $month=$this->input->post('month');
- $frm = $this->input->post('from_date');
- $t = $this->input->post('to_date');
- foreach($spurchse as $rel)
- {
- ?>
-
-
- supplier_name;?>
-
- counts);
- echo round($rel->counts);?>
- quantity);
- echo round($rel->quantity);?>
- value;
- echo number_format($rel->value,2,'.','');?>
-
-
-
-
-
-
-
-
-
- Total
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Supplier Name
+ PO Count
+ Quantity
+ Value (₹)
+
+
+
+
+
+
+ supplier_name; ?>
+
+ counts);
+ echo round($rel->counts); ?>
+ quantity);
+ echo round($rel->quantity); ?>
+ value;
+ echo number_format($rel->value, 2, '.', ''); ?>
+
+
+
+
+
+
+
+
+
+ Total
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+ });
+ });
+
\ No newline at end of file
diff --git a/app/Views/Report_supplier_summary.php b/app/Views/Report_supplier_summary.php
index ffd84bf8..77fd6556 100755
--- a/app/Views/Report_supplier_summary.php
+++ b/app/Views/Report_supplier_summary.php
@@ -1,404 +1,257 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+ Report
+ Inward
+
+ Inward Summary
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Supplier Name
- Quantity
- Value (₹)
-
-
-
-
-
- input->post('financialyear');
- $month=$this->input->post('month');
- $frm = $this->input->post('from_date');
- $t = $this->input->post('to_date');
- foreach($spurchse as $rel)
- {
- ?>
-
-
- supplier_name;?>
-
-
- quantity);
- echo round($rel->quantity);?>
- value;
- echo number_format($rel->value,2,'.','');?>
-
-
-
-
-
-
-
-
-
- Total
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+ Supplier Name
+ Quantity
+ Value (₹)
+
+
+
+
+
+ input->post('financialyear');
+ $month = $this->input->post('month');
+ $frm = $this->input->post('from_date');
+ $t = $this->input->post('to_date');
+ foreach ($spurchse as $rel) {
+ ?>
+
+
+ supplier_name; ?>
+
+
+ quantity);
+ echo round($rel->quantity); ?>
+ value;
+ echo number_format($rel->value, 2, '.', ''); ?>
+
+
+
+
+
+
+
+
+
+ Total
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+ });
+ });
+
\ No newline at end of file
diff --git a/app/Views/Report_year_wise_inward.php b/app/Views/Report_year_wise_inward.php
index 073f6466..176145ef 100755
--- a/app/Views/Report_year_wise_inward.php
+++ b/app/Views/Report_year_wise_inward.php
@@ -1,179 +1,178 @@
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Select Year
-
-
- financial_year ; ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Month-Year
- Quantity
- Total Value (₹)
-
-
-
-
-
-
-
-
-
- materialrcvddate);
- $new = date('M-y', $da);
- $pass = date('Y-m-d',$da);
- $ab=$this->input->post('financialyear');
- //echo $rel->CreatedDate;
- ?>
-
-
-
- quantity;
- echo round($rel->quantity);?>
- value,2,'.','');
- echo number_format($rel->value,2,'.','');?>
-
-
-
-
-
-
-
-
- input->post('financialyear');
- $Total="Total";
- echo anchor('report/iyear_wise_total/' . $ab,$Total); ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Month-Year
+ Quantity
+ Total Value (₹)
+
+
+
+
+
+
+
+ materialrcvddate);
+ $new = date('M-y', $da);
+ $pass = date('Y-m-d', $da);
+ $ab = $financialyear;
+ //echo $rel->CreatedDate;
+ ?>
+
+
+
+ quantity;
+ echo round($rel->quantity); ?>
+ value, 2, '.', '');
+ echo number_format($rel->value, 2, '.', ''); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -182,95 +181,44 @@
+
+
-
-
-
\ No newline at end of file
+ $.fn.dataTable.moment('DD-MM-YYYY');
+ // Initialize the DataTable
+ var table = $('#cc').DataTable({
+ dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+ buttons: [
+ 'excel' // Export buttons
+ ],
+ pageLength: 10, // Default rows per page
+ lengthMenu: [
+ [10, 20, 30, 50, -1],
+ [10, 20, 30, 50, "All"]
+ ], // Rows per page options
+ responsive: true, // Responsive table
+ ordering: false,
+ language: {
+ paginate: {
+ next: '
', // Next button icon
+ previous: '
' // Previous button icon
+ },
+ emptyTable: '
Data Not Found!
'
+ }
+ });
+ });
+
\ No newline at end of file
diff --git a/app/Views/Report_year_wise_total_inward.php b/app/Views/Report_year_wise_total_inward.php
index 915deb1f..457311e8 100755
--- a/app/Views/Report_year_wise_total_inward.php
+++ b/app/Views/Report_year_wise_total_inward.php
@@ -1,130 +1,130 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Supplier Name
- Material Name
- Quantity
- Total Value (₹)
-
-
-
-
-
- uri->total_segments();
- $ab=$this->uri->segment($last);
- foreach($ytotal as $rel)
- {
- ?>
-
-
- supplier_name;?>
-
- material_name;?>
- quantity);
- echo round($rel->quantity);?>
- total,2,'.','');
- echo number_format($rel->total,2,'.','');?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Supplier Name
+ Material Name
+ Quantity
+ Total Value (₹)
+
+
+
+
+
+
+ supplier_name; ?>
+
+ material_name; ?>
+ quantity);
+ echo round($rel->quantity); ?>
+ total, 2, '.', '');
+ echo number_format($rel->total, 2, '.', ''); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -133,120 +133,82 @@
+
+
-
-
-
\ No newline at end of file
+ $.fn.dataTable.moment('DD-MM-YYYY');
+ // Initialize the DataTable
+ var table = $('#cc').DataTable({
+ dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+ buttons: [
+ 'excel' // Export buttons
+ ],
+ pageLength: 10, // Default rows per page
+ lengthMenu: [
+ [10, 20, 30, 50, -1],
+ [10, 20, 30, 50, "All"]
+ ], // Rows per page options
+ responsive: true, // Responsive table
+ ordering: false,
+ language: {
+ paginate: {
+ next: '
', // Next button icon
+ previous: '
' // Previous button icon
+ },
+ emptyTable: '
Data Not Found!
'
+ }
+ });
+ });
+
\ No newline at end of file
diff --git a/app/Views/deliver_perform.php b/app/Views/deliver_perform.php
index 84e4257f..6d2a02f4 100755
--- a/app/Views/deliver_perform.php
+++ b/app/Views/deliver_perform.php
@@ -1,379 +1,286 @@
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+ Report
+ Inward
+
+ Delivery Performance
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
- OrderedDate
- DispatchDate
- CustomerName
- InvoiceNumber
- OrderedQuantity
- DispatchQuantity
- Rating
-
-
-
-
- uri->total_segments();
- // $ab=$this->uri->segment($last);
- $i=0;
- foreach($per as $rel)
- {
- ?>
-
-
-
- invoice_date_created));
- echo $itemdate;
- ?>
-
- invoice_date_created));
- echo $invoicedate;
- ?>
-
-
- client_name);?>
- invoice_number); ?>
-
-
- qty);
- echo number_format(round($rel->qty));
- ?>
-
- qty);
- echo number_format(round($rel->qty));
- ?>
-
-
-
-
- qty);
- $DispatchQuantity= round($rel->qty);
- $Rating =@($DispatchQuantity / $OrderedQuantity )*100;
-
-
- echo number_format($Rating, 2, '.', ' ') ; ?>
-
-
-
-
-
-
-
-  
-  
-  
- Total
-  
-
-
-
-
-
-
-
-
-
-  
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OrderedDate
+ DispatchDate
+ CustomerName
+ InvoiceNumber
+ OrderedQuantity
+ DispatchQuantity
+ Rating
+
+
+
+
+ uri->total_segments();
+ // $ab=$this->uri->segment($last);
+ $i = 0;
+ foreach ($per as $rel) {
+ ?>
+
+
+
+ invoice_date_created));
+ echo $itemdate;
+ ?>
+
+ invoice_date_created));
+ echo $invoicedate;
+ ?>
+
+
+ client_name); ?>
+ invoice_number); ?>
+
+
+ qty);
+ echo number_format(round($rel->qty));
+ ?>
+
+ qty);
+ echo number_format(round($rel->qty));
+ ?>
+
+
+
+
+ qty);
+ $DispatchQuantity = round($rel->qty);
+ $Rating = @($DispatchQuantity / $OrderedQuantity) * 100;
+
+
+ echo number_format($Rating, 2, '.', ' '); ?>
+
+
+
+
+
+
+
+  
+  
+  
+ Total
+  
+
+
+
+
+
+
+
+
+
+  
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+ });
+ });
+
\ No newline at end of file
diff --git a/app/Views/employeeLeaveApplicationForm.php b/app/Views/employeeLeaveApplicationForm.php
index 594a4fa5..a89fe967 100755
--- a/app/Views/employeeLeaveApplicationForm.php
+++ b/app/Views/employeeLeaveApplicationForm.php
@@ -229,7 +229,7 @@
-
+
Status
@@ -258,10 +258,10 @@
diff --git a/app/Views/emppayListing.php b/app/Views/emppayListing.php
index fadad718..13ad4ab7 100755
--- a/app/Views/emppayListing.php
+++ b/app/Views/emppayListing.php
@@ -17,7 +17,7 @@
-
Create New Loan
+
Create New Loan