SmartDukaan – /

Rev 5205 – Added space to the Operating system as given in the ...

amit.gupta — Thu, 17 May 2012 19:46:23 +0530

amit.gupta – 1 file(s) modified
Added space to the Operating system as given in the enum

~ /trunk/ContentStore/src/jython/comparisonrules/laptops/processor.py

Rev 5204 – Processors scores reverted

amit.gupta — Thu, 17 May 2012 19:18:02 +0530

amit.gupta – 1 file(s) modified
Processors scores reverted

~ /trunk/ContentStore/src/jython/comparisonrules/laptops/processor.py

Rev 5203 – Ticket Id : #1265 #1277 Reviewed by : Anupam Singh ...

amar.kumar — Thu, 17 May 2012 18:57:54 +0530

amar.kumar – 6 file(s) modified
Ticket Id : #1265 #1277
Reviewed by : Anupam Singh

Enhancements in Activity creation/display and ticket/activity reports.

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/ActivityController.java
~ /trunk/Crm/src/main/java/in/shop2020/util/CRMConstants.java
~ /trunk/Crm/src/main/webapp/css/common.css
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-editNew.vm
~ /trunk/Crm/src/main/webapp/WEB-INF/content/activity-index.vm

Rev 5202 – Added type of airway bill number along with provider.

rajveer — Thu, 17 May 2012 16:30:12 +0530

rajveer – 1 file(s) modified
Added type of airway bill number along with provider.

~ /trunk/PyProj/src/shop2020/logistics/service/script/AwbNumberAlerter.py

Rev 5201 – To change the awb numbers for given ser of orders.

rajveer — Thu, 17 May 2012 15:27:00 +0530

rajveer – 1 file(s) modified
To change the awb numbers for given ser of orders.

+ /trunk/PyProj/src/shop2020/model/v1/order/script/ChangeAwbNumbers.py

Rev 5200 – Separating bookingCube and salesCube

anupam.singh — Thu, 17 May 2012 14:25:41 +0530

anupam.singh – 1 file(s) modified
Separating bookingCube and salesCube

~ /trunk/pentaho/schema/SalesSchema.xml

Rev 5199 – Fixed bugs where reservation field was not getting appropriately updated ...

mandeep.dhir — Thu, 17 May 2012 11:19:10 +0530

mandeep.dhir – 1 file(s) modified
Fixed bugs where reservation field was not getting appropriately updated
Reviewer: Rajveer

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

Rev 5198 – Corrected a logged statement

varun.gupta — Thu, 17 May 2012 08:06:45 +0530

varun.gupta – 1 file(s) modified
Corrected a logged statement

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

Rev 5197 – Checking for empty string

anupam.singh — Wed, 16 May 2012 18:47:15 +0530

anupam.singh – 1 file(s) modified
Checking for empty string

~ /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py

Rev 5196 – Added Title to Glossary listing page

varun.gupta — Wed, 16 May 2012 18:03:36 +0530

varun.gupta – 1 file(s) modified
Added Title to Glossary listing page

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/GlossaryController.java

Rev 5195 – Using 18th column instead of 14th.

anupam.singh — Wed, 16 May 2012 17:57:12 +0530

anupam.singh – 1 file(s) modified
Using 18th column instead of 14th.

~ /trunk/pentaho/scripts/start-pentaho

Rev 5194 – Trac #1290 Reviewer : Mandeep Dhir Added capability in ...

anupam.singh — Wed, 16 May 2012 17:54:55 +0530

anupam.singh – 1 file(s) modified
Trac #1290
Reviewer : Mandeep Dhir

Added capability in EmailSender of sending mails to multiple users.

~ /trunk/PyProj/src/shop2020/helpers/impl/EmailSender.py

Rev 5193 – Corrected paths in email sender start up script.

rajveer — Wed, 16 May 2012 17:50:42 +0530

rajveer – 1 file(s) modified
Corrected paths in email sender start up script.

~ /trunk/runutils/init.d/email-sender

Rev 5192 – Modified title parsing logic

varun.gupta — Wed, 16 May 2012 16:02:57 +0530

varun.gupta – 1 file(s) modified
Modified title parsing logic

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/GlossaryController.java

Rev 5191 – changing loglevel for GAE logging failure to WARN from ERROR ...

amar.kumar — Wed, 16 May 2012 15:17:45 +0530

amar.kumar – 1 file(s) modified
changing loglevel for GAE logging failure to WARN from ERROR and adding some parameters in log

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EstimateController.java

Rev 5190 – Added Most Compared Phones index

varun.gupta — Wed, 16 May 2012 14:01:36 +0530

varun.gupta – 1 file(s) modified
Added Most Compared Phones index

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/GeneratedController.java

Rev 5189 – Vendor Reconciliation - added unsettled orders sheet

