mbauskar 
							
						 
					 
					
						
						
						
						
							
						
						
							e9747a8a6e 
							
						 
					 
					
						
						
							
							[minor] fixes in validate selling price  
						
						
						
						
					 
					
						2016-11-16 17:19:47 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							9f26bc16b7 
							
						 
					 
					
						
						
							
							Update selling_controller.py  
						
						
						
						
					 
					
						2016-10-20 16:45:53 +05:30 
						 
				 
			
				
					
						
							
							
								shreyas 
							
						 
					 
					
						
						
						
						
							
						
						
							e8aaa92816 
							
						 
					 
					
						
						
							
							[Minor] Some more fixes to the code  
						
						
						
						
					 
					
						2016-10-20 15:57:45 +05:30 
						 
				 
			
				
					
						
							
							
								shreyas 
							
						 
					 
					
						
						
						
						
							
						
						
							edcba51c8b 
							
						 
					 
					
						
						
							
							[Fix] Added check to validate selling price against valuation rate  
						
						
						
						
					 
					
						2016-10-20 15:57:45 +05:30 
						 
				 
			
				
					
						
							
							
								shreyas 
							
						 
					 
					
						
						
						
						
							
						
						
							1cfe2d7b45 
							
						 
					 
					
						
						
							
							[Minor] Validate purchase price against selling price  
						
						
						
						
					 
					
						2016-10-20 15:57:45 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Waghchaure 
							
						 
					 
					
						
						
						
						
							
						
						
							7d5298997b 
							
						 
					 
					
						
						
							
							Documentation for payments  
						
						
						
						
					 
					
						2016-10-06 16:49:39 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							14aa9c5320 
							
						 
					 
					
						
						
							
							[fix] Cleanup and fixes in update stock feature in Purchase Invoice  
						
						
						
						
					 
					
						2016-04-18 16:59:47 +05:30 
						 
				 
			
				
					
						
							
							
								Umair Sayyed 
							
						 
					 
					
						
						
						
						
							
						
						
							72534deea2 
							
						 
					 
					
						
						
							
							removed Is Sales Item and Is Purchase Item  
						
						
						
						
					 
					
						2016-04-15 12:57:00 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							2f957f27b0 
							
						 
					 
					
						
						
							
							[fix] apply Tax Rule for lead  
						
						
						
						
					 
					
						2016-04-08 17:43:08 +05:30 
						 
				 
			
				
					
						
							
							
								Saurabh 
							
						 
					 
					
						
						
						
						
							
						
						
							d313553ae3 
							
						 
					 
					
						
						
							
							[enhancement] get valuation rate and gross profit on sales order item  
						
						
						
						
					 
					
						2016-03-09 15:42:00 +05:30 
						 
				 
			
				
					
						
							
							
								patilsangram 
							
						 
					 
					
						
						
						
						
							
						
						
							bf2b511988 
							
						 
					 
					
						
						
							
							[Removed Stop Button from SO and PO]  
						
						
						
						
					 
					
						2016-02-22 16:24:23 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							01de945388 
							
						 
					 
					
						
						
							
							[cleanup] Removed 'Is Service Item' checkbox and filters  
						
						... 
						
						
						
						'Is Service Item' checkbox only worked for filtering Items in Maintenance Schedule and Maintenance Visit, and validating that Items in a Maintenance type Order were of type 'Service'. However, it doesn't fit an actual use case where any Sales Item could be given for Maintenance, making the checkbox an unnecessary addition. 
						
						
					 
					
						2016-01-26 16:22:51 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							602e8253be 
							
						 
					 
					
						
						
							
							[enhancement] Int, Currency, Float, Percent as not null and default to 0  
						
						
						
						
					 
					
						2015-11-19 13:23:36 +05:30 
						 
				 
			
				
					
						
							
							
								Saurabh 
							
						 
					 
					
						
						
						
						
							
						
						
							8a8ef85174 
							
						 
					 
					
						
						
							
							[fixes] reviwe fixes  
						
						
						
						
					 
					
						2015-10-29 19:43:33 +05:30 
						 
				 
			
				
					
						
							
							
								Saurabh 
							
						 
					 
					
						
						
						
						
							
						
						
							e930f0f74e 
							
						 
					 
					
						
						
							
							[fixes] filter on supplier list for DropShip, checking closed status  
						
						
						
						
					 
					
						2015-10-29 19:43:33 +05:30 
						 
				 
			
				
					
						
							
							
								Saurabh 
							
						 
					 
					
						
						
						
						
							
						
						
							5b7e9a1c94 
							
						 
					 
					
						
						
							
							[minor fixes]  
						
						
						
						
					 
					
						2015-10-29 19:43:31 +05:30 
						 
				 
			
				
					
						
							
							
								Saurabh 
							
						 
					 
					
						
						
						
						
							
						
						
							c306b21415 
							
						 
					 
					
						
						
							
							[merge fixes]  
						
						
						
						
					 
					
						2015-10-29 19:43:31 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							b445be3552 
							
						 
					 
					
						
						
							
							Test case for delivery to target warehouse  
						
						
						
						
					 
					
						2015-10-13 15:46:42 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							c865f229fb 
							
						 
					 
					
						
						
							
							Target Warehouse in Delivery Note and Sales Invoice and removed Serial No status  
						
						
						
						
					 
					
						2015-10-13 15:46:42 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							cd103c05d6 
							
						 
					 
					
						
						
							
							Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order  
						
						
						
						
					 
					
						2015-09-08 19:24:35 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							1f94fa25a8 
							
						 
					 
					
						
						
							
							Update delivered / ordered qty in sales/purchase order from return entry  
						
						... 
						
						
						
						Reserved Qty logic cleaned up 
						
						
					 
					
						2015-08-25 14:11:12 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							1826791891 
							
						 
					 
					
						
						
							
							[fix][patch] Reserved Qty logic fixed and reposted for existing items  
						
						
						
						
					 
					
						2015-08-19 11:00:00 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							453cc374d4 
							
						 
					 
					
						
						
							
							- Fixed logic of reserved qty calculation while delivered product bundle via Sales Invoice  
						
						... 
						
						
						
						- Delete stock ledger entries on cancellation of Sales Invoice while product bundle delivered
