SmartDukaan – /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java

Rev 25119 – Fixed purchase GRN

amit.gupta — Fri, 21 Jun 2019 21:26:48 +0530

amit.gupta – 2 file(s) modified
Fixed purchase GRN

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java

Rev 25112 – Fixed changes related to PO

amit.gupta — Fri, 21 Jun 2019 20:47:58 +0530

amit.gupta – 5 file(s) modified
Fixed changes related to PO

Rev 24991 – Added new warehouse for Lucknow

amit.gupta — Tue, 28 May 2019 13:02:03 +0530

amit.gupta – 7 file(s) modified
Added new warehouse for Lucknow

Rev 24332 – Fixed po scenario

amit.gupta — Mon, 17 Dec 2018 15:24:54 +0530

amit.gupta – 1 file(s) modified
Fixed po scenario

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.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 11801 – Committed by Manish Sharma for Direct Scan to Amazon Warehouses ...

manish.sharma — Thu, 26 Jun 2014 21:55:50 +0530

manish.sharma – 16 file(s) modified
Committed by Manish Sharma for Direct Scan to Amazon Warehouses on 26-Jun-2014

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/BulkPurchaseController.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/bulk-purchase-show.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-new.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
~ /trunk/PyProj/src/shop2020/purchase/main/model/Purchase.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/Purchase.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java

Rev 8217 – Change to allow same item with serial number to be ...

amar.kumar — Thu, 26 Sep 2013 16:24:33 +0530

amar.kumar – 1 file(s) modified
Change to allow same item with serial number to be scanned in as a new purchase if the previous item's lastScanType is DOA_REPLACED

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java

Rev 7441 – Change to keep transferLotId same for same purchase

amar.kumar — Mon, 10 Jun 2013 19:52:07 +0530

amar.kumar – 2 file(s) modified
Change to keep transferLotId same for same purchase

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm

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 7321 – Amar:Allowing scan-ins if item's lastScanType is purchase-return

amit.gupta — Wed, 22 May 2013 15:27:48 +0530

amit.gupta – 1 file(s) modified
Amar:Allowing scan-ins if item's lastScanType is purchase-return

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java

Rev 6641 – Change in Scanning Logic to avoid creation of multiple Grns

amar.kumar — Thu, 10 Jan 2013 15:25:27 +0530

amar.kumar – 1 file(s) modified
Change in Scanning Logic to avoid creation of multiple Grns

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java

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 5945 – Separating catalog and inventory services Trac#1594 Reviewer: Rajveer

mandeep.dhir — Fri, 07 Sep 2012 16:37:44 +0530

mandeep.dhir – 99 file(s) modified
Separating catalog and inventory services Trac#1594 Reviewer: Rajveer

~ /trunk/Common/src/main/java/in/shop2020/thrift/clients/CatalogClient.java
+ /trunk/Common/src/main/java/in/shop2020/thrift/clients/InventoryClient.java
~ /trunk/Common/src/main/java/in/shop2020/utils/CategoryManager.java
~ /trunk/Common/src/main/java/in/shop2020/utils/ConfigClientKeys.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/ItemUpdateController.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/CatalogUploderToGAE.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/PriceInsertor.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/AmazonSCDataGenerator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentMigrator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/MobileSiteDataXMLGenerator.java
~ /trunk/ContentStore/src/main/java/in/shop2020/util/ProductListGenerator.java
~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/UserCartController.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CatalogUtils.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/CourierDetailsGenerator.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/InvoiceServlet.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/TransactionUtils.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/CurrentInventoryController.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/IgnoredItemMappingController.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/SupplierController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java
+ /trunk/runutils/.project
+ /trunk/runutils/.pydevproject
+ /trunk/runutils/init.d/inventory-server
+ /trunk/Support/Converted-2-2012-08-06-16:29:31.xls
+ /trunk/Support/Converted-2-2012-08-11-14:58:00.xls
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CartReportController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierDetailsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/HotspotReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/ProductNotificationsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/StockReportsController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java
~ /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/AnalysisDataGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/CourierDetailsGenerator.java
~ /trunk/Support/src/main/java/in/shop2020/support/services/ManifestGenerator.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/AvailableAndReservedStock.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/BillingType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogServiceException.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Category.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/HolidayType.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryServiceException.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventory.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemInventoryHistory.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ItemNotificationRequestCount.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/ProductNotification.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Vendor.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemMapping.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/VendorItemPricing.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Warehouse.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseLocation.java
x /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/WarehouseType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/AvailableAndReservedStock.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/BillingType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/HolidayType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryServiceException.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryType.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/ItemInventory.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/ItemInventoryHistory.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/Vendor.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/VendorItemMapping.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/VendorItemPricing.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/Warehouse.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/WarehouseLocation.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/WarehouseType.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
+ /trunk/ThriftGen/thriftsrc/InventoryService
+ /trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BestDealsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BestSellersController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ClearanceSaleController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ComingSoonController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LatestArrivalsController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyPurchasesController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ProductNotificationController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/SourceInterceptor.java
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java

