Subversion Repositories SmartDukaan

Rev

Show changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
37776 12 d 5 h amit /trunk/profitmandi-dao/src/main/ returns: reverse a refunded debit-note return whose goods never reached the warehouse

Once a return was refunded nothing could undo it - rejectReturn refuses an already
refunded one - so a return booked and paid for goods that never arrived left phantom
warehouse stock, the unit missing from partner stock, the order marked returned, a
wallet credit and a filed credit note, with no way back.

ReturnReversalService.reverse(imei, reason, by, dryRun) undoes exactly one unit:
the warehouse return scan (row deleted so a genuine return later is not rejected as a
duplicate) and the stock it added, partner stock with its schemes/price drop/offers,
the order's return quantity and status, the wallet refund as a REVERSAL entry, and the
return item / debit note. Guards refuse anything that has moved since the refund, and a
dry run reports the plan without writing.

The credit note follows movement and the NIC clock: inside the 24h window, and only
when the note credits nothing but this unit, its IRN is cancelled and the note marked
cancelled; past it a DBN with its own IRN is issued against the note
(CreditNoteService.issueReturnReversalDebitNote, stored as CN_CANCELLATION with no
margin month so the statement does not show it twice - the wallet REVERSAL is the
statement line); a note never filed at NIC is voided locally. Every local write happens
first and NIC last, so a refusal rolls the whole reversal back.

fofo.return_reversal (return_reversal_20260921.sql) records each reversal and, unique
per return item, makes it once-only. Also adds cancelled=0 to the RETURNS_CN branches of
the account statement queries, without which a cancelled note keeps crediting the
statement - no current effect, no RETURNS note is cancelled today.
 
37563 26 d 22 h amit /trunk/profitmandi-dao/src/main/ Filter delisted SKUs out of creation pickers; add rolling 24m delist migration

Creation screens could offer items whose catalog.tag_listing.active = 0:
- Item.selectAllModels (scheme/offer model dropdown) joined tag_listing with
no active predicate. Adding tl.active = true also gives the model-level
rollup, since callers dedupe to catalogItemId: a model whose colours are
all inactive now yields no rows, one keeping a listed colour stays.
- The shared partner item picker had no active filter at all. Added a second
basis via getAllPartnerItemStringDescription(anyColor, activeOnly);
activeOnly participates in the fofoItems cache key so the two bases cannot
serve each other's cached results. Default stays false for screens that
inspect or edit existing records.
- New TagListing.selectActiveItemIds named query backs the filter.

Also adds the rolling 24-month delist migration: zero stock both sides, no
outstanding vendor PO (status IN (1,2), external supplier, unfulfilled > 0 --
INIT is excluded as it is a drawer of stale drafts), and re-categorises
fully-dark mobile models to OTHER. Idempotent, audited, rollback documented.
 
36624 138 d 11 h amit /trunk/profitmandi-dao/src/main/java/ Thrift cleanup: migrate types, remove dead code, add moved files

- Added Affiliate.java POJO (replaces Thrift struct)
- Moved from profitmandi-common: WalletHistoryModel, ExcelUtils, CustomOrder
- Removed dead createReturnTransaction method from ReturnService/Impl
- Removed dead getPartnerStockOnDate from InventoryService/Impl
- Replaced CatalogServiceException with Exception in PdfPoSheetGenerator
- Removed Thrift client imports from UserServiceImpl
 
36103 190 d 6 h amit /trunk/profitmandi-dao/src/main/ Add DN rejection with full reversal: restore inventory, schemes, price drops, offers; add deny reason to purchase return items; add purchase return notification service  
35191 357 d 13 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/ Fixed Investment  
33952 685 d 9 h aman.kumar /trunk/ activated imei  
33245 899 d 12 h ranu /trunk/ added signature  
30500 1594 d 12 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/ Fixed ahead issue  
30493 1595 d 4 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/ Fixed ahead issue  
30197 1670 d 11 h tejbeer /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ change  
30148 1674 d 11 h amit.gupta /trunk/ Fixed scheme creation  
27618 2093 d 14 h tejbeer /trunk/ changes  
27596 2099 d 7 h tejbeer /trunk/ change  
27583 2101 d 8 h tejbeer /trunk/ change  
27529 2113 d 6 h tejbeer /trunk/ warehouse wise data change  
26961 2233 d 14 h amit.gupta /trunk/ Added ageing report for all partners  
26924 2246 d 11 h amit.gupta /trunk/ Fixed inventory changes  
26891 2255 d 15 h amit.gupta /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/ Fixed Inventory Logic  
26299 2438 d 20 h amit.gupta /trunk/ Added activation as seperate table  
26265 2447 d 8 h amit.gupta /trunk/ Added migration for duplicate grns  

Show All