| 
							
							
								 Nabin Hait | 5690be103c | Replaced renamed total fields in code files | 2015-02-12 16:09:11 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 7945712171 | Merge branch 'v5.0' of https://github.com/frappe/erpnext into foreign_currency_calc | 2015-02-11 12:55:10 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 15cd12214e | Fixed conflict while merging v4 into v5 | 2015-02-10 16:37:18 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | dea3fb0d64 | [fix] call calculate code only once after applying pricing rule | 2015-02-05 15:06:16 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | dd942bb3d2 | [minor] fixed update item name in bom patch, removed filter from sales invoice list, show tax calculation only if tax exists | 2015-02-04 18:53:24 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | c567e8e960 | [fix] analytics reports + remove print item tables #2667 | 2015-02-03 17:56:25 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 052bd624c1 | [minor] removed company description and don't call apply_price_list if no items | 2015-01-30 16:57:24 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | aff9a59f2d | [minor] removed pscript from Feature Setup, made Activity Type as mandator in Time Log | 2015-01-29 19:49:34 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | d41f3c1f5e | All the calculations in taxes_and_totals file | 2015-01-23 16:24:49 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | b4a3dfa893 | All the calculations in taxes_and_totals file | 2015-01-22 17:13:13 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | 88a1515b46 | [minor] ERPNext as navbar-home | 2015-01-21 18:25:04 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 963393409e | minor fix: child table length | 2015-01-21 17:22:11 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | f02e142d5d | [design] mobile | 2015-01-19 15:59:45 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 239c2c327c | Hide currency and price list section after submission | 2015-01-15 14:22:04 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | fff3ab752c | Fixed conflict | 2015-01-14 16:27:13 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 2244ac4d52 | Discount amount in party currency | 2015-01-12 17:35:37 +05:30 |  | 
			
				
					| 
							
							
								 Neil Trini Lasrado | 0866272ba1 | get fiscal year fix | 2015-01-12 16:41:55 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 135fe3405f | [ui] listviews | 2015-01-12 16:11:02 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | 50d7e8cf8f | [design] Point of Sale | 2015-01-06 17:14:26 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | 9b955feff8 | [design] POS - item grid and taxes | 2015-01-05 16:19:12 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | 3f5e95a99e | [design] Fixed Grid Reports | 2015-01-01 16:26:18 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 4c36d7388c | [ux] fixed creation via tree views for Item Group etc | 2015-01-01 15:59:34 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | bfaf0a8f43 | [tree] [ui] | 2015-01-01 12:49:18 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 7a8f009116 | [fixes] | 2014-12-31 15:34:37 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 419ae33c3e | [merge] v5-design | 2014-12-31 15:03:14 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 54361e8651 | fixed conflict while merging develop into v5 | 2014-12-31 13:24:36 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | afbfdcf552 | [ui] minor fixes | 2014-12-30 18:11:32 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 54c31b498b | Fixes in Stock Analytics | 2014-12-30 16:33:07 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 7d8fa8089a | always calculate taxes and totals onchange of exchange rate | 2014-12-30 15:35:59 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | dd38a266b8 | Removed tname and fname from code | 2014-12-26 13:15:21 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | a5b149c061 | [design] module pages, messages, timelines | 2014-12-26 12:53:02 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 4096a3ab2b | [design] form toolbar | 2014-12-26 12:53:02 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | a9ba5eff99 | [design] pos | 2014-12-26 12:52:11 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | f870527e7c | [design] wip | 2014-12-26 12:52:11 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 79f091e2fe | field renaming | 2014-12-26 11:41:15 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | e7d153624f | Table Field Renaming: code replace, JV and budget distribution renamed | 2014-12-25 16:01:55 +05:30 |  | 
			
				
					| 
							
							
								 Neil Trini Lasrado | 31a92bd9d9 | company wise letter head feature added | 2014-12-23 17:52:41 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | cfe3c54ca0 | Dont reset pricing if ignore pricing rule | 2014-12-22 10:43:10 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 49a2729663 | Reapply price list if pricing rule reset as blank | 2014-12-17 11:24:00 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | b072c74efc | render address and contacts for party | 2014-12-16 12:49:13 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 6d950d23a8 | [merge] | 2014-11-28 12:08:51 +05:30 |  | 
			
				
					| 
							
							
								 ankitjavalkarwork | 9269c86339 | Display mobile no of contact | 2014-11-27 17:13:36 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 0a7abc188e | [minor] [ux] contact template | 2014-11-24 15:06:40 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 5eeef7f065 | [refactor] address and contact list in customer, supplier, lead, sales person | 2014-11-24 14:16:51 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 7d36875d6f | [refactor] address and contact list in customer, supplier, lead, sales person | 2014-11-24 14:16:47 +05:30 |  | 
			
				
					| 
							
							
								 Neil Trini Lasrado | 2c388f9d7e | POS feature #2305 | 2014-11-11 16:00:09 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | ae1dcabcb5 | Fixed merge conflict | 2014-11-05 12:41:02 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 28913b97b0 | [fix] Null issue fixed in stock analytics report | 2014-10-31 14:46:25 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 3daa49ac1f | [shopping-cart] i'm back | 2014-10-21 16:16:30 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | be1a8d82c5 | [merge] develop | 2014-10-21 13:14:55 +05:30 |  |