Rev 5530 – Trac#1065 Tracking Non-serialized inventory scanning out with item numbers

mandeep.dhir — Mon, 02 Jul 2012 18:23:22 +0530

mandeep.dhir – 21 file(s) modified
Trac#1065 Tracking Non-serialized inventory scanning out with item numbers

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/JacketInfoBox.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/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
~ /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/script/UnscannedItemsReporter.py
+ /trunk/PyProj/src/shop2020/purchase/script
+ /trunk/PyProj/src/shop2020/purchase/script/__init__.py
~ /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/Support/src/main/java/in/shop2020/support/controllers/FileArchiveController.java
~ /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 5496 – Trac#1333 Trac#1423 - Daily Alerts for Invoice vs Scan ...

mandeep.dhir — Tue, 26 Jun 2012 18:28:48 +0530

mandeep.dhir – 16 file(s) modified
Trac#1333 Trac#1423
- Daily Alerts for Invoice vs Scan mismatch
- Scanning Item numbers and serial numbers for accessories
- Enumerated invoice numbers in Purchase receive UI
Reviewer: Rajveer

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
~ /trunk/InventoryManager/src/main/webapp/js/purchase.js
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-new.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm
+ /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/InvoiceScan.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 5437 – Interface to add supplier inventory Merged 2 calls during scan ...

mandeep.dhir — Sun, 17 Jun 2012 21:53:31 +0530

mandeep.dhir – 26 file(s) modified
Interface to add supplier inventory
Merged 2 calls during scan IN to avoid errors
Using initialQuantity for serialized inventory items as well
Trac#1391

~ /trunk/InventoryManager/pom.xml
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/DivisionStrategy.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/EffectiveAvailabilityComputer.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/Strategy.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/StrategyEvaluator.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/SubtractStrategy.java
~ /trunk/InventoryManager/src/main/resources/shiro.ini
+ /trunk/InventoryManager/src/main/resources/supplier-inventory.cfg
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-inventory-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/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/warehouse/WarehouseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.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/ScanMapper.xml

Rev 5372 – Trac#1344 Added report screens for Purchases report

mandeep.dhir — Wed, 06 Jun 2012 15:25:12 +0530

mandeep.dhir – 26 file(s) modified
Trac#1344 Added report screens for Purchases report

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/AccountingReportsController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SaleReportController.java (copied from /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SalesReportController.java@5368)
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SaleReturnReportController.java (copied from /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SalesReturnReportController.java@5368)
x /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SalesReportController.java
x /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SalesReturnReportController.java
~ /trunk/InventoryManager/src/main/resources/shiro.ini
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/accounting-reports-index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-report-index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/sale-report-index.vm (copied from /trunk/InventoryManager/src/main/webapp/WEB-INF/content/sales-report-index.vm@5368)
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/sale-return-report-index.vm (copied from /trunk/InventoryManager/src/main/webapp/WEB-INF/content/sales-return-report-index.vm@5368)
x /trunk/InventoryManager/src/main/webapp/WEB-INF/content/sales-report-index.vm
x /trunk/InventoryManager/src/main/webapp/WEB-INF/content/sales-return-report-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/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

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 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 4846 – Trac#1043 Handling cases where itemnumber to itemId mapping is not ...

mandeep.dhir — Fri, 30 Mar 2012 10:09:26 +0530

mandeep.dhir – 11 file(s) modified
Trac#1043 Handling cases where itemnumber to itemId mapping is not unique

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm
~ /trunk/ThriftConfig/src/main/java/in/shop2020/generic/Constants.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/generic/ExceptionType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/GenericService/GenericService.thrift
~ /trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ItemNumberHandler.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ItemNumberMapper.java
~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
~ /trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ItemNumberMapper.xml

Rev 4754 – Trac#974 Trac#975 Adding UI for PO create, amend etc. ALso ...

mandeep.dhir — Wed, 21 Mar 2012 10:45:42 +0530

