| 
							
							
								 Rushabh Mehta | 5dd12cb4f0 | Merge branch 'master' into develop | 2016-11-22 23:18:29 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 8685225644 | Merge branch 'hotfix' | 2016-11-22 23:18:28 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 6557e37d5c | bumped to version 7.1.17 | 2016-11-22 23:48:28 +06:00 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 698c040d21 | [hot] fix quotation (#7039) | 2016-11-22 23:16:40 +05:30 |  | 
			
				
					| 
							
							
								 Kanchan Chauhan | 2c1f399479 | Apply Pricing Rule in Shopping Cart | 2016-11-22 22:23:31 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 4e61564f73 | [minor] fixes to daily work summary formatting | 2016-11-22 21:59:20 +05:30 |  | 
			
				
					| 
							
							
								 strixaluco | fc6a3aa42c | [docs] URL fixes | 2016-11-22 16:25:20 +08:00 |  | 
			
				
					| 
							
							
								 Nabin Hait | c381327e6e | Merge pull request #7032 from rohitwaghchaure/patch_issue fix patch | 2016-11-22 13:51:51 +05:30 |  | 
			
				
					| 
							
							
								 Rohit Waghchaure | 334f032780 | fix patch | 2016-11-22 13:30:13 +05:30 |  | 
			
				
					| 
							
							
								 Rohit Waghchaure | b1b328865e | [Enhancement] Currency added in the BOM | 2016-11-22 12:52:20 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | ee874a2a36 | Update student_admission.py | 2016-11-22 12:42:24 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 9872d8cdb5 | Revert "[optimize] remove count(*) from queries" | 2016-11-21 21:04:47 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | d3344ebcd1 | Merge pull request #7021 from neilLasrado/develop Added Instructors table to Student Batch | 2016-11-21 19:36:11 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | d855167b9b | Fixed merge conflict | 2016-11-21 19:13:22 +05:30 |  | 
			
				
					| 
							
							
								 Neil Trini Lasrado | fb35b484a5 | Added Instructors table to Student Batch | 2016-11-21 19:10:13 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 8132be288f | Merge branch 'hotfix' | 2016-11-21 19:10:05 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | d75d3a927d | bumped to version 7.1.16 | 2016-11-21 19:40:05 +06:00 |  | 
			
				
					| 
							
							
								 Nabin Hait | 4374ef5adc | Merge pull request #6995 from neilLasrado/develop Added Student Batch Name & Batch Creation Tool in Schools Module. | 2016-11-21 19:08:15 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 651d8e996b | Merge pull request #7020 from nabinhait/balance_sheet_fix Provisional Loss related fix in Balance Sheet. Fixed #6918 | 2016-11-21 19:06:42 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | d01d74cafd | Merge pull request #7019 from nabinhait/fix_10014 Default warehouse is mandatory only for stock item in POS. Fixed #6893 | 2016-11-21 19:06:30 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 9789b50ae5 | Merge pull request #7018 from nabinhait/fix_10013 Set project from Sales Order while creating Material Request from PPT, fixed #6731 | 2016-11-21 19:06:14 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 5224a04628 | Merge pull request #7016 from nabinhait/fix_10012 Set WIP warehouse in Pro Order based on Manufacturing Settings. Fixed #6636 | 2016-11-21 19:05:50 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | bdab3103e3 | Merge pull request #7015 from nabinhait/fix_10011 Multiple fixes | 2016-11-21 19:05:34 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 09f7a7a977 | Merge pull request #7013 from rmehta/remove-features-setup-docs [fix] remove feature setup docs | 2016-11-21 19:05:04 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 376e8945f7 | Merge pull request #7014 from rohitwaghchaure/rename_autoname_field patch for rename autoname field | 2016-11-21 19:04:44 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 3d5ef804b2 | Provisional Loss related fix in Balance Sheet. Fixed #6918 | 2016-11-21 18:53:05 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 0d5d4aefe5 | [docs] added style | 2016-11-21 18:47:00 +05:30 |  | 
			
				
					| 
							
							
								 Neil Trini Lasrado | f89ffdb57a | Fixes for student Attendance | 2016-11-21 18:32:40 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 977eff911f | Default warehouse is mandatory only for stock item in POS. Fixed #6893 | 2016-11-21 18:29:16 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 9b797974b5 | Set project from Sales Order while creating Material Request from PPT, fixed #6731 | 2016-11-21 18:15:50 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 075e33245e | Set WIP warehouse in Pro Order based on Manufacturing Settings. Fixed #6636 | 2016-11-21 18:09:55 +05:30 |  | 
			
				
					| 
							
							
								 Neil Trini Lasrado | b444d5d81b | Rename Scheduling Tool to Course scheduling Tool, Batch Name to Student Batch Name and Batch Creation tool to Student Batch Creation tool | 2016-11-21 17:04:23 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | fd23fa7c0b | Prifitability report link added to accounts module page | 2016-11-21 16:59:03 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 542bf8f7d4 | Party filter and total row for opening and closing in trial balance for party report | 2016-11-21 16:58:50 +05:30 |  | 
			
				
					| 
							
							
								 Rohit Waghchaure | 4810d1fa2d | patch for rename autoname field | 2016-11-21 16:52:50 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 1df70cedc1 | [fix] remove feature setup docs | 2016-11-21 16:38:13 +05:30 |  | 
			
				
					| 
							
							
								 Neil Trini Lasrado | 6566431fc5 | Rearranged scheduling Tool | 2016-11-21 16:21:25 +05:30 |  | 
			
				
					| 
							
							
								 Neil Trini Lasrado | defdd784f4 | Added Student Batch Name & Batch Creation Tool in Schools Module. | 2016-11-21 16:21:25 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 75d455422a | [fix] [patch] rename_quality_inspection_field | 2016-11-21 16:19:50 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 8d161ef2e1 | Merge pull request #6899 from shreyasp/docs-update Updated Docs for Purchase Order and Supplier Quotation | 2016-11-21 15:28:27 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | d50d6a559c | Merge pull request #7012 from rmehta/remove-count-star [optimize] remove count(*) from queries | 2016-11-21 15:28:01 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | e60d51b74c | Merge pull request #6969 from rohitwaghchaure/pos_syncing_issue_and_enhancement User can able to add multiple item group, customer group in the POS profile. | 2016-11-21 15:27:41 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 5a258cbc2d | [optimize] remove count(*) from queries | 2016-11-21 14:57:36 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 5f166c11fc | Merge pull request #6971 from ShraddhaRanjane/patch-2 Update naming-series.md | 2016-11-21 14:52:22 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 2d5b48c4f2 | Update naming-series.md | 2016-11-21 14:52:10 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | b30e184f6b | Merge pull request #7003 from KanchanChauhan/workstation-fix [Fix]Workstation holiday list | 2016-11-21 14:51:24 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | d7faefc739 | Merge pull request #7004 from KanchanChauhan/bom-error-fix [Fix] Better error message if default BOM not found | 2016-11-21 14:51:03 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 0900407c18 | Merge pull request #7010 from rmehta/duplicate-icon-patch-fix [patch] reload desktop icon #6826 | 2016-11-21 14:50:36 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | c16b373969 | Merge pull request #6994 from nabinhait/manual_depreciation Manual Depreciation Schedule for Asset | 2016-11-21 14:49:58 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | c2f8dd71d7 | Merge pull request #6965 from manassolanki/qa_redesign [Fix] [Enhancement] Quality Inspection | 2016-11-21 14:49:18 +05:30 |  |