Subversion Repositories SmartDukaan

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
25121 2492 d 13 h amit.gupta /trunk/InventoryManager/src/main/webapp/WEB-INF/content/  
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
25120 2492 d 13 h amit.gupta /trunk/InventoryManager/src/main/webapp/WEB-INF/content/  
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
25116 2495 d 4 h amit.gupta /trunk/InventoryManager/src/main/webapp/WEB-INF/content/  
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
25115 2495 d 4 h amit.gupta /trunk/InventoryManager/src/main/webapp/WEB-INF/content/  
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
25113 2495 d 5 h amit.gupta /trunk/InventoryManager/src/main/webapp/WEB-INF/content/  
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
25112 2495 d 5 h amit.gupta /trunk/ Fixed changes related to PO  
/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/webapp/WEB-INF/content/purchase-order-show.vm
/trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
/trunk/PyProj/src/shop2020/purchase/main/model/LineItem.py
17423 3822 d 7 h manish.sharma /trunk/InventoryManager/src/main/webapp/WEB-INF/content/ Committed by Manish Sharma for Product Label Generator on 02-Nov-2015  
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
17409 3822 d 9 h manish.sharma /trunk/InventoryManager/src/main/webapp/WEB-INF/content/ Committed by Manish Sharma for Product Label Generator on 02-Nov-2015  
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
17408 3822 d 9 h manish.sharma /trunk/InventoryManager/src/main/webapp/WEB-INF/content/ Committed by Manish Sharma for Product Label Generator on 02-Nov-2015  
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
17406 3822 d 9 h manish.sharma /trunk/InventoryManager/src/main/webapp/WEB-INF/content/ Committed by Manish Sharma for Some commenting additional Logic on 02-Nov-2015  
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
17403 3822 d 9 h manish.sharma /trunk/InventoryManager/ Committed by Manish Sharma for Product Label Generator on 02-Nov-2015  
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/service/ProductLabelGenerator.java
/trunk/InventoryManager/pom.xml
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
/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
12531 4259 d 10 h manish.sharma /trunk/ Committed by Manish Sharma for Check Imei Status Before GRN on 22-Aug-2014  
/trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/CheckGrnImeiController.java
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/check-grn-imei.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService-remote
/trunk/PyProj/src/shop2020/thriftpy/warehouse/WarehouseService.py
/trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
/trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java
11802 4315 d 15 h manish.sharma /trunk/InventoryManager/src/main/webapp/WEB-INF/content/ Committed by Manish Sharma for Direct Scan to Amazon Warehouses on 27-Jun-2014  
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
11801 4316 d 4 h manish.sharma /trunk/ 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
10427 4402 d 12 h manish.sharma /trunk/InventoryManager/src/main/webapp/WEB-INF/content/ Committed by Manish Sharma for Disable Purchase Creation in case of Closed POs on Apr-01-2014  
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
10424 4402 d 12 h manish.sharma /trunk/InventoryManager/src/main/webapp/WEB-INF/content/ Committed by Manish Sharma for Disable Purchase Creation in case of Closed POs on Apr-01-2014  
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
10413 4403 d 5 h manish.sharma /trunk/InventoryManager/src/main/webapp/WEB-INF/content/ Committed by Manish Sharma for Disable Purchase Creation in case of Closed POs on Mar-31-2014  
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
9925 4443 d 22 h amar.kumar /trunk/ Changes for
1) Opening of Purchase Order created less than 7 days ago
2) Option to set different ShippingWarehouseId and corresponding changes in Pdf		  
/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-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/purchase/main/handler/PurchaseServiceHandler.py
/trunk/PyProj/src/shop2020/purchase/main/model/PurchaseOrder.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.py
/trunk/PyProj/src/shop2020/thriftpy/purchase/ttypes.py
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseOrder.java
/trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
/trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift
9416 4479 d 9 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
6380 4892 d 9 h amar.kumar /trunk/ Changes for
1) Adding recieved timestamp of purchase
2) We have to remove the option of continuing a purchase
3) Stop changing inventory for real warehouses

Reviewed by Amar		  
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/current-inventory-show.vm
/trunk/InventoryManager/src/main/webapp/WEB-INF/content/purchase-order-show.vm
/trunk/PyProj/src/shop2020/purchase/main/model/Purchase.py

←Prev12Next→

Show All