SmartDukaan – /

Rev 36147 – Add original_invoice_number to credit_note for RETURNS type, increase PrecDocDtls cap ...

amit — Thu, 02 Apr 2026 11:38:31 +0530

amit – 4 file(s) modified
Add original_invoice_number to credit_note for RETURNS type, increase PrecDocDtls cap to 10

CreditNote entity: added originalInvoiceNumber field
PurchaseReturnServiceImpl: set originalInvoiceNumber on RETURNS CN
CreditNoteServiceImpl: increased invoice ref collection from 4 to 10
GstProService: increased PrecDocDtls limit from 4 to 10

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/CreditNote.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/CreditNoteServiceImpl.java

Rev 36146 – Credit Note IRN generation for monthly margins and returns ...

amit — Thu, 02 Apr 2026 11:22:48 +0530

amit – 2 file(s) modified
Credit Note IRN generation for monthly margins and returns

GstProService:
- Overloaded generateCreditNoteIrn() accepting pre-built InvoicePdfModel + multiple invoice refs (up to 4 PrecDocDtls)

CreditNoteServiceImpl:
- issueMonthlyMarginsCN: generate CRN IRN before PDF, stamp IRN/QR on PDF
- Uses generateInvoiceV2 for CN PDF (new clean format)
- Collects distinct invoice references from margin models
- Non-fatal: IRN failure doesn't block CN generation

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/CreditNoteServiceImpl.java

Rev 36145 – Credit Note label support: CREDIT NOTE DETAILS / CN No: ...

amit — Thu, 02 Apr 2026 11:22:09 +0530

amit – 1 file(s) modified
Credit Note label support: CREDIT NOTE DETAILS / CN No: for credit note documents

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java

Rev 36144 – Wire Credit Note on debit note refund — proper CN ...

amit — Wed, 01 Apr 2026 20:44:51 +0530

amit – 1 file(s) modified
Wire Credit Note on debit note refund — proper CN numbering and persistence

refundOrder(debitNoteId):
- Generate CN number via SellerWarehouse.creditNoteSequence (CN-{prefix}{seq})
- Persist CreditNote record (type=RETURNS) in transaction.credit_note
- Persist CreditNoteLine per returned item with tax rates from original order
- Generate CRN e-invoice IRN on NIC referencing original invoice
- Non-fatal: CN/IRN failure doesn't block the refund

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnServiceImpl.java

Rev 36143 – Wire Credit Note e-invoice generation on debit note refund ...

amit — Wed, 01 Apr 2026 20:36:30 +0530

amit – 1 file(s) modified
Wire Credit Note e-invoice generation on debit note refund

refundOrder(debitNoteId):
- After wallet refund and status updates, generate CRN e-invoice on NIC
- Credit Note number: CN-{debitNoteNumber}
- References original transaction invoice via PrecDocDtls
- Non-fatal: CRN failure doesn't block the refund
- Supports multiple CRNs per invoice (partial returns over time)

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnServiceImpl.java

Rev 36142 – Prevent duplicate SALE_RET scans — fix double wallet refund bug ...

amit — Wed, 01 Apr 2026 20:04:17 +0530

amit – 1 file(s) modified
Prevent duplicate SALE_RET scans — fix double wallet refund bug

receiveDebitNoteItems():
- Build alreadyReturnedSet from existing SALE_RET/DOA_IN/SALE_RET_UNUSABLE scans
- Serialized: throw exception if IMEI already returned against same order
- Non-serialized: include existing return count in over-return check

processInvoiceReturn():
- Same alreadyReturnedSet check — skip with warning if already returned

Prevents the bug where same IMEI is returned, re-sold, then returned again
against the original order causing duplicate wallet refund.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnServiceImpl.java

Rev 36141 – Fix Credit Note: PrecDocDtls must be a list for NIC ...

amit — Wed, 01 Apr 2026 19:50:37 +0530

amit – 2 file(s) modified
Fix Credit Note: PrecDocDtls must be a list for NIC API. Sandbox verified all 3 flows: IRN generate, IRN cancel (within 24h), Credit Note CRN (past 24h)

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/api/model/E_InvoiceCommon.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProService.java

Rev 36140 – Handle IRN cancellation with 24h window + Credit Note fallback ...

amit — Wed, 01 Apr 2026 19:32:02 +0530

