File size: 3,622 Bytes
622387b | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 | diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d5255e..d6d4e0b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
# Changelog
+## 1.2.x
+
+### New
+
+- `NSDLCASData.parse_warnings` — non-fatal warnings for demat holdings whose
+ numbers don't reconcile.
+
+### Fixed
+
+- NSDL demat holdings parsed by arithmetic (`units*nav≈value`) instead of
+ hardcoded pixel columns; fixes wrong nav/value on layout-shifted statements.
+- NSDL equities: same fix (`shares*price≈value`) + pledged sub-rows no longer
+ parsed as separate holdings.
+- CDSL mutual-fund profit/return assigned by `value-cost` identity, not
+ position; fixes return% being reported as profit.
+
+### Changed
+
+- `CapitalGainsReport` is lazy-loaded, keeping `import casparser` lighter.
+
## 1.2.1
### Fixed
diff --git a/casparser/parsers/cdsl.py b/casparser/parsers/cdsl.py
index cf3774b..7fc0828 100644
--- a/casparser/parsers/cdsl.py
+++ b/casparser/parsers/cdsl.py
@@ -132,6 +132,66 @@ def _looks_numeric(text: str) -> bool:
return bool(NUMERIC_RE.match(s))
+def _rel_close(a: Decimal, b: Decimal, rel: Decimal = Decimal("0.005")) -> bool:
+ if b == 0:
+ return abs(a) <= Decimal("0.01")
+ return abs(a - b) / abs(b) <= rel
+
+
+def _resolve_cdsl_mf_pnl_returns(
+ numerics: List[str],
+ value: Decimal,
+ invested: Optional[Decimal],
+ has_distrib_col: bool,
+) -> Tuple[Optional[Decimal], Optional[Decimal]]:
+ """Assign profit and return% from the post-value numeric tail.
+
+ Positional ``numerics[-2]`` / ``[-1]`` is wrong when the statement
+ omits a printed profit column and only shows return% — identity
+ ``value - invested`` picks profit when present; otherwise leave
+ ``pnl`` unset and treat a small trailing % as ``return_``."""
+ if not has_distrib_col:
+ return None, None
+
+ value_idx = 3 if len(numerics) >= 4 else 2
+ remaining = [_to_decimal(n) for n in numerics[value_idx + 1 :]]
+ remaining = [r for r in remaining if r != 0]
+
+ expected_pnl: Optional[Decimal] = None
+ if invested is not None and invested > 0:
+ expected_pnl = value - invested
+
+ pnl: Optional[Decimal] = None
+ ret: Optional[Decimal] = None
+
+ if expected_pnl is not None:
+ for r in remaining:
+ if _rel_close(r, expected_pnl):
+ pnl = r
+ break
+ if pnl is None and len(numerics) >= 6:
+ pos_pnl = _opt_decimal(numerics[-2])
+ if pos_pnl is not None and _rel_close(pos_pnl, expected_pnl):
+ pnl = pos_pnl
+
+ others = [r for r in remaining if r != pnl]
+ if pnl is not None and others:
+ ret = others[-1]
+ elif pnl is None and expected_pnl is not None:
+ for r in others:
+ if abs(r) < Decimal("100"):
+ ret = r
+ break
+ elif len(numerics) >= 5:
+ ret = _opt_decimal(numerics[-1])
+
+ if pnl == 0:
+ pnl = None
+ if ret == 0:
+ ret = None
+ return pnl, ret
+
+
# --- account key utilities ---
@@ -586,8 +646,7 @@ def _parse_mf_holdings_row(
# Reduced row: units | NAV | value (no separate invested/cost).
invested = None
value = _to_decimal(numerics[2])
- pnl = _opt_decimal(numerics[-2]) if has_distrib_col and len(numerics) >= 6 else None
- ret = _opt_decimal(numerics[-1]) if has_distrib_col and len(numerics) >= 5 else None
+ pnl, ret = _resolve_cdsl_mf_pnl_returns(numerics, value, invested, has_distrib_col)
# Pull UCC from scheme_meta keyed on scheme_code (prefix of name)
ucc = None
|