SmartDukaan – /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java

Rev 25269 –

tejbeer — Tue, 09 Jul 2019 17:06:01 +0530

tejbeer – 3 file(s) modified

~ /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

Rev 23400 – Added

amit.gupta — Wed, 28 Feb 2018 14:04:59 +0530

amit.gupta – 5 file(s) modified
Added

~ /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/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 23307 –

ashik.ali — Thu, 01 Feb 2018 19:40:55 +0530

ashik.ali – 2 file(s) modified

~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java

Rev 21617 – Fixed bugs related bulk scan during purchase. Fixed spring transaction.

amit.gupta — Sat, 03 Jun 2017 21:37:17 +0530

amit.gupta – 15 file(s) modified
Fixed bugs related bulk scan during purchase.
Fixed spring transaction.

~ /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/css/common.css
+ /trunk/InventoryManager/src/main/webapp/css/images/loader.gif
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/bulk-purchase-show.vm
~ /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/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/WarehouseServer.java
~ /trunk/WarehouseService/src/main/resources/context.xml
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml

Rev 21242 –

kshitij.sood — Tue, 18 Apr 2017 15:00:24 +0530

kshitij.sood – 4 file(s) modified

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/ProcessBulkBilling.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/service/handler/WarehouseServiceHandler.java

Rev 16264 – Committed by Manish Sharma for Transfer Invoice Mismatch Generator and ...

manish.sharma — Fri, 31 Jul 2015 15:47:28 +0530

manish.sharma – 14 file(s) modified
Committed by Manish Sharma for Transfer Invoice Mismatch Generator and Some Old Issues Resolval on 31-Jul-2015

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
+ /trunk/PyProj/src/shop2020/purchase/main/script/TransferReceiveMismatchGenerator.py
~ /trunk/PyProj/src/shop2020/purchase/main/script/UnscannedItemsReporter.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/TransferInvoiceScan.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

Rev 15045 – Committed by Manish Sharma for Changes in the Third Party ...

manish.sharma — Mon, 04 May 2015 18:34:45 +0530

manish.sharma – 18 file(s) modified
Committed by Manish Sharma for Changes in the Third Party Inventory Receive and Movement Report Changes on 05-May-2015

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/TransferLotReceiveController.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/transfer-lot-receive-new.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/transfer-lot-receive-show.vm
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/RemovalStockShipmentReference.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/TransferLot.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/RemovalStockShipmentReference.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/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/TransferLotMapper.xml
~ /trunk/WarehouseService/src/main/resources/mybatis-config.xml

Rev 14491 – Committed by Manish Sharma for Doa Out Report Changes on ...

manish.sharma — Tue, 17 Mar 2015 16:47:58 +0530

manish.sharma – 22 file(s) modified
Committed by Manish Sharma for Doa Out Report Changes on 17-Mar-2015

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaOutController.java
+ /trunk/InventoryManager/src/main/webapp/css/demo.css
+ /trunk/InventoryManager/src/main/webapp/css/jquery.dataTables.css
+ /trunk/InventoryManager/src/main/webapp/css/jquery.dataTables.min.css
+ /trunk/InventoryManager/src/main/webapp/css/jquery.dataTables_themeroller.css
~ /trunk/InventoryManager/src/main/webapp/js/doa.js
+ /trunk/InventoryManager/src/main/webapp/js/jquery.dataTables.1.10.3.min.js
+ /trunk/InventoryManager/src/main/webapp/js/jquery.dataTables.js
+ /trunk/InventoryManager/src/main/webapp/js/jquery1.11.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-in-index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-out-index.vm
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/DoaOutInventoryItem.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/persistence/InventoryItemMapper.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

Rev 13529 – Committed by Manish Sharma for Movement Report and Purchase Return ...

manish.sharma — Mon, 12 Jan 2015 19:02:58 +0530

manish.sharma – 10 file(s) modified
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

Rev 13504 – Committed by Manish Sharma for Movement Report and Purchase Return ...

manish.sharma — Tue, 06 Jan 2015 18:18:31 +0530

manish.sharma – 11 file(s) modified
Committed by Manish Sharma for Movement Report and Purchase Return Changes on 06-Jan-2015

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/MovementReportController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReturnController.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/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/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

Rev 12800 – Committed by Manish Sharma for New Inventory Age Report Logic ...

manish.sharma — Mon, 29 Sep 2014 18:39:09 +0530

manish.sharma – 14 file(s) modified
Committed by Manish Sharma for New Inventory Age Report Logic on 29-Sep-2014

~ /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/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/DetailedPurchaseScan.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InvAgeConsiderItems.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

Rev 12531 – Committed by Manish Sharma for Check Imei Status Before GRN ...

manish.sharma — Fri, 22 Aug 2014 15:40:13 +0530

