BlueGrey
calm
Elegant
Català-Valencià – Catalan
中文 – Chinese (Simplified)
中文 – Chinese (Traditional)
Česky – Czech
Dansk – Danish
Nederlands – Dutch
English – English
Suomi – Finnish
Français – French
Deutsch – German
עברית – Hebrew
हिंदी – Hindi
Magyar – Hungarian
Bahasa Indonesia – Indonesian
Italiano – Italian
日本語 – Japanese
한국어 – Korean
Македонски – Macedonian
मराठी – Marathi
Norsk – Norwegian
Polski – Polish
Português – Portuguese
Português – Portuguese (Brazil)
Русский – Russian
Slovenčina – Slovak
Slovenščina – Slovenian
Español – Spanish
Svenska – Swedish
Türkçe – Turkish
Українська – Ukrainian
Oëzbekcha – Uzbek
Subversion Repositories
SmartDukaan
(root)
/
trunk
/
WarehouseService
/
src
/
main
/
java
/
in
/
shop2020
/
warehouse
/
persistence
/
ScanMapper.java
– Rev 16264
Rev
Hide changed files
|
Details
|
Compare with Previous
|
Blame
|
RSS feed
Filtering Options
From rev
To rev
Max revs
Search history for
Show All
Rev
Age
Author
Path
Log message
Diff
Changes
16264
3821 d 19 h
manish.sharma
/trunk/
Committed by Manish Sharma for Transfer Invoice Mismatch Generator and Some Old Issues Resolval on 31-Jul-2015
/trunk/PyProj/src/shop2020/purchase/main/script/TransferReceiveMismatchGenerator.py
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/TransferInvoiceScan.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
/trunk/PyProj/src/shop2020/purchase/main/script/UnscannedItemsReporter.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/warehouse/WarehouseService.java
/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
/trunk/WarehouseService/src/main/resources/mybatis-config.xml
13529
4021 d 16 h
manish.sharma
/trunk/
Committed by Manish Sharma for Movement Report and Purchase Return Changes on 12-Jan-2015
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/MovementReportController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/movement-report-index.vm
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
/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
12800
4126 d 16 h
manish.sharma
/trunk/
Committed by Manish Sharma for New Inventory Age Report Logic on 29-Sep-2014
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InvAgeConsiderItems.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/InventoryAgeController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportByGrnDateController.java
/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/warehouse/DetailedPurchaseScan.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/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
/trunk/WarehouseService/src/main/resources/mybatis-config.xml
10689
4285 d 15 h
manish.sharma
/trunk/
Committed by Manish Sharma for Change in Inventory Age Report on Apr-23-2014
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/AmazonTransferredSkuDetail.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/AmazonTransferredSkuDetail.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/InventoryAgeController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
/trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
/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/java/in/shop2020/warehouse/util/InTransitInventoryReportSender.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
10308
4315 d 20 h
amar.kumar
/trunk/
Changes for Doa-Reject option and removing amazon-stock and transfers from Movement report
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaOutController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/MovementReportController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-out-index.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/ScanType.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/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
10120
4330 d 16 h
manish.sharma
/trunk/
Committed by Manish Sharma for Partial Transfer Lot Receive(Amazon) on Mar-09-2014
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
/trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
/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/handler/TransferLotHandler.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/persistence/TransferLotMapper.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/in/shop2020/warehouse/persistence/TransferLotMapper.xml
7957
4543 d 19 h
amar.kumar
/trunk/
Changes in Movement Report to add bad inventory sheets and adding columns for DOA_OUT, DOA_REPLACED and Transfer_in and Transfer_Out
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/MovementReportController.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/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
7676
4579 d 19 h
amar.kumar
/trunk/
Change to give option of selecting warehouse at the time of getting stock sheet
and option to set nlc at the time of adding a new item for creating a Purchase-order
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/FbaSheetGeneratorController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/InventoryReaderController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/PdfPoSheetGenerator.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
/trunk/InventoryManager/src/main/webapp/js/common.js
/trunk/InventoryManager/src/main/webapp/js/purchase-order-common.js
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
/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/InventoryItemMapper.xml
/trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml
7410
4606 d 1 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
7216
4641 d 20 h
amar.kumar
/trunk/
Option for additional movement report that will include Hotspot purchases
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/MovementReportController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/movement-report-index.vm
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
/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
7210
4643 d 19 h
amar.kumar
/trunk/
Adding purchase report based on GRN date
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportByGrnDateController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-report-by-grn-date-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/accounting-reports-index.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
/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
7199
4647 d 15 h
amar.kumar
/trunk/
Logic to handle
1) RTO for Freebie Orders
2) Option to bill Freebie present in our warehouses from Kalkaji-dashboard
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/JacketInfoBox.java
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
/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
6880
4706 d 22 h
amar.kumar
/trunk/
Changes for
1) Inventory Movement Report
2) Rearranging of fields in PO creation dashboard
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/MovementReportController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/movement-report-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
/trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
/trunk/PyProj/src/shop2020/purchase/main/model/LineItem.py
/trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
/trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.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
/trunk/WarehouseService/src/main/resources/mybatis-config.xml
6765
4733 d 19 h
amar.kumar
/trunk/
Reverting changes for Warehouse Service
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
/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
/trunk/WarehouseService/src/main/resources/mybatis-config.xml
6762
4733 d 20 h
amar.kumar
/trunk/
Changes for OUR External Billing
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryMovement.java
/trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
/trunk/PyProj/src/shop2020/purchase/main/model/PurchaseOrder.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService-remote
/trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.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/purchase/PurchaseService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
/trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.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
/trunk/WarehouseService/src/main/resources/mybatis-config.xml
6630
4754 d 17 h
amar.kumar
/trunk/
Changes for following
1) Creating purchase after scans are validated
2) Change to get entire inventory from inventory dashboard instead of only serialized
3) Adding the check to not allow duplicate invoiceNumber for a supplier.
4) Changing the code to use preferredVendor's transferprice while raising PO for Dummy Vendor
/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/webapp/WEB-INF/content/purchase-show.vm
/trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
/trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.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
6548
4766 d 20 h
amar.kumar
/trunk/
Making Changes for:
1) Pulling inventory for Serialized Items from Inventory Mgmnt Dashboard
2) Backend for Lost Item
3) Correction in Purchase Return Code to decrease availability in CIS
Reviewed By Amit Gupta
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/InventoryReaderController.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryAvailability.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/ScanType.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/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/mybatis-config.xml
6467
4787 d 18 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 23 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
5711
4915 d 18 h
mandeep.dhir
/trunk/
Trac#1486 Reviewer: Anupam
Ageing report for Mahipalpur
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/InventoryAgeController.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryAge.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SaleReportController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
/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/warehouse/WarehouseService.java
/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
/trunk/WarehouseService/src/main/resources/mybatis-config.xml
←Prev
1
2
Next→
Show All