Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							5e13e0c316 
							
						 
					 
					
						
						
							
							net_total and grand_total mismatch issue  
						
						
						
						
					 
					
						2015-02-05 17:18:03 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							8a00319962 
							
						 
					 
					
						
						
							
							minor fix  
						
						
						
						
					 
					
						2015-01-04 17:27:40 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							ccd9fd3e94 
							
						 
					 
					
						
						
							
							Rounding in totals calculation  
						
						
						
						
					 
					
						2014-11-14 14:27:24 +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 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							1394509343 
							
						 
					 
					
						
						
							
							Fixes for recurring document  
						
						
						
						
					 
					
						2014-09-21 19:45:49 +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 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							365ae27acf 
							
						 
					 
					
						
						
							
							frappe/frappe#478  fixes  
						
						
						
						
					 
					
						2014-04-03 17:38:54 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							f191f854cd 
							
						 
					 
					
						
						
							
							frappe/frappe#478  erpnext install works  
						
						
						
						
					 
					
						2014-04-02 18:09:34 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							5b552b51f1 
							
						 
					 
					
						
						
							
							frappe/frappe#478  
						
						
						
						
					 
					
						2014-04-02 15:03:35 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							f2227d033c 
							
						 
					 
					
						
						
							
							frappe/frappe#478 , removed instances of .fields  
						
						
						
						
					 
					
						2014-03-31 23:37:40 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							81ba0b29da 
							
						 
					 
					
						
						
							
							frappe/frappe#478  
						
						
						
						
					 
					
						2014-03-28 15:23:26 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							f78d1aee28 
							
						 
					 
					
						
						
							
							Replaced doc, doc.fields  frappe/frappe#478  
						
						
						
						
					 
					
						2014-03-28 13:55:00 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							e88bc8b12a 
							
						 
					 
					
						
						
							
							frappe/frappe#478  
						
						
						
						
					 
					
						2014-03-27 17:51:41 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							d2b34dc30c 
							
						 
					 
					
						
						
							
							frappe/frappe#478  
						
						
						
						
					 
					
						2014-03-27 16:12:56 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							e9baaa68e7 
							
						 
					 
					
						
						
							
							Changed frappe.conn to frappe.db  
						
						
						
						
					 
					
						2014-02-26 12:35:33 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							2f8d4451f5 
							
						 
					 
					
						
						
							
							calculate outstanding amount in server side, only if docstatus is 0  
						
						
						
						
					 
					
						2014-02-20 14:59:37 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							793ba6bd37 
							
						 
					 
					
						
						
							
							-webnotes +frappe  💥  
						
						
						
						
					 
					
						2014-02-14 15:47:51 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							0aa71a5c41 
							
						 
					 
					
						
						
							
							minor fixes  
						
						
						
						
					 
					
						2014-02-12 14:54:15 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							1eb560130a 
							
						 
					 
					
						
						
							
							Rename fields: amount related fields  
						
						
						
						
					 
					
						2014-02-12 14:54:14 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							7979f7ed21 
							
						 
					 
					
						
						
							
							Field Rename: rate field mass replacement  
						
						
						
						
					 
					
						2014-02-12 14:54:14 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							a7f757a3f4 
							
						 
					 
					
						
						
							
							Rename fields: initial commit  
						
						
						
						
					 
					
						2014-02-12 14:54:13 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							cc008cc109 
							
						 
					 
					
						
						
							
							commonified get_party_details  
						
						
						
						
					 
					
						2014-02-03 16:14:56 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							347889b233 
							
						 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2014-02-03 14:49:53 +05:30 
						 
				 
			
				
					
						
							
							
								Akhilesh Darjee 
							
						 
					 
					
						
						
						
						
							
						
						
							4f7215662d 
							
						 
					 
					
						
						
							
							webnotes/erpnext#1090  set default tax type in customer and supplier  
						
						
						
						
					 
					
						2014-01-29 16:31:38 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							24da761a17 
							
						 
					 
					
						
						
							
							more updates to party  
						
						
						
						
					 
					
						2014-01-29 15:26:04 +05:30 
						 
				 
			
				
					
						
							
							
								Akhilesh Darjee 
							
						 
					 
					
						
						
						
						
							
						
						
							2ced3b07d4 
							
						 
					 
					
						
						
							
							changed fieldname from charge to taxes  
						
						
						
						
					 
					
						2014-01-28 19:16:05 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							49dd7bee87 
							
						 
					 
					
						
						
							
							added get_supplier_details and commonified invoice functions  
						
						
						
						
					 
					
						2014-01-28 17:43:10 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							5c6d13a0df 
							
						 
					 
					
						
						
							
							Fixed conflict while merging with develop branch  
						
						
						
						
					 
					
						2014-01-20 17:18:16 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							dc15b4fa8a 
							
						 
					 
					
						
						
							
							Fixed conflict while merging with develop brnach  
						
						
						
						
					 
					
						2014-01-20 16:48:49 +05:30 
						 
				 
			
				
					
						
							
							
								Akhilesh Darjee 
							
						 
					 
					
						
						
						
						
							
						
						
							57738a0ff3 
							
						 
					 
					
						
						
							
							flat discount replaced to discount amount  
						
						
						
						
					 
					
						2014-01-03 18:15:07 +05:30 
						 
				 
			
				
					
						
							
							
								Akhilesh Darjee 
							
						 
					 
					
						
						
						
						
							
						
						
							d203aea7c2 
							
						 
					 
					
						
						
							
							[flat discount] flat discount implemented on sales cycle  
						
						
						
						
					 
					
						2013-12-27 17:49:57 +05:30