Subversion Repositories SmartDukaan

Rev

Go to most recent revision | Show changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
37365 51 d 8 h amit /trunk/profitmandi-fofo/src/main/ Debit note receive: surface the partner-declared condition and warn before rejecting

The receive screen defaulted every row's condition to GOOD regardless of what the
partner declared, so a warehouse user could not see what they were disagreeing with -
and the backend treats any disagreement as a rejection of the whole debit note.

- Show 'Declared By Partner' per row and preselect the condition to match it, so
submitting unchanged is a genuine agreement rather than an accident of the default.
- A changed row now switches the submit button to 'Reject Return', shows what rejection
means (no refund; partner, Logistics, RBM and Sales notified), makes the remark
mandatory and confirms before posting.
- SMTP timeouts raised to 30s connect / 120s read-write; the 10s read timeout was
cutting off larger attachment sends.
- jsVersion 405 -> 406 for the return.js change.
 
36447 161 d 5 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
 
36408 165 d 9 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).
 
36316 172 d 10 h aman /trunk/ Fix:Migrate legacy Purchase Return flow (Report + Bulk Create + Debit Notes) into FOFO  
36027 204 d 9 h amit /trunk/profitmandi-fofo/src/main/ Sale Returns: finance approval endpoint, invoice links in all views, invoice map for INV: returns, purchase reference check fix  
36022 205 d 9 h amit /trunk/profitmandi-fofo/src/main/ Sale Returns: invoice return flow with auto-approve, rename to Sale Returns, role-based search results, Finance L2+ access  
35998 209 d 9 h amit /trunk/profitmandi-fofo/src/main/ Invoice Return: controller endpoints, UI views (receive/refund/reject/details/search), JS handlers, role-based access, dashboard menu  
34580 508 d 14 h ranu /trunk/ intrasist data modification  
34142 630 d 16 h tejus.lohani /trunk/profitmandi-fofo/src/main/ DN request only mapped partner ,show only mapped partner  
29937 1712 d 10 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/ OK  
27763 2068 d 10 h tejbeer /trunk/ partner onboarding panel changes  
27754 2069 d 10 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/resources/js/ Fixed live with on  
26320 2431 d 15 h tejbeer /trunk/ CHANGE  
23644 3069 d 15 h amit.gupta /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/ Fixed denied issue  
23638 3073 d 20 h amit.gupta /trunk/ Added Changes to Partner Return and Customers Return  
23540 3104 d 15 h amit.gupta /trunk/profitmandi-fofo/src/main/ Fixed itemdesc  
23539 3104 d 15 h amit.gupta /trunk/ Added debit notes for return  
23532 3106 d 15 h amit.gupta /trunk/ Added changes related to returns  
23506 3109 d 21 h amit.gupta /trunk/profitmandi-fofo/src/main/ Added changes related to Schemes