WebSVN – SmartDukaan – Diff – /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java

             Document document = new Document();
             document.setMargins(0, 0, 25, 0);
             PdfWriter pdfWriter = PdfWriter.getInstance(document, outputStream);
             document.open();
+            // 8 columns: S.No | Description | HSN | Qty | Gross Sale Value | Taxable Value (Margin) | Tax Rate | Tax Amount
-            float[] marginSchemeWidths = new float[]{0.3f, 2.2f, 0.6f, 0.3f, 0.9f, 0.9f, 0.8f, 0.8f, 0.9f};
+            float[] marginSchemeWidths = new float[]{0.3f, 2.4f, 0.6f, 0.3f, 0.9f, 0.9f, 0.9f, 0.7f};
             for (InvoicePdfModel pdfModel : pdfModels) {
                 CustomCustomer customer = pdfModel.getCustomer();
                 CustomRetailer retailer = pdfModel.getRetailer();
                 boolean stateGst = customer.getAddress().getState().equals(retailer.getAddress().getState());
                     cancelledPages = true;
                 } else {
                     cancelledPageList.add(0);
+                }
-                document.addTitle("INVOICE OF SUPPLY (MARGIN SCHEME)");
+                document.addTitle("TAX INVOICE");
                 document.addAuthor(pdfModel.getAuther());
-                Paragraph paragraphTitle = new Paragraph("INVOICE OF SUPPLY (MARGIN SCHEME)", FONT_TITLE);
+                Paragraph paragraphTitle = new Paragraph("TAX INVOICE", FONT_TITLE);
                 paragraphTitle.setAlignment(Element.ALIGN_CENTER);
                 document.add(paragraphTitle);
+                Font subtitleFont = new Font(Font.FontFamily.HELVETICA, 9, Font.ITALIC);
+                Paragraph subtitle = new Paragraph("(GST Payable on Margin Scheme Basis \u2014 ITC not admissible to buyer)", subtitleFont);
+                subtitle.setAlignment(Element.ALIGN_CENTER);
+                document.add(subtitle);
                 Rectangle rectangle = document.getPageSize();
                 if (pdfModel.getIrnModel() != null) {
                     addIrnDetails(pdfModel.getIrnModel(), rectangle, document);
+                }
-                // Customer and Retailer details
+                // Customer and Retailer details (same as regular invoice)
                 PdfPTable tableCustomerRetailer = new PdfPTable(2);
                 tableCustomerRetailer.setWidthPercentage(90);
                 tableCustomerRetailer.getDefaultCell().setBorder(Rectangle.NO_BORDER);
                 PdfPCell columnCustomerInfo = new PdfPCell();
