Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							fd4bcd855b 
							
						 
					 
					
						
						
							
							test case fixes  
						
						
						
						
					 
					
						2015-05-22 16:55:55 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							e6e456b373 
							
						 
					 
					
						
						
							
							message fixed  
						
						
						
						
					 
					
						2015-05-13 17:21:44 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							ffc7f3fef6 
							
						 
					 
					
						
						
							
							Apply default taxes on loading of document  
						
						
						
						
					 
					
						2015-05-12 15:07:02 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							574d5ff535 
							
						 
					 
					
						
						
							
							fetch only stock items as raw materials supplied for subcontracting  
						
						
						
						
					 
					
						2015-05-07 16:29:29 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							e693f794f5 
							
						 
					 
					
						
						
							
							[subcontract] refactor, make stock entry from PO  
						
						
						
						
					 
					
						2015-03-03 15:50:24 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							885e074697 
							
						 
					 
					
						
						
							
							Changed company name from Web Notes to Frappe Technologies  
						
						
						
						
					 
					
						2015-03-03 14:56:43 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							82e3e25cdb 
							
						 
					 
					
						
						
							
							fixes for base_rate, base_amount, tax_amount: mass search and replace  
						
						
						
						
					 
					
						2015-02-24 10:02:28 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							de9c8a9028 
							
						 
					 
					
						
						
							
							discount calculation and in print view  
						
						
						
						
					 
					
						2015-02-24 10:02:27 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							f9fc04ce8e 
							
						 
					 
					
						
						
							
							Website Listing  
						
						
						
						
					 
					
						2015-02-23 22:34:27 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							3237c75d98 
							
						 
					 
					
						
						
							
							Commonified taxes and totals calculation in server side  
						
						
						
						
					 
					
						2015-02-17 11:11:11 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							188f69a713 
							
						 
					 
					
						
						
							
							commonified totals calculation in js  
						
						
						
						
					 
					
						2015-02-12 17:55:50 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							5690be103c 
							
						 
					 
					
						
						
							
							Replaced renamed total fields in code files  
						
						
						
						
					 
					
						2015-02-12 16:09:11 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							15cd12214e 
							
						 
					 
					
						
						
							
							Fixed conflict while merging v4 into v5  
						
						
						
						
					 
					
						2015-02-10 16:37:18 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								ankitjavalkarwork 
							
						 
					 
					
						
						
						
						
							
						
						
							5edae0e47b 
							
						 
					 
					
						
						
							
							[ #2314 ] Add selectable BOM field for Subcontracted Item  
						
						
						
						
					 
					
						2014-12-04 15:54:54 +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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							fce2881de6 
							
						 
					 
					
						
						
							
							minor fix  
						
						
						
						
					 
					
						2014-10-08 18:38:27 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							e96e83d557 
							
						 
					 
					
						
						
							
							stock reco and repost vouchers  
						
						
						
						
					 
					
						2014-10-08 18:06:14 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							c62b6a815b 
							
						 
					 
					
						
						
							
							[tests] fixes to stock entry  
						
						
						
						
					 
					
						2014-10-07 17:15:30 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							724f9e57e3 
							
						 
					 
					
						
						
							
							[item-variants] get table values from template if not set in variant  #2224  
						
						
						
						
					 
					
						2014-10-07 15:29:58 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							c68646c694 
							
						 
					 
					
						
						
							
							[merge] 4.x to 5.0  
						
						
						
						
					 
					
						2014-10-06 12:57:48 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							1394509343 
							
						 
					 
					
						
						
							
							Fixes for recurring document  
						
						
						
						
					 
					
						2014-09-21 19:45:49 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							c0bb453b88 
							
						 
					 
					
						
						
							
							[refactor] [frappe 5.0]  
						
						
						
						
					 
					
						2014-09-16 15:10:54 +05:30 
						 
				 
			
				
					
						
							
							
								Sambhaji Kolate 
							
						 
					 
					
						
						
						
						
							
						
						
							e3d2643f2b 
							
						 
					 
					
						
						
							
							Changes for Recurring PO/PI  
						
						
						
						
					 
					
						2014-09-10 13:07:59 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							14b8af2e65 
							
						 
					 
					
						
						
							
							Rounding issue fixed for bom quantity  
						
						
						
						
					 
					
						2014-08-29 11:50:58 +05:30 
						 
				 
			
				
					
						
							
							
								nabinhait 
							
						 
					 
					
						
						
						
						
							
						
						
							cc0692d714 
							
						 
					 
					
						
						
							
							landed cost fix  
						
						
						
						
					 
					
						2014-08-11 16:12:31 +05:30 
						 
				 
			
				
					
						
							
							
								nabinhait 
							
						 
					 
					
						
						
						
						
							
						
						
							87f2401c1e 
							
						 
					 
					
						
						
							
							Landed Cost on_submit and gl entries for PR  
						
						
						
						
					 
					
						2014-08-11 16:12:31 +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 
						 
				 
			
				
					
						
							
							
								nabinhait 
							
						 
					 
					
						
						
						
						
							
						
						
							614fb750b7 
							
						 
					 
					
						
						
							
							set qty as per stock uom in entire purchase cycle  
						
						
						
						
					 
					
						2014-07-14 10:48:12 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							98d9d797fd 
							
						 
					 
					
						
						
							
							Tax category validation ignored in material request  
						
						
						
						
					 
					
						2014-06-16 15:54:05 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							c3d1d6a946 
							
						 
					 
					
						
						
							
							cleanup raw materials supplied table for sub-contraction.  Fixes   #1743  
						
						
						
						
					 
					
						2014-06-04 19:00:56 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							75e50ee082 
							
						 
					 
					
						
						
							
							Fixes for subcontracting  
						
						
						
						
					 
					
						2014-05-11 12:11:15 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							966edff222 
							
						 
					 
					
						
						
							
							minor fix  
						
						
						
						
					 
					
						2014-05-09 10:54:12 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							344f4436f1 
							
						 
					 
					
						
						
							
							Create / update raw materials supplied table for sub-contracting  
						
						
						
						
					 
					
						2014-05-08 19:08:20 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							b054eb7a4f 
							
						 
					 
					
						
						
							
							Call calculate_taxes_and_totals after mapping  
						
						
						
						
					 
					
						2014-04-22 20:35:22 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							a0c239db8d 
							
						 
					 
					
						
						
							
							perpetual inventory fix related to sub-contracting  
						
						... 
						
						
						
						Cherry-picked and modified by @anandpdoshi
Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	controllers/buying_controller.py
	controllers/stock_controller.py 
						
						
					 
					
						2014-04-16 15:23:10 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							9f0d625300 
							
						 
					 
					
						
						
							
							update translation strings  #1403  
						
						
						
						
					 
					
						2014-04-14 19:20:45 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							312ba99e71 
							
						 
					 
					
						
						
							
							frappe/frappe#478  fixes  
						
						
						
						
					 
					
						2014-04-04 11:06:10 +05:30