| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 36532 |
17 h 24 m |
amit |
/trunk/ |
Fix moveToBill to use net availability, add bulk PO items upload UI with template download |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/transaction/TransactionServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/OrderManagementController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/PurchaseOrderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-purchase-order-add-item.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-management.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
|
| 36520 |
2 d 14 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Add total quantity display on PO create page |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-purchase-order-add-item.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
|
| 36299 |
26 d 13 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. |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
|
| 36206 |
37 d 9 h |
amit |
/trunk/profitmandi-fofo/src/main/webapp/ |
GRN correction: split space/comma-separated IMEIs in frontend, validate count, update placeholder text |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-grn-correction-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
|
| 35884 |
74 d 13 h |
amit |
/trunk/profitmandi-fofo/src/main/webapp/ |
Update GRN correction UI: rename labels, add IMEI field for serialized item corrections |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-grn-correction-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-grn-correction-request-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
|
| 35806 |
83 d 9 h |
amit |
/trunk/profitmandi-fofo/src/main/ |
Add GRN correction controller, views, and JS. Fix XSS in correction detail template, add self-approval prevention, add null check on requestId |
|
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-grn-correction-approval.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-grn-correction-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-grn-correction-request-detail.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-grn-correction.vm
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
|
| 34047 |
518 d 12 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
|
| 33809 |
594 d 18 h |
ranu |
/trunk/ |
partner loan ledger statment |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanStatementReportModel.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-loan-statement-summary.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-loan-statement.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/inventory/State.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/LoanStatement.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanStatementRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/transaction/LoanStatementRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/config/AppConfig.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ReportsController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/account-statement-list.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/dashboard1.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/partner-account-statement.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/reports.js
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
|
| 33737 |
614 d 11 h |
ranu |
/trunk/ |
generate invoice excel format |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/model/PurchaseInvoiceModel.java
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/ExcelUtils.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseSupplierInvoice.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseSupplierInvoiceRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseSupplierInvoiceRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-debit-note.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-invoices.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
|
| 33729 |
616 d 13 h |
ranu |
/trunk/ |
debit not filter date wise and generate excel |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/VendorDebitNoteModel.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-datewise-debitnote.vm
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/WarehouseDebitNote.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/VendorPriceCircularModel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseDebitNoteRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseDebitNoteRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/pricing/PriceDropServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java
/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/warehouse-debit-note.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-edit-purchase-order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-purchase-lineitem.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
|
| 33727 |
618 d 16 h |
ranu |
/trunk/profitmandi-fofo/src/main/ |
purchase order total price showing |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/PurchaseOrderController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-edit-purchase-order.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-purchase-lineitem.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-purchase-order-add-item.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
|
| 32912 |
831 d 8 h |
amit.gupta |
/trunk/ |
Added changes to auto clean invoice section. rights provided to Warehouse L2 |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PositionRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/PositionRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/dtr/DocumentRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseInvoiceItemRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseInvoiceItemRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehousePurchaseGrnRequestItemsRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehousePurchaseGrnRequestItemsRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehousePurchaseGrnRequestRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehousePurchaseGrnRequestRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseSupplierInvoiceRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/warehouse/WarehouseSupplierInvoiceRepositoryImpl.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderService.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/warehouse/PurchaseOrderServiceImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/warehouse/GrnController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-grn-request.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-receive-new-invoice.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
|
| 32686 |
894 d 12 h |
shampa |
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ |
Datewise |
|
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
|
| 32643 |
908 d 11 h |
raveendra.bharati |
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ |
roll back invoice |
|
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
|
| 32642 |
908 d 11 h |
raveendra.bharati |
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ |
validation on invoice is correct |
|
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
|
| 32638 |
909 d 12 h |
raveendra.bharati |
/trunk/profitmandi-fofo/src/main/webapp/resources/js/ |
Invoice validation updaded |
|
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
|
| 32629 |
915 d 10 h |
amit.gupta |
/trunk/ |
Fixed logic for invoice edit |
|
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/HygieneDataRepository.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/fofo/HygieneDataRepositoryImpl.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/RetailerController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/create-prebooking-order.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
|
| 32603 |
918 d 17 h |
raveendra.bharati |
/trunk/ |
Fixed order Shipping Date(dd-MM-yyyy HH:mm:ss). Can now be updated |
|
/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/util/FormattingUtils.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/logistics/ProviderTat.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/ManualPaymentType.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/NotifyCancel.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/NotifyColorChange.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/NotifyItem.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/NotifyMessage.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/NotifyOrder.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Payment.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/PriceDrop.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/transaction/Transaction.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/entity/warehouse/TransferLot.java
/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/model/BilledOrderListModel.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LogisticsController.java
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PartnerOnBoardingPanelController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/warehouse-receive-new-invoice.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
|
| 32488 |
961 d 14 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/ |
Fixed PO Date logic |
|
/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/VendorController.java
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
|
| 32485 |
963 d 15 h |
amit.gupta |
/trunk/profitmandi-fofo/src/main/ |
Improved pricing related methods |
|
/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/GrnController.java
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/vendor-catalog-pricing.vm
/trunk/profitmandi-fofo/src/main/webapp/WEB-INF/views/ftl/wallet-history.vm
/trunk/profitmandi-fofo/src/main/webapp/resources/js/warehouse-purchase.js
|