| Rev |
Age |
Author |
Path |
Log message |
Diff |
| 37869 |
31 m |
amit |
/trunk/profitmandi-fofo/src/main/ |
fix(fofo): GlitchTip quick wins - empty billing queue, regex search, upload dates
- /om/transactions: no crash when warehouse has no unbilled orders (#50);
/om/orderByTransaction returns "No pending orders" instead of querying with
no items (#88); JS skips detail load when there is no transaction.
- /om/transactions, /om/billedInvoice: warehouseId=0 fallback used a warehouse
id as a list index (authWarehouseIds.get(authWarehouseIds.get(0))).
- Item / vendor / retailer typeahead: substring match via contains() instead of
a regex built from user input, which threw PatternSyntaxException on "("
(#1932, #1375, #1700, #600, #1926, #1721, #1754).
- Billed-order shipping upload: time optional, dd-MM-yyyy[ HH:mm[:ss]],
missing parts default to 00 (#1976).
- IMEI activation upload: time optional, M/d/yyyy[ H:mm[:ss]], missing time =
00:00:00; every row validated, bad dates and duplicate IMEIs reported with
row numbers instead of a 500 (#1990).
- Bump JS version to 443. |
|
| 37823 |
5 d 21 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
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. |
|
| 37697 |
19 d 19 h |
amit |
/trunk/profitmandi-fofo/src/ |
PO create: show what can move, and which orders hold the rest, while the quantity is typed
Picking an item on a movement order already called getPricing, which read the sending
warehouse's stock and returned only a price. It now returns the availability too, so the row
can show it: an info marker beside the quantity box opens the breakdown - in stock, promised
with each holding order named by PO number and date, anything still arriving, and the quantity
this order can take.
The quantity box flags the moment what is typed passes that cap, so it is corrected before
submitting rather than after being refused. The marker turns amber when stock is partly
promised and red when none can move.
Outside vendors are unaffected: their pricing response carries no availability and their rows
are left exactly as they were. jsVersion bumped so the screen picks up the new script.
Tests cover the four cases that matter: what can move with orders named, zero movable reported
rather than refused, this order's cap kept separate from what the warehouse holds when stock
came in at two costs, and a warehouse holding none of the item still refusing. |
|
| 37604 |
25 d 1 h |
amit |
/trunk/profitmandi-fofo/src/ |
Show the derived movement price when building an internal purchase order
Both places a price reaches a purchase order now use the movement price for internal
suppliers: the single lookup as an item is added on screen, and the per-item resolution
behind a bulk upload, which does the whole file in one pass instead of loading a circular
the sending warehouse does not have.
Removes addVendorPricingIfMissing, which fired only when someone typed a numeric item id
into the search box, and only for Samsung or non-handsets, writing permanent approved
pricing rows onto the internal supplier from a hardcoded source vendor. Bulk upload never
called it at all, which is why the same item could be added on screen but rejected in a
file.
Tests cover what is decided once origins are known - drawing the oldest stock first,
refusing a quantity that spans two original vendors while naming how many can move and
asking for a separate order, refusing an unmapped supplier, and falling back to the catalog
without ever recording an inferred vendor as though it were known.
Requires profitmandi-dao r37603. |
|
| 37133 |
76 d 5 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Bulk approve vendor catalog pricing requests by re-uploading the pricing file on the approval queue page: new /bulkVendorCatalogPricing/verify endpoint, upload control + JS handler on pending-requests page, single-row approve branch moved to service (approveVendorCatalogPricingLog); bump jsVersion to 381 |
|
| 37072 |
85 d 23 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
PO creation: alert on missing approved vendor price + JS version bump 378 (T10); POST whitespace sanitizer deserializer + VendorController search fix (T9.5) |
|
| 36468 |
156 d 2 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
fix NPE in downloadPriceCircularReport: skip internal vendors and missing catalog items |
|
| 36464 |
156 d 5 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. |
|
| 34057 |
660 d 2 h |
tejus.lohani |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
table filer remove |
|
| 34050 |
664 d 2 h |
tejus.lohani |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
In po give filter to not check category of live demo and dummy |
|
| 34048 |
664 d 23 h |
tejus.lohani |
/trunk/ |
bug fix ,create po only if status is update like, HOD , FAST MOVING , etc present , if not then first add update that item then able to create po of that item |
|
| 34047 |
665 d 1 h |
tejus.lohani |
/trunk/profitmandi-fofo/src/main/ |
create po only if status is update like, HOD , FAST MOVING , etc present , if not then first add update that item then able to create po of that item |
|
| 33750 |
757 d 22 h |
ranu |
/trunk/ |
vendor pricing log request view and download csv option created |
|
| 33467 |
838 d 4 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
type button change to submit |
|
| 33465 |
838 d 5 h |
ranu |
/trunk/ |
bulk vendor pricing for category team |
|
| 33183 |
914 d 23 h |
shampa |
/trunk/ |
show all vendors data report without select any particular vendor. Add download csv file. |
|
| 32970 |
963 d 0 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Added accessories to take values automatically for internal movement |
|
| 32942 |
971 d 2 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Added samsung removed rest |
|
| 32927 |
974 d 3 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
use catalog instead of item |
|
| 32924 |
974 d 4 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Fixed issue with only itemcode is being asked |
|
| 32903 |
980 d 2 h |
amit.gupta |
/trunk/ |
Fixed changes to bringback stock to Main warehouse |
|
| 32901 |
981 d 0 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Fixed changes |
|
| 32900 |
981 d 0 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Fixed changes |
|
| 32899 |
981 d 0 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Fixed changes |
|
| 32898 |
981 d 1 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Fixed changes |
|
| 32791 |
1008 d 5 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Took Raveendra Changes |
|
| 32786 |
1009 d 1 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Fixed approval logic |
|
| 32785 |
1009 d 1 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Fixed approval logic |
|
| 32488 |
1108 d 3 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/ |
Fixed PO Date logic |
|
| 32485 |
1110 d 4 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/ |
Improved pricing related methods |
|
| 32398 |
1128 d 5 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Fixed front end related issues with add/remove row |
|
| 32383 |
1134 d 1 h |
amit.gupta |
/trunk/ |
Fixed front end related issues with add/remove row |
|
| 32298 |
1161 d 22 h |
tejbeer |
/trunk/ |
|
|
| 32194 |
1185 d 0 h |
tejbeer |
/trunk/ |
change |
|
| 32163 |
1205 d 6 h |
tejbeer |
/trunk/ |
change |
|
| 32145 |
1212 d 5 h |
tejbeer |
/trunk/ |
change |
|
| 32086 |
1223 d 8 h |
tejbeer |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
|
|
| 32075 |
1224 d 7 h |
tejbeer |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
change |
|