mandeep.dhir – 27 file(s) modified
Trac#974 Trac#975 Adding UI for PO create, amend etc.
ALso UI for inventory read and edit.
Display Vendor name, date in POs list
On PO creation, list the vendors to whom PO can be sent.
For selected Vendor,display the PO to be generated to users who later can amend the PO, (quantity, add/remove lineitem etc.) before actually creating and sending mail for PO to vendors.
Display COD vs Prepaid count, total amount of PO being raised etc. as well
Allow quantity, item and color amends in existing PO
Feature to resend the amended PO to vendor in mail
Ability to find PO given an item pending scan
Users should be sent emails to remind them to create PO
We should also be able to audit all the amends made to a PO

Rev 4687 – Trac#974 webapp for inventory mgmt

mandeep.dhir — Tue, 13 Mar 2012 12:06:06 +0530

mandeep.dhir – 182 file(s) modified
Trac#974 webapp for inventory mgmt

+ /trunk/InventoryManager
+ /trunk/InventoryManager/.classpath
+ /trunk/InventoryManager/.project
+ /trunk/InventoryManager/.settings
+ /trunk/InventoryManager/.settings/org.eclipse.jdt.core.prefs
+ /trunk/InventoryManager/.settings/org.maven.ide.eclipse.prefs
+ /trunk/InventoryManager/pom.xml
+ /trunk/InventoryManager/src
+ /trunk/InventoryManager/src/main
+ /trunk/InventoryManager/src/main/java
+ /trunk/InventoryManager/src/main/java/in
+ /trunk/InventoryManager/src/main/java/in/shop2020
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/BaseController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/CurrentInventoryController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/HomeController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/RaisePOController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/WarehouseController.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service
+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/PdfPoSheetGenerator.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/serving
+ /trunk/InventoryManager/src/main/java/in/shop2020/serving/auth
+ /trunk/InventoryManager/src/main/java/in/shop2020/serving/auth/InventoryAuthorizingRealm.java
+ /trunk/InventoryManager/src/main/java/in/shop2020/serving/auth/VerboseFilter.java
+ /trunk/InventoryManager/src/main/resources
+ /trunk/InventoryManager/src/main/resources/log4j.properties
+ /trunk/InventoryManager/src/main/resources/shiro.ini
+ /trunk/InventoryManager/src/main/resources/struts.xml
+ /trunk/InventoryManager/src/main/webapp
+ /trunk/InventoryManager/src/main/webapp/change-password.html
+ /trunk/InventoryManager/src/main/webapp/css
+ /trunk/InventoryManager/src/main/webapp/css/common.css
+ /trunk/InventoryManager/src/main/webapp/js
+ /trunk/InventoryManager/src/main/webapp/js/current-inventory.js
+ /trunk/InventoryManager/src/main/webapp/js/jquery-1.4.2.js
+ /trunk/InventoryManager/src/main/webapp/js/jquery.dataTables.min.js
+ /trunk/InventoryManager/src/main/webapp/js/jquery.validate.js
+ /trunk/InventoryManager/src/main/webapp/js/purchase-order-common.js
+ /trunk/InventoryManager/src/main/webapp/js/purchase-order-events.js
+ /trunk/InventoryManager/src/main/webapp/js/purchase.js
+ /trunk/InventoryManager/src/main/webapp/login.html
+ /trunk/InventoryManager/src/main/webapp/WEB-INF
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/current-inventory-index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/current-inventory-show.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/exception.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-create.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-new.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-change-color.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/raisePO-index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/raisePO-result.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/warehouse-index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/web.xml
+ /trunk/InventoryManager/target
+ /trunk/InventoryManager/target/classes
+ /trunk/InventoryManager/target/classes/in
+ /trunk/InventoryManager/target/classes/in/shop2020
+ /trunk/InventoryManager/target/classes/in/shop2020/inventory
+ /trunk/InventoryManager/target/classes/in/shop2020/inventory/controllers
+ /trunk/InventoryManager/target/classes/in/shop2020/inventory/controllers/BaseController.class
+ /trunk/InventoryManager/target/classes/in/shop2020/inventory/controllers/CurrentInventoryController.class
+ /trunk/InventoryManager/target/classes/in/shop2020/inventory/controllers/HomeController.class
+ /trunk/InventoryManager/target/classes/in/shop2020/inventory/controllers/PurchaseController.class
+ /trunk/InventoryManager/target/classes/in/shop2020/inventory/controllers/PurchaseOrderController.class
+ /trunk/InventoryManager/target/classes/in/shop2020/inventory/controllers/RaisePOController.class
+ /trunk/InventoryManager/target/classes/in/shop2020/inventory/controllers/WarehouseController.class
+ /trunk/InventoryManager/target/classes/in/shop2020/inventory/service
+ /trunk/InventoryManager/target/classes/in/shop2020/inventory/service/PdfPoSheetGenerator.class
+ /trunk/InventoryManager/target/classes/in/shop2020/serving
+ /trunk/InventoryManager/target/classes/in/shop2020/serving/auth
+ /trunk/InventoryManager/target/classes/in/shop2020/serving/auth/InventoryAuthorizingRealm.class
+ /trunk/InventoryManager/target/classes/in/shop2020/serving/auth/VerboseFilter.class
+ /trunk/InventoryManager/target/classes/log4j.properties
+ /trunk/InventoryManager/target/classes/shiro.ini
+ /trunk/InventoryManager/target/classes/struts.xml
+ /trunk/InventoryManager/target/InventoryManager
+ /trunk/InventoryManager/target/InventoryManager.war
+ /trunk/InventoryManager/target/InventoryManager/change-password.html
+ /trunk/InventoryManager/target/InventoryManager/css
+ /trunk/InventoryManager/target/InventoryManager/css/common.css
+ /trunk/InventoryManager/target/InventoryManager/js
+ /trunk/InventoryManager/target/InventoryManager/js/current-inventory.js
+ /trunk/InventoryManager/target/InventoryManager/js/jquery-1.4.2.js
+ /trunk/InventoryManager/target/InventoryManager/js/jquery.dataTables.min.js
+ /trunk/InventoryManager/target/InventoryManager/js/jquery.validate.js
+ /trunk/InventoryManager/target/InventoryManager/js/purchase-order-common.js
+ /trunk/InventoryManager/target/InventoryManager/js/purchase-order-events.js
+ /trunk/InventoryManager/target/InventoryManager/js/purchase.js
+ /trunk/InventoryManager/target/InventoryManager/login.html
+ /trunk/InventoryManager/target/InventoryManager/META-INF
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/classes
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/inventory
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/inventory/controllers
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/inventory/controllers/BaseController.class
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/inventory/controllers/CurrentInventoryController.class
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/inventory/controllers/HomeController.class
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/inventory/controllers/PurchaseController.class
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/inventory/controllers/PurchaseOrderController.class
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/inventory/controllers/RaisePOController.class
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/inventory/controllers/WarehouseController.class
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/inventory/service
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/inventory/service/PdfPoSheetGenerator.class
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/serving
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/serving/auth
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/serving/auth/InventoryAuthorizingRealm.class
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/in/shop2020/serving/auth/VerboseFilter.class
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/log4j.properties
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/shiro.ini
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/classes/struts.xml
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/content
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/content/current-inventory-index.vm
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/content/current-inventory-show.vm
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/content/exception.vm
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/content/index.vm
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/content/purchase-create.vm
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/content/purchase-new.vm
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/content/purchase-order-change-color.vm
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/content/purchase-order-editNew.vm
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/content/purchase-order-index.vm
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/content/purchase-order-show.vm
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/content/purchase-show.vm
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/content/raisePO-index.vm
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/content/raisePO-result.vm
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/content/warehouse-index.vm
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/activation-1.1.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/Common-1.0-SNAPSHOT.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/commons-beanutils-1.8.3.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/commons-collections-3.2.1.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/commons-digester-2.0.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/commons-fileupload-1.2.1.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/commons-io-1.3.2.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/commons-lang-2.4.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/commons-lang-2.5.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/commons-logging-1.0.4.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/commons-logging-1.1.1.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/commons-logging-api-1.1.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/commons-validator-1.3.1.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/ezmorph-1.0.3.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/freemarker-2.3.15.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/httpclient-4.0.1.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/httpcore-4.0.1.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/icu4j-4.8.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/iText-5.0.4.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/json-20090211.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/json-lib-2.1-jdk15.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/jsp-api-2.1.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/libthrift-0.7.0.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/log4j-log4j-1.2.16.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/mail-1.4.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/ognl-2.7.3.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/poi-3.7-20101029.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/readonly.apache-log4j-1.2.16.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/servlet-api-2.5.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/shiro-core-1.1.0.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/shiro-web-1.1.0.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/slf4j-api-1.6.1.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/slf4j-log4j12-1.6.1.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/struts2-convention-plugin-2.1.8.1.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/struts2-core-2.1.8.1.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/struts2-rest-plugin-2.1.8.1.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/ThriftConfig-1.0-SNAPSHOT.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/velocity-1.6.3.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/velocity-tools-1.4.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/xpp3_min-1.1.3.4.O.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/xstream-1.2.2.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/lib/xwork-core-2.1.6.jar
+ /trunk/InventoryManager/target/InventoryManager/WEB-INF/web.xml
+ /trunk/InventoryManager/target/maven-archiver
+ /trunk/InventoryManager/target/maven-archiver/pom.properties
+ /trunk/InventoryManager/target/surefire