| Rev |
Age |
Author |
Path |
Log message |
Diff |
| 36769 |
20 m |
amit |
/trunk/ |
Account statement: select the month-end scheme/margin credit notes by margin_month instead of cn_date.
Added CreditNoteRepository.selectByMarginMonth(fofoId, YearMonth) - fofo-scoped, keyed on margin_month passed as a YearMonth so the generic repo matches it as a whole-month range (robust to the stored day). populateData now uses it for the month-end CN block. margin_month is the explicit margin-period field (always populated for MARGINS and CN_CANCELLATION; RETURNS have none and are naturally excluded, consistent with returns being sourced from returnorderinfo). |
|
| 36768 |
38 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/ |
Restore ActivatedImei.checked idempotency guard (revert r36579)
r36579 removed the 'ai.checked = false' filter from selectMissedActivationSale
and dropped the checked field, treating it as dead. It was not: the filter
prevented the daily activation-scheme sweep from re-processing the ~163K
already-evaluated historical activations (checked=1). Without it, the sweep
resurrected those old activations as PENDING scheme_in_out rows, and the
oldest ones (whose legacy orders have no fofo_order) made processActivation
throw FFORDR_1000 and roll back the entire batch every run since 2026-05-18,
stalling all special-support credits.
Restores the checked field + accessors and the 'ai.checked = false' filter.
checked column repopulated on fofo.activated_imei from backup; rogue PENDING
rows cleaned up separately. |
|
| 36767 |
1 h 8 m |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/scheme/ |
Fixed Stock Purchase sAle ageing days, added fields to mail |
|
| 36766 |
7 h 9 m |
vikas |
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ |
Punch, Check, Deferred handling improvements and mapbox |
|
| 36765 |
7 h 11 m |
vikas |
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ |
Punch, Check, Deferred handling improvements and mapbox |
|
| 36764 |
22 h 27 m |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
some Enhancements or changes |
|
| 36763 |
22 h 28 m |
ranu |
/trunk/ |
some Enhancements or changes |
|
| 36762 |
22 h 37 m |
vikas |
/trunk/ |
Punch, Check, Deferred handling improvements and mapbox |
|
| 36761 |
22 h 39 m |
ranu |
/trunk/profitmandi-fofo/src/main/ |
some Enhancements or changes |
|
| 36760 |
22 h 46 m |
vikas |
/trunk/ |
Punch, Check, Deferred handling improvements and mapbox |
|
| 36759 |
22 h 51 m |
vikas |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/auth/ |
Punch, Check, Deferred handling improvements and mapbox |
|
| 36758 |
23 h 9 m |
vikas |
/trunk/ |
Punch, Check, Deferred handling improvements and mapbox |
|
| 36757 |
1 d 0 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ |
Fixed Stock Purchase sAle ageing days, added fields to mail |
|
| 36756 |
1 d 0 h |
amit |
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ |
Fixed Stock Purchase sAle ageing days, added fields to mail |
|
| 36755 |
1 d 4 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Account statement: relabel the reconciling line as 'FLOAT DIFF' (rounding/float only).
It is not pending indent or a cross-period movement - with clean data it is only a few rupees of float. A large value indicates a data issue (e.g. MARGINS CN not yet rolled out) and is surfaced by the existing reconciliation warning. |
|
| 36754 |
1 d 6 h |
amit |
/trunk/ |
Account statement (Excel): reconcile running balance to net standing (wallet + pending indent - loan).
- populateData: categorised lines, scheme/margin shown as month-end MARGINS credit note (CN_CANCELLATION and negative-net CNs rendered as debit notes), interest-accrued line as the standing-moving loan cost, and a net-pending-indent/diff line that lands the running balance on closing.
- Returns shown individually from returnorderinfo (one credit line per return, against its invoice on refundedAt); billing-query RETURNED/RETURNS_CN suppressed to avoid double count.
- Exclude PURCHASE and CREDIT_LIMIT/CREDIT_UTILIZED (loan cash legs) from the wallet body.
- LoanStatementRepository.getInterestAccruedBetween; ReturnOrderInfoRepository.selectReturnsBetween. |
|
| 36753 |
1 d 6 h |
aman |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
Fix:Contact us list update |
|
| 36752 |
1 d 6 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ |
Fixed Stock Purchase sAle ageing days, added fields to mail |
|
| 36751 |
1 d 7 h |
amit |
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ |
Fixed Stock Purchase sAle ageing days, added fields to mail |
|
| 36750 |
2 d 2 h |
amit |
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/ |
Keep e-invoice PrdDesc as IMEI count within NIC 300-char limit while invoice PDF lists full IMEIs (complements r36749 IMEI-listing restore) |
|