manish.sharma – 7 file(s) modified
Committed by Manish Sharma for Check Imei Status Before GRN on 22-Aug-2014

+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/CheckGrnImeiController.java
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/check-grn-imei.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.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/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 11751 – Committed by Manish Sharma for Change in Details required for ...

manish.sharma — Tue, 24 Jun 2014 19:42:03 +0530

manish.sharma – 14 file(s) modified
Committed by Manish Sharma for Change in Details required for Purchase Return Items on 24-Jun-2014

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReturnController.java
~ /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/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.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/InventoryItemHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml

Rev 10886 – Committed by Manish Sharma for Showing Order Id for DOA ...

manish.sharma — Fri, 02 May 2014 19:12:34 +0530

manish.sharma – 7 file(s) modified
Committed by Manish Sharma for Showing Order Id for DOA in items on 02-May-2014

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaInController.java
~ /trunk/InventoryManager/src/main/webapp/js/doa.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-in-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/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 10864 – Committed by Manish Sharma for Change in Purchase Return Current ...

manish.sharma — Wed, 30 Apr 2014 20:19:19 +0530

manish.sharma – 30 file(s) modified
Committed by Manish Sharma for Change in Purchase Return Current Implementation and Adding New Bangalore Warehouse on 30-Apr-2014

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/BaseController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReturnController.java
~ /trunk/InventoryManager/src/main/webapp/js/common.js
~ /trunk/InventoryManager/src/main/webapp/js/purchase-return.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
~ /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/WEB-INF/content/purchase-return-output.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-editNew.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/PurchaseReturn.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseReturn.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseReturnInventoryType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InTransitInventory.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/ScanType.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/domain/InTransitInventory.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/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

Rev 10689 – Committed by Manish Sharma for Change in Inventory Age Report ...

manish.sharma — Wed, 23 Apr 2014 20:11:02 +0530

manish.sharma – 15 file(s) modified
Committed by Manish Sharma for Change in Inventory Age Report on Apr-23-2014

~ /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/AmazonTransferredSkuDetail.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/AmazonTransferredSkuDetail.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/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

Rev 10489 –

amar.kumar — Sat, 05 Apr 2014 01:28:15 +0530

amar.kumar – 10 file(s) modified

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/DoaOutController.java
~ /trunk/InventoryManager/src/main/webapp/js/doa.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-out-index.vm
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /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/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 10308 – Changes for Doa-Reject option and removing amazon-stock and transfers from ...

amar.kumar — Mon, 24 Mar 2014 14:56:23 +0530

amar.kumar – 10 file(s) modified
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

Rev 10215 – Adding list of Empty Grn(s) in Purchase Report

amar.kumar — Fri, 14 Mar 2014 15:10:24 +0530

amar.kumar – 5 file(s) modified
Adding list of Empty Grn(s) in Purchase Report

~ /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/persistence/InventoryItemMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 10120 – Committed by Manish Sharma for Partial Transfer Lot Receive(Amazon) on ...

manish.sharma — Sun, 09 Mar 2014 19:16:31 +0530

manish.sharma – 14 file(s) modified
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

Rev 8717 – Changes for billing of bad Inventory

amar.kumar — Wed, 06 Nov 2013 19:17:21 +0530

amar.kumar – 16 file(s) modified
Changes for billing of bad Inventory

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.ui.xml
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
~ /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/thriftpy/model/v1/order/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/ProductCondition.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 8565 – Changes related to billing of Non Serialized Inventory and bad_sale

amar.kumar — Thu, 24 Oct 2013 15:20:39 +0530

amar.kumar – 10 file(s) modified
Changes related to billing of Non Serialized Inventory and bad_sale

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /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/InventoryItemHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml

Rev 7968 – Changes for 1) While billing Freebie Order changing order ...

amar.kumar — Tue, 13 Aug 2013 01:24:22 +0530

amar.kumar – 11 file(s) modified
Changes for
1) While billing Freebie Order changing order of scans. Now first checking if freebie is available, then billing main product, then billing freebie
2) Change in Daily Inventory Mismatch between CIS and warehouse db to take care of in transit inventory.
3)

~ /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/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml

Rev 7957 – Changes in Movement Report to add bad inventory sheets and ...

amar.kumar — Thu, 08 Aug 2013 16:07:26 +0530

amar.kumar – 10 file(s) modified
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

Rev 7718 – Changes for setting amount of purchase-return by using unitprice of ...

amar.kumar — Tue, 09 Jul 2013 15:22:45 +0530

amar.kumar – 10 file(s) modified
Changes for setting amount of purchase-return by using unitprice of the product from po instead of current transfer price

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReturnController.java
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 7676 – Change to give option of selecting warehouse at the time ...

amar.kumar — Wed, 03 Jul 2013 15:31:35 +0530

