Subversion Repositories SmartDukaan

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
24832 2480 d 19 h tejbeer /trunk/ Added changes to save tp information for that day, to figure out price drop difference while claiming it.  
/trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
/trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
21844 3118 d 16 h amit.gupta /trunk/ Gst Changes  
/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/service/PdfPoSheetGenerator.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-edit.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-editNew.vm
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/inventory/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/purchase/main/handler/PurchaseServiceHandler.py
/trunk/PyProj/src/shop2020/purchase/main/model/LineItem.py
/trunk/PyProj/src/shop2020/purchase/main/model/Supplier.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/StateInfo.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/Warehouse.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/BuyerInfo.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/LineItem.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/SellerInfo.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TaxType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/WarehouseAddress.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/purchase/Supplier.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/TaxType.java
/trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
12357 4178 d 11 h manish.sharma /trunk/ Committed by Manish Sharma for Weighted Nlc Avg Calculation on 08-Aug-2014  
/trunk/PyProj/src/shop2020/model/v1/inventory/script/AmazonStockWeightedNlcInfoUpdater.py
/trunk/PyProj/src/shop2020/model/v1/inventory/script/NlcPlusUpdater.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/StockWeightedNlcInfo.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportByGrnDateController.java
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.py
/trunk/PyProj/src/shop2020/purchase/main/model/LineItem.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/Warehouse.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/AmazonTransferredSkuDetail.java
/trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
/trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
/trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/AmazonTransferredSkuDetail.java
/trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml
/trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml
9416 4384 d 15 h amar.kumar /trunk/ Changes for
1) Allow Billing of Orders on CForm
2) Store and Show Mrp of items purchased in Purchase-order page
3) Add Support for C-Form in purchase-orders		  
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/TaxType.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/PdfPoSheetGenerator.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/current-inventory-show.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/js/purchase-order-common.js
/trunk/InventoryManager/src/main/webapp/js/purchase-order-events.js
/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/purchase/main/model/LineItem.py
/trunk/PyProj/src/shop2020/purchase/main/model/PurchaseOrder.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
/trunk/Support/src/main/java/in/shop2020/support/controllers/BulkOrderController.java
/trunk/Support/src/main/webapp/WEB-INF/content/bulk-order-editNew.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/Order.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseOrder.java
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
8182 4496 d 12 h amar.kumar /trunk/ Changes related to EBAY and minor changes related to use of rto orders for PO creation

