RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme

Browse Source
This commit is contained in:
vadivelJ96 2025-04-23 15:00:57 +05:30
commit 9b22bf3969
5 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Config/Routes.php
View File

@ -547,4 +547,18 @@ $routes->post('updateAbstractDetails','StockController::updateAbstractDetails');
//Reports Module
$routes->get('allReports','Report::allReports');
$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');

8
app/Controllers/Report.php
View File

@ -232,6 +232,8 @@ class Report extends BaseController
$fa = substr((string)$ab, 0, -5);
$aa = substr((string)$ab, 5, 5);
$m = $this->request->getPost('month');
$data['month'] = $m;
$data['financialyear'] = $ab;
$data['finyear'] = $this->dahsboard_Model->report_finyear();
$data['mmr'] = $this->dahsboard_Model->report_MMReceiptValue($fa, $aa, $m);
}
@ -576,14 +578,20 @@ class Report extends BaseController
$this->global['pageTitle'] = 'Inward PO Reports';
if ($this->request->getPost('btn_submit')) {
$cname = $this->request->getPost('client_name');
$data['client_name'] = $cname;
$prod = $this->request->getPost('item_name');
$data['item_name'] = $prod;
$ab = $this->request->getPost('financialyear');
$data['financialyear'] = $ab;
$cat = $this->request->getVar('cat');
$fa = substr((string)$ab, 0, -5);
$aa = substr((string)$ab, 5, 5);
$m = $this->request->getPost('month');
$data['month'] = $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();

4
app/Models/Dashboard_model.php
View File

@ -875,7 +875,9 @@ group by po.SupplierID,pl.MaterialCode";
{
$sql = "SELECT MaterialCode,MaterialName,UOM,Category,HSNCODE FROM t_materialmaster group by MaterialCode";
$sql = "SELECT MaterialCode,MaterialName,UOM, t_configdetails.ConfigValue as Category,HSNCODE FROM t_materialmaster
join t_configdetails on t_configdetails.key = t_materialmaster.Category
group by MaterialCode";
$query = $this->db->query($sql);
return $query->getResult();
}

7
app/Views/monthlypayinputs.php
View File

@ -456,14 +456,17 @@
} ?>
<?php if ($record->is_payslip_generated == 1) { ?> title="Payslip Calculated"
style="text-align:right;color:blue;" <?php }else{ ?>style="text-align:right;" <?php } ?>>
<?php if (!empty($record->Estimate)) {
<!-- <?php if (!empty($record->Estimate)) {
echo $record->Estimate;
$estTotal[] = $record->Estimate;
} else {
echo $empSalary[$i];
$estTotal[] = $empSalary[$i];
}
?>
?> -->
<?php echo $empSalary[$i]; $estTotal[] = $empSalary[$i]; ?>
</td>

0
app/Views/reportslink.php Executable file → Normal file
View File