Rushabh Mehta
|
3f1c7a5e5b
|
Merge pull request #16810 from scmmishra/lms-beta-v2
feat: LMS Feature
|
2019-04-24 12:50:52 +05:30 |
|
scmmishra
|
bf7d13a7be
|
Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2
|
2019-04-24 09:50:19 +05:30 |
|
Nabin Hait
|
43324179d0
|
Merge pull request #17339 from KanchanChauhan/fix-stock-entry-feed
fix: Subject of Stock Entry feed
|
2019-04-24 09:35:18 +05:30 |
|
Nabin Hait
|
f593935026
|
Merge pull request #17330 from nabinhait/income-tax-period-factor-dev
fix: Income tax period factor considering joining and relieving date
|
2019-04-24 09:19:30 +05:30 |
|
Nabin Hait
|
08da372ae5
|
Merge branch 'develop' into income-tax-period-factor-dev
|
2019-04-24 09:19:21 +05:30 |
|
Nabin Hait
|
8d3644d826
|
Merge pull request #17351 from nabinhait/rounded-salary-tax
fix: Rounded tax amount in salary slip
|
2019-04-24 09:19:00 +05:30 |
|
Deepesh Garg
|
719dc506b9
|
Merge pull request #17352 from nabinhait/pos-advance
fix: don't allocate advances if POS
|
2019-04-24 08:18:05 +05:30 |
|
Deepesh Garg
|
7dddc0c5bf
|
Merge branch 'develop' into fix-stock-entry-feed
|
2019-04-24 08:14:10 +05:30 |
|
Deepesh Garg
|
fa420c0309
|
Merge pull request #17245 from surajshetty3416/employee-skill-map
feat: Employee skill map
|
2019-04-24 08:10:07 +05:30 |
|
Deepesh Garg
|
12af1c3837
|
Merge branch 'develop' into employee-skill-map
|
2019-04-24 00:03:04 +05:30 |
|
Rohan
|
d12e9426bd
|
fix(selling): Fix method to also consider return documents (#17340)
|
2019-04-23 23:08:26 +05:30 |
|
Nabin Hait
|
aa028d7856
|
fix: don't allocate advances if POS
|
2019-04-23 21:44:21 +05:30 |
|
Nabin Hait
|
c144f66dac
|
Merge branch 'develop' into income-tax-period-factor-dev
|
2019-04-23 21:39:33 +05:30 |
|
Nabin Hait
|
09438562d4
|
Merge branch 'develop' into fix-stock-entry-feed
|
2019-04-23 21:39:04 +05:30 |
|
Nabin Hait
|
acac41d62b
|
Merge branch 'develop' into rounded-salary-tax
|
2019-04-23 21:38:16 +05:30 |
|
Nabin Hait
|
5e0bc20ab8
|
Merge pull request #17337 from nabinhait/travis-fix-dev
fix: Load doc before save
|
2019-04-23 21:35:18 +05:30 |
|
Audacityy
|
bf8d3658c9
|
Issue form reorder (#17346)
* fix: Issue form reorder
|
2019-04-23 18:55:42 +05:30 |
|
Nabin Hait
|
1f61a1ecf2
|
minot fix
|
2019-04-23 18:44:57 +05:30 |
|
Nabin Hait
|
6592a6bcd4
|
Merge branch 'develop' into income-tax-period-factor-dev
|
2019-04-23 18:38:54 +05:30 |
|
Deepesh Garg
|
cb2c13fa50
|
fix: Stock Ledger report fix (#17343)
|
2019-04-23 17:29:59 +05:30 |
|
Nabin Hait
|
24b4a8722e
|
fix: Rounded tax amount in salary slip
|
2019-04-23 15:54:32 +05:30 |
|
Kanchan Chauhan
|
253c6f962d
|
fix: Subject of Stock Entry feed
|
2019-04-23 14:40:02 +05:30 |
|
Nabin Hait
|
319c912f91
|
fix: Load doc before save
|
2019-04-23 13:13:36 +05:30 |
|
Rushabh Mehta
|
77b82894ff
|
fix(style): buttons in address and contact
|
2019-04-23 07:57:31 +05:30 |
|
Suraj Shetty
|
df59c1573d
|
feat: Add training date field
|
2019-04-22 23:35:36 +05:30 |
|
Deepesh Garg
|
2ef7022385
|
fix: Remove print statements (#17333)
|
2019-04-22 19:25:18 +05:30 |
|
scmmishra
|
936f36ccda
|
fix: import frappe._ in lms.py
|
2019-04-22 18:55:19 +05:30 |
|
scmmishra
|
68b3203366
|
chore: Moved get_quiz_progress and get_program_progress to a class function in program_enrollment
|
2019-04-22 18:50:08 +05:30 |
|
scmmishra
|
3673b25b64
|
fix: quiz is now visible to administrator
|
2019-04-22 18:10:19 +05:30 |
|
scmmishra
|
804a74c01c
|
fix (ui): UI fixes to Video page
|
2019-04-22 17:52:48 +05:30 |
|
scmmishra
|
6c8f23b27e
|
fixed (ui): Fixed cards with better buttons
|
2019-04-22 17:51:30 +05:30 |
|
Nabin Hait
|
7f4e7b63d7
|
fix: Income tax period factor considering joining and relieving date
|
2019-04-22 17:39:36 +05:30 |
|
Nabin Hait
|
af309473f8
|
Merge pull request #17326 from rohitwaghchaure/moved_erpnext_related_methods_from_frappe_to_erpnext_develop
fix: moved erpnext related methods from frappe to erpnext(cherry-picked)
|
2019-04-22 15:59:30 +05:30 |
|
Nabin Hait
|
8624957cbc
|
Merge pull request #17291 from prasadarr/listing-fixes
fix: Allow system manager to access share ledger
|
2019-04-22 15:35:35 +05:30 |
|
Nabin Hait
|
28a7aec124
|
Update accounting.py
|
2019-04-22 15:35:13 +05:30 |
|
Rushabh Mehta
|
3bf71cc18e
|
fix(splash): revert to old image
|
2019-04-22 15:24:28 +05:30 |
|
Deepesh Garg
|
15a7b7ce71
|
fix: GSTR 3b report fixes (#17317)
* fix: GSTR-3b report total taxable value fixes
* fix: Test Cases
|
2019-04-22 15:22:36 +05:30 |
|
Nabin Hait
|
0828064596
|
Merge pull request #17323 from nabinhait/rename-depends-on-lwp
fix: Renamed depends_on_lwp to depends_on_payment_days
|
2019-04-22 14:55:56 +05:30 |
|
scmmishra
|
5079e6c1c1
|
chore: minor improvements
|
2019-04-22 14:48:32 +05:30 |
|
scmmishra
|
ac8d3479c9
|
feat: Added add_quiz_activity function to course_enrollment class
|
2019-04-22 14:38:51 +05:30 |
|
scmmishra
|
33969b7d7c
|
chore: Minor change to question doctype
|
2019-04-22 14:30:14 +05:30 |
|
Rohit Waghchaure
|
270d4e9f4e
|
fix: moved erpnext related methods from frappe to erpnext
|
2019-04-22 14:11:43 +05:30 |
|
scmmishra
|
66d239281c
|
chore: minor code improvements
|
2019-04-22 14:10:09 +05:30 |
|
Nabin Hait
|
d3cd98c45e
|
fix: Renamed depends_on_lwp to depends_on_payment_days
|
2019-04-22 13:45:45 +05:30 |
|
Nabin Hait
|
452f2c5694
|
Merge pull request #17322 from nabinhait/salary-structure-child-docstatus
Salary structure child docstatus
|
2019-04-22 13:42:55 +05:30 |
|
Nabin Hait
|
36561801c2
|
Update set_salary_details_submitable.py
|
2019-04-22 13:38:06 +05:30 |
|
Anurag Mishra
|
35e52b5596
|
fix: fixed spelling
|
2019-04-22 13:37:03 +05:30 |
|
Nabin Hait
|
0294a7f0fd
|
Merge pull request #17318 from SaiFi0102/Revert-Allocate-Advance-Automatically-V12
fix: Set Allocate Advance Automatically disabled by default (v12)
|
2019-04-22 13:32:37 +05:30 |
|
Saif Ur Rehman
|
a216844d2c
|
fix: Set Allocate Advance Automatically disabled by default
|
2019-04-22 12:10:40 +05:00 |
|
scmmishra
|
64d2fe0ad7
|
fix: Minor typo
|
2019-04-22 12:30:08 +05:30 |
|