Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							14aa9c5320 
							
						 
					 
					
						
						
							
							[fix] Cleanup and fixes in update stock feature in Purchase Invoice  
						
						
						
						
					 
					
						2016-04-18 16:59:47 +05:30 
						 
				 
			
				
					
						
							
							
								jof2jc 
							
						 
					 
					
						
						
						
						
							
						
						
							524ebbcbb9 
							
						 
					 
					
						
						
							
							Added Make Receipt (Update Stock) and IsCash option on Purchase Invoice  
						
						
						
						
					 
					
						2016-04-18 15:57:55 +05:30 
						 
				 
			
				
					
						
							
							
								Neil Trini Lasrado 
							
						 
					 
					
						
						
						
						
							
						
						
							6e343e23d9 
							
						 
					 
					
						
						
							
							Renamed project_name to project  
						
						
						
						
					 
					
						2016-03-15 17:50:53 +05:30 
						 
				 
			
				
					
						
							
							
								Valmik Jangla 
							
						 
					 
					
						
						
						
						
							
						
						
							d89dcf60e6 
							
						 
					 
					
						
						
							
							Removed from Delivery Note and Appraisal  
						
						... 
						
						
						
						Added back in Stock Ledger Entry
Added validation in GL Entry and SL Entry
Stock Controller sets Fiscal Year using Posting Date 
						
						
					 
					
						2016-03-11 13:07:48 +05:30 
						 
				 
			
				
					
						
							
							
								Valmik Jangla 
							
						 
					 
					
						
						
						
						
							
						
						
							319bbad4d4 
							
						 
					 
					
						
						
							
							Removed from Stock Entry  
						
						
						
						
					 
					
						2016-03-11 13:05:19 +05:30 
						 
				 
			
				
					
						
							
							
								patilsangram 
							
						 
					 
					
						
						
						
						
							
						
						
							bf2b511988 
							
						 
					 
					
						
						
							
							[Removed Stop Button from SO and PO]  
						
						
						
						
					 
					
						2016-02-22 16:24:23 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							20105d8a0d 
							
						 
					 
					
						
						
							
							[fix] Accept return items in any warehouse  
						
						
						
						
					 
					
						2016-01-19 18:05:28 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							6b71ef5843 
							
						 
					 
					
						
						
							
							[refactor] changed set_modified, change_modified to update_modified like in the framework  
						
						
						
						
					 
					
						2016-01-06 16:32:06 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							bdab0eea0f 
							
						 
					 
					
						
						
							
							Billing status in Purchase Receipt  
						
						
						
						
					 
					
						2016-01-06 15:42:43 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							2e292060c5 
							
						 
					 
					
						
						
							
							[fix] Reserved and ordered qty fix for drop ship orders  
						
						
						
						
					 
					
						2015-11-18 17:39:26 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							14a908bdec 
							
						 
					 
					
						
						
							
							[test] [fix] abs(valuation_rate) for moving average  
						
						
						
						
					 
					
						2015-10-15 12:28:20 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							6e439a5e53 
							
						 
					 
					
						
						
							
							Multi currency: test case and fixes  
						
						
						
						
					 
					
						2015-08-28 19:24:22 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							13d8835b75 
							
						 
					 
					
						
						
							
							Fixed merge conflict  
						
						
						
						
					 
					
						2015-08-27 14:55:34 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							fa65c7bf29 
							
						 
					 
					
						
						
							
							[minor] stopped or cancelled message  
						
						
						
						
					 
					
						2015-08-26 19:15:24 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							c561a499d7 
							
						 
					 
					
						
						
							
							Multi currency GL entry fixes  
						
						
						
						
					 
					
						2015-08-21 14:31:47 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							46bcbaf97b 
							
						 
					 
					
						
						
							
							GL Entry in account currency  
						
						
						
						
					 
					
						2015-08-21 14:31:47 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							b16b9cd7a0 
							
						 
					 
					
						
						
							
							[fix] force stock_uom in item and stock ledger entry  
						
						
						
						
					 
					
						2015-08-03 16:13:33 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							1d21842f68 
							
						 
					 
					
						
						
							
							Sales / Purchase Return redesigned via negative DN / SI / PR / PI  
						
						
						
						
					 
					
						2015-07-24 13:26:53 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							03cf407574 
							
						 
					 
					
						
						
							
							[fix] removed print  
						
						
						
						
					 
					
						2015-04-06 19:38:13 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							c399709789 
							
						 
					 
					
						
						
							
							fixes to test cases  
						
						
						
						
					 
					
						2015-04-06 19:29:16 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							0dc79f4de0 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'frappe/v4.x.x' into develop  
						
						... 
						
						
						
						Conflicts:
	.travis.yml
	erpnext/__version__.py
	erpnext/controllers/queries.py
	erpnext/hooks.py
	erpnext/selling/sales_common.js
	erpnext/stock/doctype/bin/bin.py
	erpnext/stock/doctype/stock_entry/stock_entry.js
	erpnext/stock/doctype/stock_entry/stock_entry.py
	erpnext/stock/stock_ledger.py
	setup.py 
						
						
					 
					
						2015-04-06 13:21:07 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							54c865e77c 
							
						 
					 
					
						
						
							
							Landed cost voucher: fixes for serialized item  
						
						
						
						
					 
					
						2015-03-27 15:39:06 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							885e074697 
							
						 
					 
					
						
						
							
							Changed company name from Web Notes to Frappe Technologies  
						
						
						
						
					 
					
						2015-03-03 14:56:43 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							15cd12214e 
							
						 
					 
					
						
						
							
							Fixed conflict while merging v4 into v5  
						
						
						
						
					 
					
						2015-02-10 16:37:18 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							9c47efb592 
							
						 
					 
					
						
						
							
							Landed cost voucher: allow negative stock while doing cancellation entry for purchase receipts  
						
						
						
						
					 
					
						2015-01-21 16:22:45 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							fff3ab752c 
							
						 
					 
					
						
						
							
							Fixed conflict  
						
						
						
						
					 
					
						2015-01-14 16:27:13 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							7778b480fd 
							
						 
					 
					
						
						
							
							fix reposting gl entries for future vouchers  
						
						
						
						
					 
					
						2015-01-07 15:45:10 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							f40ce616a7 
							
						 
					 
					
						
						
							
							In stock entry, difference account can be non-profit-and-loss account  
						
						
						
						
					 
					
						2015-01-02 14:37:01 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							dd38a266b8 
							
						 
					 
					
						
						
							
							Removed tname and fname from code  
						
						
						
						
					 
					
						2014-12-26 13:15:21 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							ae1dcabcb5 
							
						 
					 
					
						
						
							
							Fixed merge conflict  
						
						
						
						
					 
					
						2014-11-05 12:41:02 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							5288bdeabb 
							
						 
					 
					
						
						
							
							Minor fix  
						
						
						
						
					 
					
						2014-11-03 15:08:21 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							be1a8d82c5 
							
						 
					 
					
						
						
							
							[merge] develop  
						
						
						
						
					 
					
						2014-10-21 13:14:55 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							f1a07ff105 
							
						 
					 
					
						
						
							
							Allow zero rate while reposting  
						
						
						
						
					 
					
						2014-10-15 12:23:35 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							fb6e434315 
							
						 
					 
					
						
						
							
							Guess valuation rate in case of negative stock  
						
						
						
						
					 
					
						2014-10-15 11:34:40 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							38d0ed9f3a 
							
						 
					 
					
						
						
							
							Negative stock allowed for perpetual inventory. Blocked in specific case  
						
						
						
						
					 
					
						2014-10-14 16:08:19 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							4d74216147 
							
						 
					 
					
						
						
							
							Maintain negative stock balance if balance qty is negative  
						
						
						
						
					 
					
						2014-10-09 19:25:19 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							e96e83d557 
							
						 
					 
					
						
						
							
							stock reco and repost vouchers  
						
						
						
						
					 
					
						2014-10-08 18:06:14 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							6c48ef781b 
							
						 
					 
					
						
						
							
							Utility: Repost stock ledger entries and gl entries for all stock transactions  
						
						
						
						
					 
					
						2014-10-08 11:02:18 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							adeb976a1b 
							
						 
					 
					
						
						
							
							Block negative stock in perpetual inventory  
						
						
						
						
					 
					
						2014-10-08 11:02:18 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							be8ec39678 
							
						 
					 
					
						
						
							
							Deleted master_type, master_name, credit_days, credit_limit fields from account  
						
						... 
						
						
						
						Warehouse account is linked via Warehouse field now, instead of master_name field
