SmartDukaan – //trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 5514 – Corrected a method for voucher tracking.

rajveer — Thu, 28 Jun 2012 17:57:39 +0530

rajveer – 1 file(s) modified
Corrected a method for voucher tracking.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 5508 – Added support to issue a coupon to user on placemet ...

rajveer — Thu, 28 Jun 2012 12:29:22 +0530

rajveer – 3 file(s) modified
Added support to issue a coupon to user on placemet of order.

~ /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/script/SpicedeckRechargeVoucherService.py

Rev 5488 – Ticket #1428 Generate Reconciliation report for Vendor payments based on ...

phani.kumar — Tue, 26 Jun 2012 11:48:06 +0530

phani.kumar – 1 file(s) modified
Ticket #1428 Generate Reconciliation report for Vendor payments based on date range

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 5481 – Ticket #1428 Generate Reconciliation report for Vendor payments based on ...

phani.kumar — Fri, 22 Jun 2012 17:25:57 +0530

phani.kumar – 9 file(s) modified
Ticket #1428 Generate Reconciliation report for Vendor payments based on date range
Ticket #1427 In Vendor Reconciliation add Delhivery support
reviewer: Rajveer Singh

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
~ /trunk/Support/src/main/webapp/js/vendor-reconciliation.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 5447 – Front-end for COD Verification Performance Report Trac# 1398 Reviewer ...

anupam.singh — Mon, 18 Jun 2012 18:14:40 +0530

anupam.singh – 11 file(s) modified
Front-end for COD Verification Performance Report

Trac# 1398
Reviewer : Varun Gupta

~ /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/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/OrderVerificationPerformanceController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/order-verification-performance-index.vm
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/CODVerificationAgent.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 5436 – Bugfix. Converting thirdparty warehouse to our warehouse while fetching the ...

mandeep.dhir — Sun, 17 Jun 2012 15:34:35 +0530

mandeep.dhir – 1 file(s) modified
Bugfix. Converting thirdparty warehouse to our warehouse while fetching the inventory item to be billed

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 5419 – Bug fix. Checking scanMap entry existence for order status. Reviewer: ...

mandeep.dhir — Thu, 14 Jun 2012 12:07:48 +0530

mandeep.dhir – 1 file(s) modified
Bug fix. Checking scanMap entry existence for order status.
Reviewer: Rajveer

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 5412 – Passing selfPickUp argument as well

mandeep.dhir — Wed, 13 Jun 2012 14:38:05 +0530

mandeep.dhir – 1 file(s) modified
Passing selfPickUp argument as well

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 5411 – Added support to scan multiple items in case of bulk ...

rajveer — Wed, 13 Jun 2012 13:48:22 +0530

rajveer – 9 file(s) modified
Added support to scan multiple items in case of bulk order.
Reviewer: Mandeep
Ticket: 1379

Rev 5402 – Billed Orders can be marked as delivered if they are ...

rajveer — Tue, 12 Jun 2012 12:06:46 +0530

rajveer – 1 file(s) modified
Billed Orders can be marked as delivered if they are self pickup.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 5388 – vendorId copied into new order for reships

phani.kumar — Fri, 08 Jun 2012 16:19:24 +0530

phani.kumar – 1 file(s) modified
vendorId copied into new order for reships

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 5387 – Added support to handle self pickup. Also provided support to ...

rajveer — Fri, 08 Jun 2012 15:35:05 +0530

rajveer – 17 file(s) modified
Added support to handle self pickup. Also provided support to display quantity in OM dashboard.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderList.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/Order.java
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StockReportsController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-editNew.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java

Rev 5386 – vendor reconciliation

phani.kumar — Fri, 08 Jun 2012 14:51:53 +0530

phani.kumar – 11 file(s) modified
vendor reconciliation

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ProcessReturnOrderHandler.java
~ /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/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
~ /trunk/Support/src/main/webapp/js/vendor-reconciliation.js
~ /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 5382 – Added paymentGatewayId as parameter to method when getting payment settlement

varun.gupta — Thu, 07 Jun 2012 17:28:50 +0530

varun.gupta – 7 file(s) modified
Added paymentGatewayId as parameter to method when getting payment settlement

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 5368 – Trac#1344 Added report screens for Sales and sales register

mandeep.dhir — Tue, 05 Jun 2012 18:41:57 +0530

mandeep.dhir – 11 file(s) modified
Trac#1344 Added report screens for Sales and sales register

+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/AccountingReportsController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/BaseController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SalesReportController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SalesReturnReportController.java
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/accounting-reports-index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-report-index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-return-report-index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/sales-report-index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/sales-return-report-index.vm
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 5361 – Trac#1065 Tracking Non-serialized inventory

mandeep.dhir — Mon, 04 Jun 2012 23:05:41 +0530