amit – 1 file(s) modified
Handle IRN cancellation with 24h window + Credit Note fallback

cancelInvoiceGst(invoiceNumber, reason, creditNoteNumber):
- Within 24h: cancel IRN directly (EWB auto-cancelled by NIC)
- Past 24h: generate Credit Note e-invoice (DocType=CRN) referencing original invoice
- DC invoices: cancel standalone EWB regardless of time

generateCreditNoteIrn(originalInvoice, creditNoteNo, reason):
- Same endpoint as IRN generation but DocType=CRN
- RefDtls.PrecDocDtls references original invoice number and date
- No EWB details in credit note
- IRN persisted in einvoice_details table

Sandbox verified: CRN generation works with DocType=CRN

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProService.java

Rev 36139 – code for socket snapshot

ranu — Wed, 01 Apr 2026 19:19:29 +0530

ranu – 4 file(s) modified
code for socket snapshot

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/knowlarity/KnowlarityCallMonitorScheduler.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/knowlarity/KnowlarityCallMonitorService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/knowlarity/KnowlarityEventListener.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/knowlarity/KnowlarityLiveCallClient.java

Rev 36138 – Delivery Challan: show CHALLAN DETAILS and Challan No instead of ...

amit — Wed, 01 Apr 2026 18:40:46 +0530

amit – 1 file(s) modified
Delivery Challan: show CHALLAN DETAILS and Challan No instead of INVOICE DETAILS and Invoice No

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java

Rev 36137 – Indian currency formatting: lakh/crore amount in words + Indian comma ...

amit — Wed, 01 Apr 2026 18:37:42 +0530

amit – 1 file(s) modified
Indian currency formatting: lakh/crore amount in words + Indian comma style (1,25,129.00) for all money fields in invoice table and summary

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java

Rev 36136 – Fix date formatting: use dateFormatter (dd/MM/yyyy) instead of toLocalDate() in ...

amit — Wed, 01 Apr 2026 17:24:56 +0530

amit – 4 file(s) modified
Fix date formatting: use dateFormatter (dd/MM/yyyy) instead of toLocalDate() in all GRN correction views

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-grn-correction-approval.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-grn-correction-detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-grn-correction-request-detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-grn-correction.vm

Rev 36135 – Include correction To Item IDs in itemMap so item names ...

amit — Wed, 01 Apr 2026 16:59:13 +0530

amit – 1 file(s) modified
Include correction To Item IDs in itemMap so item names resolve in approval view

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java

Rev 36134 – Fix item description: use getItemDescription() (brand+model+number+color) instead of just modelName

amit — Wed, 01 Apr 2026 16:55:08 +0530

amit – 2 file(s) modified
Fix item description: use getItemDescription() (brand+model+number+color) instead of just modelName

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-grn-correction-detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-grn-correction-request-detail.vm

Rev 36133 – GRN correction approval: add GRN By column

amit — Wed, 01 Apr 2026 16:52:12 +0530

amit – 1 file(s) modified
GRN correction approval: add GRN By column

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-grn-correction-approval.vm

Rev 36132 – GRN correction views: add invoice date, show item names in ...

amit — Wed, 01 Apr 2026 16:45:35 +0530

amit – 3 file(s) modified
GRN correction views: add invoice date, show item names in qty corrections, wrap JS in Velocity literal blocks

Rev 36131 – Fix Velocity parse error: wrap JS in literal block to ...

amit — Wed, 01 Apr 2026 16:18:45 +0530

amit – 1 file(s) modified
Fix Velocity parse error: wrap JS in literal block to prevent jQuery $ conflicts

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-grn-correction-detail.vm

Rev 36130 – Generate standalone EWB for Delivery Challans > 20K GstProService.generateEwbForDeliveryChallan(): ...

amit — Wed, 01 Apr 2026 16:10:43 +0530

amit – 2 file(s) modified
Generate standalone EWB for Delivery Challans > 20K

GstProService.generateEwbForDeliveryChallan():
- Builds GENEWAYBILL payload from order data (seller, buyer, items, transport)
- docType=CHL, subSupplyType=8, transactionType=4 (intra-state same GSTIN)
- Zero GST, items aggregated by HSN
- Stores EWB number in einvoice_details table
- Skips if EWB already exists for the invoice

