SmartDukaan – /

Rev 37847 – refactor(warehouse): read warehouse lists and labels from BillingWarehouseService instead of ...

amit — Mon, 05 Oct 2026 18:48:40 +0530

amit – 24 file(s) modified
refactor(warehouse): read warehouse lists and labels from BillingWarehouseService instead of WAREHOUSE_MAP/WAREHOUSE_NAME_MAP

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/checkout/OrderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/guest/GuestController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/services/SolrService.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoDashboardController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoGrnController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoIndentController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoInventoryController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoLogisticsController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoMonitorController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoNotificationController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoOfferController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoOrderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoOrderManagementController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoPlacementPlanController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoProviderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoPurchaseOrderController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoPurchaseReturnController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoRetailerController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoSchemeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoSellerController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoSupplierController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoWarehouseController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoWarehouseRiderController.java

Rev 37846 – feat(warehouse): dashboards list ACTIVE warehouses only, warehouse-team screens ACTIVE+SUSPENDED (from ...

amit — Mon, 05 Oct 2026 18:48:38 +0530

amit – 50 file(s) modified
feat(warehouse): dashboards list ACTIVE warehouses only, warehouse-team screens ACTIVE+SUSPENDED (from BillingWarehouseService, WAREHOUSE_MAP gone); global $warehouseNames for labels of data rows in any state; Sellers & Warehouses screen: all-warehouse overview with status tabs, 3-state status, rename, stock/unshipped orders/stores/mapping usage, send stock alert; partner zone offers active warehouses only; brand stock 'All' = active warehouses (replaces r37838 loop); jsVersion 442

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/ControllerSetup.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LogisticsController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/MonitorController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/RbmDrrDashboardController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/NotificationController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PlacementPlanController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/provider/ProviderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReturnPermissionHelper.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReturnToVendorController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SellerController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SupplierController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/OrderManagementController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/PoStockApprovalController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/PurchaseOrderController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/WarehouseController.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse_rider/WarehouseRiderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/seller.js
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/activation-updation-timestamp.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/brand-region-mapping-view.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog-warehouse-item.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-combo.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/inventory-listing-purchase-item.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/placement-plan-details.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/provider-tat-detail.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/secondary-warehouse-billing-order.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/seller-warehouse-container.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/seller.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/today_po.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-activated-itemwise-model.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-datewise-debitnote.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-grn-correction.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-invoice-view.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-open-purchase-order.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-purchase-order.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-receive-new-invoice.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehousewise_accessoriesbrand_sale.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehousewise_activated_model.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehousewise_brand_partners_sale.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse_accessories_itemwsie_sale.vm
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse_partner_itemwise_sale.vm

Rev 37845 – feat(warehouse): ACTIVE/SUSPENDED/INACTIVE status + label on sellerwarehouse replace WAREHOUSE_MAP - ...

amit — Mon, 05 Oct 2026 18:48:21 +0530

amit – 33 file(s) modified
feat(warehouse): ACTIVE/SUSPENDED/INACTIVE status + label on sellerwarehouse replace WAREHOUSE_MAP - BillingWarehouseService (active for dashboards, active+suspended for warehouse screens, names in every state, 5 min cache); setup service: guarded status change (no suspend while franchise stores or brand mapping route there, no close while stock/unshipped orders), rename, all-warehouse overview with usage; partner store assignable only to an active warehouse; daily stock alert for suspended/inactive warehouses to logistics/accounts top 2 staffed levels + leadership; dashboard warehouse list = active (replaces r37834 stock-holding loop); migration sellerwarehouse_status_display_name_20261005.sql (applied on hadb1)

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/SellerWarehouse.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/enumuration/warehouse/WarehouseStatus.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/warehouse/PhysicalWarehouseView.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/warehouse/WarehouseStockLine.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/warehouse/WarehouseUsage.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/FofoStoreRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/InventoryWarehouseRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/SaholicInventoryCISRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/SaholicInventoryCISRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/WarehouseRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/SellerWarehouseRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/SellerWarehouseRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/solr/FofoSolr.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/authentication/JWTUtil.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/RbmTargetServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/BillingWarehouseService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/BillingWarehouseServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PoStockApprovalDigestServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PoStockApprovalServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/SuspendedWarehouseStockAlertService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/SuspendedWarehouseStockAlertServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseSetupService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseSetupServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseSetupValidator.java
+ /trunk/profitmandi-dao/src/main/resources/sql/sellerwarehouse_status_display_name_20261005.sql
+ /trunk/profitmandi-dao/src/test/java/com/spice/profitmandi/service/warehouse/BillingWarehouseServiceImplTest.java
+ /trunk/profitmandi-dao/src/test/java/com/spice/profitmandi/service/warehouse/SuspendedWarehouseStockAlertServiceImplTest.java
~ /trunk/profitmandi-dao/src/test/java/com/spice/profitmandi/service/warehouse/WarehouseSetupServiceImplTest.java

Rev 37844 – refactor(warehouse): drop WAREHOUSE_MAP and WAREHOUSE_NAME_MAP - billing warehouses, their labels ...

amit — Mon, 05 Oct 2026 18:46:54 +0530

amit – 1 file(s) modified
refactor(warehouse): drop WAREHOUSE_MAP and WAREHOUSE_NAME_MAP - billing warehouses, their labels and status now come from transaction.sellerwarehouse (BillingWarehouseService)

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java

Rev 37843 – revival process fix loi

ranu — Mon, 05 Oct 2026 18:33:13 +0530

ranu – 2 file(s) modified
revival process fix loi

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/loiForm/LoiFormServiceImpl.java
~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoiFormController.java

Rev 37842 – Fixed mail sender everywhere

amit — Mon, 05 Oct 2026 16:12:55 +0530

amit – 1 file(s) modified
Fixed mail sender everywhere

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProAuthService.java

Rev 37841 – Fixed mail sender everywhere

amit — Mon, 05 Oct 2026 16:03:40 +0530

amit – 1 file(s) modified
Fixed mail sender everywhere

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProAuthService.java

Rev 37840 – fix(offers): select month offers by date overlap so multi-month offers ...

amit — Mon, 05 Oct 2026 13:28:42 +0530

amit – 2 file(s) modified
fix(offers): select month offers by date overlap so multi-month offers show in price circular

selectAll(YearMonth) kept an offer only if its start or end date fell in the month,
so an offer running Sep 24 -> Nov 15 (e.g. 10378) was missing from October's price
circular, partner offer view and getMonthOfferIds. Now start <= month end AND
end >= month start. Offer cache eviction (edit + bulk create) clears every month
the offer covers instead of only the start month.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/OfferRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/offers/OfferServiceImpl.java

Rev 37839 – drr view dashboard commit

ranu — Mon, 05 Oct 2026 12:31:59 +0530

ranu – 1 file(s) modified
drr view dashboard commit

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/monitors/RbmDrrDashboardController.java

Rev 37838 – fix(dashboard): warehouse brand stock 'All' includes every warehouse holding stock ...

amit — Mon, 05 Oct 2026 11:49:24 +0530

amit – 1 file(s) modified
fix(dashboard): warehouse brand stock 'All' includes every warehouse holding stock in tbl_cis, not only franchise-store warehouses plus hardcoded 7573/10516/7678 - HR hubs (internal stores only) now counted (same rule as r37834)

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/DashboardController.java

Rev 37837 – fix(availability): tablets (10010) count as devices in the stock half ...

amit — Mon, 05 Oct 2026 11:19:38 +0530

amit – 1 file(s) modified
fix(availability): tablets (10010) count as devices in the stock half of BrandRegionMapping.availability and .availabilityVendorWarehouse, matching their reservation half and every other routing query - stock and reservations now go through the same mapping rows

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/BrandRegionMapping.java

Rev 37836 – Lead Management: the calendar date range now applies to follow-up ...

aman — Mon, 05 Oct 2026 10:58:22 +0530

aman – 2 file(s) modified
Lead Management: the calendar date range now applies to follow-up leads too, in both the lead list and the CSV download. Previously follow-ups were appended undated, and the download (non-field-sales path) appended them even when the list did not, so a date-filtered download contained all follow-up leads from all time. 'All' status now consistently includes follow-ups in every branch.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01JjVXnkrysiXEa2YYRn4BqL

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoLeadController.java

Rev 37835 – chore(sql): record applied migrations - HR movement HSN/GST-rate/category fixes (2026-10-02) ...

amit — Sun, 04 Oct 2026 13:53:44 +0530

amit – 2 file(s) modified
chore(sql): record applied migrations - HR movement HSN/GST-rate/category fixes (2026-10-02) and HR warehouse self brand mapping (2026-10-04); both re-runnable, already applied on hadb1

+ /trunk/profitmandi-dao/src/main/resources/sql/20261002_hr_movement_hsn_tax_category_fixes.sql
+ /trunk/profitmandi-dao/src/main/resources/sql/20261004_hr_warehouse_self_brand_mapping.sql

Rev 37834 – fix(dashboard): warehouse-wise stock lists every warehouse holding stock in tbl_cis, ...

amit — Sun, 04 Oct 2026 13:46:30 +0530

amit – 3 file(s) modified
fix(dashboard): warehouse-wise stock lists every warehouse holding stock in tbl_cis, not only franchise-store warehouses plus hardcoded 7573 - HR hubs (internal stores only) now show

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/SaholicInventoryCISRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/SaholicInventoryCISRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java

Rev 37833 – feat(cron): --retryIrn re-files rejected e-invoices after their data is corrected ...

amit — Fri, 02 Oct 2026 02:48:44 +0530

amit – 2 file(s) modified
feat(cron): --retryIrn re-files rejected e-invoices after their data is corrected - reset and filing in one transaction so the scheduled IRN job cannot race it

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
+ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/IrnRetrier.java

Rev 37832 – feat(cron): --closeMovementPO closes movement POs the way the PO screen's ...

amit — Fri, 02 Oct 2026 02:02:21 +0530

amit – 3 file(s) modified
feat(cron): --closeMovementPO closes movement POs the way the PO screen's Close does (refund live orders, preclose); dry run by default

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/MovementPoCreator.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/MovementPoTask.java

Rev 37831 – feat(cron): movement billing takes only units at the order's price; ...

amit — Fri, 02 Oct 2026 01:53:52 +0530

amit – 2 file(s) modified
feat(cron): movement billing takes only units at the order's price; PO dry run names each PO's vendor warehouse

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/MovementBiller.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/MovementPoTask.java

Rev 37830 – feat(movement): one PO per source vendor warehouse and cost - ...

amit — Fri, 02 Oct 2026 01:53:51 +0530

amit – 9 file(s) modified
feat(movement): one PO per source vendor warehouse and cost - layers carry their GOOD/OURS vendor warehouse, orders are raised pinned to it, holds of pinned orders come off their own warehouse, billing takes units at the order's price first

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/InternalMovementAllocationModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/InternalMovementPriceModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseInventoryItemRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/InternalMovementPricingServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseServiceImpl.java
+ /trunk/profitmandi-dao/src/test/java/com/spice/profitmandi/service/warehouse/MovementPoSplitTest.java

Rev 37829 – fix(order): split order's line item carries its item, so the ...

amit — Fri, 02 Oct 2026 01:06:56 +0530

amit – 1 file(s) modified
fix(order): split order's line item carries its item, so the split can be billed or split again in the same transaction (NPE at addBillingDetailsForGrouppedOrders)

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java

Rev 37828 – fix(cron): movement billing looks POs up inside a transaction (driver ...

amit — Fri, 02 Oct 2026 00:46:22 +0530

amit – 3 file(s) modified
fix(cron): movement billing looks POs up inside a transaction (driver has none - 'Could not obtain transaction-synchronized Session'); failure message no longer claims nothing was raised

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/MovementBiller.java
~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/MovementBillingTask.java

Rev 37827 – feat(cron): --autoCreateMovementPO raises an internal movement PO from an upload ...

amit — Fri, 02 Oct 2026 00:03:39 +0530

amit – 3 file(s) modified
feat(cron): --autoCreateMovementPO raises an internal movement PO from an upload file as the operator; dry run previews every PO, line, price and origin; --bill dry-runs billing of the raised POs

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
+ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/MovementPoCreator.java
+ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/MovementPoTask.java

Rev 37826 – feat(warehouse): previewMovementPurchaseOrders - read-only view of the POs an internal ...

amit — Fri, 02 Oct 2026 00:03:38 +0530

amit – 2 file(s) modified
feat(warehouse): previewMovementPurchaseOrders - read-only view of the POs an internal movement would be raised as (margin-scheme apart, one per cost)

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java

Rev 37825 – feat(cron): --autoBillMovement bills internal movement POs (dry run by default) ...

amit — Thu, 01 Oct 2026 23:38:50 +0530

amit – 3 file(s) modified
feat(cron): --autoBillMovement bills internal movement POs (dry run by default)

Bills the orders a movement PO raised the way the order management screen does:
orders parked on the Dummy (brand without a source mapping) are re-pointed to the
source vendor warehouse holding the stock (split when it spans several), serialized
units take IMEIs oldest first at qty 1 with a good last scan, then acceptOrders ->
addBillingDetailsForGrouppedOrders -> checkOrderDispatchEligibility, one invoice per
transaction, all-or-nothing. IRN / e-way bill follow from the existing cron job.

Usage: --autoBillMovement --pos=PO1,PO2 --email=<operator> --provider=<id> [--live]
Dry run (default) plans and validates only - billing opens its own REQUIRES_NEW
transaction (createLoanForBilling) that a rollback would not undo. Refuses a
transaction over 900 invoice lines (NIC caps an IRN at 1000). Prints the invoice
list for --autoGrnInternal.

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/Application.java
+ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/MovementBiller.java
+ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/migrations/MovementBillingTask.java

Rev 37824 – feat(warehouse): add HR Gurugram warehouses 13368/13370/13372 to WAREHOUSE_MAP HR-NSSPL/GGN, ...

amit — Thu, 01 Oct 2026 21:11:48 +0530

amit – 1 file(s) modified
feat(warehouse): add HR Gurugram warehouses 13368/13370/13372 to WAREHOUSE_MAP

HR-NSSPL/GGN, HR-NSSPL/DL and HR-NSSPL/UPW (seller 21 NSSPL-HR-GGN, 06AACCN9802G2ZI)
in WAREHOUSE_MAP and WAREHOUSE_NAME_MAP, so the PO / GRN destination lists, vendor
warehouse lookup, Solr availability fields and warehouse reports include them.
Labels are the warehouse display names; 'HR' stays 7720.

~ /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java

Rev 37823 – feat(seller): rebuild Sellers & Warehouses screen; PO supplier filter by ...

amit — Thu, 01 Oct 2026 21:07:01 +0530

amit – 12 file(s) modified
feat(seller): rebuild Sellers & Warehouses screen; PO supplier filter by warehouse; internal warehouse from active sellerwarehouse

Needs dao r37822 and the warehouseaddressmaster.active migration (applied on hadb1).

- Sellers & Warehouses (menu 113): SellerController is now a thin layer over
WarehouseSetupService. Seller list; per-seller physical warehouses with internal
store / supplier / Dummy / sequences, Active toggle and Change address (internal
stores follow); address list with Active toggle; New Address with city, pin,
contact and invoice preview; New Seller with GSTIN checks; New Warehouse creates
the OURS/BAD vendor 40 + Dummy shape. JSON posts; refusals come back as 400 text.
- PO create screen: vendor search takes the selected warehouse and lists only
suppliers mapped to it (/vendors?warehouseId); changing warehouse clears the vendor.
- Supplier create/edit: internal warehouse defaults to 0 and is picked from active
physical warehouses (transaction.sellerwarehouse.is_active), not WAREHOUSE_MAP;
validated on save. Fixes the edit form ticking "Internal Warehouse" for a stored 0
and saving the first option (7720), and the create form never sending it.
- jsVersion 441.

Rev 37822 – feat(warehouse): physical warehouse setup service, supplier mapping PO guard, address ...

amit — Thu, 01 Oct 2026 21:06:34 +0530

amit – 24 file(s) modified
feat(warehouse): physical warehouse setup service, supplier mapping PO guard, address active flag

- WarehouseSetupService + WarehouseSetupValidator: create seller (state from GSTIN,
unique label/GSTIN), address master (city stored last, 6-digit pin, contact),
physical warehouse (OURS/BAD vendor 40 + Dummy/G + sellerwarehouse + mapping in
one transaction), activate/deactivate (sellerwarehouse.is_active), remap address
with internal store sync. Limits follow column sizes (sql_mode is empty).
- WarehouseAddressMaster.active: only active addresses are offered for assignment.
Migration sql/20261001_warehouseaddressmaster_active.sql (applied on hadb1).
- PO guard: createPurchaseOrder refuses a supplier with no OURS/GOOD vendor
warehouse at the destination (GRN could never receive it).
InventoryWarehouseRepository.hasGoodSupplierWarehouse / selectSupplierIdsWithGoodWarehouse
use existence checks; 67 pairs carry duplicate OURS/GOOD rows.
- SellerService.syncInternalStoreAddress(store); RetailerServiceImpl syncs an
INTERNAL store's address when it moves warehouse or becomes internal.
- Record of 2026-10-01 HR Gurugram setup SQL (seller 21, warehouses 13368/13370/13372).
- Tests: WarehouseSetupValidatorTest (10), WarehouseSetupServiceImplTest (7).

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/WarehouseAddressMaster.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/warehouse/NewPhysicalWarehouseRequest.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/warehouse/NewSellerRequest.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/warehouse/NewWarehouseAddressRequest.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/warehouse/PhysicalWarehouseView.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/warehouse/WarehouseAddressView.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/InventoryWarehouseRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/InventoryWarehouseRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WarehouseAddressMappingRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/WarehouseAddressMappingRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/SellerService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/SellerServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/user/RetailerServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseSetupService.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseSetupServiceImpl.java
+ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/WarehouseSetupValidator.java
+ /trunk/profitmandi-dao/src/main/resources/sql/20261001_delete_hrgn1715_hr_uk_store.sql
+ /trunk/profitmandi-dao/src/main/resources/sql/20261001_hr_gurugram_vendor_warehouses.sql
+ /trunk/profitmandi-dao/src/main/resources/sql/20261001_hr_gurugram_virtual_warehouses.sql
+ /trunk/profitmandi-dao/src/main/resources/sql/20261001_warehouseaddressmaster_active.sql
+ /trunk/profitmandi-dao/src/test/java/com/spice/profitmandi/service/warehouse/WarehouseSetupServiceImplTest.java
+ /trunk/profitmandi-dao/src/test/java/com/spice/profitmandi/service/warehouse/WarehouseSetupValidatorTest.java

Rev 37821 – Lead Management: CSV download now also honours the lead table's ...

aman — Thu, 01 Oct 2026 19:12:54 +0530

aman – 3 file(s) modified
Lead Management: CSV download now also honours the lead table's search text (searchTerm), so the exported rows match the filtered rows on screen. Applies to both the fofo download and the V2 API download.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01JjVXnkrysiXEa2YYRn4BqL

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/lead.js
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoLeadController.java

Rev 37820 – Lead Management: make Excel/CSV download honour the same filters as ...

aman — Thu, 01 Oct 2026 18:36:37 +0530

aman – 3 file(s) modified
Lead Management: make Excel/CSV download honour the same filters as the on-screen list. V2 download no longer folds followUp into the status list when All is chosen (it skipped the status/color/date query and exported only follow-ups); fofo lead page re-selects every chosen status so Download sends the statuses the table was loaded with.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01JjVXnkrysiXEa2YYRn4BqL

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/lead.vm
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoLeadController.java

Rev 37819 – feat(loi): allow all Accounts users (L1-L4) to download Pending LOI ...

amit — Wed, 30 Sep 2026 18:20:04 +0530

amit – 2 file(s) modified
feat(loi): allow all Accounts users (L1-L4) to download Pending LOI Forms report

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoiFormController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pendingForm.vm

Rev 37818 – feat(movement): allow full movable qty on PO screen, split raised ...

amit — Wed, 30 Sep 2026 16:43:23 +0530

amit – 5 file(s) modified
feat(movement): allow full movable qty on PO screen, split raised as separate POs

- Cap the movement quantity at everything that can move; stock at more than one cost is
raised as one PO per cost on create (dao r37817). Note replaces 'raise a separate PO'.
- Tests: split by cost, multi-item PO grouping, same-warehouse refusal, shelf before arriving.
- jsVersion 440.

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
~ /trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
~ /trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/service/warehouse/InternalMovementPricingServiceTest.java
~ /trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/service/warehouse/InventoryCostLayerTest.java
+ /trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/service/warehouse/MovementPurchaseOrderSplitTest.java

Rev 37817 – fix(movement): shelf stock before arriving, one PO per cost, close ...

amit — Wed, 30 Sep 2026 16:43:15 +0530

amit – 7 file(s) modified
fix(movement): shelf stock before arriving, one PO per cost, close PO on invoice cancel

- Internal movement fills from shelf stock before stock still arriving (a pending PO dated at
midnight ranked ahead of same-day receipts, pricing movements from units that never shipped).
- A quantity spanning stock at different costs is raised as one PO per cost at once instead of
being refused (first PO takes every item's oldest cost, the next the following cost).
- Refuse a movement from a warehouse to itself.
- Cancelling a movement's invoice/DC takes the order's qty off its PO and pre-closes it when
nothing is left open, as refunds already did.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/InternalMovementAvailabilityModel.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepository.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/OrderRepositoryImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/PurchaseReturnServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/InternalMovementPricingService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/InternalMovementPricingServiceImpl.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java

Rev 37816 – fix(einvoice): save the e-way bill whenever NIC returns EwbNo, not ...

amit — Wed, 30 Sep 2026 16:02:53 +0530

amit – 2 file(s) modified
fix(einvoice): save the e-way bill whenever NIC returns EwbNo, not only with the EWBPPD note

GstProService saved EWB details only when InfoDtls held EWBPPD. NIC sends that
note (its pin-to-pin distance) only when we pass Distance=0, and the DUPIRN
get-by-IRN response carries no InfoDtls at all. So every partner with a
warehouse_partner_distance_mapping row, and every IRN recovered after a
timeout, lost its EWB although NIC had filed it (13 + 2 invoices in 30 days,
backfilled 2026-09-30), and a false "EWB Not Generated" mail was sent.

- Key on EwbNo; distance from EWBPPD, else the distance we sent, else none.
- Invoice PDF prints the "[distance]" suffix only when a distance is known
(was "[null]").

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProService.java
~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/invoicing/InvoiceService.java

Rev 37815 – feat(loi): allow Finance L1 (Accounts) to download Pending LOI Forms ...

amit — Wed, 30 Sep 2026 15:35:48 +0530

amit – 2 file(s) modified
feat(loi): allow Finance L1 (Accounts) to download Pending LOI Forms report

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoiFormController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pendingForm.vm

Rev 37814 – revert(samsung-rebilling): drop TODO, keep ritesh.chauhan1 on the mail Removes ...

amit — Tue, 29 Sep 2026 18:53:34 +0530

amit – 1 file(s) modified
revert(samsung-rebilling): drop TODO, keep ritesh.chauhan1 on the mail

Removes the TODO(amit.gupta) comment added in r37812. The only change left from
r37812 is ritesh.chauhan1 on To alongside kamini.sharma; tarun.verma stays on CC.

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

Rev 37813 – revert(samsung-rebilling): restore original PCM filter, drop TODO Reverts r37811: ...

amit — Tue, 29 Sep 2026 18:53:34 +0530

amit – 1 file(s) modified
revert(samsung-rebilling): restore original PCM filter, drop TODO

Reverts r37811: findByBillingDateBrand goes back to spcm.pcmDate > wsi.invoiceDate
(stores with no samsung_pcm row are no longer listed). File is identical to r37810.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseInventoryItem.java

Rev 37812 – fix(samsung-rebilling): send rebilling mail to kamini.sharma and ritesh.chauhan1 praveen.sharma ...

amit — Tue, 29 Sep 2026 16:26:42 +0530

amit – 1 file(s) modified
fix(samsung-rebilling): send rebilling mail to kamini.sharma and ritesh.chauhan1

praveen.sharma was dropped in r37631 (inactive auth user); ritesh.chauhan1 now joins
kamini.sharma on To, tarun.verma stays on CC. TODO(amit.gupta) records the open
points: recipients cannot open Manage PCM (menu 208 is Financial Services L1/L2),
and the CSV omits the invoice and PCM dates the query already returns.

Requires profitmandi-dao r37811 (missing-PCM rows); deploy dao and cron together.

~ /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

Rev 37811 – fix(samsung-rebilling): list IMEIs of stores with no PCM date ...

amit — Tue, 29 Sep 2026 16:11:36 +0530

amit – 1 file(s) modified
fix(samsung-rebilling): list IMEIs of stores with no PCM date

findByBillingDateBrand required spcm.pcmDate > wsi.invoiceDate in the WHERE, so the
left join to SamsungPCM behaved as an inner join and the "PCM date Missing" label in
the cron mail could never appear. No PCM date has been entered since 2025-10-26, so
the query has returned nothing on almost every run and the daily mail went silent.

Stores with no samsung_pcm row now come through with a null PCM date (interim),
alongside the existing PCM-date-after-invoice rows. Internal-movement stock is still
dropped by s.internal=false - TODO(amit.gupta) left on the query.

Deploy with the matching profitmandi-cron commit.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseInventoryItem.java

Rev 37810 – fix(irn-reset): allow reset of failed invoices and show the real ...

amit — Tue, 29 Sep 2026 15:20:24 +0530

amit – 2 file(s) modified
fix(irn-reset): allow reset of failed invoices and show the real rejection reason

A failed IRN filing leaves an einvoice_details row with irn NULL and only
irn_error_message set, but the reset panel treated any row as "IRN already
generated" and refused every failed invoice (e.g. NSLCK38227, GSP032 timeout,
billed same day) with the message "older than five days".

- Block only when einvoice_details.irn is set.
- Report a reason per invoice: not found / IRN already generated / already
queued / billed more than five days ago.
- Trim invoice numbers: the panel joins with ", ", so resetOrdersIrn matched
only the first invoice and silently skipped the rest.

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OrderController.java
~ /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/eligible-irn-reset-orders.vm

Rev 37809 – fix(einvoice): keep waiting for a fresh NIC auth token instead ...

amit — Tue, 29 Sep 2026 15:20:16 +0530

amit – 1 file(s) modified
fix(einvoice): keep waiting for a fresh NIC auth token instead of giving up after one wait

getUsableAuthToken waited out an expiring token once and failed if NIC still
handed back one with under 60s of life. NSNOI14473 (2026-09-10) waited out a
token expiring 17:12:53, got one expiring 17:13:00 (6s left) and was parked at
irn_generated=0; the next invoice 5s later filed fine. Now waits up to 3 times,
each bounded by the remaining life of the token in hand.

~ /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/integrations/gstpro/GstProAuthService.java

Rev 37808 – offer-radar notification commit

ranu — Tue, 29 Sep 2026 14:53:49 +0530

ranu – 1 file(s) modified
offer-radar notification commit

~ /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/OfferRadarNotificationController.java