patch to copy warehouse value from master_name to warehouse
party_type and party field added in GL Entry and Journal Voucher Detail 
						
						
					 
					
						2014-10-06 13:02:40 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							b9e04815f8 
							
						 
					 
					
						
						
							
							Repost gl entries for future stock vouchers  
						
						
						
						
					 
					
						2014-09-26 14:24:42 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							913c51b1f8 
							
						 
					 
					
						
						
							
							[fix] get future vouchers query  
						
						
						
						
					 
					
						2014-08-27 22:09:15 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							78b6366325 
							
						 
					 
					
						
						
							
							[fix] Error Reports  
						
						
						
						
					 
					
						2014-08-19 12:20:48 +05:30 
						 
				 
			
				
					
						
							
							
								nabinhait 
							
						 
					 
					
						
						
						
						
							
						
						
							87f2401c1e 
							
						 
					 
					
						
						
							
							Landed Cost on_submit and gl entries for PR  
						
						
						
						
					 
					
						2014-08-11 16:12:31 +05:30 
						 
				 
			
				
					
						
							
							
								nabinhait 
							
						 
					 
					
						
						
						
						
							
						
						
							e6cee7b41f 
							
						 
					 
					
						
						
							
							Expense account can be liability account for stock reconciliation  
						
						
						
						
					 
					
						2014-07-14 10:48:11 +05:30