Commit Graph

17324 Commits

Author SHA1 Message Date
robert schouten
d8bdaeffe3 [fix] include cancel time logs in convert and v6 to v7.1 fix (#6840) 2016-11-07 17:16:39 +05:30
Faris Ansari
5049296f8d [ui] fix student image not visible (#6825) 2016-11-07 17:10:10 +05:30
Nagarajan
7b7b5bd340 Update getting-started-with-erpnext.md (#6832) 2016-11-07 17:09:41 +05:30
KanchanChauhan
dd01bcc485 Get employee details in Salary Slip (#6837) 2016-11-07 17:09:07 +05:30
robert schouten
27d45a244e [fix]fix name definition in old patch (#6841) 2016-11-07 17:08:37 +05:30
Nabin Hait
43eeddfaf6 Clear rows from Journal Entry if no debit/credit 2016-11-07 15:25:40 +05:30
Nabin Hait
7f5089d19d Merge pull request #6831 from manassolanki/develop
[Fix] Notification Count Issue #5987
2016-11-07 15:25:27 +05:30
Manas Solanki
546ca31a4e Notification Count Issue #5987
Add notification count for Payment Entry in Accounts module page
2016-11-05 11:47:24 +05:30
pratu16x7
a43639edb4 [fix] role fix for schools setup (#6824) 2016-11-05 10:09:53 +05:30
Rohit Waghchaure
0ecad33642 cleanup and fixes 2016-11-05 08:09:21 +05:30
Nabin Hait
f5d8dd3b18 Fixed merge conflict 2016-11-04 16:54:53 +05:30
Nabin Hait
dc3d9ac26c Merge branch 'hotfix' 2016-11-04 16:53:17 +05:30
Nabin Hait
a28c2d37f7 bumped to version 7.1.7 2016-11-04 17:23:17 +06:00
Nabin Hait
81f7a265bc Merge pull request #6723 from rohitwaghchaure/enhancement_remember_last_selected_value
Remember last selected value for link field
2016-11-04 16:13:49 +05:30
Nabin Hait
44e260b04b Merge pull request #6818 from nagarajannxweb/patch-2
Update salary-and-payroll.md
2016-11-04 16:07:12 +05:30
Nabin Hait
bd2d4762d9 Merge pull request #6817 from nabinhait/hotfix
[fix] float division by zero
2016-11-04 16:06:27 +05:30
Nabin Hait
4c46c3e94a Merge pull request #6774 from KanchanChauhan/salarystruct-process-payroll
[Fix] Error in pulling in Salary Structure fixed
2016-11-04 15:58:44 +05:30
Kanchan Chauhan
63dda84862 [Fix] Error in pulling in Salary Structure fixed 2016-11-04 12:58:05 +05:30
nagarajannxweb
a420c20bf9 Update salary-and-payroll.md 2016-11-04 12:30:14 +05:30
nagarajannxweb
4d100ac08b Update salary-and-payroll.md 2016-11-04 12:17:21 +05:30
Nabin Hait
e593f170a3 [fix] Patch order changed 2016-11-04 11:43:58 +05:30
Nabin Hait
43d2fec78e [fix] float division by zero 2016-11-04 10:58:30 +05:30
Rohit Waghchaure
0d2f7e62c0 set remember last selected value as true for company field 2016-11-03 16:19:34 +05:30
Nabin Hait
eab38cd4eb Merge branch 'master' into develop 2016-11-03 15:17:39 +05:30
Nabin Hait
4dc263ee12 Merge branch 'hotfix' 2016-11-03 15:17:38 +05:30
Nabin Hait
bb2ede8fab bumped to version 7.1.6 2016-11-03 15:47:38 +06:00
Nabin Hait
a3f393918d Merge pull request #6807 from nabinhait/hotfix
[fix] Get data in opportunity dashboard
2016-11-03 15:13:03 +05:30
Nabin Hait
9f5f534900 set item rate on first selection of item 2016-11-03 14:54:06 +05:30
Rohit Waghchaure
3844d2cc01 Remember last selected value for link field 2016-11-03 14:49:27 +05:30
Nabin Hait
1ac67b873c [fix] Get data in opportunity dashboard 2016-11-03 11:00:09 +05:30
Nabin Hait
ceca7fbc87 Merge pull request #6780 from rohitwaghchaure/float_issue
Change fieldtype from float to currency
2016-11-03 10:49:05 +05:30
Nabin Hait
57f51f648e Merge pull request #6795 from manassolanki/report
Report: Bin - Item Shortage Report -- Should have Item Name and descr…
2016-11-03 10:48:37 +05:30
Nabin Hait
4c5bd43ec0 Merge pull request #6794 from neilLasrado/hotfix
Documentation Cleanup
2016-11-03 10:41:23 +05:30
Nabin Hait
cf935a4b42 Merge pull request #6799 from rmehta/minor-01-nov
Minor fixes
2016-11-03 10:40:49 +05:30
robert schouten
e32e2126f4 gantt fix 2016-11-03 08:10:30 +08:00
robert schouten
e8c1777c5f gantt fix 2016-11-03 08:10:03 +08:00
Rushabh Mehta
f87b7b0c4e [fix] typo 2016-11-02 10:53:53 +05:30
Rushabh Mehta
e855f53f08 [minor] fix ellipsis style 2016-11-02 07:34:17 +05:30
Rushabh Mehta
1aac956306 [minor] [fixes] can rename program and disable role on domainify 2016-11-02 07:33:18 +05:30
Rushabh Mehta
bdc8a88b4d [minor] fix date comparisons 2016-11-02 07:32:09 +05:30
Neil Trini Lasrado
f905ee9f0f Updated documentation for warehouse 2016-11-01 18:58:29 +05:30
Neil Trini Lasrado
8b99a06477 Projected qty image cleanup in documentation 2016-11-01 18:48:52 +05:30
Nabin Hait
e0038b428b Merge pull request #6791 from rohitwaghchaure/documentation_issue
[Fix] jinja syntax in documentation
2016-11-01 18:10:18 +05:30
Manas Solanki
5bc4784bad Report: Bin - Item Shortage Report -- Should have Item Name and description #4946
New report is build including two new column Item name and item description
2016-11-01 18:07:12 +05:30
Rohit Waghchaure
c84072b16f [Fix] jinja syntax issue 2016-11-01 17:58:10 +05:30
Nabin Hait
51eed9a128 Merge branch 'hotfix' 2016-11-01 17:44:43 +05:30
Nabin Hait
df01b5770b Merge branch 'master' into develop 2016-11-01 17:44:43 +05:30
Nabin Hait
74874d5785 bumped to version 7.1.5 2016-11-01 18:14:43 +06:00
Nabin Hait
06fe0c7c9d Merge pull request #6790 from neilLasrado/hotfix
Hotfixes for demo
2016-11-01 17:40:03 +05:30
Nabin Hait
8015d60e97 Merge pull request #6772 from frappe/bcornwellmott-patch-3
[fix] Change communication to Linked
2016-11-01 17:31:38 +05:30