SmartDukaan – /

Rev 5472 – #1439, #1437

amit.gupta — Fri, 22 Jun 2012 11:41:11 +0530

amit.gupta – 1 file(s) modified
#1439, #1437

~ /trunk/ContentStore/src/jython/comparisonrules/display_math.py

Rev 5471 – Added Headphones category

mandeep.dhir — Fri, 22 Jun 2012 11:25:35 +0530

mandeep.dhir – 1 file(s) modified
Added Headphones category

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/InventoryStockReportGenerator.py

Rev 5470 – S5300 Galaxy Pocket removed from the coupon

varun.gupta — Fri, 22 Jun 2012 03:38:40 +0530

varun.gupta – 1 file(s) modified
S5300 Galaxy Pocket removed from the coupon

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_SAnniversary.py

Rev 5469 – Added infrastructure to generate, store, issue and activate voucher of ...

rajveer — Thu, 21 Jun 2012 18:32:15 +0530

rajveer – 13 file(s) modified
Added infrastructure to generate, store, issue and activate voucher of spicedeck.com.
Reviewer: Mandeep

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Converters.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/Dataservice.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionDataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/user/impl/PromotionServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/PromotionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/ttypes.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/user/UserContextService-remote
+ /trunk/Support/src/main/java/in/shop2020/support/services/SpiceDeckRechargeService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/PromotionService.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/Voucher.java
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/user/VoucherType.java
~ /trunk/ThriftGen/thriftsrc/UserModel/UserModel.thrift

Rev 5468 – To remove statusCode from url, added it to restricted parameter ...

rajveer — Thu, 21 Jun 2012 14:57:32 +0530

rajveer – 4 file(s) modified
To remove statusCode from url, added it to restricted parameter list.

+ /trunk/Website/src/main/java/in/shop2020/serving/dispatcher
+ /trunk/Website/src/main/java/in/shop2020/serving/dispatcher/SaholicServletRedirectResult.java
x /trunk/Website/src/main/java/in/shop2020/serving/model
~ /trunk/Website/src/main/resources/struts.xml

Rev 5467 – #1439, #1437

amit.gupta — Thu, 21 Jun 2012 14:47:28 +0530

amit.gupta – 2 file(s) modified
#1439, #1437

~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml
~ /trunk/ContentStore/src/xml/model/featuredefinitions.xml

Rev 5466 – Added support for tracking newsletter as a source Trac ...

anupam.singh — Thu, 21 Jun 2012 12:50:40 +0530

anupam.singh – 2 file(s) modified
Added support for tracking newsletter as a source

Trac #838
Reviewer : Amar Kumar

~ /trunk/pentaho/schema/ProductActivitySchema.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/interceptors/TrackingInterceptor.java

Rev 5465 – Changing availibility to availability

mandeep.dhir — Thu, 21 Jun 2012 12:39:11 +0530

mandeep.dhir – 1 file(s) modified
Changing availibility to availability

~ /trunk/runutils/daily-inventory-report.sh

Rev 5464 – Using cartId directly to getDiscounts, instead of getting cartId from ...

amar.kumar — Thu, 21 Jun 2012 12:29:50 +0530

amar.kumar – 1 file(s) modified
Using cartId directly to getDiscounts, instead of getting cartId from line and then using it

~ /trunk/UserService/src/main/java/in/shop2020/user/handler/CartHandler.java

Rev 5463 – Trac#1212 Added purchase report for Hotspot as well. Also, updating ...

mandeep.dhir — Thu, 21 Jun 2012 10:53:37 +0530

mandeep.dhir – 1 file(s) modified
Trac#1212 Added purchase report for Hotspot as well.
Also, updating staging as well when mappings are uploaded

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

Rev 5462 – Trac#1212 Added purchase report for Hotspot as well. Also, updating ...

mandeep.dhir — Thu, 21 Jun 2012 10:38:05 +0530

