Subversion Repositories SmartDukaan

Rev

Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
36155 49 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ Fix e-invoice/EWB retry loop: set irnGenerated on all failure paths, send email on errors, prevent infinite cron retries  
36154 1 h 52 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/ Fix GRN correction for non-serialized items: create invoice_item when target item not on invoice, drop stale itemNumber copy  
36153 2 h 0 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/ Switch downloadCN to generateInvoiceV2 with IRN/QR stamp for finance team CN downloads  
36152 2 h 24 m aman /trunk/ Feat:Request Panel for brand dealer registration,Admin panel for managing WOD request templates  
36151 2 h 33 m amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ Switch /credit-note/{id} to use generateInvoiceV2 for new clean PDF format  
36150 2 h 37 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/ On IRN cancel within 24h: set order status INVOICE_CANCELLED(90), regenerate PDF with CANCELLED stamp  
36149 2 h 41 m amit /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ Add INVOICE_CANCELLED(90) status for post-billing IRN cancellation within 24h  
36148 2 h 52 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ Increase PrecDocDtls cap to 100 — NIC has no explicit limit, covers all per-partner monthly invoices  
36147 2 h 58 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ 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
 
36146 3 h 14 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ 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
 
36145 3 h 15 m amit /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ Credit Note label support: CREDIT NOTE DETAILS / CN No: for credit note documents  
36144 17 h 52 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/ 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
 
36143 18 h 0 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/ 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)
 
36142 18 h 33 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/ 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.
 
36141 18 h 46 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/ 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)  
36140 19 h 5 m amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/ 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
 
36139 19 h 17 m ranu /trunk/ code for socket snapshot  
36138 19 h 56 m amit /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ Delivery Challan: show CHALLAN DETAILS and Challan No instead of INVOICE DETAILS and Invoice No  
36137 19 h 59 m amit /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ Indian currency formatting: lakh/crore amount in words + Indian comma style (1,25,129.00) for all money fields in invoice table and summary  
36136 21 h 12 m amit /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fix date formatting: use dateFormatter (dd/MM/yyyy) instead of toLocalDate() in all GRN correction views  

Show All