Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							4bfbd29411 
							
						 
					 
					
						
						
							
							Permission for Stock ledger and balance report  
						
						
						
						
					 
					
						2015-05-07 15:41:09 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							2682278ad9 
							
						 
					 
					
						
						
							
							Merge pull request  #3221  from neilLasrado/hr  
						
						... 
						
						
						
						employee removed from HR setup 
						
						
					 
					
						2015-05-07 14:59:45 +05:30 
						 
				 
			
				
					
						
							
							
								Neil Trini Lasrado 
							
						 
					 
					
						
						
						
						
							
						
						
							d1c413a668 
							
						 
					 
					
						
						
							
							employee removed from HR setup  
						
						
						
						
					 
					
						2015-05-07 12:40:18 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							bcdea3ea51 
							
						 
					 
					
						
						
							
							[rename] Sales/Purchase Taxes and Charges Master > Sales/Purchase Taxes and Charges Template  
						
						
						
						
					 
					
						2015-05-06 18:45:47 +05:30 
						 
				 
			
				
					
						
							
							
								Neil Trini Lasrado 
							
						 
					 
					
						
						
						
						
							
						
						
							458b8885f0 
							
						 
					 
					
						
						
							
							New Document Activity Cost created.  
						
						... 
						
						
						
						In TL - billing rate and internal rate added
In Project - total expense claim and total activity cost. Buttons addded - show time logs and show expense claims.
In Expense Claim - Employee and project link added. update cost in project on submit and on trash. Validation added to check sanctioned amount is not greater than claim amount. 
						
						
					 
					
						2015-04-22 11:25:57 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							20bcf6aeff 
							
						 
					 
					
						
						
							
							[fixes] print_hide on stock uom and gross profit  
						
						
						
						
					 
					
						2015-04-13 15:31:24 +05:30 
						 
				 
			
				
					
						
							
							
								Neil Trini Lasrado 
							
						 
					 
					
						
						
						
						
							
						
						
							e1d620b168 
							
						 
					 
					
						
						
							
							Offer Letter - New Doctype added and job_applicant naming changed  
						
						
						
						
					 
					
						2015-04-08 12:28:20 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							14ae4c3603 
							
						 
					 
					
						
						
							
							[email] many fixes, newsletter, unsubscribe  
						
						
						
						
					 
					
						2015-03-19 17:16:03 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							8be6939288 
							
						 
					 
					
						
						
							
							help description for party account  
						
						
						
						
					 
					
						2015-02-26 12:31:07 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							d35354cc06 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'frappe/develop' into v5.0  
						
						... 
						
						
						
						Conflicts:
	erpnext/__version__.py
	erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
	erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
	erpnext/hooks.py
	erpnext/patches.txt
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	erpnext/stock/get_item_details.py
	erpnext/translations/ar.csv
	erpnext/translations/bs.csv
	erpnext/translations/ca.csv
	erpnext/translations/el.csv
	erpnext/translations/es.csv
	erpnext/translations/fr.csv
	erpnext/translations/hr.csv
	erpnext/translations/id.csv
	erpnext/translations/is.csv
	erpnext/translations/ja.csv
	erpnext/translations/nl.csv
	erpnext/translations/pl.csv
	erpnext/translations/pt-BR.csv
	erpnext/translations/ru.csv
	erpnext/translations/tr.csv
	erpnext/translations/zh-cn.csv
	erpnext/translations/zh-tw.csv
	setup.py 
						
						
					 
					
						2015-02-24 18:12:17 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							99d0941008 
							
						 
					 
					
						
						
							
							[time logs] fixes  
						
						
						
						
					 
					
						2015-02-24 14:48:11 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							d57e793bf3 
							
						 
					 
					
						
						
							
							[fix] Added unicode_literals if missing in py files  
						
						
						
						
					 
					
						2015-02-24 12:24:53 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							a1da88a3d3 
							
						 
					 
					
						
						
							
							[capacity planning] automatically plan Time Logs from Production Order  
						
						
						
						
					 
					
						2015-02-23 20:18:38 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							d06c1188a0 
							
						 
					 
					
						
						
							
							[item] patches  
						
						
						
						
					 
					
						2015-02-23 14:43:15 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							46e03eadca 
							
						 
					 
					
						
						
							
							[rename] Customer Issue -> Warranty Claim  
						
						
						
						
					 
					
						2015-02-17 10:45:50 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							60cfccbf77 
							
						 
					 
					
						
						
							
							[new-module] crm  
						
						
						
						
					 
					
						2015-02-17 10:36:54 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							71a6b93d89 
							
						 
					 
					
						
						
							
							[cleanups]  
						
						
						
						
					 
					
						2015-01-19 17:35:05 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							81e972eac4 
							
						 
					 
					
						
						
							
							[cleanups]  
						
						
						
						
					 
					
						2015-01-19 17:34:54 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							e8500ad4e6 
							
						 
					 
					
						
						
							
							Multiple fixes  
						
						
						
						
					 
					
						2015-01-10 16:05:17 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							e1cb0ae738 
							
						 
					 
					
						
						
							
							[design] list views  
						
						
						
						
					 
					
						2015-01-05 17:39:05 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							ff58261407 
							
						 
					 
					
						
						
							
							[icons] mfg and shopping cart  
						
						
						
						
					 
					
						2015-01-02 14:40:48 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							419ae33c3e 
							
						 
					 
					
						
						
							
							[merge] v5-design  
						
						
						
						
					 
					
						2014-12-31 15:03:14 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							7b822abcd6 
							
						 
					 
					
						
						
							
							[desktop] new icons  
						
						
						
						
					 
					
						2014-12-31 14:42:23 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							afbfdcf552 
							
						 
					 
					
						
						
							
							[ui] minor fixes  
						
						
						
						
					 
					
						2014-12-30 18:11:32 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							23d2a53017 
							
						 
					 
					
						
						
							
							Code replacement for journal voucher renaming  
						
						
						
						
					 
					
						2014-12-25 17:14:18 +05:30 
						 
				 
			
				
					
						
							
							
								Neil Trini Lasrado 
							
						 
					 
					
						
						
						
						
							
						
						
							e84fa67f30 
							
						 
					 
					
						
						
							
							Actual operating cost, Actal operating time added to 'production order operations' - auto fetched based on 'time log' creation 'make time log' button appears only if 'production order' document is submitted server side validation added to check if 'Production Order' mentioned on 'Time Log' is in submit state test cases added to check all of the above  
						
						... 
						
						
						
						Time Log Bug Fixed
