Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
13600 4011 d 17 h manish.sharma /trunk/ Committed by Manish Sharma for Purchase Return Changes on 22-Jan-2015  
/trunk/PyProj/src/shop2020/purchase/main/model/PurchaseReturnSettlement.py
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PrReasonType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseReturnSettlement.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/SettlementType.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReturnController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-return-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-return-new.vm
/trunk/InventoryManager/src/main/webapp/js/purchase-return.js
/trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
/trunk/PyProj/src/shop2020/purchase/main/model/PurchaseReturn.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService-remote
/trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseReturn.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
10864 4278 d 13 h manish.sharma /trunk/ Committed by Manish Sharma for Change in Purchase Return Current Implementation and Adding New Bangalore Warehouse on 30-Apr-2014  
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-return-output.vm
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseReturnInventoryType.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/BaseController.java
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReturnController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-return-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-return-new.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-editNew.vm
/trunk/InventoryManager/src/main/webapp/js/common.js
/trunk/InventoryManager/src/main/webapp/js/purchase-return.js
/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
/trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
/trunk/PyProj/src/shop2020/purchase/main/model/PurchaseReturn.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService-remote
/trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseReturn.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InTransitInventory.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/ScanType.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
/trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
/trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/InTransitInventory.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/util/InTransitInventoryReportSender.java
/trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml
6821 4718 d 17 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
6467 4787 d 16 h amar.kumar /trunk/ Changes for Purchase Return
Reviewed by Amit Gupta		  
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReturnController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-return-index.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-return-new.vm
/trunk/InventoryManager/src/main/webapp/images
/trunk/InventoryManager/src/main/webapp/images/add.png
/trunk/InventoryManager/src/main/webapp/images/copy.png
/trunk/InventoryManager/src/main/webapp/images/copy_hover.png
/trunk/InventoryManager/src/main/webapp/images/csv.png
/trunk/InventoryManager/src/main/webapp/images/csv_hover.png
/trunk/InventoryManager/src/main/webapp/images/pdf.png
/trunk/InventoryManager/src/main/webapp/images/pdf_hover.png
/trunk/InventoryManager/src/main/webapp/images/print.png
/trunk/InventoryManager/src/main/webapp/images/print_hover.png
/trunk/InventoryManager/src/main/webapp/images/xls.png
/trunk/InventoryManager/src/main/webapp/images/xls_hover.png
/trunk/InventoryManager/src/main/webapp/js/jquery.colorbox-min.js
/trunk/InventoryManager/src/main/webapp/js/purchase-return.js
/trunk/PyProj/src/shop2020/purchase/main/model/PurchaseReturn.py
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseReturn.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/index.vm
/trunk/InventoryManager/src/main/webapp/css/common.css
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/DataAcessors.py
/trunk/PyProj/src/shop2020/model/v1/inventory/impl/InventoryServiceHandler.py
/trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
/trunk/PyProj/src/shop2020/thriftpy/model/v1/inventory/InventoryService.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
/trunk/PyProj/src/shop2020/thriftpy/warehouse/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/inventory/InventoryService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/InventoryItem.java
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
/trunk/ThriftGen/thriftsrc/InventoryService/InventoryService.thrift
/trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
/trunk/ThriftGen/thriftsrc/WarehouseService/WarehouseService.thrift
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/domain/InventoryItem.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/InventoryItemHandler.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/handler/ScanHandler.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/InventoryItemMapper.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/persistence/ScanMapper.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
/trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/InventoryItemMapper.xml
/trunk/WarehouseService/src/main/resources/in/shop2020/warehouse/persistence/ScanMapper.xml