InvoiceService.saveInvoice():
- DC invoices with total > 20K trigger standalone EWB generation
- EWB failure is non-fatal (logged, doesn't block PDF generation)

Rev 36129 – Refactor EWB API to use headers (consistent with e-invoice auth ...

amit — Wed, 01 Apr 2026 15:48:53 +0530

amit – 2 file(s) modified
Refactor EWB API to use headers (consistent with e-invoice auth style)

Auth: params in headers (aspid, password, Gstin, Username, Ewbpwd)
Generate/Cancel: credentials in headers, action in query param
Extracted common ewbApiCall() with retry-on-GSP752 logic
getEwbApiHeaders() in GstProAuthService for reuse

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProAuthService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProService.java

Rev 36128 – EWB auth with Redis cache (6h TTL) + auto-retry on ...

amit — Wed, 01 Apr 2026 15:19:44 +0530

amit – 2 file(s) modified
EWB auth with Redis cache (6h TTL) + auto-retry on token expiry

GstProAuthService: getEwbAuthToken() cached via redisCacheManager (6h TTL),
fetchEwbAuthToken() for direct API call on cache miss/eviction.

GstProService: getEwbToken() tries cache first, evicts and retries on failure.
generateStandaloneEwb/cancelEwb retry once on GSP752 (expired token) error.

Rev 36127 – Add standalone E-Way Bill APIs for Delivery Challans - ...

amit — Wed, 01 Apr 2026 15:13:15 +0530

amit – 1 file(s) modified
Add standalone E-Way Bill APIs for Delivery Challans

- getEwbAuthToken(): authenticate with EWB portal (separate from e-invoice auth)
- generateStandaloneEwb(): GENEWAYBILL action for DC documents
- cancelEwb(): CANEWB action with reason code 3 (order cancelled)
- Sandbox and production endpoints configured
- Uses existing RestClient, no external library needed
- Sandbox verified: auth, generate, cancel all working

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProService.java

Rev 36126 – Change FOFO invoice PDF title from Retailer Invoice to Tax ...

amit — Wed, 01 Apr 2026 13:04:08 +0530

amit – 1 file(s) modified
Change FOFO invoice PDF title from Retailer Invoice to Tax Invoice

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/order/OrderServiceImpl.java

Rev 36125 – weekly rating system live on calling module

ranu — Wed, 01 Apr 2026 12:15:28 +0530

ranu – 1 file(s) modified
weekly rating system live on calling module

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java

Rev 36124 – weekly rating system live on calling module

ranu — Wed, 01 Apr 2026 10:52:38 +0530

ranu – 1 file(s) modified
weekly rating system live on calling module

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm_call_target.vm

Rev 36123 – weekly rating system live on calling module

ranu — Wed, 01 Apr 2026 10:50:00 +0530

ranu – 1 file(s) modified
weekly rating system live on calling module

~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm_call_target.vm

Rev 36122 – weekly rating system live on calling module

ranu — Wed, 01 Apr 2026 10:46:39 +0530

ranu – 6 file(s) modified
weekly rating system live on calling module

+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/bronze-medal.png
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/clock.png
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/king.png
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/star-badge.png
+ /trunk/profitmandi-fofo/src/main/webapp/resources/images/trophy-cup.png
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm_call_target.vm

Rev 36121 – Set orderId on CustomOrderItem for invoice PDF generation

amit — Tue, 31 Mar 2026 19:48:51 +0530

amit – 1 file(s) modified
Set orderId on CustomOrderItem for invoice PDF generation

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/InvoiceService.java

Rev 36120 – Widen Order Id column, compact E-Way Bill format matching invoice ...

amit — Tue, 31 Mar 2026 19:48:40 +0530

amit – 2 file(s) modified
Widen Order Id column, compact E-Way Bill format matching invoice style

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/EWayBillPDF.java
~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java

Rev 36119 – Invoice PDF fixes: unified Rate column, per-unit gross sale for ...

amit — Tue, 31 Mar 2026 18:39:03 +0530

amit – 1 file(s) modified
Invoice PDF fixes: unified Rate column, per-unit gross sale for margin qty>1, Tax+Total columns, Tax Rate header, remove whitespace in summary

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java

Rev 36118 – code for socket snapshot

ranu — Tue, 31 Mar 2026 18:27:21 +0530

ranu – 4 file(s) modified
code for socket snapshot

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/knowlarity/KnowlarityCallMonitorScheduler.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/knowlarity/AgentLiveStatusRedisService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/knowlarity/KnowlarityCallMonitorService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/knowlarity/KnowlarityLiveCallClient.java

Rev 36117 – Route all invoice PDF generation to generateInvoiceV2

amit — Tue, 31 Mar 2026 18:21:07 +0530

amit – 1 file(s) modified
Route all invoice PDF generation to generateInvoiceV2

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/InvoiceService.java

Rev 36116 – Unified invoice PDF generation (generateInvoiceV2) for both margin and regular ...

amit — Tue, 31 Mar 2026 18:20:49 +0530

amit – 1 file(s) modified
Unified invoice PDF generation (generateInvoiceV2) for both margin and regular invoices

- New clean layout: Logo+Title+QR header, Supplier/Invoice/Buyer sections, 10-col item table
- Margin: subtitle, declaration, Gross Sale/Margin columns, GST on Margin summary
- Regular: Rate/Taxable columns, Total GST summary, no declaration
- Shared: Tax Rate col, Tax+Total cols, payment, credit terms, IRN/QR, EWB, cancellation
- Old generateAndWrite() preserved for debit notes and credit notes

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java

Rev 36115 – rbm rating consolidate mail

ranu — Tue, 31 Mar 2026 18:04:30 +0530

ranu – 5 file(s) modified
rbm rating consolidate mail

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/knowlarity/KnowlarityCallMonitorScheduler.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/knowlarity/AgentLiveStatusRedisService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/knowlarity/KnowlarityCallMonitorService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/knowlarity/KnowlarityLiveCallClient.java

Rev 36114 – rating system updated ..weekly rating

ranu — Tue, 31 Mar 2026 16:43:15 +0530

ranu – 1 file(s) modified
rating system updated ..weekly rating

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java

Rev 36113 – rbm rating consolidate mail

ranu — Tue, 31 Mar 2026 16:42:28 +0530

ranu – 2 file(s) modified
rbm rating consolidate mail

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledSkeleton.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasksTest.java

Rev 36112 – weekly rating system live on calling module

ranu — Tue, 31 Mar 2026 16:19:56 +0530

ranu – 2 file(s) modified
weekly rating system live on calling module

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/rbm_call_target.vm

Rev 36111 – Update margin scheme invoice PDF to match GST compliant format ...

amit — Tue, 31 Mar 2026 15:22:58 +0530

amit – 1 file(s) modified
Update margin scheme invoice PDF to match GST compliant format per Rule 32(5)

- Title: TAX INVOICE with margin scheme subtitle
- No purchase price disclosed on invoice
- Columns: S.No, Description, HSN, Qty, Gross Sale Value, Taxable Value (Margin), Tax Rate, Tax Amount
- Declaration box with Section 2(27) and Rule 32(5) reference
- Summary: Total Selling Price, GST on Margin, Total Invoice Value
- Labels: Buyer Details / Supplier Details per GST terminology

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java

Rev 36110 – Route margin scheme invoices to new generateMarginSchemeInvoice() PDF method

amit — Tue, 31 Mar 2026 12:57:04 +0530

amit – 1 file(s) modified
Route margin scheme invoices to new generateMarginSchemeInvoice() PDF method

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/InvoiceService.java

Rev 36109 – Separate margin scheme invoice PDF generation from regular invoice flow ...

amit — Tue, 31 Mar 2026 12:56:57 +0530

amit – 1 file(s) modified
Separate margin scheme invoice PDF generation from regular invoice flow

- Add generateMarginSchemeInvoice() with proper margin scheme table format:
S.No | Description | HSN | Qty | Purchase Price | Selling Price | Margin | GST on Margin | Invoice Total
- Title: INVOICE OF SUPPLY (MARGIN SCHEME)
- Remove margin-specific logic from generateAndWrite() (regular invoice path)
- IRN, E-Way Bill, and cancellation stamp logic intact in both paths

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/PdfUtils.java

Rev 36108 – Fix margin scheme e-invoice: remove OthChrg from item level, declare ...

amit — Mon, 30 Mar 2026 21:11:34 +0530

amit – 1 file(s) modified
Fix margin scheme e-invoice: remove OthChrg from item level, declare only taxable margin + GST in e-invoice values. NIC/GSP rejects item-level OthChrg with error 2189. Verified on sandbox.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProService.java