Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							6ff0caa87a 
							
						 
					 
					
						
						
							
							Fixed merge conflict  
						
						
						
						
					 
					
						2017-02-08 11:33:33 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							0a6aaf4257 
							
						 
					 
					
						
						
							
							Get standard/historical valuation rate where missing: some minor fixes  
						
						
						
						
					 
					
						2017-02-07 12:50:22 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							ea8fab52c6 
							
						 
					 
					
						
						
							
							Get standard/historical valuation rate where missing, if item is not a sample item  
						
						
						
						
					 
					
						2017-02-07 01:24:32 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Waghchaure 
							
						 
					 
					
						
						
						
						
							
						
						
							92c9ad8c72 
							
						 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						
						
						
					 
					
						2017-01-28 14:14:33 +05:30 
						 
				 
			
				
					
						
							
							
								Kanchan Chauhan 
							
						 
					 
					
						
						
						
						
							
						
						
							b77eaf7053 
							
						 
					 
					
						
						
							
							[URGENT][FIX]Stock Controller fix  
						
						
						
						
					 
					
						2017-01-28 13:26:46 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							710dc5392f 
							
						 
					 
					
						
						
							
							[merge]  
						
						
						
						
					 
					
						2017-01-27 15:48:31 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							cb19f52985 
							
						 
					 
					
						
						
							
							Update stock_controller.py  
						
						
						
						
					 
					
						2017-01-25 19:20:35 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Waghchaure 
							
						 
					 
					
						
						
						
						
							
						
						
							3899d74f15 
							
						 
					 
					
						
						
							
							[Fix] Get valuation rate from item master and update stock value difference  
						
						
						
						
					 
					
						2017-01-25 18:47:53 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							349d520ae2 
							
						 
					 
					
						
						
							
							Fixed merge conflict  
						
						
						
						
					 
					
						2017-01-20 15:44:35 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							a0b967f2cd 
							
						 
					 
					
						
						
							
							Get valuation rate from Item while not found based on SLE  
						
						
						
						
					 
					
						2017-01-20 12:50:40 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							ffd80a6061 
							
						 
					 
					
						
						
							
							[fix] warehouse test cases  
						
						
						
						
					 
					
						2017-01-16 17:23:20 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							9784d27317 
							
						 
					 
					
						
						
							
							Optimization to reduce GLE reposting time for future stock transactions  
						
						
						
						
					 
					
						2016-12-30 16:21:35 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							3fe99559ef 
							
						 
					 
					
						
						
							
							Fixed negative stock validation message for translation and fixed test cases  
						
						
						
						
					 
					
						2016-12-16 15:30:43 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							8c61f343b3 
							
						 
					 
					
						
						
							
							Validate negative stock on delivery while missing valuation rate for booking expenses  
						
						
						
						
					 
					
						2016-12-15 13:46:03 +05:30 
						 
				 
			
				
					
						
							
							
								Manas Solanki 
							
						 
					 
					
						
						
						
						
							
						
						
							60db98aaff 
							
						 
					 
					
						
						
							
							[Minor] Variable assignment before reference  
						
						... 
						
						
						
						Variable = 'inspection_required_fieldname' 
						
						
					 
					
						2016-11-18 14:52:13 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							8af429da1f 
							
						 
					 
					
						
						
							
							Cleanup and fixes in quality inspection feature  
						
						
						
						
					 
					
						2016-11-16 17:22:38 +05:30 
						 
				 
			
				
					
						
							
							
								Manas Solanki 
							
						 
					 
					
						
						
						
						
							
						
						
							cc90241fa5 
							
						 
					 
					
						
						
							
							Quality Inspection Issue  
						
						... 
						
						
						
						1. validate_inspection() function defination in stock_controller.py
2. function call in purchase_receipt.py, purchase_invoice.py and delivery_note.py
3. added functality in quality_inspection.py file for linking to purchase_receipt_no and delivery_note_no 
						
						
					 
					
						2016-11-16 17:22:38 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							d662502f3c 
							
						 
					 
					
						
						
							
							[fix] Validate if warehouse is not linked to any account  
						
						
						
						
					 
					
						2016-10-24 18:17:57 +05:30 
						 
				 
			
				
					
						
							
							
								robert schouten 
							
						 
					 
					
						
						
						
						
							
						
						
							6465711ca6 
							
						 
					 
					
						
						
							
							[fix] missing gl entries warnings  
						
						
						
						
					 
					
						2016-09-12 11:17:14 +08:00 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							3b6dc141c6 
							
						 
					 
					
						
						
							
							[fix] Repost only distinct purchase receipts and invoices  
						
						
						
						
					 
					
						2016-08-19 16:39:50 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							99d4ff4a29 
							
						 
					 
					
						
						
							
							Repost gle for future transactions if update stock checked in back dated purchase invoice  
						
						
						
						
					 
					
						2016-08-08 14:12:58 +05:30 
						 
				 
			
				
					
						
							
							
								Saurabh 
							
						 
					 
					
						
						
						
						
							
						
						
							78333c7e07 
							
						 
					 
					
						
						
							
							[fixes] check group condition  
						
						
						
						
					 
					
						2016-06-26 14:27:46 +05:30 
						 
				 
			
				
					
						
							
							
								Saurabh 
							
						 
					 
					
						
						
						
						
							
						
						
							7fecb50360 
							
						 
					 
					
						
						
							
							[enhance] rename warehouse account type to stock  
						
						
						
						
					 
					
						2016-06-26 14:27:46 +05:30 
						 
				 
			
				
					
						
							
							
								Saurabh 
							
						 
					 
					
						
						
						
						
							
						
						
							4d02949814 
							
						 
					 
					
						
						
							
							[fixes] validate trash condition for warehouse and related account, move existing warehouses under all warehouse group, set account parent and is group for warehouse account  
						
						
						
						
					 
					
						2016-06-25 11:06:14 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							591a5aba56 
							
						 
					 
					
						
						
							
							Added Project in GL Entry and General Ledger report  
						
						
						
						
					 
					
						2016-05-26 17:51:20 +05:30 
						 
				 
			
				
					
						
							
							
								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