| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Anand Doshi | 8e332ffd16 | Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions Conflicts:
	erpnext/accounts/page/accounts_browser/accounts_browser.css
	erpnext/controllers/buying_controller.py
	erpnext/manufacturing/doctype/production_order/production_order.py
	erpnext/patches/patch_list.py
	erpnext/selling/doctype/customer/customer.txt
	erpnext/selling/doctype/sales_order/sales_order.py
	erpnext/selling/doctype/sales_order/test_sales_order.py
	erpnext/setup/doctype/features_setup/features_setup.txt
	erpnext/stock/doctype/stock_entry/test_stock_entry.py
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	startup/query_handlers.py | 2013-12-26 19:12:51 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 54047780fc | Merge with 3.3.8 | 2013-12-26 11:07:46 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 2b08985e16 | Translations redesigned webnotes/wnframework#351 | 2013-12-19 18:27:48 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 1f84799f2d | install, web serving, session booting webnotes/wnframework#351 | 2013-12-12 19:12:19 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | afea58b7a1 | moved modules inside erpnext folder | 2013-12-11 10:43:52 +05:30 |  |