Subversion Repositories SmartDukaan

Rev

Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
36527 1 d 13 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/icicilombard/ l3 and avobe show all warehouse stock  
36504 4 d 20 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ DN generation: DUPIRN reconciliation flow + fix cnDate to use NIC acknowledge date + extract /A prefix handling  
36502 5 d 5 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ DN generation for cancelled MARGINS CNs + fix /A CN prefix extraction NPE

- Add generateDebitNotesForCancelled(List<String>) for explicit CN list
- Add selectByCreditNoteNumbers repository method
- Fix GstProService sandbox: use SANDBOX_GST_NUMBER before isGstEnabled check, sandbox buyer details
- Fix prefix extraction NPE for /A suffixed CN numbers (getCreditNotePdfModel, existingCNMap, extractPrefix)
 
36493 5 d 12 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/ Refactor CRN/DBN IRN generation: unify 4 methods into single generateNoteIrn with shared auth, DUPIRN, and persist helpers  
36477 8 d 8 h amit /trunk/ Invoice return: IRN/EWB cancellation on approve, Logistics L2+ permission, DL GST disabled

- approveInvoiceReturn now cancels IRN+EWB when cancellable (path B) before falling back to Credit Note (path A)
- DC/challan EWB cancelled best-effort before Credit Note path
- Added enabled flag to GstEInvoiceUser; DL GSTIN disabled in E_INVOICE_USERS and EWB_USERS
- isGstEnabled guard added to all public GST API methods in GstProService
- Logistics L2+ can now approve/reject invoice returns (not just Finance)
- invoice-return.vm uses canApproveInvoiceReturn for INV-prefix button visibility
 
36453 11 d 9 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ Fix NPE in credit note IRN: modularize InvoiceService.getInvoicePdfModel into core (ForIrn) and enrichment (EWB/eInvoice), switch purchase return CN to model-based IRN builder  
36431 14 d 5 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ Add reissueMarginsCN: reissue MARGINS credit notes with /A suffix, March 31 book date, Delhi GST skip, consolidated partner emails  
36415 15 d 10 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/ GstProService: cancel EWB before IRN in within-24h cancellation

NIC rejects IRN cancellation with 'This IRN cannot be cancelled because
e-way bill has been generated' when an EWB is still active against the
invoice. Existing within-24h branch went straight to cancelIrn and hit
this rejection on every cancellation that had a generated EWB.

Mirror the DC branch's EWB-cancel pattern: when eInvoiceDetails.ewbNo is
non-null, resolve sellerGstin (prod gstin / sandbox), parse ewbNo, call
cancelEwb first, then proceed to cancelIrn. EWB-cancel is wrapped in
try/catch + WARN — already-cancelled EWBs (transient or manual) don't
block the IRN cancel that follows; a genuinely-active EWB still surfaces
via the IRN cancel error.
 
36399 16 d 13 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Replace mailSender (SendGrid) with gmailRelaySender - SendGrid API key expired/revoked  
36218 35 d 15 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Credit/Debit note enhancements: add margin_month + cancelled columns, fofo_dn_sequence on sellerwarehouse, generateDebitNoteIrn for margin reversals, selectCancelledByMonth repo, generateDebitNotesForCancelled service, cn_date = ack_date, dedup by margin_month, source-based descriptions (Schemes/Offers vs Price Drop), skip negative margin line items for CRNs  
36200 37 d 8 h ranu /trunk/ error correctly will show  
36199 37 d 8 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/ Fix: add DUPIRN handling in credit note IRN generation (both MARGINS and RETURNS overloads) — fetch existing IRN from NIC instead of failing  
36184 39 d 14 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Fix Credit Note IRN generation for monthly margins

- Add hsnCode to InventoryMarginModel, update 3 named queries to select ii.hsnCode
- Group CN items by taxRate+HSN, set hsnCode on CustomOrderItem
- Add getGenIrnRequest/getItemList overloads in GstProService for credit notes
- Fix IndexOutOfBoundsException from orders-items mismatch in generateCreditNoteIrn
- Wrap fofo and vendor loops in try-catch so one CN failure does not abort the process
- Send summary email with failure details to amit.gupta and ranu.rajput
 
36171 41 d 9 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/ Handle GSP102 auth token expired/missing: evict cache and retry, same as GSP752  
36168 41 d 9 h amit /trunk/profitmandi-dao/src/ Add EWB GET APIs (GetEwayBillsByDate, GetEwayBill), fix irn_generated for existing EWB, fetch+update script  
36167 41 d 10 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/ DC challans: use challan number as IRN, skip ack/qr/ack_date (not applicable for DCs)  
36165 41 d 10 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/ Handle EWB 604: return marker result since Chartered Info API has no doc-number lookup  
36164 41 d 10 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/ Handle EWB 604 (already exists): fetch existing EWB via GETEWBBYDOCNO instead of failing  
36163 41 d 10 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/ Skip EWB for same-pincode DC transfers (virtual warehouse, no physical movement)  
36162 41 d 11 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/ Fix standalone EWB for courier DCs: send Part A only without transMode to avoid 303 error, fix transactionType 4->1  

Show All