From c14203cbecaacad136004a4b39f7142a8cb7232a Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Tue, 2 Jul 2024 13:39:42 +0000 Subject: [PATCH] FIX_today changes : ps --- app/Config/Routes.php | 4 +++- app/Controllers/Supplier.php | 2 +- app/Models/Purchaseorder_model.php | 9 +++++---- app/Models/Rawmaterialdetails_model.php | 3 ++- app/Views/EditservicePurchaseorder.php | 8 ++++---- app/Views/POlist.php | 2 +- app/Views/editCapitalPo.php | 10 +++++----- app/Views/editRevenuepurchaseorder.php | 16 ++++++++++----- app/Views/editimportpo.php | 10 +++++----- app/Views/includes/header.php | 26 ++++++++++++------------- app/Views/po_pdf.php | 14 +++++++++---- app/Views/rawmaterialListing.php | 12 +++++++----- 12 files changed, 67 insertions(+), 49 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 4b27626b..a445ae9f 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -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'); diff --git a/app/Controllers/Supplier.php b/app/Controllers/Supplier.php index ba022a41..91699702 100644 --- a/app/Controllers/Supplier.php +++ b/app/Controllers/Supplier.php @@ -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'); diff --git a/app/Models/Purchaseorder_model.php b/app/Models/Purchaseorder_model.php index c4146a03..e01ddabf 100644 --- a/app/Models/Purchaseorder_model.php +++ b/app/Models/Purchaseorder_model.php @@ -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 diff --git a/app/Models/Rawmaterialdetails_model.php b/app/Models/Rawmaterialdetails_model.php index 7a8d0b64..5ef35d3d 100644 --- a/app/Models/Rawmaterialdetails_model.php +++ b/app/Models/Rawmaterialdetails_model.php @@ -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; diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index 44d767e1..278257cb 100644 --- a/app/Views/EditservicePurchaseorder.php +++ b/app/Views/EditservicePurchaseorder.php @@ -2033,9 +2033,9 @@ if (!empty($getlogpodtl)) { Basic Amount Tax Amount Total Order Amount - Actual Quantity + Action @@ -2073,9 +2073,9 @@ if (!empty($getlogpodtl)) { Taxamount ?> TotalValue ?> - Quantity ?> + diff --git a/app/Views/POlist.php b/app/Views/POlist.php index 9215b502..b373fd15 100644 --- a/app/Views/POlist.php +++ b/app/Views/POlist.php @@ -113,7 +113,7 @@ StatusCode; - if ($statusCode == PO_DRAFT) { ?> + if ($statusCode == PO_DRAFT || $statusCode == PO_CREATED) { ?>     diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php index 0ec8788e..e0de4115 100644 --- a/app/Views/editCapitalPo.php +++ b/app/Views/editCapitalPo.php @@ -1082,9 +1082,9 @@ $("#PaymentMethod").select2(); Basic Amount Tax Amount Total Order Amount - Actual Quantity + Action @@ -1126,9 +1126,9 @@ $("#PaymentMethod").select2(); - Quantity ?> - ReceivedQuantity ?> - Quantity - $record->ReceivedQuantity, 2, '.', ''); ?> + $record->MaterialCode,"ReqNo"=>$record->ReqNo); array_push($res_arr_values, $row); diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php index d25d083d..10070e49 100644 --- a/app/Views/editRevenuepurchaseorder.php +++ b/app/Views/editRevenuepurchaseorder.php @@ -2338,11 +2338,17 @@ if (!empty($getlogpodtl)) {
+
> IS THIS OPEN ORDER FORMAT
+ +
+
+
- Select Line Item + +
@@ -3435,9 +3441,9 @@ if (!empty($getlogpodtl)) { Basic Amount Tax Amount Total Order Amount - Actual Quantity + Action @@ -3463,9 +3469,9 @@ if (!empty($getlogpodtl)) { Taxamount ?> TotalValue ?> - Quantity ?> + diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php index 56a2dc75..8ec81acb 100644 --- a/app/Views/editimportpo.php +++ b/app/Views/editimportpo.php @@ -2733,9 +2733,9 @@ echo form_textarea($data); UOM Rate Basic Amount - Received Qty + Action @@ -2764,9 +2764,9 @@ echo form_textarea($data); UOM ?> Rate ?> BasicValue ?> - ReceivedQuantity ?> - QuantityRejected ?> - PendingQty?> + + + diff --git a/app/Views/includes/header.php b/app/Views/includes/header.php index bf2f556d..187f7e29 100644 --- a/app/Views/includes/header.php +++ b/app/Views/includes/header.php @@ -1107,6 +1107,12 @@