mandeep.dhir – 3 file(s) modified
Trac#1212 Added purchase report for Hotspot as well.
Also, updating staging as well when mappings are uploaded

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 5461 – Removed Galaxy Y Duos S6102 and Samsung Galaxy Y S5360 ...

varun.gupta — Wed, 20 Jun 2012 18:03:14 +0530

varun.gupta – 1 file(s) modified
Removed Galaxy Y Duos S6102 and Samsung Galaxy Y S5360 from the coupon

~ /trunk/PyProj/src/shop2020/model/v1/user/promotionrules/rule_SAnniversary.py

Rev 5460 – Ticket #1355 Clearance Sale Page should be driven by Catalog ...

phani.kumar — Wed, 20 Jun 2012 15:28:32 +0530

phani.kumar – 19 file(s) modified
Ticket #1355 Clearance Sale Page should be driven by Catalog
reviewer: Anupam

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemDetails.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/client/ItemForm.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/shared/Item.java
~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportGenerator.java
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemDetails.ui.xml
~ /trunk/CatalogDashboard/src/main/resources/in/shop2020/catalog/dashboard/client/ItemForm.ui.xml
~ /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
~ /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/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/InventoryService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ClearanceSaleController.java
~ /trunk/Website/src/main/webapp/WEB-INF/content/clearance-sale-index.vm

Rev 5459 – Enhancing header

mandeep.dhir — Tue, 19 Jun 2012 18:00:18 +0530

mandeep.dhir – 1 file(s) modified
Enhancing header

~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-inventory-index.vm

Rev 5458 – Successful updates should happen only when 60% rows are processed ...

mandeep.dhir — Tue, 19 Jun 2012 17:57:46 +0530

mandeep.dhir – 2 file(s) modified
Successful updates should happen only when 60% rows are processed without error

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SupplierInventoryController.java
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/supplier-inventory-index.vm

Rev 5457 – Update cache for every item.

rajveer — Tue, 19 Jun 2012 17:18:04 +0530

rajveer – 1 file(s) modified
Update cache for every item.

~ /trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

Rev 5456 – change in SaveDiscount method

amar.kumar — Tue, 19 Jun 2012 17:01:27 +0530

amar.kumar – 1 file(s) modified
change in SaveDiscount method

~ /trunk/UserService/src/main/java/in/shop2020/user/handler/CartHandler.java

Rev 5455 – Removed unused coded.

rajveer — Tue, 19 Jun 2012 15:19:25 +0530

rajveer – 40 file(s) modified
Removed unused coded.

x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/admin/AdminPresenter.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/admin/AdminPresenterImpl.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/admin/AdminWidget.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/admin/gradient_bg_dark.png
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/admin/OrderDetails.ui.xml
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/admin/OrderList.ui.xml
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/admin/shop2020.jpg
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/admin/TopPanel.ui.xml
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddressLabelEvent.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/AddressLabelEventHandler.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadBestDealsEvent.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadBestDealsEventHandler.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadBestSellersEvent.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadBestSellersEventHandler.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadLatestArrivalsEvent.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadLatestArrivalsEventHandler.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadWarningsEvent.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/event/LoadWarningsEventHandler.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/gin/Module.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/AddressWidget.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/InboxPresenterImpl.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/Print.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/MainPresenterImpl.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/guice/ServerModule.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/AddressHandler.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/BestDealsHandler.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/BestSellersHandler.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/LatestArrivalsHandler.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/handler/WarningRequestHandler.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AddressRequest.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/AddressResponse.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/BestDealsRequest.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/BestDealsResponse.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/BestSellersRequest.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/BestSellersResponse.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/LatestArrivalsRequest.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/LatestArrivalsResponse.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/WarningRequest.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/actions/WarningResponse.java
x /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/shared/data/Address.java

Rev 5454 – Sending other updates even if no scans are done

mandeep.dhir — Tue, 19 Jun 2012 15:03:37 +0530

mandeep.dhir – 1 file(s) modified
Sending other updates even if no scans are done

