Commit Graph

27798 Commits

Author SHA1 Message Date
Anurag Mishra
fd19678bc7 fix: show cost center in print fromat of report trial balance 2019-06-06 18:37:10 +05:30
Anurag Mishra
4ca393d14c
fix: renamed report BOM item scraps into BOM Explorer (#17869) 2019-06-06 18:05:08 +05:30
Anurag Mishra
4992fc98dd
Merge branch 'develop' into qmsystem 2019-06-06 17:25:39 +05:30
Shivam Mishra
67e345dfda
Merge pull request #17870 from scmmishra/lms-refactor
fix: sql query case fix
2019-06-06 17:21:35 +05:30
Shivam Mishra
d49b5e4736 fix: sql query case fix 2019-06-06 17:19:53 +05:30
Himanshu
b57b4a7199
Merge branch 'develop' into qmsystem 2019-06-06 16:42:53 +05:30
Shivam Mishra
76fe1b1e9f
Merge pull request #17674 from scmmishra/lms-refactor
refactor: lms
2019-06-06 16:32:17 +05:30
Shivam Mishra
2a0483dee3 refactor: styling cards and article 2019-06-06 16:02:38 +05:30
Himanshu
d0d5380cb1
Merge branch 'develop' into qmsystem 2019-06-06 15:37:04 +05:30
Suraj Shetty
97780613ad fix: Improve call popup UI 2019-06-06 14:48:37 +05:30
Suraj Shetty
c0a640c462 feat: Add user_id of employee to employee group 2019-06-06 14:47:40 +05:30
Shivam Mishra
6132c8527b refactor: all programs are shown on home by deafult 2019-06-06 14:19:36 +05:30
Himanshu Warekar
db1d1197ea feat: add fixtures 2019-06-06 14:17:07 +05:30
Shivam Mishra
098b8324f2 refactor: remove erpnext.com link 2019-06-06 14:14:17 +05:30
Himanshu Warekar
ab97cd4db1 feat: dashboards 2019-06-06 14:13:10 +05:30
Shivam Mishra
b31276572b refactor: styling changes 2019-06-06 14:03:01 +05:30
Shivam Mishra
09cd46fa0b fix: minor bugs 2019-06-06 14:02:49 +05:30
Deepesh Garg
d07163ecf8
Merge pull request #17867 from shipmnts/develop_add_gstin_filters
fix: GSTIN filters in hsn wise summary and itemised reports
2019-06-06 13:28:39 +05:30
Himanshu Warekar
b114d9f621 test: fix test case 2019-06-06 12:14:19 +05:30
Prasann Shah
829172c267 [Add] GSTIN filters in hsn wise summary and itemised reports 2019-06-06 12:08:09 +05:30
Himanshu Warekar
b318b83bb7 patch: fixes 2019-06-06 12:03:37 +05:30
Himanshu Warekar
7acdcac124 patch: fixes 2019-06-06 11:56:38 +05:30
Himanshu Warekar
cbbe2814a6 patch: add priority in service level and agreement 2019-06-06 11:49:15 +05:30
Shivam Mishra
624b4fd5b8 refactor: better sql 2019-06-06 11:30:56 +05:30
Suraj Shetty
87645e98ad fix: Get available employees from communication medium 2019-06-06 11:24:31 +05:30
Suraj Shetty
44c0e9d549 fix: Create call log instead of communication 2019-06-06 11:18:16 +05:30
Himanshu Warekar
b9c24a01da patch: reload_doc before inserting values 2019-06-06 11:15:33 +05:30
Himanshu Warekar
e175dd8249 patch: set priorities for issue 2019-06-06 10:58:42 +05:30
Suraj Shetty
27234ff907 fix: Update call log doctype 2019-06-06 10:57:13 +05:30
Himanshu Warekar
e119a713fd Merge develop into sla_fix 2019-06-06 10:46:36 +05:30
Saurabh
6179130a54
Merge pull request #17861 from frappe/clarkejj-patch-1
fix: Update demo.html
2019-06-06 10:37:48 +05:30
Saurabh
f4b840d1ec
Merge pull request #17862 from adityahase/fix-error-report-email
fix(error-report): Do not send error reports to support@erpnext.com
2019-06-06 10:36:41 +05:30
Aditya Hase
29e77ccc00 fix(error-report): Do not send error reports to support@erpnext.com 2019-06-05 23:29:45 +05:30
John Clarke
8cb92e066d
Update demo.html
fix typo nit in page
2019-06-05 10:49:47 -06:00
Nabin Hait
68eaaa068b
fix: Removed unwanted total row from financial statement and general ledger print (#17860) 2019-06-05 20:29:24 +05:30
Mangesh-Khairnar
2bd211cc05 fix(attendance): fetch employee name (#17857) 2019-06-05 20:24:15 +05:30
Deepesh Garg
448af7bd46 fix: NoneType fixes in Lab test (#17858) 2019-06-05 20:23:23 +05:30
Shivam Mishra
f121b51951 fix: import _ in porgram.py 2019-06-05 19:43:51 +05:30
Shivam Mishra
d69892abfa feat: added topic page 2019-06-05 19:42:30 +05:30
Shivam Mishra
2c0e9929fe chore: remove old lms files 2019-06-05 18:30:40 +05:30
Shivam Mishra
c5964b1cf0 fix: minor ui fixes 2019-06-05 18:16:09 +05:30
Shivam Mishra
9cad9439a1 fix: travis fixes for education setup 2019-06-05 17:52:21 +05:30
Shivam Mishra
7597baab95 refactor: minor fixes 2019-06-05 17:49:42 +05:30
Shivam Mishra
bd499fcf27 chore: added session check for profile page 2019-06-05 17:38:12 +05:30
Shivam Mishra
16b4129ede feat: added student profile page 2019-06-05 17:29:48 +05:30
Rohan
bd9abc15b5 fix(projects): Remove hardcode of expected end date for new Tasks (#17717) 2019-06-05 14:17:29 +05:30
Himanshu Warekar
b903da6bfd fix: remove priorities list 2019-06-05 13:42:03 +05:30
Shivam Mishra
6593263df8 feat: added navigation 2019-06-05 13:34:44 +05:30
Nabin Hait
3f97fac8e1
feat: Salary rounding based on settings on salary component (#17852) 2019-06-05 13:20:08 +05:30
Shivam Mishra
570161b978 feat: added course progress apis 2019-06-05 13:08:53 +05:30