Subversion Repositories SmartDukaan

Rev

Show changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
36536 8 h 50 m amit /trunk/profitmandi-fofo/src/main/ moveToBill: fix response unwrapping, auto-move qty=1 orders to warehouse with gross stock  
36532 16 h 23 m amit /trunk/ Fix moveToBill to use net availability, add bulk PO items upload UI with template download  
36522 2 d 12 h amit /trunk/profitmandi-fofo/src/main/ bumbed jsVersion  
36520 2 d 13 h amit /trunk/profitmandi-fofo/src/main/ Add total quantity display on PO create page  
36499 5 d 9 h ranu /trunk/profitmandi-fofo/src/main/webapp/resources/js/ l3 and avobe show all warehouse stock  
36464 9 d 15 h amit /trunk/ Add vendor pricing changes Excel download report on Vendor Price Circular page. Flat file with Vendor/Date/Model/CatalogId/TP/DP/MOP columns, filterable by vendor. Shows baseline pricing as of start date plus subsequent TP changes within period for all non-internal suppliers.  
36452 11 d 11 h amit /trunk/profitmandi-fofo/src/main/webapp/ Add reference field to offer/scheme create forms and admin views  
36447 12 d 4 h amit /trunk/profitmandi-fofo/src/main/ DN lifecycle UI: acknowledge rejected return endpoint, status labels, JS handler

- Add PUT /return/debit-note/reject/acknowledge/{debitNoteId} endpoint
- invoice-return.vm: Rejected-Pending Acknowledgment + Cancelled status labels, Acknowledge Receipt button
- return.js: click handler for acknowledge-rejected-return
 
36442 12 d 14 h amit /trunk/profitmandi-fofo/src/ Rename monitor type 'normal' to 'base' in controller, validator, UI, and tests  
36421 15 d 10 h amit /trunk/profitmandi-fofo/src/main/webapp/ Feat:Scheme item date window — per-item start/end dates with inline editing, category→brand→model cascade in add-item modal, duplicate detection, full-width layout  
36408 16 d 8 h amit /trunk/profitmandi-fofo/src/main/ Sale-return reversal: controller wiring + UI for cancellability gate + INV reject + date filter

PurchaseReturnController:
/return/invoice/process — autoApprove now isIrnCancellable && !isShipped.
!isShipped guard restored: shipped goods route through manual approval
even within 24h, so the physical return goes through CN flow.
/return/invoice/reject/{proId} — new endpoint for finance to reject a
pending INV PRO (sale stands, no inventory/wallet/GST action).
/return/invoice — date filter (fromDate/toDate query params, default
last 30 days) backed by selectByWarehouseIdsAndDateRange. Limit
bumped to 200 to accommodate longer ranges.
receive-debit-note view — passes $requiresFinanceApproval so the
template can render the finance-approval banner when DN's IRN is
past the 24h window.

invoice-return.vm:
Added From/To date inputs + Apply button.
Added Reject button next to Approve & Refund for pending INV PROs.

receive-debit-note.vm:
Added one informational banner (#if $requiresFinanceApproval) above
the receipt form. No layout / JS / submit-URL change.

return.js:
#invoice-return-date-apply handler — POSTs the selected range to
/return/invoice and refreshes the table.
.reject-invoice-return handler — prompts for reason, calls the new
reject endpoint.

dev/staging/prod.properties: feature flag finance.receipt.approval.email.enabled
(default false, flip per env when mail infra is ready).
 
36404 16 d 13 h amit /trunk/profitmandi-fofo/src/ Add catalog monitor type upload, sample sheet, Placement Plan UI tagging (orange/yellow), Today PO csv column, placement-plan-statement.xlsx header coloring  
36394 16 d 14 h amit /trunk/profitmandi-fofo/src/main/ Add IMEI net-margin modal on order-index billing panel.

New /getImeiNetMarginModal endpoint: given an IMEI, derives the
purchase-billed date from the IMEI's purchase order
(InventoryItem.purchaseId -> Purchase.purchaseReference -> Order.billingTimestamp),
fetches schemes applicable on that date via PriceCircular, and shows
per-scheme contribution, NLC, and net margin in a slim modal.

Effective DP = inventory_item.unit_price - max(0, price_drop_amount)
to match SchemeServiceImpl.createSchemeInOut/PriceCircularService.getPayouts.
Offers are intentionally excluded. Per-IMEI price-drop history is
shown for reference.
 
36316 23 d 9 h aman /trunk/ Fix:Migrate legacy Purchase Return flow (Report + Bulk Create + Debit Notes) into FOFO  
36299 26 d 12 h amit /trunk/profitmandi-fofo/src/main/ GRN correction: surface autoApproved flag to UI

Controller returns {status, autoApproved} JSON; JS shows an
'auto-approved' message when the request bypasses approval, otherwise
the existing 'raised for approval' message. Pairs with dao r36298.
 
36231 34 d 10 h ranu /trunk/profitmandi-fofo/src/main/ any rbm can see activity his partner ticket  
36217 36 d 8 h vikas /trunk/profitmandi-fofo/src/main/ Purchase Sale Panel: Export Report  
36215 36 d 9 h vikas /trunk/profitmandi-fofo/src/main/webapp/ Purchase Sale Panel: Export Report  
36206 37 d 8 h amit /trunk/profitmandi-fofo/src/main/webapp/ GRN correction: split space/comma-separated IMEIs in frontend, validate count, update placeholder text  
36198 37 d 9 h amit /trunk/profitmandi-fofo/src/main/ Add Download All CN summary report for FOFO_ADMIN: bulk CSV with partner details, IRN, ack date per month  

Show All