varun.gupta — Wed, 16 May 2012 13:31:05 +0530

varun.gupta – 11 file(s) modified
Vendor Reconciliation - added unsettled orders sheet

~ /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/VendorReconciliationController.java
~ /trunk/Support/src/main/webapp/WEB-INF/content/vendor-reconciliation-report.vm
~ /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/ThriftGen/thriftsrc/OrderService/OrderService.thrift

Rev 5188 – Create user client if required, otherwise not.

rajveer — Wed, 16 May 2012 13:12:41 +0530

rajveer – 1 file(s) modified
Create user client if required, otherwise not.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java

Rev 5187 – Making changes to compute directly while getting data from datastore ...

amar.kumar — Wed, 16 May 2012 11:27:26 +0530

amar.kumar – 1 file(s) modified
Making changes to compute directly while getting data from datastore instead of adding it in an intermediate list and then computing

~ /trunk/GoogleAppDatalog/src/main/java/in/shop2020/web/DailyComparisonStatsGenerator.java

Rev 5186 – Trac#1281 Agent to read and post inventory state from SNCA ...

mandeep.dhir — Wed, 16 May 2012 10:18:53 +0530

mandeep.dhir – 1 file(s) modified
Trac#1281 Agent to read and post inventory state from SNCA Tally system

+ /ClientAgent/src/main/java/in/shop2020/agent/utils/SNCAAgent.java

Rev 5185 – Trac#981 DOA replacement support. Fixing reserved field when order is ...

mandeep.dhir — Wed, 16 May 2012 10:14:51 +0530

mandeep.dhir – 32 file(s) modified
Trac#981 DOA replacement support. Fixing reserved field when order is cancelled from PO_RAISED etc. states > 7(BILLED).

+ /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/resources/shiro.ini
+ /trunk/InventoryManager/src/main/webapp/js/doa.js
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-in-index.vm
+ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/doa-out-index.vm
~ /trunk/InventoryManager/src/main/webapp/WEB-INF/content/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/model/v1/order/impl/DataAccessors.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/purchase/PurchaseService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/purchase/PurchaseService.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/CourierDetailsController.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/catalog/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/ScanType.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/warehouse/WarehouseService.java
~ /trunk/ThriftGen/thriftsrc/CatalogService/CatalogService.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/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 5184 – Correct the name in Low end multimedia.

rajveer — Tue, 15 May 2012 17:56:53 +0530

rajveer – 1 file(s) modified
Correct the name in Low end multimedia.

~ /trunk/Website/src/main/resources/templates/header.vm

Rev 5183 – added new catalogclient for each catalog service calls.

amit.gupta — Tue, 15 May 2012 15:07:11 +0530

amit.gupta – 1 file(s) modified
added new catalogclient for each catalog service calls.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportGenerator.java

Rev 5182 – Ticket #959 - Added 'External Hard Disk' to header menu ...

varun.gupta — Tue, 15 May 2012 14:21:43 +0530

varun.gupta – 3 file(s) modified
Ticket #959 - Added 'External Hard Disk' to header menu and added relevant actions to CategoryController and EntityController

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/resources/templates/header.vm

Rev 5181 – moved file to export path.

amit.gupta — Tue, 15 May 2012 14:15:05 +0530

amit.gupta – 1 file(s) modified
moved file to export path.

~ /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/util/ReportSender.java

Rev 5180 – Made "Brand/ModelName/ModelNumber" javascript safe

amit.gupta — Tue, 15 May 2012 12:50:31 +0530

amit.gupta – 2 file(s) modified
Made "Brand/ModelName/ModelNumber" javascript safe

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java
~ /trunk/ContentCreation/src/main/webapp/WEB-INF/content/entity-index.vm

Rev 5179 – Ticket #1268 - Enclosed helpdoc title in h1 tag

varun.gupta — Tue, 15 May 2012 12:38:49 +0530

varun.gupta – 2 file(s) modified
Ticket #1268 - Enclosed helpdoc title in h1 tag

~ /trunk/ContentStore/src/velocity/helpdoc.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/glossary-show.vm

Rev 5178 – Undid the changes

amit.gupta — Tue, 15 May 2012 11:55:26 +0530

amit.gupta – 1 file(s) modified
Undid the changes

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 5177 – Bugfix. SALE_RET for cancelled orders is needed only for serialized ...

mandeep.dhir — Tue, 15 May 2012 11:49:29 +0530

mandeep.dhir – 1 file(s) modified
Bugfix. SALE_RET for cancelled orders is needed only for serialized items for now.

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

Rev 5176 – Made "Brand/ModelName/ModelNumber" htmlsafe

amit.gupta — Tue, 15 May 2012 11:46:30 +0530

amit.gupta – 1 file(s) modified
Made "Brand/ModelName/ModelNumber" htmlsafe

