Subversion Repositories SmartDukaan

Rev

Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
36757 31 m amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ Fixed Stock Purchase sAle ageing days, added fields to mail  
36756 33 m amit /trunk/profitmandi-fofo/src/main/webapp/resources/js/ Fixed Stock Purchase sAle ageing days, added fields to mail  
36755 5 h 18 m 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 6 h 57 m 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 7 h 4 m aman /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ Fix:Contact us list update  
36752 7 h 26 m amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ Fixed Stock Purchase sAle ageing days, added fields to mail  
36751 7 h 31 m amit /trunk/profitmandi-fofo/src/main/webapp/resources/js/ Fixed Stock Purchase sAle ageing days, added fields to mail  
36750 1 d 3 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)  
36749 1 d 3 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/ code commited miss beat  
36748 1 d 6 h ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ beat plan info commit  
36747 1 d 6 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 1 d 9 h amit /trunk/profitmandi-fofo/src/main/ Restore Total Payables and Credit Utilization fields on wallet statement dashboard (NPE-safe via creditSummary)  
36745 1 d 18 h ranu /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/ code commited miss beat  
36744 1 d 22 h ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ beat defers  
36743 3 d 1 h amit /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/ Surface internally-sourced serialized stock in warehouse billing

Removed the su.internal=0 filter from the imeisToSecondaryForWarehouseBilling
named query. The query's intent is to find whatever serialized stock is
physically present in the billing warehouse and report its original ageing;
the supplier filter was wrongly excluding units whose original purchase came
from an internal/group supplier (e.g. inter-warehouse transfers), making real
available stock invisible to billing and forcing the UI into a quantity-input
fallback instead of the IMEI picker.

Ageing ordering is preserved: AgeingService dedups by serial keeping the
earliest invoice date, so transferred stock still ages from its original
external purchase. Only 4 internal-only serial units exist network-wide;
those now age from their internal invoice (their only origin).
 
36742 3 d 1 h ranu /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ beat plan info commit  
36741 3 d 1 h ranu /trunk/profitmandi-fofo/src/main/ beat plan info commit  
36740 3 d 18 h ranu /trunk/profitmandi-fofo/src/main/ beat plan info commit  
36739 3 d 19 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/ beat deffer  
36738 3 d 19 h ranu /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ code committed for buy mode(v2)  

Show All