~ /ClientAgent/src/main/java/in/shop2020/agent/utils/Agent.java

Rev 5453 – Ticket #1395 Synonyms should not be appearing in the search ...

phani.kumar — Tue, 19 Jun 2012 12:53:48 +0530

phani.kumar – 2 file(s) modified
Ticket #1395 Synonyms should not be appearing in the search box
reviewer: Rajveer Singh

~ /trunk/ContentStore/src/main/java/in/shop2020/util/ContentGenerationUtility.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/AutoSuggestService.java

Rev 5452 – Ticket #1386 Generate updates from Hotspot catalog sheet reviewer: Rajveer ...

phani.kumar — Tue, 19 Jun 2012 12:45:02 +0530

phani.kumar – 1 file(s) modified
Ticket #1386 Generate updates from Hotspot catalog sheet
reviewer: Rajveer Singh

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/CatalogComparer.py

Rev 5451 – Case-insensitive mapping lookup

mandeep.dhir — Tue, 19 Jun 2012 11:08:53 +0530

mandeep.dhir – 1 file(s) modified
Case-insensitive mapping lookup

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java

Rev 5450 – Bugfix. Not copying quantity to unfulfilledQuantity

mandeep.dhir — Tue, 19 Jun 2012 10:17:17 +0530

mandeep.dhir – 1 file(s) modified
Bugfix. Not copying quantity to unfulfilledQuantity

~ /trunk/PyProj/src/shop2020/purchase/main/model/LineItem.py

Rev 5449 – Enabling reports download automatically

mandeep.dhir — Tue, 19 Jun 2012 10:03:22 +0530

mandeep.dhir – 5 file(s) modified
Enabling reports download automatically

~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseOrderController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/PurchaseReportController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SaleReportController.java
~ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/SaleReturnReportController.java
~ /trunk/InventoryManager/src/main/resources/shiro.ini

Rev 5448 – Case-insensitive mapping lookup

mandeep.dhir — Tue, 19 Jun 2012 09:27:14 +0530

mandeep.dhir – 1 file(s) modified
Case-insensitive mapping lookup

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java

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

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

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

Trac# 1398
Reviewer : Varun Gupta

~ /trunk/PyProj/src/shop2020/model/v1/order/impl/Convertors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py
~ /trunk/PyProj/src/shop2020/model/v1/order/impl/OrderServiceHandler.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/ttypes.py
+ /trunk/Support/src/main/java/in/shop2020/support/controllers/OrderVerificationPerformanceController.java
+ /trunk/Support/src/main/webapp/WEB-INF/content/order-verification-performance-index.vm
+ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/CODVerificationAgent.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 5446 – Change COD limit based on the new decision taken.

rajveer — Mon, 18 Jun 2012 17:02:31 +0530

rajveer – 1 file(s) modified
Change COD limit based on the new decision taken.

~ /trunk/UserService/src/main/java/in/shop2020/user/handler/CartHandler.java

Rev 5445 – Added some new enums as per ticket 1416 and 1418.

rajveer — Mon, 18 Jun 2012 16:21:04 +0530

rajveer – 1 file(s) modified
Added some new enums as per ticket 1416 and 1418.

~ /trunk/ContentStore/src/xml/model/datatypedefinitions.xml

Rev 5444 – Ticket #1386 Generate updates from Hotspot catalog sheet reviewer: Rajveer ...

phani.kumar — Mon, 18 Jun 2012 16:05:19 +0530

phani.kumar – 1 file(s) modified
Ticket #1386 Generate updates from Hotspot catalog sheet
reviewer: Rajveer Singh

~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/CatalogComparer.py

Rev 5443 – Trac#1419 Adding support to input invoices Reviewer: Rajveer

mandeep.dhir — Mon, 18 Jun 2012 13:52:49 +0530

mandeep.dhir – 12 file(s) modified
Trac#1419 Adding support to input invoices
Reviewer: Rajveer