- Make packing list on validate 
						
						
					 
					
						2015-07-29 15:59:57 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							1e8025b327 
							
						 
					 
					
						
						
							
							[cleanup] yes/no selects changed to checks in Item  
						
						
						
						
					 
					
						2015-07-29 11:38:33 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							04d244a360 
							
						 
					 
					
						
						
							
							Credit Note print format  
						
						
						
						
					 
					
						2015-07-24 13:26:54 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							1d21842f68 
							
						 
					 
					
						
						
							
							Sales / Purchase Return redesigned via negative DN / SI / PR / PI  
						
						
						
						
					 
					
						2015-07-24 13:26:53 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							0847f9a074 
							
						 
					 
					
						
						
							
							Reserved warehouse should not be validated on cancellation of sales order  
						
						
						
						
					 
					
						2015-07-14 18:23:05 +05:30 
						 
				 
			
				
					
						
							
							
								Neil Trini Lasrado 
							
						 
					 
					
						
						
						
						
							
						
						
							ed8cecbdd8 
							
						 
					 
					
						
						
							
							Sales BOM renamed to Product Bundle  
						
						
						
						
					 
					
						2015-07-13 12:41:27 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							6e38e917eb 
							
						 
					 
					
						
						
							
							Reserved warehouse should not be validated on cancellation of sales order  
						
						
						
						
					 
					
						2015-07-13 11:36:36 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							ff8a854b82 
							
						 
					 
					
						
						
							
							Fixes   #3349 . Thanks @abelbm for reporting.  
						
						
						
						
					 
					
						2015-05-26 18:13:28 -04:00 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							ffc7f3fef6 
							
						 
					 
					
						
						
							
							Apply default taxes on loading of document  
						
						
						
						
					 
					
						2015-05-12 15:07:02 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							2cc585f180 
							
						 
					 
					
						
						
							
							[git fixes] salary manager, time log title, notificaitons  
						
						
						
						
					 
					
						2015-03-03 16:06:54 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							885e074697 
							
						 
					 
					
						
						
							
							Changed company name from Web Notes to Frappe Technologies  
						
						
						
						
					 
					
						2015-03-03 14:56:43 +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 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							de9c8a9028 
							
						 
					 
					
						
						
							
							discount calculation and in print view  
						
						
						
						
					 
					
						2015-02-24 10:02:27 +05:30 
						 
				 
			
				
					
						
							
							
								Sambhaji Kolate 
							
						 
					 
					
						
						
						
						
							
						
						
							973f78e7d3 
							
						 
					 
					
						
						
							
							fixed stock_balance report for stock_uom and stock ledger entry for Delivery Note  #2802  
						
						
						
						
					 
					
						2015-02-20 13:09:39 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							6f0a3ed8d4 
							
						 
					 
					
						
						
							
							fixed conflict  
						
						
						
						
					 
					
						2015-02-17 11:12:04 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							3237c75d98 
							
						 
					 
					
						
						
							
							Commonified taxes and totals calculation in server side  
						
						
						
						
					 
					
						2015-02-17 11:11:11 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							60cfccbf77 
							
						 
					 
					
						
						
							
							[new-module] crm  
						
						
						
						
					 
					
						2015-02-17 10:36:54 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							5690be103c 
							
						 
					 
					
						
						
							
							Replaced renamed total fields in code files  
						
						
						
						
					 
					
						2015-02-12 16:09:11 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							8fa503e177 
							
						 
					 
					
						
						
							
							Fixed conflict while merging v4 into v5  
						
						
						
						
					 
					
						2015-02-10 16:44:00 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							15cd12214e 
							
						 
					 
					
						
						
							
							Fixed conflict while merging v4 into v5  
						
						
						
						
					 
					
						2015-02-10 16:37:18 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							6dfd430a2f 
							
						 
					 
					
						
						
							
							Moved flags like ignore_mandatory, ignore_validate etc to doc.flags  
						
						
						
						
					 
					
						2015-02-10 14:41:27 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							5e13e0c316 
							
						 
					 
					
						
						
							
							net_total and grand_total mismatch issue  
						
						
						
						
					 
					
						2015-02-05 17:18:03 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							c567e8e960 
							
						 
					 
					
						
						
							
							[fix] analytics reports + remove print item tables  #2667  
						
						
						
						
					 
					
						2015-02-03 17:56:25 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							fff3ab752c 
							
						 
					 
					
						
						
							
							Fixed conflict  
						
						
						
						
					 
					
						2015-01-14 16:27:13 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							2244ac4d52 
							
						 
					 
					
						
						
							
							Discount amount in party currency  
						
						
						
						
					 
					
						2015-01-12 17:35:37 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							8a00319962 
							
						 
					 
					
						
						
							
							minor fix  
						
						
						
						
					 
					
						2015-01-04 17:27:40 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							dd38a266b8 
							
						 
					 
					
						
						
							
							Removed tname and fname from code  
						
						
						
						
					 
					
						2014-12-26 13:15:21 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							e7d153624f 
							
						 
					 
					
						
						
							
							Table Field Renaming: code replace, JV and budget distribution renamed  
						
						
						
						
					 
					
						2014-12-25 16:01:55 +05:30