amar.kumar – 14 file(s) modified
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/js/common.js
~ /trunk/InventoryManager/src/main/webapp/js/purchase-order-common.js
~ /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/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

Rev 7672 – Changes made to add nlc.

rajveer — Tue, 02 Jul 2013 12:26:47 +0530

rajveer – 28 file(s) modified
Changes made to add nlc.

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportByGrnDateController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportController.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/LineItem.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/RevisionedPurchaseOrder.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/warehouse/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/DetailedPurchaseScan.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryItem.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /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/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 7613 – Setting up daily report for In Transit Inventory for various ...

amar.kumar — Mon, 24 Jun 2013 19:00:02 +0530

amar.kumar – 10 file(s) modified
Setting up daily report for In Transit Inventory for various warehouses

+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InTransitInventory.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/InTransitInventory.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/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/mybatis-config.xml

Rev 7574 – Additional Changes for Receiving Items from another warehouse

amar.kumar — Wed, 19 Jun 2013 16:58:48 +0530

amar.kumar – 7 file(s) modified
Additional Changes for Receiving Items from another warehouse

~ /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/persistence/InventoryItemMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml

Rev 7453 – Additional Changes for Transfer Lot

amar.kumar — Tue, 11 Jun 2013 12:56:17 +0530

amar.kumar – 7 file(s) modified
Additional Changes for Transfer Lot

~ /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-receive-new.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/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml

Rev 7410 – Changes for 1)Multiple Ours Physical Warehouses 2)Movement of Goods ...

amar.kumar — Fri, 07 Jun 2013 10:13:38 +0530

amar.kumar – 111 file(s) modified
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/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/controllers/TransferLotController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/TransferLotReceiveController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/PdfPoSheetGenerator.java
+ /trunk/InventoryManager/src/main/webapp/css/colorbox.css
~ /trunk/InventoryManager/src/main/webapp/css/common.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-min.js
+ /trunk/InventoryManager/src/main/webapp/js/jquery.colorbox.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/js/transfer-lot.js
~ /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/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/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/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
+ /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/CRMService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMServiceException.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/AgentWarehouseMapping.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/PossibleWarehouseMovement.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/TransferLot.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/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/PossibleWarehouseMovement.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/Scan.java
+ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/TransferLot.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/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
~ /trunk/WarehouseService/src/main/resources/mybatis-config.xml

Rev 7216 – Option for additional movement report that will include Hotspot purchases

amar.kumar — Thu, 02 May 2013 15:27:16 +0530

amar.kumar – 9 file(s) modified
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

Rev 7210 – Adding purchase report based on GRN date

amar.kumar — Tue, 30 Apr 2013 16:05:35 +0530

amar.kumar – 9 file(s) modified
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/accounting-reports-index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-report-by-grn-date-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

Rev 7199 – Logic to handle 1) RTO for Freebie Orders 2) Option ...

amar.kumar — Fri, 26 Apr 2013 19:53:35 +0530

amar.kumar – 9 file(s) modified
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

Rev 7190 – Changes for Freebie Order Automation Reviewed by Amit Gupta

amar.kumar — Thu, 25 Apr 2013 15:17:13 +0530

amar.kumar – 48 file(s) modified
Changes for Freebie Order Automation

Reviewed by Amit Gupta

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemForm.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
+ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/FreebieItem.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Item.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemForm.ui.xml
~ /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/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddJacketNumberEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SplitFreebieOrderEvent.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SplitFreebieOrderEventHandler.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/client/inbox/SplitFreebieOrderBox.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/BillOrderHandler.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SplitFreebieOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.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/Order.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SplitFreebieOrderRequest.java
+ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SplitFreebieOrderResponse.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.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/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/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /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.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/FreebieItem.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/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/OosStatusMarker.java

Rev 6880 – Changes for 1) Inventory Movement Report 2) Rearranging of ...

amar.kumar — Tue, 26 Feb 2013 12:32:46 +0530

amar.kumar – 18 file(s) modified
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/index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/movement-report-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

Rev 6765 – Reverting changes for Warehouse Service

amar.kumar — Wed, 30 Jan 2013 16:10:55 +0530

amar.kumar – 7 file(s) modified
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

Rev 6762 – Changes for OUR External Billing

amar.kumar — Wed, 30 Jan 2013 15:14:18 +0530

amar.kumar – 17 file(s) modified
Changes for OUR External Billing

~ /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/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryMovement.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

Rev 6630 – Changes for following 1) Creating purchase after scans are validated ...

amar.kumar — Wed, 09 Jan 2013 18:04:55 +0530

amar.kumar – 17 file(s) modified
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/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.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

Rev 6548 – Making Changes for: 1) Pulling inventory for Serialized Items from ...

amar.kumar — Fri, 28 Dec 2012 15:06:26 +0530

amar.kumar – 12 file(s) modified
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/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryAvailability.java
~ /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