Subversion Repositories SmartDukaan

Rev

Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
37775 34 m ranu /trunk/ aging po approval process  
37774 52 m amit /trunk/profitmandi-fofo/src/main/ feat: show sanction request investment numbers as whole rupees

Adds a global $nf0 Velocity formatter (en-IN grouping, 0 decimals, HALF_UP) and
uses it for Total/Short Investment on the sanction request and RBM L2 screens.
 
37773 1 h 3 m amit /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ fix: show live partner investment on sanction request approval screens

Total/short investment on /getSanctionRequest, /getRbmL2SanctionRequest and the
row re-render after submit now read the 2-minute partner_investment snapshot via
PartnerInvestmentService instead of yesterday's partner_daily_investment row.
 
37772 1 h 20 m amit /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/ fix(supplier): V2 supplier save derives state from GSTIN  
37771 1 h 20 m amit /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ fix(movement): movement POs no longer auto-close; open movement PO digest to Warehouse L1/L2 at 09:00 and 17:00  
37770 1 h 20 m amit /trunk/profitmandi-fofo/src/main/ fix(movement): GRN of a movement invoice validated against its own PO + billed IMEIs; Reopen removed; PO list shows Created By; supplier state from GSTIN; jsVersion 436  
37769 1 h 20 m amit /trunk/profitmandi-dao/src/ fix(movement): receive a movement invoice only against its own PO, stop auto-closing movements, cancel reduces the PO line

- GRN: movement invoice resolves invoice -> orders -> transaction -> its own movement PO (or a receive-only PO
from the billing warehouse); supplier/warehouse keyed at entry must match; scanned IMEIs must be the billed ones
- Cancelling an unbilled movement order takes its qty off the PO line; PO CLOSED/PRECLOSED once nothing is open
- reopenedAt removed (movements no longer auto-close); PO records createdBy
- SupplierStateResolver: a supplier's state is derived from its GSTIN on save
- sql: add_po_created_by (applied), drop_po_reopened_at (run AFTER fofo/cron/web deploy)
 
37768 1 h 20 m amit /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ feat(supplier): GstinUtil - read state code / PAN from a GSTIN so the GSTIN decides a supplier's state  
37767 1 h 50 m amit /trunk/profitmandi-dao/src/ fix(orders): movements ship from their source only; a row reserved beyond its stock gives nothing

Internal movement orders were allocated by the partner allocator, which spills a source
shortfall to every warehouse the brand mapping links to the destination - stock billed
there has no PO to be received against (PO 54279: 3 units put on Jaipur for a UP->Delhi
movement). createTransactionInternally now keeps the source's own rows only; a shortfall
still parks on the source's Dummy.

getItemQty took min(qty, netAvailability) on a row reserved beyond its stock - always the
case on a Dummy holding an open order - so a -1 row added a unit to the shortfall, which
then parked on the Dummy as an extra order (24 Sep: 9 units raised for a movement of 8,
refused by the cart-value guard). Rows with nothing free are now skipped and no longer
offset another row's free stock in the warehouse total.

Removes the empty, uncalled markOrdersAsGrnCompleted.
 
37766 2 h 52 m amit /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/ feat(store-closure): V2 closeStore goes through StoreClosureService; access checks read StoreAccess

Same rules as the fofo portal (dao r37764): reason, remark and approval mail required; mohit.gulati
removed from extend billing.
 
37765 2 h 52 m amit /trunk/profitmandi-fofo/src/main/ feat(store-closure): closure popup with reason, remark and approval mail upload

- Close Store (inactive stores page and deactivate flow) opens one shared popup; /closeStore
delegates to StoreClosureService (dao r37764)
- store status access checks read StoreAccess lists; mohit.gulati removed from extend billing
- jsVersion 435
 
37764 2 h 53 m amit /trunk/profitmandi-dao/src/main/ feat(store-closure): require reason, remark and approval mail to close a store; mail closure report

- fofo.store_closure audit table (reason, remark, approval document, closed_by); migration applied on hadb1
- StoreClosureService: validates and closes, queues closure report with approval attached to the
partner's Sales L2, top 3 Sales levels, top Accounts level and the closer
- StoreAccess: single home for store close/deactivate/activate/extend-billing access lists;
neeraj.gupta can close, mohit.gulati removed from extend billing
 
37763 5 h 9 m ranu /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ aging po approval process  
37762 6 h 57 m ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/ aging po approval process  
37761 7 h 15 m ranu /trunk/ aging po approval process  
37760 1 d 0 h vikas /trunk/profitmandi-fofo/src/main/ Upload directory and Data correction for lead  
37759 1 d 0 h vikas /trunk/ LMS Call for App  
37758 1 d 0 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ aging po approval process  
37757 1 d 0 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/ aging po approval process  
37756 1 d 0 h ranu /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/ aging po approval process  

Show All