Mangesh-Khairnar
|
b16d395a8f
|
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
|
2019-06-07 11:33:06 +05:30 |
|
Mangesh-Khairnar
|
e4d03bf0d0
|
fix: consider expiry in leaves
|
2019-06-07 11:30:27 +05:30 |
|
rohitwaghchaure
|
74f502cfa6
|
Merge pull request #17830 from rohitwaghchaure/multiple_manufacturer_part_no_for_items
feat: provision to set multiple manufacturer against the item
|
2019-06-07 10:24:53 +05:30 |
|
Mangesh-Khairnar
|
368a974368
|
style: change formatting
|
2019-06-06 20:43:32 +05:30 |
|
Mangesh-Khairnar
|
86e0f4c617
|
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
|
2019-06-06 20:41:28 +05:30 |
|
Himanshu
|
2d7cbcd79f
|
Merge pull request #17780 from hrwX/qmsystem
refactor(Quality): QMS refactor
|
2019-06-06 20:41:25 +05:30 |
|
Mangesh-Khairnar
|
c7b9ae9c5e
|
fix: get leave balance based on the ledger entries
|
2019-06-06 20:38:59 +05:30 |
|
Mangesh-Khairnar
|
b840ba4407
|
feat: show dashboard on submit
|
2019-06-06 20:38:23 +05:30 |
|
Mangesh-Khairnar
|
00c607116b
|
fix: handle negative leaves without allocation
|
2019-06-06 20:37:34 +05:30 |
|
Mangesh-Khairnar
|
f13243a92e
|
feat: fetch annual allocation based on leave policy
|
2019-06-06 20:35:10 +05:30 |
|
Mangesh-Khairnar
|
3863fc5fb2
|
feat: create ledger entry for each earned leave
|
2019-06-06 20:34:10 +05:30 |
|
Mangesh-Khairnar
|
050f65beb4
|
feat: fetch leave allocation from ledger entry
|
2019-06-06 20:32:01 +05:30 |
|
Rohit Waghchaure
|
3cf24366a9
|
feat: provision to set multiple manufacturer in the item master
|
2019-06-06 19:53:32 +05:30 |
|
Himanshu
|
c4366c9357
|
Merge branch 'develop' into qmsystem
|
2019-06-06 19:04:48 +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 |
|
Shivam Mishra
|
6132c8527b
|
refactor: all programs are shown on home by deafult
|
2019-06-06 14:19:36 +05:30 |
|
Shivam Mishra
|
098b8324f2
|
refactor: remove erpnext.com link
|
2019-06-06 14:14:17 +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 |
|
Shivam Mishra
|
624b4fd5b8
|
refactor: better sql
|
2019-06-06 11:30:56 +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 |
|
Mangesh-Khairnar
|
351f4d53a0
|
feat: add employee filter to employee leave balance
|
2019-06-05 21:22:07 +05:30 |
|
Mangesh-Khairnar
|
62011c9dc4
|
feat: add link to policy
|
2019-06-05 21:16:27 +05:30 |
|
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 |
|
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 |
|