mandeep.dhir – 20 file(s) modified
Trac#1065 Tracking Non-serialized inventory

Rev 5348 – Adding COD Verification Agent Reviewer : Mandeep

anupam.singh — Fri, 01 Jun 2012 14:55:54 +0530

anupam.singh – 8 file(s) modified
Adding COD Verification Agent
Reviewer : Mandeep

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/TicketsController.java
~ /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/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 5272 – Paymentflagged cancellation cases were not updating reserved field

mandeep.dhir — Fri, 25 May 2012 15:26:05 +0530

mandeep.dhir – 1 file(s) modified
Paymentflagged cancellation cases were not updating reserved field

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 5256 – Adding the name of Suraj and Zaffar in the mailing ...

rajveer — Wed, 23 May 2012 18:50:44 +0530

rajveer – 1 file(s) modified
Adding the name of Suraj and Zaffar in the mailing list.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 5208 – Updated Vendor Recon

varun.gupta — Fri, 18 May 2012 14:59:42 +0530

varun.gupta – 7 file(s) modified
Updated Vendor Recon

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 5199 – Fixed bugs where reservation field was not getting appropriately updated ...

mandeep.dhir — Thu, 17 May 2012 11:19:10 +0530

mandeep.dhir – 1 file(s) modified
Fixed bugs where reservation field was not getting appropriately updated
Reviewer: Rajveer

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 5189 – Vendor Reconciliation - added unsettled orders sheet

varun.gupta — Wed, 16 May 2012 13:31:05 +0530

varun.gupta – 11 file(s) modified
Vendor Reconciliation - added unsettled orders sheet

~ /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/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm
~ /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/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 5185 – Trac#981 DOA replacement support. Fixing reserved field when order is ...

mandeep.dhir — Wed, 16 May 2012 10:14:51 +0530

mandeep.dhir – 32 file(s) modified
Trac#981 DOA replacement support. Fixing reserved field when order is cancelled from PO_RAISED etc. states > 7(BILLED).

+ /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/resources/shiro.ini
+ /trunk/InventoryManager/src/main/webapp/js/doa.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/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/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/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/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/ScanType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.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/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 5177 – Bugfix. SALE_RET for cancelled orders is needed only for serialized ...

mandeep.dhir — Tue, 15 May 2012 11:49:29 +0530

mandeep.dhir – 1 file(s) modified
Bugfix. SALE_RET for cancelled orders is needed only for serialized items for now.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 5165 – Promised and expected delivery time should be adjusted with respect ...

rajveer — Mon, 14 May 2012 13:47:02 +0530

rajveer – 1 file(s) modified
Promised and expected delivery time should be adjusted with respect to shipping time.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 5147 – Trac#1173 Fixed PO amendment logic Trac#1237 Using preferredVendor when no ...

mandeep.dhir — Thu, 10 May 2012 10:21:57 +0530

mandeep.dhir – 4 file(s) modified
Trac#1173 Fixed PO amendment logic
Trac#1237 Using preferredVendor when no availability found at warehouses for arriving at fulfilment warehouse

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py

