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

FIX_today changes : ps

Browse Source
This commit is contained in:
VE10-Sanjeev 2024-07-02 13:39:42 +00:00
parent 3b4c859723
commit c14203cbec
12 changed files with 67 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Config/Routes.php
View File

@ -216,7 +216,9 @@ $routes->match(['get', 'post', 'put', 'delete'],'ViewPO', 'Purchaseorder::viewfu
$routes->get('amendmentpurchaseorder','Amendmentpurchaseorder::index');
$routes->get('EditAmendPO', 'Amendmentpurchaseorder::EditAmendPurchaseOrder');
$routes->post('amendmentpurchaseorder/EditRevenuePurchaseOrder', 'Amendmentpurchaseorder::EditRevenuePurchaseOrder');
$routes->post('amendmentpurchaseorder/UpdateAmendServicePurchaseOrder', 'Amendmentpurchaseorder::UpdateAmendServicePurchaseOrder');
$routes->post('amendmentpurchaseorder/EditAmendCapitalPurchaseOrder', 'Amendmentpurchaseorder::EditAmendCapitalPurchaseOrder');
$routes->post('amendmentpurchaseorder/EditAmendImportPO', 'Amendmentpurchaseorder::EditAmendImportPO');
$routes->post('emergencypurchaseorder/getMaterialCode','Emergencypurchaseorder::getMaterialCode');
$routes->post('emergencypurchaseorder/getCostCenterName','Emergencypurchaseorder::getCostCenterName');

2
app/Controllers/Supplier.php
View File

@ -277,7 +277,7 @@ class Supplier extends BaseController
$PAN = (is_string($PAN)) ? strtoupper($PAN) : null ;
$GSTNo = $this->request->getPost('GSTNo');
$GSTNo = (is_string($GSTNo)) ? strtoupper($GSTNo) : null ;
$MSMENo = $this->request->getPost('MSMENo');
$MSMENo = $this->request->getPost('MSME');
$PaymentTerms = $this->request->getPost('paymentname');
//print_r($PaymentTerms);
$UpdatedBy = $this->session->get('userId');

9
app/Models/Purchaseorder_model.php
View File

@ -1008,7 +1008,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
$subQuery = 'SELECT distinct LineItem.LineItemNo,LineItem.ReqNo,LineItem.Per,LineItem.ServiceMaterialDescription,Mat.MaterialCode,Mat.MaterialName,POMaster.ParentPO,
Mat.UOM,Quantity,Rate,ROUND((Quantity *Rate),2 ) as BasicValue,POMaster.AmendedDetails,LineItem.AmendedDetails as lineamenddetails,
ROUND(( Tax.After_SGST + Tax.After_CGST + Tax.After_IGST ) ,2)as Taxamount,ReqMat.NumberOfService,ReqMat.Schedule_Type,ReqMat.Service_Period,
TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.SupplierID,sup.Address,sup.ContactNumber,sup.EmailAddress,sup.PAN,sup.GSTNO,Payment.PaymentTerms,AdvanceAmount
TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.SupplierID,sup.Address,sup.ContactNumber,sup.EmailAddress,sup.PAN,sup.GSTNO,sup.MSME,sup.Cert_MSME,Payment.PaymentTerms,AdvanceAmount
FROM T_PurchaseOrder_LineItem LineItem
join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
join T_Service_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
@ -1053,7 +1053,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
Mat.UOM,Mat.HSNCODE,Quantity,Rate,ROUND((Quantity *Rate),2 ) as BasicValue ,
ROUND(((AfterSGST + AfterCGST +
AfterIGST)) ,2)as Taxamount,AdvanceAmount,
TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.Address,sup.SupplierID,sup.ContactNumber,sup.EmailAddress,sup.PAN,sup.GSTNO,sup.Cert_MSME,
TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.Address,sup.SupplierID,sup.ContactNumber,sup.EmailAddress,sup.PAN,sup.GSTNO,sup.MSME,sup.Cert_MSME,
LineItem.AmendedDetails as LineAmend,LineItem.AmendedDetails as lineamenddetails,Payment.PaymentTerms
FROM T_PurchaseOrder_LineItem LineItem
left join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
@ -1104,7 +1104,8 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
$subQuery = 'SELECT distinct LineItem.LineItemNo,LineItem.ReqNo,Mat.MaterialCode,Mat.MaterialName,Import_DispatchDetails,LineItem.Per,LineItem.ServiceMaterialDescription,
Mat.UOM,Quantity,ReqMas.Requestedby,Rate,ROUND((RMCIncludingCustomersPerKG*Quantity),2)as Taxamount ,
ProductPrice,Tax.*,LineItem.CostCenterCode ,Date(ReqMast.ReqDate) as ReqDate,POMaster.*,sup.SupplierName,sup.Address,LineItem.AmendedDetails as LineAmend,LineItem.AmendedDetails as lineamenddetails,AdvanceAmount, Pay.PaymentTerms as Pay,ROUND((Quantity *Rate),2 ) as BasicValue,HSNCODE,sup.EmailAddress,sup.SupplierID,sup.PAN,sup.ContactNumber,sup.GSTNO
ProductPrice,Tax.*,LineItem.CostCenterCode ,Date(ReqMast.ReqDate) as ReqDate,POMaster.*,sup.SupplierName,sup.Address,LineItem.AmendedDetails as LineAmend,LineItem.AmendedDetails as lineamenddetails,AdvanceAmount, Pay.PaymentTerms as Pay,ROUND((Quantity *Rate),2 ) as BasicValue,HSNCODE,
sup.EmailAddress,sup.SupplierID,sup.PAN,sup.ContactNumber,sup.GSTNO,sup.MSME,sup.Cert_MSME
FROM T_PurchaseOrder_LineItem LineItem
join T_Requestion_Master ReqMas on ReqMas.ReqNo=LineItem.ReqNo
join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
@ -1657,7 +1658,7 @@ left join T_Employee_Details emp on Req.Requestedby = emp.EmpID
$subQuery = 'SELECT distinct LineItem.LineItemNo,LineItem.Per,LineItem.AmendedDetails as lineamd,LineItem.AmendedDetails as lineamenddetails,ReqNo,Mat.MaterialCode,Mat.MaterialName,LineItem.ServiceMaterialDescription,
Mat.UOM,Mat.HSNCODE,Quantity,Rate,ROUND((Quantity *Rate),2 ) as BasicValue ,
LineItem.CostCenterCode , POMaster.*,sup.SupplierName,sup.SupplierID,sup.Address,sup.ContactNumber,sup.EmailAddress,sup.PAN,sup.GSTNO,Payment.PaymentID,Payment.PaymentTerms,AdvanceAmount,HSNCODE
LineItem.CostCenterCode , POMaster.*,sup.SupplierName,sup.SupplierID,sup.Address,sup.ContactNumber,sup.EmailAddress,sup.PAN,sup.GSTNO,sup.MSME,sup.Cert_MSME,Payment.PaymentID,Payment.PaymentTerms,AdvanceAmount,HSNCODE
FROM T_PurchaseOrder_LineItem LineItem
join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode

3
app/Models/Rawmaterialdetails_model.php
View File

@ -19,7 +19,8 @@ class Rawmaterialdetails_model extends Model
$builder = $this->db->table('T_MaterialMaster')
->select('*')
->where('IsActive', 1);
->where('IsActive', 1)
->orderBy('CreatedDate','DESC');
$query = $builder->get();
$result = $query->getResult();
return $result;

8
app/Views/EditservicePurchaseorder.php
View File

@ -2033,9 +2033,9 @@ if (!empty($getlogpodtl)) {
<th>Basic Amount <?php echo "($INRSYM)" ?></th>
<th>Tax Amount <?php echo "($INRSYM)" ?></th>
<th>Total Order Amount <?php echo "($INRSYM)" ?></th>
<th>Actual Quantity</th>
<!-- <th>Actual Quantity</th>
<th>Received Quantity</th>
<th>Pending Quantity</th>
<th>Pending Quantity</th> -->
<th>Action</th>
</tr>
</thead>
@ -2073,9 +2073,9 @@ if (!empty($getlogpodtl)) {
<td align="right"><?php echo $record->Taxamount ?></td>
<td align="right"><?php echo $record->TotalValue ?></td>
<td align="right"><?php echo $record->Quantity ?></td>
<!-- <td align="right"><?php echo $record->Quantity ?></td>
<td align="right"><?php echo $record->ReceivedQuantity ?></td>
<td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td>
<td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td> -->
<input type="hidden" name="<?php echo 'Reqnumber' . $index ?>" id="<?php echo 'Reqnumber' . $index ?>" value="<?php echo $record->ReqNo; ?>" />

2
app/Views/POlist.php
View File

@ -113,7 +113,7 @@
<?php $statusCode = $record->StatusCode;
if ($statusCode == PO_DRAFT) { ?>
if ($statusCode == PO_DRAFT || $statusCode == PO_CREATED) { ?>
<td> <a data-toggle="tooltip" href="<?php echo base_url() . 'EditPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType . '&CapitalRange=' . $record->CapitalRange; ?>"><i class="fa fa-pencil" data-toggle="tooltip" title="<?php echo $record->PONO; ?> - Click here to Edit Purchase Order details"></i>&nbsp;&nbsp;&nbsp;</a> </td>
<?php
} else { ?>

10
app/Views/editCapitalPo.php
View File

@ -1082,9 +1082,9 @@ $("#PaymentMethod").select2();
<th>Basic Amount<?php echo "($INR)"?></th>
<th>Tax Amount<?php echo "($INR)"?></th>
<th>Total Order Amount<?php echo "($INR)"?></th>
<th>Actual Quantity</th>
<!-- <th>Actual Quantity</th>
<th>Received Quantity</th>
<th>Pending Quantity</th>
<th>Pending Quantity</th> -->
<th>Action</th>
</tr>
</thead>
@ -1126,9 +1126,9 @@ $("#PaymentMethod").select2();
<?php } ?>
<td align="right"><?php echo $record->Quantity ?></td>
<td align="right"><?php echo $record->ReceivedQuantity ?></td>
<td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td>
<!-- <td align="right"><?php echo $record->Quantity ?></td>
<td align="right"><?php echo $record->ReceivedQuantity ?></td>
<td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td> -->
<?php
$row=array("materialCode"=>$record->MaterialCode,"ReqNo"=>$record->ReqNo);
array_push($res_arr_values, $row);

16
app/Views/editRevenuepurchaseorder.php
View File

@ -2338,11 +2338,17 @@ if (!empty($getlogpodtl)) {
<div align="right">
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
<div class="col-md-12">
<?php if ($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
<div class="col-md-3 col-md-offset-7" align="right" style="padding:5px">
<input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1" <?php echo $isChecked ? 'checked' : ''; ?>> IS THIS OPEN ORDER FORMAT
</div>
<?php }else{ ?>
<div class="col-md-3 col-md-offset-7" align="right" style="padding:5px">
</div>
<?php } ?>
<div class="col-md-1" align="right">
<a data-toggle="modal" onclick="showmodel();" class=" btn btn-success"> Select Line Item </a>
<!-- <a data-toggle="modal" onclick="showmodel();" class=" btn btn-success"> Select Line Item </a> -->
<a data-toggle="modal" ><button type="submit" onclick="myFunction();" class="btn btn-primary" id="abcd" >Select Line Item</button> </a>
</div>
</div>
<?php } ?>
@ -3435,9 +3441,9 @@ if (!empty($getlogpodtl)) {
<th>Basic Amount <?php echo "($INRSYM)" ?></th>
<th>Tax Amount <?php echo "($INRSYM)" ?></th>
<th>Total Order Amount <?php echo "($INRSYM)" ?></th>
<th>Actual Quantity</th>
<!-- <th>Actual Quantity</th>
<th>Received Quantity</th>
<th>Pending Quantity</th>
<th>Pending Quantity</th> -->
<th>Action</th>
</tr>
</thead>
@ -3463,9 +3469,9 @@ if (!empty($getlogpodtl)) {
<td align="right"><?php echo $record->Taxamount ?></td>
<td align="right"><?php echo $record->TotalValue ?></td>
<td align="right"><?php echo $record->Quantity ?></td>
<!-- <td align="right"><?php echo $record->Quantity ?></td>
<td align="right"><?php echo $record->ReceivedQuantity ?></td>
<td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td>
<td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td> -->
<input type="hidden" name="<?php echo 'Reqnumber' . $index ?>" id="<?php echo 'Reqnumber' . $index ?>" value="<?php echo $record->ReqNo; ?>" />
<input type="hidden" name="<?php echo 'departmentName' . $index ?>" id="<?php echo 'departmentName' . $index ?>" value="<?php echo $record->DepartmentName; ?>" />
<input type="hidden" name="<?php echo 'AvilBudget' . $index ?>" id="<?php echo 'AvilBudget' . $index ?>" value="<?php echo $AvlAmount; ?>" />

10
app/Views/editimportpo.php
View File

@ -2733,9 +2733,9 @@ echo form_textarea($data);
<th>UOM</th>
<th>Rate<?php echo $INR?></th>
<th>Basic Amount<?php echo $INR?></th>
<th>Received Qty</th>
<!-- <th>Received Qty</th>
<th>Rejected Qty</th>
<th>Pending Qty</th>
<th>Pending Qty</th> -->
<!-- <th>Tax Amount</th>
<th>Total Order Amount</th> -->
<th>Action</th>
@ -2764,9 +2764,9 @@ echo form_textarea($data);
<td><?php echo $record->UOM ?></td>
<td><?php echo $record->Rate ?></td>
<td><?php echo $record->BasicValue ?></td>
<td><?php echo $record->ReceivedQuantity ?></td>
<td><?php echo $record->QuantityRejected ?></td>
<td><?php echo $record->PendingQty?></td>
<!-- <td><?php echo $record->ReceivedQuantity ?></td> -->
<!-- <td><?php echo $record->QuantityRejected ?></td> -->
<!-- <td><?php echo $record->PendingQty?></td> -->
<!-- <td><?php echo $record->Taxamount?></td>
<td><?php echo $record->TotalOrderValue?></td> -->

26
app/Views/includes/header.php
View File

@ -1107,6 +1107,12 @@
</span>
</a>
<ul class="treeview-menu">
<li>
<a href="<?php echo base_url(); ?>purchaseorderListing">
<i class="fa fa-list"></i>
<span>Purchase Order List</span>
</a>
</li>
<?php if ($DEPCode == FINANCE) { ?>
<!-- <li>
<a href="<?php echo base_url(); ?>POApproval">
@ -1130,12 +1136,6 @@
<i class="fa fa-ambulance"></i>
<span>Emergency Purchase Order </span>
</a>
</li>
<li>
<a href="<?php echo base_url(); ?>purchaseorderListing">
<i class="fa fa-list"></i>
<span>Purchase Order List</span>
</a>
</li>
<li>
<a href="<?php echo base_url(); ?>Report_pending_purchase">
@ -1181,7 +1181,13 @@
<span class="fa fa-angle-down pull-right"></span>
</span>
</a>
<ul class="treeview-menu">
<ul class="treeview-menu">
<li>
<a href="<?php echo base_url(); ?>purchaseorderListing">
<i class="fa fa-list"></i>
<span>Purchase Order List</span>
</a>
</li>
<!-- <li>
<a href="<?php echo base_url(); ?>POApproval">
<i class="fa fa-users"></i>
@ -1224,12 +1230,6 @@
<span>Emergency Purchase Order </span>
</a>
</li>
<li>
<a href="<?php echo base_url(); ?>purchaseorderListing">
<i class="fa fa-list"></i>
<span>Purchase Order List</span>
</a>
</li>
<li>
<a href="<?php echo base_url(); ?>Report_pending_purchase">
<i class="fa fa-align-left"></i>

14
app/Views/po_pdf.php
View File

@ -146,7 +146,7 @@
$supplierEmail = (!empty($POItem) && !empty($POItem[0]->EmailAddress)) ? $POItem[0]->EmailAddress : "-";
$supplierGst = (!empty($POItem) && !empty($POItem[0]->GSTNO)) ? $POItem[0]->GSTNO : "-";
$supplierPan = (!empty($POItem) && !empty($POItem[0]->PAN)) ? $POItem[0]->PAN : "-";
$supplierMsme = (!empty($POItem) && !empty($POItem[0]->Cert_MSME)) ? $POItem[0]->Cert_MSME : "-";
$supplierMsme = (!empty($POItem) && !empty($POItem[0]->MSME)) ? $POItem[0]->MSME : "-";
$supplierContact = (!empty($POItem) && !empty($POItem[0]->ContactNumber)) ? $POItem[0]->ContactNumber : "-";
$serviceDescription = (!empty($POItem) && !empty($POItem[0]->Description_Of_Service)) ? $POItem[0]->Description_Of_Service : "-";
$supplierVendor = (!empty($POItem) && !empty($POItem[0]->SupplierID)) ? $POItem[0]->SupplierID : "-";
@ -569,7 +569,7 @@
$tax = [];
if (!empty($POItem)) {
//print_r($POItem);die;
// print_r($POItem);die;
foreach ($POItem as $item) { ?>
<tr>
<td class="text-center no-border"><?php echo $i++; ?></td>
@ -577,8 +577,14 @@
<?php if ($POType == REVENUE) {
echo ($item->MaterialCode . ' - ') . ($item->MaterialName . $item->ServiceMaterialDescription);
} ?>
<?php if ($POType == SERVICE && ($serviceDescription != '')) {
echo ($serviceDescription);
<?php if ($POType == SERVICE) {
echo ($item->MaterialCode . ' - ') . ($item->MaterialName ? $item->MaterialName : $item->ServiceMaterialDescription);
} ?>
<?php if ($POType == IMPORT) {
echo ($item->MaterialCode . ' - ') . ($item->MaterialName);
} ?>
<?php if ($POType == CAPITAL) {
echo ($item->MaterialCode . ' - ') . ($item->MaterialName);
} ?>
</td>
<td class="text-right no-border"><?php echo $item->HSNCODE ?? 'N/A'; ?></td>

12
app/Views/rawmaterialListing.php
View File

@ -42,14 +42,15 @@
<table id="datatable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;" >
<thead style="background-color: #ddd;">
<tr>
<th style="display: none;"></th>
<th>Created On</th>
<th>Material Code</th>
<th>Material Description</th>
<th>Type of Material</th>
<th>UOM</th>
<th>Opening Stock</th>
<th>Material Category</th>
<th>HSN Code</th>
<th>HSN Code</th>
</tr>
</thead>
<tbody>
@ -62,7 +63,8 @@
?>
<tr>
<td style="display: none;"><?php echo $record->CreatedDate; ?></td>
<td style="width:8%;"><?php echo format_date($record->CreatedDate,0,'d/m/Y') ?></td>
<td style="width:9%;"><u><a class="a_tag_link" href="<?php echo base_url().'viewRawmaterial?RID='.$record->MaterialCode.'&MType='.$record->MaterialType.'&UOM='.$record->UOM.'&date1='.$date ?>" data-toggle="tooltip" title="<?php echo $record->MaterialCode; ?> - Click here to view Material details"><?php echo $record->MaterialCode ?> </a></u></td>
<td style="width:12%;"><?php echo $record->MaterialName ?></td>
<td style="width:10%;"><?php echo $record->MaterialType ?></td>
@ -74,7 +76,6 @@
<?php }?>
<td style="width:11%;"><?php echo $record->Category ?></td>
<td style="width:8%;"><?php echo $record->HSNCODE ?></td>
</tr>
<?php
}
@ -99,7 +100,8 @@
"searching": true,
"ordering": true,
"info": true,
"autoWidth": true
"autoWidth": true,
"aaSorting": [[ 0, "desc" ]],
});
});