| 
							
							
								 Nabin Hait | 395d757c5a | Fixed merge conflict | 2016-10-17 16:42:49 +05:30 |  | 
			
				
					| 
							
							
								 Faris Ansari | e1416c3dda | Update sales-invoice.md frappe/erpnext#6507 (#6629) * Update sales-invoice.md
* add pos-invoice screenshot | 2016-10-17 16:22:43 +05:30 |  | 
			
				
					| 
							
							
								 vrms | e4e8bfae9f | Update managing-fixed-assets.md Sale an asset > Sell and Asset | 2016-10-10 15:33:27 +08:00 |  | 
			
				
					| 
							
							
								 Nabin Hait | cd9c45f816 | Fixed merge conflict | 2016-10-07 16:53:07 +05:30 |  | 
			
				
					| 
							
							
								 Rohit Waghchaure | 7d5298997b | Documentation for payments | 2016-10-06 16:49:39 +05:30 |  | 
			
				
					| 
							
							
								 vrms | bbe7a1062e | Update product-bundle.md tried to work out the mechanics of Parent and Child items a little clearer | 2016-10-06 07:40:21 +08:00 |  | 
			
				
					| 
							
							
								 Umair Sayed | 06b88a464d | Update supplier.md | 2016-10-04 12:10:08 +05:30 |  | 
			
				
					| 
							
							
								 Umair Sayed | 6c1c03efe7 | Update data-import-tool.md | 2016-09-29 16:34:39 +05:30 |  | 
			
				
					| 
							
							
								 Kanchan Chauhan | b40c0a917d | [WIP] Process Payroll Changes | 2016-09-28 15:14:41 +05:30 |  | 
			
				
					| 
							
							
								 strixaluco | 71073e1730 | Update stock-entry.md Stock Reconciliation hyperlink added | 2016-09-19 15:38:38 +08:00 |  | 
			
				
					| 
							
							
								 Nabin Hait | 5bab04fead | Merge pull request #6381 from rmehta/lead-source [enhance] added Lead Source master, fixes #6231 | 2016-09-16 16:58:40 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 39b5d39df6 | [fix] remove campaign depends on | 2016-09-16 15:55:34 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 86e660f6c3 | Article on maximum number of fields | 2016-09-16 14:51:45 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | b267673b8e | Merge pull request #6373 from vrms/patch-2 Patch 2 | 2016-09-15 16:11:56 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 756467c872 | Merge pull request #6372 from vrms/patch-1 Patch 1 | 2016-09-15 16:11:45 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 33d18dbc9a | [docs] for auto email | 2016-09-15 13:57:43 +05:30 |  | 
			
				
					| 
							
							
								 vrms | 05e33789aa | Update index.md | 2016-09-15 14:11:06 +08:00 |  | 
			
				
					| 
							
							
								 vrms | 6d34033c3f | Update item-variants.md tried to bring out the implications and meaning of Variants (compared to a regular item) a little more detailed | 2016-09-15 14:05:13 +08:00 |  | 
			
				
					| 
							
							
								 Rohit Waghchaure | 4eb908fc76 | Doc updated for timesheet | 2016-09-12 13:27:28 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | c0c2f75159 | fixed conflict | 2016-08-31 12:36:03 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 88e3487f03 | Merge pull request #6206 from neilLasrado/docs Updated Docs for Schools Module | 2016-08-31 12:12:17 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | c97f7cac80 | Merge pull request #6162 from strixaluco/patch-1 [minor] docs typo fix | 2016-08-26 11:59:11 +05:30 |  | 
			
				
					| 
							
							
								 joopdorresteijn | 8da1e9eeb8 | Update user-restriction.md Sales user also doesn't exist | 2016-08-25 15:46:24 +08:00 |  | 
			
				
					| 
							
							
								 strixaluco | 5380a1c56a | Update price-lists.md Repetitive sentence removed. | 2016-08-25 10:40:42 +08:00 |  | 
			
				
					| 
							
							
								 strixaluco | 7d60dd7e21 | Update price-lists.md | 2016-08-24 09:42:07 +08:00 |  | 
			
				
					| 
							
							
								 strixaluco | a623a59f9e | [minor] docs typo fix availale → available | 2016-08-24 09:36:17 +08:00 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 3d93ddc606 | [fix] docs links | 2016-08-22 18:48:04 +05:30 |  | 
			
				
					| 
							
							
								 Faris Ansari | 3a6155b1b9 | add help_links.js | 2016-08-22 14:37:22 +05:30 |  | 
			
				
					| 
							
							
								 Kanchan Chauhan | 3769996dfd | Images for redesigned salary docs | 2016-08-18 23:06:16 +05:30 |  | 
			
				
					| 
							
							
								 Kanchan Chauhan | bccf0fa041 | [WIP] Formula based Salary Structure and multiple employees for same Salary Structure | 2016-08-18 13:02:39 +05:30 |  | 
			
				
					| 
							
							
								 Umair Sayyed | 1bd9f22add | updated docsgd | 2016-08-16 18:08:24 +05:30 |  | 
			
				
					| 
							
							
								 Umair Sayyed | f369b5951e | updated docs | 2016-08-16 18:08:00 +05:30 |  | 
			
				
					| 
							
							
								 Umair Sayyed | 81995389ac | updated docs | 2016-08-16 18:08:00 +05:30 |  | 
			
				
					| 
							
							
								 Neil Trini Lasrado | 999f34a568 | Updated Docs for Schools Module | 2016-08-16 17:50:08 +05:30 |  | 
			
				
					| 
							
							
								 Neil Trini Lasrado | acf85dffc5 | Merged docs for schools to erpnext docs | 2016-08-08 18:59:15 +05:30 |  | 
			
				
					| 
							
							
								 Umair Sayyed | 3962cded76 | updated docs | 2016-08-04 19:01:02 +05:30 |  | 
			
				
					| 
							
							
								 Umair Sayyed | 66360f694e | updated docs | 2016-08-04 19:01:02 +05:30 |  | 
			
				
					| 
							
							
								 Umair Sayyed | 5dba950afa | docs update | 2016-08-04 19:01:02 +05:30 |  | 
			
				
					| 
							
							
								 Umair Sayyed | 6a3f51bee2 | updated docs | 2016-08-04 19:01:02 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | efe1ab742f | [minor] fixes for demo | 2016-08-04 17:29:46 +05:30 |  | 
			
				
					| 
							
							
								 Umair Sayyed | e96b3ce725 | added documentation for the new features | 2016-08-01 17:42:30 +05:30 |  | 
			
				
					| 
							
							
								 Revant Nandgaonkar | cc8fb1a8d6 | changed path to login frappe.templates.pages.login.login_via_google changed to frappe.www.login.login_via_google | 2016-07-28 19:50:15 +05:30 |  | 
			
				
					| 
							
							
								 Umair Sayyed | 6fcfc87d60 | Documentation of Timesheet, Budgeting and Payment Entry | 2016-07-22 15:22:56 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 528e145a54 | [docs] fixes #5697 | 2016-07-14 17:00:05 +05:30 |  | 
			
				
					| 
							
							
								 Dony Sukardi | 84c9e6bb4a | [fix] Documentation Fixes Fixes for the following issues:
- Render code block
- Fix ordered-list numbering | 2016-07-12 04:01:06 +08:00 |  | 
			
				
					| 
							
							
								 Rohit Sharma | c4fcd1996a | Update index.md I have added few points and enhanced some of the existing text. Please accept the changes. | 2016-06-30 16:44:59 +05:30 |  | 
			
				
					| 
							
							
								 Rohit Waghchaure | d6c986da8f | [Enhancement] Time log wages and multiple active salary structure | 2016-06-27 16:46:39 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 2efecac823 | Merge pull request #5522 from cgpurbaugh/patch-2 Some minor grammatical and spelling changes | 2016-06-25 13:54:19 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | a334062b03 | [redesign] website routing system | 2016-06-24 16:18:07 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 4d54fb258c | Merge pull request #5514 from cgpurbaugh/patch-1 Update tasks.md | 2016-06-22 12:09:21 +05:30 |  |