Rev 5144 – For orders in state [SUBMITTED_FOR_PROCESSING, INVENTORY_LOW, LOW_INV_PO_RAISED, LOW_INV_REVERSAL_IN_PROCESS and ...

anupam.singh — Wed, 09 May 2012 11:32:47 +0530

anupam.singh – 1 file(s) modified
For orders in state [SUBMITTED_FOR_PROCESSING, INVENTORY_LOW, LOW_INV_PO_RAISED, LOW_INV_REVERSAL_IN_PROCESS and LOW_INV_NOT_AVAILABLE_AT_HOTSPOT] we should not call create_refund method.

Trac#1229
Reviewer : Rajveer

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 5139 – Ticket #1214 - Customized email content based on courier provider

varun.gupta — Tue, 08 May 2012 14:20:41 +0530

varun.gupta – 1 file(s) modified
Ticket #1214 - Customized email content based on courier provider

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 5123 – Bug fix. Availability of the GGN like warehouses should be ...

mandeep.dhir — Mon, 07 May 2012 09:14:18 +0530

mandeep.dhir – 1 file(s) modified
Bug fix. Availability of the GGN like warehouses should be updated

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 5110 – Trac#969, Trac#976, Trac#1058, Trac#909, Trac#996, Trac#1067, Trac#1175 Virtual warehouse modelling ...

mandeep.dhir — Fri, 04 May 2012 00:58:11 +0530

mandeep.dhir – 78 file(s) modified
Trac#969, Trac#976, Trac#1058, Trac#909, Trac#996, Trac#1067, Trac#1175
Virtual warehouse modelling
Bulk scan In feature
Categorization of Serialized vs NonSerialized items
Screen to display items whose inventory update was missed due to key mismatch

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddJacketNumberEvent.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenter.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/JacketInfoBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/MainPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CatalogUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddJacketNumberHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AuthHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/BillOrderHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/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/AuthResponse.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/Order.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/CurrentInventoryController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/IgnoredItemMappingController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/LoginController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
x /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/RaisePOController.java
~ /trunk/InventoryManager/src/main/resources/shiro.ini
~ /trunk/InventoryManager/src/main/webapp/css/common.css
+ /trunk/InventoryManager/src/main/webapp/css/demo_page.css
+ /trunk/InventoryManager/src/main/webapp/css/demo_table.css
+ /trunk/InventoryManager/src/main/webapp/css/demo_table_jui.css
~ /trunk/InventoryManager/src/main/webapp/js/current-inventory.js
~ /trunk/InventoryManager/src/main/webapp/js/purchase.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/current-inventory-show.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/ignored-item-mapping-index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/item-number-mapping.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-edit.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm
x /trunk/InventoryManager/src/main/webapp/WEB-INF/content/raisePO-index.vm
x /trunk/InventoryManager/src/main/webapp/WEB-INF/content/raisePO-result.vm
~ /trunk/PyProj/src/shop2020/helpers/impl/DataAccessor.py
~ /trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
~ /trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataService.py
~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/InventoryServiceHandler.py
x /trunk/PyProj/src/shop2020/model/v1/catalog/script/PurchaseOrderProcessor.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/logistics/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/InventoryService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/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/logistics/LogisticsInfo.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Warehouse.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/ScanType.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Warehouse.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/ThriftGen/thriftsrc/LogisticsService/LogisticsService.thrift
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/InventoryItem.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 5099 – Added service method to mark orders as paid to vendor

varun.gupta — Wed, 02 May 2012 14:59:37 +0530

varun.gupta – 6 file(s) modified
Added service method to mark orders as paid to vendor

Rev 5067 – Ticket #1148 - Service methods created to support Order Monitor ...

varun.gupta — Thu, 26 Apr 2012 18:30:52 +0530

varun.gupta – 6 file(s) modified
Ticket #1148 - Service methods created to support Order Monitor report

Rev 5062 – Ticket #1184 - Added originalOrderId field in Order and updated ...

varun.gupta — Wed, 25 Apr 2012 17:30:08 +0530

varun.gupta – 8 file(s) modified
Ticket #1184 - Added originalOrderId field in Order and updated code to populate this field

Rev 4999 – Ticket #1121 auto closing of CRM tickets created related to ...

phani.kumar — Mon, 16 Apr 2012 14:51:46 +0530

phani.kumar – 8 file(s) modified
Ticket #1121 auto closing of CRM tickets created related to nondelivery of order
reviewer: Rajveer

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/AramexLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/BlueDartLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 4982 – Added another status to mark as Delivered.

rajveer — Fri, 13 Apr 2012 18:47:39 +0530

rajveer – 1 file(s) modified
Added another status to mark as Delivered.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 4966 – phone number of warehouse in charges removed from mails and ...

phani.kumar — Thu, 12 Apr 2012 14:55:52 +0530

phani.kumar – 1 file(s) modified
phone number of warehouse in charges removed from mails and name of in charge changed for one warehouse

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 4938 – Added condition of warehouse for hotspot.

rajveer — Tue, 10 Apr 2012 13:16:20 +0530

rajveer – 1 file(s) modified
Added condition of warehouse for hotspot.

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 4920 – Ticket #1039 To introduce & implement 3 new OrderStatus states ...

phani.kumar — Thu, 05 Apr 2012 20:21:31 +0530

phani.kumar – 2 file(s) modified
Ticket #1039 To introduce & implement 3 new OrderStatus states for undelivered orders
reviewer: Rajveer

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/BlueDartLogisticsReconciliation.py

Rev 4915 – Made Helper client flexible to connect with Helper service running ...

varun.gupta — Thu, 05 Apr 2012 13:07:14 +0530

varun.gupta – 3 file(s) modified
Made Helper client flexible to connect with Helper service running on a server of choice (decided on run-time)

~ /trunk/PyProj/src/shop2020/clients/HelperClient.py
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

Rev 4910 – Ticket #1039 To introduce & implement 3 new OrderStatus states ...

phani.kumar — Wed, 04 Apr 2012 20:44:30 +0530

phani.kumar – 14 file(s) modified
Ticket #1039 To introduce & implement 3 new OrderStatus states for undelivered orders
Ticket #1040 CRM ticket creation related to undelivery of order
Ticket #1041 Generation of logistics report for orders pending local connection
reviewer: Rajveer

~ /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/order/script/AramexLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/BlueDartLogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/LogisticsReconciliation.py
~ /trunk/PyProj/src/shop2020/model/v1/order/script/UpdateRtoData.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatus.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/OrderStatusGroups.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift