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 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							6d950d23a8 
							
						 
					 
					
						
						
							
							[merge]  
						
						
						
						
					 
					
						2014-11-28 12:08:51 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							ccd9fd3e94 
							
						 
					 
					
						
						
							
							Rounding in totals calculation  
						
						
						
						
					 
					
						2014-11-14 14:27:24 +05:30 
						 
				 
			
				
					
						
							
							
								ankitjavalkarwork 
							
						 
					 
					
						
						
						
						
							
						
						
							e69a611991 
							
						 
					 
					
						
						
							
							[ #2164 ] New field names in DN, fix field name refs, Patch added  
						
						
						
						
					 
					
						2014-10-09 17:31:46 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							e9daefe07f 
							
						 
					 
					
						
						
							
							Credit Limit and credit days  fixes   #2031  
						
						
						
						
					 
					
						2014-10-06 13:05:28 +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 
						 
				 
			
				
					
						
							
							
								nathando 
							
						 
					 
					
						
						
						
						
							
						
						
							247e9ffc96 
							
						 
					 
					
						
						
							
							get_item_list does not [item qty=0]  
						
						... 
						
						
						
						- By using `if not d.qty:` it totally limits the chance of creating an empty Delivery Note 
- Should be changed to `if d.qty is None` 
Use case for empty DN: 
- Open a Delivery Note and tight to a specific Sales Order first without knowing the real qty at this point.
- Using barcode scanner to receive Sales Order to this DN (multiple times). 
						
						
					 
					
						2014-09-03 15:03:31 +08:00 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							c41a9480b8 
							
						 
					 
					
						
						
							
							Credit limit fixes  
						
						
						
						
					 
					
						2014-08-18 15:40:36 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							b5e768906a 
							
						 
					 
					
						
						
							
							built item grids for sales, purchase, stock  
						
						
						
						
					 
					
						2014-08-08 11:56:31 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							8f49cf7c03 
							
						 
					 
					
						
						
							
							[minor] fixed testcase  
						
						
						
						
					 
					
						2014-07-25 13:02:29 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							62b1cbf003 
							
						 
					 
					
						
						
							
							[impact] Limit available functions in jinja environment  
						
						
						
						
					 
					
						2014-07-25 13:02:29 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							5b51cc86a9 
							
						 
					 
					
						
						
							
							many fixes to print  
						
						
						
						
					 
					
						2014-07-25 13:01:53 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							f84c240d1c 
							
						 
					 
					
						
						
							
							cleanup for print format  
						
						
						
						
					 
					
						2014-07-25 13:01:52 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							80a988c04f 
							
						 
					 
					
						
						
							
							BugFix: selling_controller.py  
						
						
						
						
					 
					
						2014-07-07 11:35:54 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							4aa2380de2 
							
						 
					 
					
						
						
							
							Fixed get_sender for Sales and Jobs  
						
						
						
						
					 
					
						2014-06-30 12:19:22 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							6def968c3c 
							
						 
					 
					
						
						
							
							minor fix for outgoing communication email  
						
						
						
						
					 
					
						2014-06-12 10:31:43 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							2cebf9b499 
							
						 
					 
					
						
						
							
							minor  fix   #1565  
						
						
						
						
					 
					
						2014-05-02 16:12:07 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							6b03914731 
							
						 
					 
					
						
						
							
							asynchronus issue in get_party_details  
						
						
						
						
					 
					
						2014-05-02 15:45:10 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							b054eb7a4f 
							
						 
					 
					
						
						
							
							Call calculate_taxes_and_totals after mapping  
						
						
						
						
					 
					
						2014-04-22 20:35:22 +05:30