+ /trunk/InventoryManager/src/main/java/in/shop2020/inventory/controllers/InvoiceController.java
~ /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/invoice-index.vm
~ /trunk/PyProj/src/shop2020/purchase/main/handler/PurchaseServiceHandler.py
+ /trunk/PyProj/src/shop2020/purchase/main/model/Invoice.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/Invoice.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/purchase/PurchaseService.java
~ /trunk/ThriftGen/thriftsrc/PurchaseService/PurchaseService.thrift

Rev 5442 – Send empty string instead of null.

rajveer — Mon, 18 Jun 2012 12:59:27 +0530

rajveer – 1 file(s) modified
Send empty string instead of null.

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/JacketInfoBox.java

Rev 5441 – updates to vendor renconciliation

phani.kumar — Mon, 18 Jun 2012 12:07:02 +0530

phani.kumar – 1 file(s) modified
updates to vendor renconciliation

~ /trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java

Rev 5440 – updates to item loader script

phani.kumar — Mon, 18 Jun 2012 12:05:02 +0530

phani.kumar – 5 file(s) modified
updates to item loader script

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/MasterSheetGenerator.java
~ /trunk/PyProj/src/shop2020/model/v1/catalog/script/ItemLoader.py
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/catalog/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/Item.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.thrift

Rev 5439 – Ticket #1269 Create filters for accessories in saholic.com

phani.kumar — Mon, 18 Jun 2012 11:32:15 +0530

phani.kumar – 12 file(s) modified
Ticket #1269 Create filters for accessories in saholic.com

+ /trunk/ContentStore/src/jython/irdatarules/hard-drive-interface.py
+ /trunk/ContentStore/src/jython/irdatarules/hard-drive-storage.py
+ /trunk/ContentStore/src/jython/irdatarules/hard-drive-type.py
+ /trunk/ContentStore/src/jython/irdatarules/memory-card-class.py
+ /trunk/ContentStore/src/jython/irdatarules/memory-card-storage.py
+ /trunk/ContentStore/src/jython/irdatarules/pen-drive-storage.py
+ /trunk/ContentStore/src/jython/irmetadatarules/common-multivalue-false.py
+ /trunk/ContentStore/src/jython/irmetadatarules/common-multivalue-true.py
~ /trunk/ContentStore/src/xml/model/facetdefinitions.xml
~ /trunk/ContentStore/src/xml/model/irdatarules.xml
~ /trunk/ContentStore/src/xml/model/irmetadatarules.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/Utils.java

Rev 5438 – Fixing init.d script to read jars from maven repository

mandeep.dhir — Sun, 17 Jun 2012 23:01:16 +0530

mandeep.dhir – 1 file(s) modified
Fixing init.d script to read jars from maven repository

~ /trunk/runutils/init.d/warehouse-server

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 5436 – Bugfix. Converting thirdparty warehouse to our warehouse while fetching the ...

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

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

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

Rev 5435 – Changes to avoid deletion of user-communication entry if corresponding ticket ...

amar.kumar — Sat, 16 Jun 2012 04:57:07 +0530

amar.kumar – 1 file(s) modified
Changes to avoid deletion of user-communication entry if corresponding ticket has not been created

~ /trunk/CRMService/src/main/java/in/shop2020/crm/util/UserCommunicationProcessorTask.java

Rev 5434 – Show COD option based on total amount.

rajveer — Fri, 15 Jun 2012 20:03:46 +0530

rajveer – 1 file(s) modified
Show COD option based on total amount.

~ /trunk/PyProj/src/shop2020/model/v1/user/impl/CartDataAccessors.py

Rev 5433 – Setting initial quantity to 1 for serialized items

mandeep.dhir — Fri, 15 Jun 2012 14:54:08 +0530

mandeep.dhir – 1 file(s) modified
Setting initial quantity to 1 for serialized items

~ /trunk/WarehouseService/src/main/java/in/shop2020/warehouse/service/handler/WarehouseServiceHandler.java