| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 37604 |
4 d 19 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. |
|
/trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/service/warehouse
/trunk/profitmandi-fofo/src/test/java/com/spice/profitmandi/service/warehouse/InternalMovementPricingServiceTest.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/PurchaseOrderController.java
|
| 37133 |
55 d 22 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 |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/vendor-catalog-pricing-request.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/vendor-catalog.js
|
| 37072 |
65 d 17 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) |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
|
| 36468 |
135 d 20 h |
amit |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
fix NPE in downloadPriceCircularReport: skip internal vendors and missing catalog items |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
|
| 36464 |
135 d 22 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. |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/VendorCatalogPricingLog.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorCatalogPricingLogRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorCatalogPricingLogRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/vendor-price-circular.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/vendor-catalog.js
/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/v2/controller/fofo/V2FofoVendorController.java
|
| 34057 |
639 d 19 h |
tejus.lohani |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
table filer remove |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
|
| 34050 |
643 d 20 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 |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
|
| 34048 |
644 d 16 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 |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategorisedCatalogRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/CategorisedCatalogRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
|
| 34047 |
644 d 19 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 |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
|
| 33750 |
737 d 16 h |
ranu |
/trunk/ |
vendor pricing log request view and download csv option created |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/vendor-catalog-pricing-pending-request-table.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/vendor-catalog-pricing-pending-request.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorCatalogPricingLogRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorCatalogPricingLogRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/vendor-catalog.js
|
| 33467 |
817 d 22 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
type button change to submit |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/bulk-vendor-pricing.vm
|
| 33465 |
817 d 23 h |
ranu |
/trunk/ |
bulk vendor pricing for category team |
|
/trunk/profitmandi-fofo/src/main/resources/vendor-catalog-pricing-file.xlsx
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/bulk-vendor-pricing.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/VendorCatalogPricingModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/VendorCatalogPricingService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/VendorCatalogPricingServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/vendor-catalog.js
|
| 33183 |
894 d 16 h |
shampa |
/trunk/ |
show all vendors data report without select any particular vendor. Add download csv file. |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/catalog/Item.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/VendorCatalogPricingLog.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/catalog/ItemRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/inventory/VendorCatalogPricingLogRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
/trunk/profitmandi-fofo/src/main/resources/log4j2.xml
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/vendor-price-circular-view.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/vendor-price-circular.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/vendor-catalog.js
|
| 32970 |
942 d 18 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Added accessories to take values automatically for internal movement |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
|
| 32942 |
950 d 19 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Added samsung removed rest |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
|
| 32927 |
953 d 21 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
use catalog instead of item |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
|
| 32924 |
953 d 22 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Fixed issue with only itemcode is being asked |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
|
| 32903 |
959 d 20 h |
amit.gupta |
/trunk/ |
Fixed changes to bringback stock to Main warehouse |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/VendorPriceCircularModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/VendorCatalogPricingService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/inventory/VendorCatalogPricingServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
|
| 32901 |
960 d 18 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Fixed changes |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
|
| 32900 |
960 d 18 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ |
Fixed changes |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
|