~ /trunk/ContentCreation/src/main/java/in/shop2020/creation/controllers/EntityController.java

Rev 5175 – css change for snippets to show offer icon

phani.kumar — Tue, 15 May 2012 11:42:00 +0530

phani.kumar – 1 file(s) modified
css change for snippets to show offer icon

~ /trunk/Website/src/main/webapp/css/style.css

Rev 5174 – #1243:Enable Laptop Comparisons on website Reviewed by Amar

amit.gupta — Tue, 15 May 2012 10:49:23 +0530

amit.gupta – 1 file(s) modified
#1243:Enable Laptop Comparisons on website
Reviewed by Amar

~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 5173 – #1243:Enable Laptop Comparisons on website Reviewed by Amar

amit.gupta — Tue, 15 May 2012 10:44:48 +0530

amit.gupta – 12 file(s) modified
#1243:Enable Laptop Comparisons on website
Reviewed by Amar

~ /trunk/ContentStore/src/jython/common/utils.py
~ /trunk/ContentStore/src/jython/comparisonrules/laptops/displayngraphics.py
+ /trunk/ContentStore/src/jython/comparisonrules/laptops/inputoutput.py
~ /trunk/ContentStore/src/jython/comparisonrules/laptops/memory.py
~ /trunk/ContentStore/src/jython/comparisonrules/laptops/networking.py
~ /trunk/ContentStore/src/jython/comparisonrules/laptops/power.py
~ /trunk/ContentStore/src/jython/comparisonrules/laptops/processor.py
~ /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java
~ /trunk/ContentStore/src/xml/model/categories.xml
~ /trunk/ContentStore/src/xml/model/comparisonbuckets.xml
~ /trunk/ContentStore/src/xml/model/comparisondefinitions.xml
~ /trunk/ContentStore/src/xml/model/comparisonrules.xml

Rev 5172 – Adding CS_BACKUP machine as well

anupam.singh — Mon, 14 May 2012 19:49:58 +0530

anupam.singh – 1 file(s) modified
Adding CS_BACKUP machine as well

~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg

Rev 5171 – css change for snippets to show offer icon

phani.kumar — Mon, 14 May 2012 18:46:32 +0530

phani.kumar – 1 file(s) modified
css change for snippets to show offer icon

~ /trunk/Website/src/main/webapp/css/style.css

Rev 5170 – changing default assigneeId to 17 for Order Cancellation Tickets

amar.kumar — Mon, 14 May 2012 17:14:42 +0530

amar.kumar – 1 file(s) modified
changing default assigneeId to 17 for Order Cancellation Tickets

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ContactUsController.java

Rev 5169 – Thrift changes for changeAgentRole and getOpenTicketCount methods Reviewed by Anupam ...

amar.kumar — Mon, 14 May 2012 16:27:07 +0530

amar.kumar – 2 file(s) modified
Thrift changes for changeAgentRole and getOpenTicketCount methods
Reviewed by Anupam Singh

~ /trunk/ThriftConfig/src/main/java/in/shop2020/crm/CRMService.java
~ /trunk/ThriftGen/thriftsrc/CRMService/CRMService.thrift

Rev 5168 – Ticket Id : #1251 #1228 Reviewed by Anupam Singh

amar.kumar — Mon, 14 May 2012 16:04:41 +0530

amar.kumar – 11 file(s) modified
Ticket Id : #1251 #1228
Reviewed by Anupam Singh

~ /trunk/Crm/src/main/java/in/shop2020/serving/controllers/AgentController.java
~ /trunk/Crm/src/main/webapp/js/common.js
~ /trunk/Crm/src/main/webapp/js/events.js
~ /trunk/Crm/src/main/webapp/WEB-INF/content/agent-index.vm
~ /trunk/CRMService/src/main/java/in/shop2020/crm/handler/AgentHandler.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/handler/TicketHandler.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/persistence/AgentMapper.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/persistence/TicketMapper.java
~ /trunk/CRMService/src/main/java/in/shop2020/crm/service/handler/CRMServiceHandler.java
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/AgentMapper.xml
~ /trunk/CRMService/src/main/resources/in/shop2020/crm/persistence/TicketMapper.xml

Rev 5167 – Order by catalog id also in case of same start ...

rajveer — Mon, 14 May 2012 15:37:18 +0530

rajveer – 1 file(s) modified
Order by catalog id also in case of same start date to display consistent view to user.

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

Rev 5166 – removed call to function load_history_widget() as its already been called ...

amit.gupta — Mon, 14 May 2012 14:55:23 +0530

amit.gupta – 1 file(s) modified
removed call to function load_history_widget()
as its already been called from widget.js

Reviewed by Varun

~ /trunk/Website/src/main/webapp/js/entity.js