-                columnCustomerInfo.addElement(new Paragraph("Customer Details", FONT_BOLD));
+                columnCustomerInfo.addElement(new Paragraph("Buyer Details", FONT_BOLD));
                 columnCustomerInfo.addElement(new Paragraph(
                         StringUtils.capitalize(customer.getAddress().getName() + (customer.getAddress().getLastName() == null ? "" : " " + customer.getAddress().getLastName())), FONT_NORMAL));
                 if (customer.getAddress() != null) {
                     if ((customer.getAddress().getLine1() != null && !customer.getAddress().getLine1().trim().isEmpty()) || (customer.getAddress().getLine2() != null && !customer.getAddress().getLine2().trim().isEmpty())) {
                         columnCustomerInfo.addElement(new Paragraph(StringUtils.capitalize(customer.getAddress().getLine1()) + ", " + StringUtils.capitalize(customer.getAddress().getLine2()), FONT_NORMAL));
                     columnCustomerInfo.addElement(new Paragraph("GST Number - " + customer.getGstNumber(), FONT_NORMAL));
+                }
                 columnCustomerInfo.setBorder(Rectangle.NO_BORDER);
                 PdfPCell columnRetailerInfo = new PdfPCell();
+                columnRetailerInfo.addElement(new Paragraph("Supplier Details", FONT_BOLD));
                 columnRetailerInfo.addElement(new Paragraph(StringUtils.capitalize(retailer.getAddress().getName()), FONT_BOLD));
                 columnRetailerInfo.addElement(new Paragraph(StringUtils.capitalize(retailer.getAddress().getLine1()) + ", " + StringUtils.capitalize(retailer.getAddress().getLine2()) + ", " + StringUtils.capitalize(retailer.getAddress().getCity()) + "-" + retailer.getAddress().getPinCode() + ", " + retailer.getAddress().getState() + "(" + (stateGst ? pdfModel.getCustomerAddressStateCode() : pdfModel.getPartnerAddressStateCode()) + ")", FONT_BOLD));
                 columnRetailerInfo.addElement(new Paragraph("Contact No.- " + retailer.getAddress().getPhoneNumber(), FONT_BOLD));
                 columnRetailerInfo.addElement(new Paragraph("GST NO. " + retailer.getGstNumber(), FONT_BOLD));
                 columnRetailerInfo.setBorder(Rectangle.NO_BORDER);
                 tableInvoiceDateRetailer.addCell(columnRetailerInfo);
                 tableCustomerRetailer.addCell(columnCustomerInfo);
                 tableCustomerRetailer.addCell(tableInvoiceDateRetailer);
-                // Item table with margin scheme columns
+                // Item table — margin scheme columns (no purchase price disclosed)
                 PdfPTable orders = new PdfPTable(marginSchemeWidths.length);
                 orders.setWidths(marginSchemeWidths);
                 orders.setWidthPercentage(90);
                 orders.addCell(new Paragraph("S.No", FONT_BOLD));
-                orders.addCell(new Paragraph("Description", FONT_BOLD));
+                orders.addCell(new Paragraph("Description of Goods", FONT_BOLD));
-                orders.addCell(new Paragraph("HSN", FONT_BOLD));
+                orders.addCell(new Paragraph("HSN\nCode", FONT_BOLD));
                 orders.addCell(new Paragraph("Qty", FONT_BOLD));
-                orders.addCell(new Paragraph("Purchase\nPrice Rs.", FONT_BOLD));
+                orders.addCell(new Paragraph("Gross Sale\nValue (Rs.)", FONT_BOLD));
-                orders.addCell(new Paragraph("Selling\nPrice Rs.", FONT_BOLD));
+                orders.addCell(new Paragraph("Taxable Value\n- Margin (Rs.)", FONT_BOLD));
-                orders.addCell(new Paragraph("Margin\nRs.", FONT_BOLD));
+                String taxRateHeader = stateGst ? "CGST+SGST\nRate" : "IGST\nRate";
-                orders.addCell(new Paragraph("GST on\nMargin Rs.", FONT_BOLD));
+                orders.addCell(new Paragraph(taxRateHeader, FONT_BOLD));
-                orders.addCell(new Paragraph("Invoice\nTotal Rs.", FONT_BOLD));
+                orders.addCell(new Paragraph("Tax Amount\n(Rs.)", FONT_BOLD));
                 orders.setHeaderRows(1);
-                float totalSellingPrice = 0, totalMargin = 0, totalGstOnMargin = 0, totalInvoiceTotal = 0;
+                float totalGrossSale = 0, totalMargin = 0, totalTaxAmount = 0;
                 int index = 1;
                 for (CustomOrderItem orderItem : orderItems) {
-                    float gstOnMargin = orderItem.getCgstAmount() + orderItem.getSgstAmount() + orderItem.getIgstAmount();
+                    float taxAmount = orderItem.getCgstAmount() + orderItem.getSgstAmount() + orderItem.getIgstAmount();
                     orders.addCell(new Paragraph(String.valueOf(index++), FONT_NORMAL));
                     orders.addCell(new Paragraph(orderItem.getDescription(), FONT_NORMAL));
                     orders.addCell(new Paragraph(orderItem.getHsnCode(), FONT_NORMAL));
                     orders.addCell(new Paragraph(String.valueOf(orderItem.getQuantity()), FONT_NORMAL));
-                    orders.addCell(new Paragraph(String.format("%.2f", orderItem.getPurchasePrice()), FONT_NORMAL));
-                    orders.addCell(new Paragraph(String.format("%.2f", orderItem.getSellingPrice()), FONT_NORMAL));
-                    orders.addCell(new Paragraph(String.format("%.2f", orderItem.getMargin()), FONT_NORMAL));
-                    orders.addCell(new Paragraph(String.format("%.2f", gstOnMargin), FONT_NORMAL));
                     orders.addCell(new Paragraph(String.format("%.2f", orderItem.getNetAmount()), FONT_NORMAL));
+                    orders.addCell(new Paragraph(String.format("%.2f", orderItem.getAmount()), FONT_NORMAL));
+                    String taxRateText;
+                    if (stateGst) {
+                        taxRateText = String.format("CGST %.1f%%\n+ SGST %.1f%%", orderItem.getCgstRate(), orderItem.getSgstRate());
+                    } else {
+                        taxRateText = String.format("IGST %.1f%%", orderItem.getIgstRate());
+                    }
+                    orders.addCell(new Paragraph(taxRateText, FONT_NORMAL));
+                    orders.addCell(new Paragraph(String.format("%.2f", taxAmount), FONT_NORMAL));
-                    totalSellingPrice += orderItem.getSellingPrice();
+                    totalGrossSale += orderItem.getNetAmount();
-                    totalMargin += orderItem.getMargin();
+                    totalMargin += orderItem.getAmount();
-                    totalGstOnMargin += gstOnMargin;
+                    totalTaxAmount += taxAmount;
-                    totalInvoiceTotal += orderItem.getNetAmount();
+                }
                 // Total row
-                PdfPCell totalLabelCell = new PdfPCell(new Paragraph("TOTAL", FONT_BOLD));
+                PdfPCell totalLabelCell = new PdfPCell(new Paragraph("Total", FONT_BOLD));
-                totalLabelCell.setColspan(5);
+                totalLabelCell.setColspan(4);
                 orders.addCell(totalLabelCell);
-                orders.addCell(new Paragraph(String.format("%.2f", totalSellingPrice), FONT_BOLD));
+                orders.addCell(new Paragraph(String.format("%.2f", totalGrossSale), FONT_BOLD));
                 orders.addCell(new Paragraph(String.format("%.2f", totalMargin), FONT_BOLD));
-                orders.addCell(new Paragraph(String.format("%.2f", totalGstOnMargin), FONT_BOLD));
+                PdfPCell dashCell = new PdfPCell(new Paragraph("\u2014", FONT_BOLD));
+                dashCell.setHorizontalAlignment(Element.ALIGN_CENTER);
+                orders.addCell(dashCell);
-                orders.addCell(new Paragraph(String.format("%.2f", totalInvoiceTotal), FONT_BOLD));
+                orders.addCell(new Paragraph(String.format("%.2f", totalTaxAmount), FONT_BOLD));
                 // Logo and layout
                 iconImg.setAbsolutePosition(25, rectangle.getHeight() - 100);
                 iconImg.scalePercent(30);
                 document.add(iconImg);
                 document.add(Chunk.NEWLINE);
                 document.add(tableCustomerRetailer);
                 document.add(Chunk.NEWLINE);
                 document.add(orders);
-                // Grand total
+                // Declaration box
+                document.add(Chunk.NEWLINE);
-                PdfPTable grandTotalTable = new PdfPTable(3);
+                PdfPTable declarationTable = new PdfPTable(1);
-                grandTotalTable.setWidths(new float[]{6.5f, .6f, .9f});
+                declarationTable.setWidthPercentage(90);
+                Font declarationFont = new Font(Font.FontFamily.HELVETICA, 9, Font.BOLD);
+                PdfPCell declarationCell = new PdfPCell();
+                declarationCell.addElement(new Paragraph("Declaration", declarationFont));
+                Font declarationBodyFont = new Font(Font.FontFamily.TIMES_ROMAN, 9, Font.NORMAL);
+                declarationCell.addElement(new Paragraph(
+                        "GST is payable on margin scheme basis under Section 2(27) read with Rule 32(5) of CGST Rules, 2017. " +
+                        "The buyer is NOT eligible to claim Input Tax Credit on this invoice.", declarationBodyFont));
+                declarationCell.setPadding(8);
+                declarationCell.setBackgroundColor(new BaseColor(245, 245, 245));
+                declarationTable.addCell(declarationCell);
+                document.add(declarationTable);
+                // Summary table: Total Selling Price, GST on Margin, Total Invoice Value
+                document.add(Chunk.NEWLINE);
+                PdfPTable summaryTable = new PdfPTable(2);
-                grandTotalTable.setWidthPercentage(90);
+                summaryTable.setWidthPercentage(50);
+                summaryTable.setHorizontalAlignment(Element.ALIGN_RIGHT);
+                summaryTable.setWidths(new float[]{3f, 2f});
-                Paragraph grandTotalParagraph = new Paragraph("Grand total", FONT_BOLD);
+                PdfPCell slCell = new PdfPCell(new Paragraph("Total Selling Price", FONT_BOLD));
+                slCell.setPadding(4);
+                summaryTable.addCell(slCell);
+                PdfPCell slValCell = new PdfPCell(new Paragraph(String.format("Rs. %.2f", totalGrossSale), FONT_NORMAL));
-                grandTotalParagraph.setIndentationRight(20);
+                slValCell.setPadding(4);
-                grandTotalTable.addCell(grandTotalParagraph);
+                summaryTable.addCell(slValCell);
-                grandTotalTable.addCell(new Paragraph("Rs.", FONT_BOLD));
+                PdfPCell gstCell = new PdfPCell(new Paragraph("GST on Margin", FONT_BOLD));
+                gstCell.setPadding(4);
+                summaryTable.addCell(gstCell);
+                PdfPCell gstValCell = new PdfPCell(new Paragraph(String.format("Rs. %.2f", totalTaxAmount), FONT_NORMAL));
+                gstValCell.setPadding(4);
+                summaryTable.addCell(gstValCell);
+                Font grandTotalFont = new Font(Font.FontFamily.HELVETICA, 11, Font.BOLD);
+                PdfPCell gtCell = new PdfPCell(new Paragraph("Total Invoice Value", grandTotalFont));
+                gtCell.setPadding(5);
+                gtCell.setBackgroundColor(new BaseColor(230, 230, 230));
+                summaryTable.addCell(gtCell);
-                grandTotalTable.addCell(new Paragraph(String.format("%.2f", pdfModel.getTotalAmount()), FONT_BOLD));
+                PdfPCell gtValCell = new PdfPCell(new Paragraph(String.format("Rs. %.2f", pdfModel.getTotalAmount()), grandTotalFont));
+                gtValCell.setPadding(5);
+                gtValCell.setBackgroundColor(new BaseColor(230, 230, 230));
+                summaryTable.addCell(gtValCell);
-                document.add(grandTotalTable);
+                document.add(summaryTable);
                 // Amount in words
-                PdfPTable amountInWordsTable = new PdfPTable(3);
+                PdfPTable amountInWordsTable = new PdfPTable(1);
                 amountInWordsTable.setWidthPercentage(90);
-                amountInWordsTable.setWidths(new float[]{2, 5.1f, 0.9f});
-                amountInWordsTable.addCell(new Paragraph("Amount in Words:", FONT_BOLD));
                 String amountInWords = toAmountInWords(pdfModel.getTotalAmount());
-                amountInWordsTable.addCell(new Paragraph(amountInWords, FONT_BOLD));
+                PdfPCell wordsCell = new PdfPCell(new Paragraph(amountInWords, FONT_BOLD));
+                wordsCell.setPadding(5);
-                amountInWordsTable.addCell(new Paragraph("E & O.E", FONT_NORMAL));
+                amountInWordsTable.addCell(wordsCell);
                 document.add(amountInWordsTable);
                 // Payment options
                 if (pdfModel.getPaymentOptions() != null) {
                     PdfPTable paidAmountTable = new PdfPTable(2);
                     body.setIndentationLeft(25);
                     body.setIndentationRight(25);
                     document.add(body);
+                }
-                // Margin scheme declaration
-                addMarginSchemeDeclaration(document, pdfModel);
-                if (pdfModel.getTncs() != null) {
-                    StringBuffer sb = new StringBuffer();
-                    for (String tnc : pdfModel.getTncs()) {
-                        sb.append(tnc).append("\n");
-                    }
-                    Paragraph warningParagraph = new Paragraph(sb.toString(), FONT_NORMAL);
-                    warningParagraph.setIndentationLeft(40);
-                    document.add(Chunk.NEWLINE);
-                    document.add(warningParagraph);
-                }
                 document.newPage();
                 // E-Way Bill support
                 if (pdfModel.geteWayBillPdfModel() != null) {
                     EWayBillPDF.generateDocument(document, pdfWriter, pdfModel.geteWayBillPdfModel());

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java – Rev 36109 → 36111