Manufacturing seetings doctype added.
prod order holiday list time calculation added 
						
						
					 
					
						2014-12-23 17:38:59 +05:30 
						 
				 
			
				
					
						
							
							
								Neil Trini Lasrado 
							
						 
					 
					
						
						
						
						
							
						
						
							637d804abd 
							
						 
					 
					
						
						
							
							Operations added in Production Order DocType Auto-Fetch added to operations in Production Order DocType made operations in production order read-only capacity & duration of cycle added to workstation workstation operation timings added operation master added, Time log added Time Log Fixed Test Records added to Production Order Test Recorde for over Production Time Log added Validation added to check if time log timings are within working hours of the workstation. Validation added to check if workstation is closed on time log dates. Test Case added for Time Log  
						
						
						
						
					 
					
						2014-12-23 17:38:59 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							bd9b62ff28 
							
						 
					 
					
						
						
							
							[rename] Support Ticket -> Issue  
						
						
						
						
					 
					
						2014-11-28 11:46:10 +05:30 
						 
				 
			
				
					
						
							
							
								ankitjavalkarwork 
							
						 
					 
					
						
						
						
						
							
						
						
							e6e65b0907 
							
						 
					 
					
						
						
							
							[ #2362 ] Commonify Acc. Receivable Summary Report and add Acc. Payable Summary Report  
						
						
						
						
					 
					
						2014-11-04 14:40:33 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							e6370860a0 
							
						 
					 
					
						
						
							
							accounts receivable summary report cleanup  
						
						
						
						
					 
					
						2014-10-30 15:54:40 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							7dbcee87af 
							
						 
					 
					
						
						
							
							AR/AP report cleanup  
						
						
						
						
					 
					
						2014-10-30 15:54:39 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							3daa49ac1f 
							
						 
					 
					
						
						
							
							[shopping-cart] i'm back  
						
						
						
						
					 
					
						2014-10-21 16:16:30 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							39dbf73de7 
							
						 
					 
					
						
						
							
							[merge] item-variants  
						
						
						
						
					 
					
						2014-10-21 13:24:46 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							be1a8d82c5 
							
						 
					 
					
						
						
							
							[merge] develop  
						
						
						
						
					 
					
						2014-10-21 13:14:55 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							4f0e5db216 
							
						 
					 
					
						
						
							
							Stock balance grid report deprecated and moved to server side  
						
						
						
						
					 
					
						2014-10-10 20:54:57 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							70aa8933b1 
							
						 
					 
					
						
						
							
							[item variant] started  
						
						
						
						
					 
					
						2014-10-07 11:39:54 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							c68646c694 
							
						 
					 
					
						
						
							
							[merge] 4.x to 5.0  
						
						
						
						
					 
					
						2014-10-06 12:57:48 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							996a1010cb 
							
						 
					 
					
						
						
							
							Moved Installation note from tools to documents section  
						
						
						
						
					 
					
						2014-09-26 14:23:00 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							11b75759d2 
							
						 
					 
					
						
						
							
							Merge pull request  #2194  from ankitjavalkarwork/stockbalreport  
						
						... 
						
						
						
						Update report with Valuation rate, stock values, move to Main report 
						
						
					 
					
						2014-09-16 15:22:25 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							5cdc8e560c 
							
						 
					 
					
						
						
							
							[mailbox] removed separate email settings for jobs, sales, support  
						
						
						
						
					 
					
						2014-09-16 15:12:18 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							c0bb453b88 
							
						 
					 
					
						
						
							
							[refactor] [frappe 5.0]  
						
						
						
						
					 
					
						2014-09-16 15:10:54 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							16e943f120 
							
						 
					 
					
						
						
							
							Removed link of item-wise last purchase rate from buying home page  
						
						
						
						
					 
					
						2014-09-16 12:57:31 +05:30 
						 
				 
			
				
					
						
							
							
								Ankit Javalkar 
							
						 
					 
					
						
						
						
						
							
						
						
							8e7ca41817 
							
						 
					 
					
						
						
							
							Payment Tool  #2106  
						
						
						
						
					 
					
						2014-09-12 15:23:46 +05:30 
						 
				 
			
				
					
						
							
							
								ankitjavalkarwork 
							
						 
					 
					
						
						
						
						
							
						
						
							2e07305616 
							
						 
					 
					
						
						
							
							Update report with Valuation rate, stock values, move to Main report  
						
						
						
						
					 
					
						2014-09-11 16:47:19 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							12ce3eefca 
							
						 
					 
					
						
						
							
							landed cost voucher added in module page  
						
						
						
						
					 
					
						2014-09-01 18:16:24 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							72e1719220 
							
						 
					 
					
						
						
							
							added icon for pos  
						
						
						
						
					 
					
						2014-08-08 15:43:26 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							7a4e739d6c 
							
						 
					 
					
						
						
							
							templating for hr  
						
						
						
						
					 
					
						2014-08-08 11:56:32 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							1b90207360 
							
						 
					 
					
						
						
							
							[minor] [fix] Serial No Servic Contract Expiry  
						
						
						
						
					 
					
						2014-07-31 18:57:51 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							85ff3bcd04 
							
						 
					 
					
						
						
							
							updated pos invoice  
						
						
						
						
					 
					
						2014-07-25 13:01:53 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							cb86d597b7 
							
						 
					 
					
						
						
							
							Report: Trial Balance  
						
						
						
						
					 
					
						2014-07-22 19:49:16 +05:30