diff --git a/app/Models/Purchaseorder_model.php b/app/Models/Purchaseorder_model.php
index 01595714..3006ef53 100644
--- a/app/Models/Purchaseorder_model.php
+++ b/app/Models/Purchaseorder_model.php
@@ -730,7 +730,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
function getCompanyInformationforPDF()
{
- $subQuery = "select CompanyName,Address,GSTNO,PAN,ContactNumber,EmailAddress,AlternateContactNumber,companyWebsite,StateCode
+ $subQuery = "select CompanyName,Address,GSTNO,PAN,MSME,ContactNumber,EmailAddress,AlternateContactNumber,companyWebsite,StateCode
from T_Company_Details ";
@@ -1053,7 +1053,8 @@ 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,LineItem.AmendedDetails as LineAmend,Payment.PaymentTerms
+ TotalValue,Tax.*,LineItem.CostCenterCode ,POMaster.*,sup.SupplierName,sup.Address,sup.SupplierID,sup.ContactNumber,sup.EmailAddress,sup.PAN,sup.GSTNO,sup.Cert_MSME,
+ LineItem.AmendedDetails as LineAmend,Payment.PaymentTerms
FROM T_PurchaseOrder_LineItem LineItem
left join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
left join T_Revenue_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
diff --git a/app/Views/dashboard.php b/app/Views/dashboard.php
index 0d074e00..ec449b50 100644
--- a/app/Views/dashboard.php
+++ b/app/Views/dashboard.php
@@ -466,7 +466,7 @@ function synczohobooks(){
-
diff --git a/app/Views/po_pdf.php b/app/Views/po_pdf.php
index fad63b5f..5b6c2e87 100755
--- a/app/Views/po_pdf.php
+++ b/app/Views/po_pdf.php
@@ -11,6 +11,17 @@
#logo img{display: block !important;margin: 60px auto !important;}
#page_break { page-break-before: always; }
+ .invoice-details {
+ text-align: left;
+}
+
+.invoice-details p {
+ margin: 0;
+}
+
+.invoice-details .amount {
+ float: right;
+}
@@ -32,6 +43,8 @@ $companyGst = (!empty($CompanyDetails) && !empty($CompanyDetails[0]->GSTNO)) ? $
$companyPan = (!empty($CompanyDetails) && !empty($CompanyDetails[0]->PAN)) ? $CompanyDetails[0]->PAN : "-";
$companyWebsit = (!empty($CompanyDetails) && !empty($CompanyDetails[0]->companyWebsite)) ? $CompanyDetails[0]->companyWebsite :"-";
$CompanyStateCode = (!empty($CompanyDetails) && !empty($CompanyDetails[0]->StateCode)) ? $CompanyDetails[0]->StateCode : "-";
+$companyMsme = (!empty($CompanyDetails) && !empty($CompanyDetails[0]->MSME)) ? $CompanyDetails[0]->MSME : "-";
+$address = preg_replace('/SURVEY : [^,]+,/', '', $CompanyAddress);
$currencyName = 'INR';
$currencyCode = (!empty($CurrencySymbol) && !empty($CurrencySymbol[0]->FontCode2000)) ? $CurrencySymbol[0]->FontCode2000 : "-";
@@ -47,6 +60,7 @@ $supOfferNo = (!empty($POItem) && !empty($POItem[0]->Supplier_Offer_No)) ? $POIt
$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 : "-";
$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 : "-";
@@ -75,8 +89,8 @@ $poDate = $purchaseorderDate ? $purchaseorderDate->format('d-m-Y') : "-";
}
$RequistionNo = (!empty($RequistionDetails) && !empty($RequistionDetails[0]['RequistionNo'])) ? $RequistionDetails[0]['RequistionNo'] : "-";
$ReqDate = (!empty($RequistionDetails) && !empty($RequistionDetails[0]['ReqDate'])) ? $RequistionDetails[0]['ReqDate'] : "";
- $RequestedDept = (!empty($RequistionDetails) && !empty($RequistionDetails[0]['RequestedDept'])) ? $RequistionDetails[0]['RequestedDept'] : "-";
- $CostCenterCode = (!empty($RequistionDetails) && !empty($RequistionDetails[0]['CostCenterCode'])) ? $RequistionDetails[0]['CostCenterCode'] : "-";
+// $RequestedDept = (!empty($RequistionDetails) && !empty($RequistionDetails[0]['RequestedDept'])) ? $RequistionDetails[0]['RequestedDept'] : "-";
+// $CostCenterCode = (!empty($RequistionDetails) && !empty($RequistionDetails[0]['CostCenterCode'])) ? $RequistionDetails[0]['CostCenterCode'] : "-";
$releasedBy = (!empty($releasedetails) && !empty($releasedetails[0]->FirstName)) ? $releasedetails[0]->FirstName : "-";
@@ -250,7 +264,7 @@ $amountInWords = "Rupees " . $result ." Paise ". $points." Only";
} ?>
'.trans('Phone') . ': ' . htmlsc($companyPhone).','.'
';
@@ -261,10 +275,12 @@ $amountInWords = "Rupees " . $result ." Paise ". $points." Only";
if ($companyWebsit ) {
echo ''.trans('Website') . ' : ' . htmlsc($companyWebsit ).'
';
}
-
if ($companyGst ) {
echo ''.trans('GSTIN') . ' : ' . htmlsc($companyGst ).'
';
}
+ if ($companyMsme ) {
+ echo ''.trans('MSME') . ' : ' . htmlsc($companyMsme ).'
';
+ }
if ($companyPan ) {
echo ''.trans('PAN') . ' : ' . htmlsc($companyPan ).'
';
}
@@ -284,239 +300,233 @@ $amountInWords = "Rupees " . $result ." Paise ". $points." Only";
-
-
-
- | Shipped From |
- Shipped To |
-
-
-
-
-
- | |
- |
-
-
-
';?> |
- '; ?>
- |
-
-
- | |
- |
-
-
- | |
- |
-
-
- | |
- |
-
-
-
-
-
+
+
+
+
+
+ |
+ |
+
+
+ |
+ |
+
+
+ |
+ |
+
+
+ |
+ |
+
+
+ |
+ |
+
+
+ |
+ |
+
+
+ |
+ |
+
+
+ |
+ |
+
+
|
-
-
-
- |
- |
-
-
-
';?> |
-
- '; ?>
- |
-
-
- | |
- |
-
-
- | |
- |
-
-
- | |
- |
-
-
+
+
+
+ |
+ |
+
+
+ |
+ |
+
+
+ |
+ |
+
+
+ |
+ |
+
+
+ |
+ |
+
+
+ |
+ |
+
+
+ |
+ |
+
+
+ |
+
+
+
+
+ | Shipped From |
+ Shipped To |
+
+
+
+
+
+ |
+ ' . htmlsc($SuplierName) . ''; ?> |
+
+
+ |
+ |
+
+
+ |
+ |
+
+
+ |
+ |
+
+
+ |
+ |
+
+
+ |
+ |
+
+
+ |
+
+
+
+ |
+ ' . htmlsc($CompanyName) . ''; ?> |
+
+
+ |
+ |
+
+
+ |
+ |
+
+
+ |
+ |
+
+
+ |
+ |
+
+
+ |
+ |
+
|
-
-
-
-
- |
-
|
- |
- |
- |
-
₹ |
-
₹ |
-
- |
- |
- |
-
₹ |
-
-
-
|
-
₹ |
-
|
-
₹ |
-
|
-
₹ |
-
-
-
-
-
+
+
- | |
- MaterialCode.'/'.$item->MaterialName.$item->ServiceMaterialDescription);?> |
- HSNCODE ?? 'N/A'; ?> |
-
- UOM) : ?>
- UOM); ?>
-
- |
-
- Quantity); ?>
- |
-
- Rate); ?>
- |
-
- BasicValue));?>
- |
-
-
-
-
- CGST); ?>
- |
-
- AfterCGST != ''){
- echo format_currency(abs($item->AfterCGST));}
- else { }
- ?>
- |
-
- SGST); ?>
- |
-
- AfterSGST != ''){
- echo format_currency(abs($item->AfterSGST));}
- else { }
- ?>
- |
-
- IGST); ?>
- |
-
- AfterIGST != ''){
- echo format_currency(abs($item->AfterIGST)); }
- else { }
- ?>
- |
-
-
- Taxamount));
- $totalBasic = $item->BasicValue;
- $totalCGST = $item->AfterCGST ;
- $totalSGST = $item->AfterSGST ;
- $totalIGST = $item->AfterIGST ;
- $totalTax = $item->Taxamount;
- ?>
-
- |
-
+ |
+
|
+ |
+ |
+ |
+
₹ |
+
₹ |
+ |
+ |
+ |
+
₹ |
-
-
-
-
-
-
-
-
+
+
+
- TOTAL |
- |
- |
- |
- |
- |
- |
- |
-
+ if (!empty($POItem)) {
+ foreach ($POItem as $item) { ?>
+ |
+ |
+ MaterialCode); ?> |
+ MaterialName . $item->ServiceMaterialDescription); ?> |
+ HSNCODE ?? 'N/A'; ?> |
+ UOM) : ?>
+ UOM); ?>
+
+ |
+ Quantity); ?> |
+ Rate); ?> |
+ BasicValue)); ?> |
+ CGST); ?> |
+ AfterCGST != '') {
+ echo format_currency(abs($item->AfterCGST));
+ } ?> |
+ SGST); ?> |
+ AfterSGST != '') {
+ echo format_currency(abs($item->AfterSGST));
+ } ?> |
+ IGST); ?> |
+ AfterIGST != '') {
+ echo format_currency(abs($item->AfterIGST));
+ } ?> |
+ Taxamount)); ?> |
+
+
+
+
+ BasicValue;
+ $cgst[] = $item->AfterCGST;
+ $sgst[] = $item->AfterSGST;
+ $igst[] = $item->AfterIGST;
+ $tax[] = $item->Taxamount;
+ ?>
+
+
+
+
+ | TOTAL |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+
+
+
+
+
+
+
+ |
+ TOTAL AMOUNT IN WORDS:
+
|
-
-
-
- |
- TOTAL AMOUNT IN WORDS:
-
- |
- | ₹ |
- |
-
-
- | Add :CGST | ₹ |
- |
-
-
- | Add :SGST | ₹ |
- |
-
-
- | Add :IGST | ₹ |
- |
-
-
- | | ₹ |
-
- |
-
-
- | ₹ |
- TotalOrderValue); ?>
- |
-
-
- | ₹ |
- TotalOrderValue)));?> |
-
-
-
-
- Note: Please acknowledge receipt of this order for acceptance
Material to be delivered to our stores before 3pm
Please refer order number and item code in your challan/invoice
-
-
- |
-
-
- Authorized Signatory
- |
-
- | Declaration: We Declare that this invoice shows the actual price of the goods described and that all particulars are true and correct |
-
-
-
-
- | This is a system generated purchase orde |
-
+
+
+
+ |
+ ₹ |
+ |
+
+
+ |
+ ₹ |
+ |
+
+
+ |
+ ₹ |
+ |
+
+
+ |
+ ₹ |
+ |
+
+
+
+ TotalOrderValue); ?>
+ |
+ ₹ |
+ |
+
+
+ |
+ ₹ |
+ TotalOrderValue)));?> |
+
+
+ |
+
+
+
+
+ Note: Please acknowledge receipt of this order for acceptance
Material to be delivered to our stores before 3pm
Please refer order number and item code in your challan/invoice
+ |
+
+
+ Authorized Signatory
+ |
+
+
+ | Declaration: We Declare that this invoice shows the actual price of the goods described and that all particulars are true and correct |
+
+
+
+ | This is a system generated purchase order |
+
| |