| Rev |
Age |
Author |
Path |
Log message |
Diff |
| 36783 |
51 d 8 h |
vikas |
/trunk/profitmandi-fofo/src/main/ |
Location Tracking - From Punch IN |
|
| 36781 |
51 d 10 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
some Enhancements or changes |
|
| 36780 |
51 d 10 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Rename reco CSV column header In Transit -> Unbilled PO (label only; calculation unchanged) |
|
| 36776 |
51 d 10 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Remove redundant /account/closing-statements; repoint wallet-details closing button to /account/reco (now on the wallet+PI-loan model) |
|
| 36775 |
51 d 11 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Align /account/reco closing with individual account statement: closing = wallet + pending indent - loan outstanding; add Loan Outstanding column |
|
| 36773 |
51 d 12 h |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
some Enhancements or changes |
|
| 36772 |
52 d 4 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Account statement: per-CN scheme/margin lines + non-month-end raw-scheme fallback.
- Month-end: one 'Margin / Scheme Payout' line PER credit note (MARGINS net >=0 -> Credit Note (CN); CN_CANCELLATION or negative net -> Debit Note (DN), reducing the balance), referenced by CN number.
- Non-month-end statements: the trailing month's MARGINS CN isn't issued yet, so consolidate that month's raw scheme wallet entries into a single 'Margin / Scheme Payout' line placed at the end, just before the FLOAT DIFF. Keeps partial-period statements reconciling (verified AYAAN 01-15/04 float -1.97 vs 36,462 in the diff without it). |
|
| 36769 |
52 d 5 h |
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). |
|
| 36764 |
53 d 3 h |
ranu |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
some Enhancements or changes |
|
| 36763 |
53 d 3 h |
ranu |
/trunk/ |
some Enhancements or changes |
|
| 36761 |
53 d 4 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
some Enhancements or changes |
|
| 36755 |
53 d 10 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 |
53 d 11 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. |
|
| 36747 |
54 d 11 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Scheme extension: propagate new end date to scheme_item rows
extendAllScheme and extendSchemeById only updated scheme.end_date_time, leaving scheme_item.end_date at the original value, so item-level scheme eligibility did not honor the extension. Carry the new end date over to items that were tracking the scheme window (item end_date == previous scheme end date), preserving custom per-item windows, matching expireSchemeById behavior. |
|
| 36746 |
54 d 14 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Restore Total Payables and Credit Utilization fields on wallet statement dashboard (NPE-safe via creditSummary) |
|
| 36741 |
56 d 6 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
beat plan info commit |
|
| 36740 |
56 d 23 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
beat plan info commit |
|
| 36735 |
57 d 12 h |
vikas |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Filter Reportees by Manager |
|
| 36734 |
57 d 12 h |
vikas |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Changed Salesman Icon Instead of bike Icon |
|
| 36728 |
58 d 5 h |
vikas |
/trunk/profitmandi-fofo/src/main/ |
Fix dates error, And Punch IN/OUT |
|