| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 21617 |
3148 d 7 h |
amit.gupta |
/trunk/ |
Fixed bugs related bulk scan during purchase.
Fixed spring transaction. |
|
/trunk/InventoryManager/src/main/webapp/css/images/loader.gif
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/BulkPurchaseController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/bulk-purchase-show.vm
/trunk/InventoryManager/src/main/webapp/css/common.css
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryItem.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
/trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/InventoryItem.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/WarehouseServer.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
/trunk/WarehouseService/src/main/resources/context.xml
/trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml
|
| 10324 |
4315 d 8 h |
manish.sharma |
/trunk/InventoryManager/src/main/ |
Committed by Manish Sharma for CST PO Automation Process on Mar-24-2014 |
|
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
/trunk/InventoryManager/src/main/webapp/css/common.css
/trunk/InventoryManager/src/main/webapp/js/purchase-order-events.js
|
| 9448 |
4382 d 17 h |
manish.sharma |
/trunk/InventoryManager/src/main/webapp/css/ |
Commited by Manish Sharma for Seperate Implementation of Product Feeds on Jan-16-2014 |
|
/trunk/InventoryManager/src/main/webapp/css/common.css
|
| 7410 |
4605 d 18 h |
amar.kumar |
/trunk/ |
Changes for
1)Multiple Ours Physical Warehouses
2)Movement of Goods across our warehouses
3)Creation of orders for different sources through Excel Upload
Reviewed By Amit Gupta |
|
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/TransferLotController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/TransferLotReceiveController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/transfer-lot-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/transfer-lot-new.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/transfer-lot-output.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/transfer-lot-receive-show.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/transfer-lot-show.vm
/trunk/InventoryManager/src/main/webapp/css/colorbox.css
/trunk/InventoryManager/src/main/webapp/css/images
/trunk/InventoryManager/src/main/webapp/css/images/border.png
/trunk/InventoryManager/src/main/webapp/css/images/controls.png
/trunk/InventoryManager/src/main/webapp/css/images/loading.gif
/trunk/InventoryManager/src/main/webapp/css/images/loading_background.png
/trunk/InventoryManager/src/main/webapp/css/images/overlay.png
/trunk/InventoryManager/src/main/webapp/images/sort_asc.png
/trunk/InventoryManager/src/main/webapp/images/sort_asc_disabled.png
/trunk/InventoryManager/src/main/webapp/images/sort_both.png
/trunk/InventoryManager/src/main/webapp/images/sort_desc.png
/trunk/InventoryManager/src/main/webapp/images/sort_desc_disabled.png
/trunk/InventoryManager/src/main/webapp/js/common.js
/trunk/InventoryManager/src/main/webapp/js/jquery.colorbox.js
/trunk/InventoryManager/src/main/webapp/js/transfer-lot.js
/trunk/Support/src/main/java/in/shop2020/support/controllers/SourceOrderCreationController.java
/trunk/Support/src/main/webapp/WEB-INF/content/source-order-creation-authsuccess.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMServiceException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/AgentWarehouseMapping.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/PossibleWarehouseMovement.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/TransferLot.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/TransferLotStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/TransferType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/transferLot.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/PossibleWarehouseMovement.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/TransferLot.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/TransferLotHandler.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/TransferLotMapper.java
/trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/TransferLotMapper.xml
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/BaseController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaInController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaOutController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/InventoryReaderController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/InvoiceController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReturnController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/ScanRecordController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/PdfPoSheetGenerator.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/current-inventory-show.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/invoice-editNew.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-editNew.vm
/trunk/InventoryManager/src/main/webapp/css/common.css
/trunk/InventoryManager/src/main/webapp/js/jquery.colorbox-min.js
/trunk/InventoryManager/src/main/webapp/js/purchase-order-common.js
/trunk/InventoryManager/src/main/webapp/js/purchase-order-events.js
/trunk/InventoryManager/src/main/webapp/js/purchase.js
/trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/helpers/impl/DataService.py
/trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
/trunk/PyProj/src/shop2020/model/v1/order/script/A110Processor.py
/trunk/PyProj/src/shop2020/model/v1/order/script/FreebieBulkOrderCreator.py
/trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
/trunk/PyProj/src/shop2020/purchase/main/model/Invoice.py
/trunk/PyProj/src/shop2020/purchase/main/model/PurchaseOrder.py
/trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService-remote
/trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService-remote
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
/trunk/PyProj/src/shop2020/thriftpy/utils/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/WarehouseType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderSource.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/SourceDetail.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/Invoice.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryItem.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Scan.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/ScanType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
/trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift
/trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
/trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
/trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/InventoryItem.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/Scan.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ScanHandler.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
/trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml
/trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml
/trunk/WarehouseService/src/main/resources/mybatis-config.xml
|
| 7149 |
4658 d 17 h |
amar.kumar |
/trunk/ |
Dashboard to create indent sheet for Hotspot |
|
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/HotspotIndentController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/hotspot-indent-index.vm
/trunk/InventoryManager/src/main/webapp/js/hotspot-indent.js
/trunk/InventoryManager/src/main/webapp/css/common.css
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/order/script/A110Processor.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
/trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
|
| 6834 |
4715 d 5 h |
amar.kumar |
/trunk/InventoryManager/src/main/webapp/css/ |
|
|
/trunk/InventoryManager/src/main/webapp/css/common.css
|
| 6695 |
4747 d 11 h |
amar.kumar |
/trunk/InventoryManager/src/main/webapp/css/ |
Adding styling for inventoryUpload Form |
|
/trunk/InventoryManager/src/main/webapp/css/common.css
|
| 6467 |
4787 d 12 h |
amar.kumar |
/trunk/ |
Changes for Purchase Return
Reviewed by Amit Gupta |
|
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReturnController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-return-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-return-new.vm
/trunk/InventoryManager/src/main/webapp/images
/trunk/InventoryManager/src/main/webapp/images/add.png
/trunk/InventoryManager/src/main/webapp/images/copy.png
/trunk/InventoryManager/src/main/webapp/images/copy_hover.png
/trunk/InventoryManager/src/main/webapp/images/csv.png
/trunk/InventoryManager/src/main/webapp/images/csv_hover.png
/trunk/InventoryManager/src/main/webapp/images/pdf.png
/trunk/InventoryManager/src/main/webapp/images/pdf_hover.png
/trunk/InventoryManager/src/main/webapp/images/print.png
/trunk/InventoryManager/src/main/webapp/images/print_hover.png
/trunk/InventoryManager/src/main/webapp/images/xls.png
/trunk/InventoryManager/src/main/webapp/images/xls_hover.png
/trunk/InventoryManager/src/main/webapp/js/jquery.colorbox-min.js
/trunk/InventoryManager/src/main/webapp/js/purchase-return.js
/trunk/PyProj/src/shop2020/purchase/main/model/PurchaseReturn.py
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseReturn.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
/trunk/InventoryManager/src/main/webapp/css/common.css
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.py
/trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryItem.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
/trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
/trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
/trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/InventoryItem.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ScanHandler.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
/trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml
/trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml
|
| 6322 |
4813 d 16 h |
amar.kumar |
/trunk/ |
Changes for Following:
1) Option to download Order Confirmation Mail from CRM
2) Option to add new pincode or update/disable serviceability for a provider from Support Reports (Cod-Reconciliation)
3) Option to get Scan Details for a given ItemId/Serial-Number from Inventory Webapp
Reviewed by Anupam Singh |
|
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/ScanRecordController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/scan-record-index.vm
/trunk/Support/src/main/java/in/shop2020/support/controllers/PincodeController.java
/trunk/Support/src/main/webapp/css/pincode.css
/trunk/Support/src/main/webapp/js/pincode.js
/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportSender.java
/trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserOrderInfoController.java
/trunk/Crm/src/main/webapp/WEB-INF/content/user-order-info-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
/trunk/InventoryManager/src/main/webapp/css/common.css
/trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
/trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
/trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/catalog/script/CatalogComparer.py
/trunk/PyProj/src/shop2020/thriftpy/logistics/LogisticsService.py
/trunk/PyProj/src/shop2020/thriftpy/utils/HelperService.py
/trunk/Support/src/main/webapp/WEB-INF/content/cod-reconciliation-authsuccess.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/utils/HelperService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
/trunk/ThriftGen/thriftsrc/Helpers/HelperService.thrift
/trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
/trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ScanHandler.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
/trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml
|
| 5110 |
5005 d 3 h |
mandeep.dhir |
/trunk/ |
Trac#969, Trac#976, Trac#1058, Trac#909, Trac#996, Trac#1067, Trac#1175
Virtual warehouse modelling
Bulk scan In feature
Categorization of Serialized vs NonSerialized items
Screen to display items whose inventory update was missed due to key mismatch |
|
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/IgnoredItemMappingController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/LoginController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/ignored-item-mapping-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/item-number-mapping.vm
/trunk/InventoryManager/src/main/webapp/css/demo_page.css
/trunk/InventoryManager/src/main/webapp/css/demo_table.css
/trunk/InventoryManager/src/main/webapp/css/demo_table_jui.css
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseType.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/RaisePOController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/raisePO-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/raisePO-result.vm
/trunk/PyProj/src/shop2020/model/v1/catalog/script/PurchaseOrderProcessor.py
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Warehouse.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/MainPresenterImpl.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddJacketNumberEvent.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenter.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/JacketInfoBox.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CatalogUtils.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AuthHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/BillOrderHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AddJacketNumberRequest.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AuthResponse.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/CurrentInventoryController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
/trunk/InventoryManager/src/main/resources/shiro.ini
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/current-inventory-show.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-edit.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm
/trunk/InventoryManager/src/main/webapp/css/common.css
/trunk/InventoryManager/src/main/webapp/js/current-inventory.js
/trunk/InventoryManager/src/main/webapp/js/purchase.js
/trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
/trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
/trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
/trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
/trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/logistics/LogisticsInfo.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Warehouse.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/ScanType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
/trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/InventoryItem.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
|
| 4754 |
5048 d 18 h |
mandeep.dhir |
/trunk/ |
Trac#974 Trac#975 Adding UI for PO create, amend etc.
ALso UI for inventory read and edit.
Display Vendor name, date in POs list
On PO creation, list the vendors to whom PO can be sent.
For selected Vendor,display the PO to be generated to users who later can amend the PO, (quantity, add/remove lineitem etc.) before actually creating and sending mail for PO to vendors.
Display COD vs Prepaid count, total amount of PO being raised etc. as well
Allow quantity, item and color amends in existing PO
Feature to resend the amended PO to vendor in mail
Ability to find PO given an item pending scan
Users should be sent emails to remind them to create PO
We should also be able to audit all the amends made to a PO |
|
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/output.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-edit.vm
/trunk/PyProj/src/shop2020/purchase/main/model/RevisionedPurchaseOrder.py
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/BaseController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
/trunk/InventoryManager/src/main/resources/shiro.ini
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/current-inventory-show.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-new.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm
/trunk/InventoryManager/src/main/webapp/css/common.css
/trunk/InventoryManager/src/main/webapp/js/purchase-order-common.js
/trunk/InventoryManager/src/main/webapp/js/purchase-order-events.js
/trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
/trunk/PyProj/src/shop2020/helpers/impl/model/Agent.py
/trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService-remote
/trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
/trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
|
| 4687 |
5056 d 16 h |
mandeep.dhir |
/trunk/InventoryManager/ |
Trac#974 webapp for inventory mgmt |
|
/trunk/InventoryManager
/trunk/InventoryManager/.classpath
/trunk/InventoryManager/.project
/trunk/InventoryManager/.settings
/trunk/InventoryManager/.settings/org.eclipse.jdt.core.prefs
/trunk/InventoryManager/.settings/org.maven.ide.eclipse.prefs
/trunk/InventoryManager/pom.xml
/trunk/InventoryManager/src
/trunk/InventoryManager/src/main
/trunk/InventoryManager/src/main/java
/trunk/InventoryManager/src/main/java/in
/trunk/InventoryManager/src/main/java/in/shop2020
/trunk/InventoryManager/src/main/java/in/shop2020/inventory
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/BaseController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/CurrentInventoryController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/HomeController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/RaisePOController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/WarehouseController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/service
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/PdfPoSheetGenerator.java
/trunk/InventoryManager/src/main/java/in/shop2020/serving
/trunk/InventoryManager/src/main/java/in/shop2020/serving/auth
/trunk/InventoryManager/src/main/java/in/shop2020/serving/auth/InventoryAuthorizingRealm.java
/trunk/InventoryManager/src/main/java/in/shop2020/serving/auth/VerboseFilter.java
/trunk/InventoryManager/src/main/resources
/trunk/InventoryManager/src/main/resources/log4j.properties
/trunk/InventoryManager/src/main/resources/shiro.ini
/trunk/InventoryManager/src/main/resources/struts.xml
/trunk/InventoryManager/src/main/webapp
/trunk/InventoryManager/src/main/webapp/WEB-INF
/trunk/InventoryManager/src/main/webapp/WEB-INF/content
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/current-inventory-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/current-inventory-show.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/exception.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-create.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-new.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-change-color.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/raisePO-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/raisePO-result.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/warehouse-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/web.xml
/trunk/InventoryManager/src/main/webapp/change-password.html
/trunk/InventoryManager/src/main/webapp/css
/trunk/InventoryManager/src/main/webapp/css/common.css
/trunk/InventoryManager/src/main/webapp/js
/trunk/InventoryManager/src/main/webapp/js/current-inventory.js
/trunk/InventoryManager/src/main/webapp/js/jquery-1.4.2.js
/trunk/InventoryManager/src/main/webapp/js/jquery.dataTables.min.js
/trunk/InventoryManager/src/main/webapp/js/jquery.validate.js
/trunk/InventoryManager/src/main/webapp/js/purchase-order-common.js
/trunk/InventoryManager/src/main/webapp/js/purchase-order-events.js
/trunk/InventoryManager/src/main/webapp/js/purchase.js
/trunk/InventoryManager/src/main/webapp/login.html
/trunk/InventoryManager/target
/trunk/InventoryManager/target/InventoryManager
/trunk/InventoryManager/target/InventoryManager.war
/trunk/InventoryManager/target/InventoryManager/META-INF
/trunk/InventoryManager/target/InventoryManager/WEB-INF
/trunk/InventoryManager/target/InventoryManager/WEB-INF/classes
/trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in
/trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020
/trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/inventory
/trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/inventory/controllers
/trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/inventory/controllers/BaseController.class
/trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/inventory/controllers/CurrentInventoryController.class
/trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/inventory/controllers/HomeController.class
/trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/inventory/controllers/PurchaseController.class
/trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/inventory/controllers/PurchaseOrderController.class
/trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/inventory/controllers/RaisePOController.class
/trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/inventory/controllers/WarehouseController.class
/trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/inventory/service
/trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/inventory/service/PdfPoSheetGenerator.class
/trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/serving
/trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/serving/auth
/trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/serving/auth/InventoryAuthorizingRealm.class
/trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/serving/auth/VerboseFilter.class
/trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/log4j.properties
/trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/shiro.ini
/trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/struts.xml
/trunk/InventoryManager/target/InventoryManager/WEB-INF/content
/trunk/InventoryManager/target/InventoryManager/WEB-INF/content/current-inventory-index.vm
/trunk/InventoryManager/target/InventoryManager/WEB-INF/content/current-inventory-show.vm
/trunk/InventoryManager/target/InventoryManager/WEB-INF/content/exception.vm
/trunk/InventoryManager/target/InventoryManager/WEB-INF/content/index.vm
/trunk/InventoryManager/target/InventoryManager/WEB-INF/content/purchase-create.vm
/trunk/InventoryManager/target/InventoryManager/WEB-INF/content/purchase-new.vm
/trunk/InventoryManager/target/InventoryManager/WEB-INF/content/purchase-order-change-color.vm
/trunk/InventoryManager/target/InventoryManager/WEB-INF/content/purchase-order-editNew.vm
/trunk/InventoryManager/target/InventoryManager/WEB-INF/content/purchase-order-index.vm
/trunk/InventoryManager/target/InventoryManager/WEB-INF/content/purchase-order-show.vm
/trunk/InventoryManager/target/InventoryManager/WEB-INF/content/purchase-show.vm
/trunk/InventoryManager/target/InventoryManager/WEB-INF/content/raisePO-index.vm
/trunk/InventoryManager/target/InventoryManager/WEB-INF/content/raisePO-result.vm
/trunk/InventoryManager/target/InventoryManager/WEB-INF/content/warehouse-index.vm
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/Common-1.0-SNAPSHOT.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/ThriftConfig-1.0-SNAPSHOT.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/activation-1.1.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/commons-beanutils-1.8.3.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/commons-collections-3.2.1.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/commons-digester-2.0.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/commons-fileupload-1.2.1.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/commons-io-1.3.2.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/commons-lang-2.4.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/commons-lang-2.5.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/commons-logging-1.0.4.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/commons-logging-1.1.1.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/commons-logging-api-1.1.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/commons-validator-1.3.1.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/ezmorph-1.0.3.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/freemarker-2.3.15.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/httpclient-4.0.1.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/httpcore-4.0.1.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/iText-5.0.4.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/icu4j-4.8.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/json-20090211.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/json-lib-2.1-jdk15.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/jsp-api-2.1.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/libthrift-0.7.0.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/log4j-log4j-1.2.16.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/mail-1.4.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/ognl-2.7.3.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/poi-3.7-20101029.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/readonly.apache-log4j-1.2.16.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/servlet-api-2.5.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/shiro-core-1.1.0.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/shiro-web-1.1.0.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/slf4j-api-1.6.1.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/slf4j-log4j12-1.6.1.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/struts2-convention-plugin-2.1.8.1.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/struts2-core-2.1.8.1.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/struts2-rest-plugin-2.1.8.1.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/velocity-1.6.3.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/velocity-tools-1.4.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/xpp3_min-1.1.3.4.O.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/xstream-1.2.2.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/xwork-core-2.1.6.jar
/trunk/InventoryManager/target/InventoryManager/WEB-INF/web.xml
/trunk/InventoryManager/target/InventoryManager/change-password.html
/trunk/InventoryManager/target/InventoryManager/css
/trunk/InventoryManager/target/InventoryManager/css/common.css
/trunk/InventoryManager/target/InventoryManager/js
/trunk/InventoryManager/target/InventoryManager/js/current-inventory.js
/trunk/InventoryManager/target/InventoryManager/js/jquery-1.4.2.js
/trunk/InventoryManager/target/InventoryManager/js/jquery.dataTables.min.js
/trunk/InventoryManager/target/InventoryManager/js/jquery.validate.js
/trunk/InventoryManager/target/InventoryManager/js/purchase-order-common.js
/trunk/InventoryManager/target/InventoryManager/js/purchase-order-events.js
/trunk/InventoryManager/target/InventoryManager/js/purchase.js
/trunk/InventoryManager/target/InventoryManager/login.html
/trunk/InventoryManager/target/classes
/trunk/InventoryManager/target/classes/in
/trunk/InventoryManager/target/classes/in/shop2020
/trunk/InventoryManager/target/classes/in/shop2020/inventory
/trunk/InventoryManager/target/classes/in/shop2020/inventory/controllers
/trunk/InventoryManager/target/classes/in/shop2020/inventory/controllers/BaseController.class
/trunk/InventoryManager/target/classes/in/shop2020/inventory/controllers/CurrentInventoryController.class
/trunk/InventoryManager/target/classes/in/shop2020/inventory/controllers/HomeController.class
/trunk/InventoryManager/target/classes/in/shop2020/inventory/controllers/PurchaseController.class
/trunk/InventoryManager/target/classes/in/shop2020/inventory/controllers/PurchaseOrderController.class
/trunk/InventoryManager/target/classes/in/shop2020/inventory/controllers/RaisePOController.class
/trunk/InventoryManager/target/classes/in/shop2020/inventory/controllers/WarehouseController.class
/trunk/InventoryManager/target/classes/in/shop2020/inventory/service
/trunk/InventoryManager/target/classes/in/shop2020/inventory/service/PdfPoSheetGenerator.class
/trunk/InventoryManager/target/classes/in/shop2020/serving
/trunk/InventoryManager/target/classes/in/shop2020/serving/auth
/trunk/InventoryManager/target/classes/in/shop2020/serving/auth/InventoryAuthorizingRealm.class
/trunk/InventoryManager/target/classes/in/shop2020/serving/auth/VerboseFilter.class
/trunk/InventoryManager/target/classes/log4j.properties
/trunk/InventoryManager/target/classes/shiro.ini
/trunk/InventoryManager/target/classes/struts.xml
/trunk/InventoryManager/target/maven-archiver
/trunk/InventoryManager/target/maven-archiver/pom.properties
/trunk/InventoryManager/target/surefire
|