Reviewed By: Rajveer Singh		  
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SplitEbayOrderEvent.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/SplitEbayOrderEventHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/SplitEbayOrderBox.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayAramexInvoiceHelper.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayBluedartInvoiceHelper.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayDTDCInvoiceHelper.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayFedexInvoiceHelper.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayHeaderFooterProvider.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/EbayInvoiceGenerationService.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/SplitEbayOrderHandler.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SplitEbayOrderRequest.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/SplitEbayOrderResponse.java
/trunk/HotspotDashboard/src/main/resources/ebay-logo-grey-bg.jpg
/trunk/HotspotDashboard/src/main/resources/ebay-logo.jpg
/trunk/HotspotDashboard/src/main/resources/paisapay-logo.jpg
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayColorChangeController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayDashboardController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayListingUploaderController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayNormalOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderCreatorController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbayPsOrderUpdateController.java
/trunk/Support/src/main/java/in/shop2020/support/controllers/EbaySubsidyUploaderController.java
/trunk/Support/src/main/webapp/WEB-INF/content/ebay-color-change-authsuccess.vm
/trunk/Support/src/main/webapp/WEB-INF/content/ebay-dashboard-authsuccess.vm
/trunk/Support/src/main/webapp/WEB-INF/content/ebay-listing-uploader-authsuccess.vm
/trunk/Support/src/main/webapp/WEB-INF/content/ebay-normal-order-creator-authsuccess.vm
/trunk/Support/src/main/webapp/WEB-INF/content/ebay-ps-order-creator-authsuccess.vm
/trunk/Support/src/main/webapp/WEB-INF/content/ebay-ps-order-update-authsuccess.vm
/trunk/Support/src/main/webapp/WEB-INF/content/ebay-subsidy-uploader-authsuccess.vm
/trunk/Support/src/main/webapp/css/ebay.css
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/EbayItem.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/HoldInventoryDetail.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/holdInventoryDetail.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/EbayOrder.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/OrderDetails.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/InvoiceServlet.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/guice/ServerModule.java
/trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/ChooseColorHandler.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/webapp/WEB-INF/content/current-inventory-show.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-in-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
/trunk/InventoryManager/src/main/webapp/js/current-inventory.js
/trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
/trunk/PyProj/src/shop2020/logistics/service/impl/LogisticsServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/catalog/impl/CatalogServiceHandler.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/inventory/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py
/trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
/trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
/trunk/PyProj/src/shop2020/purchase/main/model/LineItem.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/inventory/InventoryService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/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/purchase/ttypes.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/model/v1/catalog/CatalogService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/ItemInventory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/OOSStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
/trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
7672 4580 d 19 h rajveer /trunk/ 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/WarehouseService-remote
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/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
6880 4706 d 19 h amar.kumar /trunk/ Changes for
1) Inventory Movement Report
2) Rearranging of fields in PO creation dashboard		  
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/MovementReportController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/movement-report-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
/trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
/trunk/PyProj/src/shop2020/purchase/main/model/LineItem.py
/trunk/PyProj/src/shop2020/thriftpy/crm/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
/trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
/trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ScanHandler.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
/trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml
/trunk/WarehouseService/src/main/resources/mybatis-config.xml
6857 4711 d 20 h amar.kumar /trunk/ Additional Changes for PO creation process  
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.py
/trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
/trunk/PyProj/src/shop2020/purchase/main/model/LineItem.py
/trunk/PyProj/src/shop2020/purchase/main/model/PurchaseOrder.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
/trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
/trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
6821 4718 d 15 h amar.kumar /trunk/ Changes in logic for PO creation to include
1) MinStockLevel
2) Min number of days stock required		  
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/ItemStockPurchaseParams.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/OOSStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/itemStockPurchaseParams.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/POType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseReturnType.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/OosStatusMarker.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
/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/inventory/impl/Convertors.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataService.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/model/v1/order/impl/OrderServiceHandler.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py
/trunk/PyProj/src/shop2020/model/v1/user/impl/UserContextSerivceHandler.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/PurchaseOrder.py
/trunk/PyProj/src/shop2020/purchase/main/model/PurchaseReturn.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/CatalogService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/CatalogService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/UserContextService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseOrder.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseReturn.java
/trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
/trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
/trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
/trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
/trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift
4754 5048 d 20 h mandeep.dhir /trunk/ Trac#974 Trac#975 Adding UI for PO create, amend etc.
ALso UI for inventory read and edit.
Display Vendor name, date in POs list
On PO creation, list the vendors to whom PO can be sent.
For selected Vendor,display the PO to be generated to users who later can amend the PO, (quantity, add/remove lineitem etc.) before actually creating and sending mail for PO to vendors.
Display COD vs Prepaid count, total amount of PO being raised etc. as well
Allow quantity, item and color amends in existing PO
Feature to resend the amended PO to vendor in mail
Ability to find PO given an item pending scan
Users should be sent emails to remind them to create PO
We should also be able to audit all the amends made to a PO		  
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/output.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-edit.vm
/trunk/PyProj/src/shop2020/purchase/main/model/RevisionedPurchaseOrder.py
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/BaseController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
/trunk/InventoryManager/src/main/resources/shiro.ini
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/current-inventory-show.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-new.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-editNew.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-show.vm
/trunk/InventoryManager/src/main/webapp/css/common.css
/trunk/InventoryManager/src/main/webapp/js/purchase-order-common.js
/trunk/InventoryManager/src/main/webapp/js/purchase-order-events.js
/trunk/PyProj/src/shop2020/helpers/impl/HelperServiceHandler.py
/trunk/PyProj/src/shop2020/helpers/impl/model/Agent.py
/trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService-remote
/trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
/trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
4496 5085 d 7 h mandeep.dhir /trunk/ Trac#888 Inventory/Warehouse management for serialized items.
Separeted purchase order service and warehouseservice
Added form in UI to create item number mapping
Added validation to avoid repeated scan of same item		  
/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/purchase
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/LineItem.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/POStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/Purchase.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseOrder.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseServiceException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchasingServiceException.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/Supplier.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryItem.java
/trunk/ThriftGen/thriftsrc/PurchaseService
/trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/LineItem.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/POStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Purchase.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/PurchaseOrder.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/StockLedgerStatus.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Supplier.java
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/Scan.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/ScanType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseServiceException.java
/trunk/ThriftGen/thriftsrc/GenericService/GenericService.thrift
/trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift