| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 37798 |
10 d 9 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Show a settled debit note as settled instead of offering Receive
The DN screens decided everything from "does a purchase_return_order exist",
which no return settled before the receive workflow ever had. A note settled
years ago therefore read "Pending Receive" with a Receive button, and receiving
one handed a partner back a phone already returned, refunded and resold
(DN UPBLY975/4, IMEI 864973083197734).
The debit note's own status now carries the fact - CREATED means there is
genuinely something to receive, anything else means it is settled - so the
screens read it directly instead of re-deriving it from warehouse scans on
every page load. r37797 backfilled the 4,154 notes the old flow left behind.
- invoice-return-results, debit-notes-table, debit-note-details,
receive-debit-note: Receive only while the note is CREATED with no return
order; otherwise "Processed - settled earlier".
- debit-notes-table: Refund only on a note received and not yet settled,
rather than on every row.
- PurchaseReturnController: the admin debit-note list now loads the return
orders its Refund button needs.
Deploy with profitmandi-dao r37797. |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-note-details.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-notes-table.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/invoice-return-results.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/receive-debit-note.vm
|
| 36274 |
176 d 10 h |
amit |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
Hide Receive/Refund actions on Recent Debit Notes from non-admin partners |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-notes-table.vm
|
| 36027 |
203 d 6 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 |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-note-details.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-notes-table.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/invoice-return-orders.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/invoice-return-results.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/invoice-return.vm /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
|
| 35999 |
208 d 2 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Invoice Return: role-based auth (receive/refund), remove unused finance fields, warehouse column in debit notes table |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-notes-table.vm
|
| 35998 |
208 d 6 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 |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-note-details.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/invoice-return-results.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/invoice-return.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/receive-debit-note.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/refund-debit-note.vm
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-readonly.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-notes-table.vm /trunk/profitmandi-fofo/src/main/webapp/resources/js/business/return.js
|
| 32771 |
1016 d 13 h |
raveendra.bharati |
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/ |
translation english to hindi |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/promoter-inactive.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/admin.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/approved-returns.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/catalog.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/contact-us.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-partner-po.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-recharge.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard-readonly.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-notes-table.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-notes.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dth-recharges.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/empty.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/foco-sale-report.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/grn-history.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/include-scripts.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/insurance-details.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/invoice-summary.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/item-aging.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/mobile-recharges.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-billing-summary-report.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-collection-summary.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-services.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-total-income.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-grn.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-indent-report.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/pending-returns.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/performance.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/prebooking-orders.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/price-drop-report.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/product-compare.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/promoter-info.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/punch-in-outs.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/purchase.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/reports.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/sale-history.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-imei-history.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/scheme-payout-report.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-details.vm /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-summary-report.vm
|
| 29635 |
1776 d 4 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/ |
Fixed debit note basic search page |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-notes-table.vm
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PurchaseReturnController.java /trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/debit-notes.vm
|