Commit Graph

27096 Commits

Author SHA1 Message Date
Suraj Shetty
5ea6a5e33a fix: Decouple call popup from exotel 2019-06-17 08:46:38 +05:30
Suraj Shetty
3fdeffff7a feat: Add medium field in call log doctype 2019-06-17 08:27:00 +05:30
Suraj Shetty
be1dddd596 feat: Add call recording URL field to call log 2019-06-17 08:06:14 +05:30
Suraj Shetty
7877ef22ba Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog 2019-06-13 17:13:59 +05:30
Suraj Shetty
06f8034542 refactor: Remove redundant code 2019-06-13 17:13:54 +05:30
Suraj Shetty
16fc5189d1
Merge branch 'develop' into call-summary-dialog 2019-06-12 17:13:13 +05:30
sahil28297
3fd51ccd38
Merge pull request #17908 from scmmishra/education-test-fixes
test: fix fixtures for program and course
2019-06-12 17:01:27 +05:30
sahil28297
deef0908d7
Merge branch 'develop' into education-test-fixes 2019-06-12 16:59:58 +05:30
Shivam Mishra
5e62142ff4
Merge pull request #17911 from scmmishra/lms-redirect-fixes
fix: redirect to lms home if query params not set
2019-06-12 16:05:34 +05:30
Shivam Mishra
147d5d9bf2 fix: redirect to lms home if query params not set 2019-06-12 16:01:02 +05:30
Shivam Mishra
3264822c1c test: fixed unknown column course_name 2019-06-12 15:43:36 +05:30
Suraj Shetty
12cd4bcd71
Merge branch 'develop' into call-summary-dialog 2019-06-12 15:43:19 +05:30
Shivam Mishra
8d95c846e4
Merge pull request #17910 from scmmishra/lms-patch-5
fix: template issue in LMS
2019-06-12 15:24:40 +05:30
Shivam Mishra
1c9280c73f
Merge branch 'develop' into lms-patch-5 2019-06-12 15:24:15 +05:30
Shivam Mishra
44f98a9a4b fix: back to course button 2019-06-12 15:22:42 +05:30
Shivam Mishra
8af1e87e83 fix: card imqge not visible for courses 2019-06-12 15:16:26 +05:30
Anurag Mishra
e4fca91792
Merge pull request #17909 from scmmishra/lms-template-fix
fix: template fix for null_card
2019-06-12 14:56:25 +05:30
Shivam Mishra
278ef4bf73 fix: template fix for null_card 2019-06-12 14:53:00 +05:30
Shivam Mishra
a99d3a844f test: fix fixtures for program and course 2019-06-12 14:32:27 +05:30
Suraj Shetty
a7ac218584
Merge branch 'develop' into call-summary-dialog 2019-06-12 13:28:41 +05:30
Shivam Mishra
6a2de27941
Merge pull request #17907 from scmmishra/lms-patch-4
fix: templates for cards
2019-06-12 12:53:39 +05:30
Shivam Mishra
28b2da7850
Merge branch 'develop' into lms-patch-4 2019-06-12 12:51:53 +05:30
Shivam Mishra
8df7e1c215 fix: templates for cards 2019-06-12 12:50:38 +05:30
Shivam Mishra
baeaca6dd4
Merge pull request #17906 from scmmishra/lms-patch-3
refactor: remove course name field from ProgramCourse
2019-06-12 12:44:23 +05:30
Shivam Mishra
147cd1035e
Merge branch 'develop' into lms-patch-3 2019-06-12 12:44:12 +05:30
Shivam Mishra
d9e68c9f69 refactor: remove course name field from ProgramCourse 2019-06-12 12:43:22 +05:30
Shivam Mishra
5047c00476
Merge pull request #17905 from scmmishra/lms-acad-fixes
refactor: doctype settings for lms
2019-06-12 12:40:50 +05:30
Shivam Mishra
490d2e0357
Merge branch 'develop' into lms-acad-fixes 2019-06-12 12:40:30 +05:30
Shivam Mishra
a9508862b2 refactor: doctype settings for lms 2019-06-12 12:39:12 +05:30
Saurabh
ccbf646a4d
Merge pull request #17904 from deepeshgarg007/patch_fix
fix(patch): Fix breaking patch on develop branch
2019-06-12 12:33:38 +05:30
Kenneth Sequeira
add002bb0f fix: Make Travel Request Document Submittable (#17874)
* make travel request submittable

* add patch

* remove patch
2019-06-12 12:25:48 +05:30
Anurag Mishra
65c355b8c8
fix: show cost_center in print format of report trial balance (#17871)
* fix: show cost center in print fromat of report trial balance

* fix: requested changes
2019-06-12 11:18:13 +05:30
Suraj Shetty
2f84779667 fix: Last Communication for lead
- Remove unused code
- Remove unused import
2019-06-12 10:31:07 +05:30
deepeshgarg007
44ac3580d9 fix: Fix breaking patch on develop branch 2019-06-11 18:35:01 +05:30
Suraj Shetty
7ff124db95 fix: Show lead name when the lead calls 2019-06-11 14:21:48 +05:30
Anurag Mishra
ff99cea1c4
Merge branch 'develop' into report_trial_balance_fix 2019-06-11 14:17:54 +05:30
Suraj Shetty
28f7c3ca3f fix: Add Make contact button 2019-06-11 12:21:30 +05:30
rohitwaghchaure
ba715feb7f
Merge pull request #17899 from rohitwaghchaure/general_ledger_group_by_voucher_consolidated_issue_develop
fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated)
2019-06-11 11:39:48 +05:30
Anurag Mishra
0ef811d92d
Merge branch 'develop' into report_trial_balance_fix 2019-06-11 11:14:02 +05:30
Anurag Mishra
acae7a903b fix: requested changes 2019-06-11 11:12:28 +05:30
Suraj Shetty
6013375fbb fix: Improve call popup UX
- Close modal after 10 secs if user is has not entered any call summary
- Show alert once the summary was saved
2019-06-11 08:03:55 +05:30
Suraj Shetty
77302b3928 fix: Save summary to right field 2019-06-11 08:01:18 +05:30
Rohit Waghchaure
ef5dd87928 fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated) 2019-06-10 18:34:18 +05:30
rohitwaghchaure
3199f695aa
Merge pull request #17897 from rohitwaghchaure/fixed_print_format_for_ar_for_120_days_develop
fix: accounts receivable for PDC not showing 120 days column
2019-06-10 18:16:59 +05:30
Rohit Waghchaure
5f41a3333b fix: accounts receivable for PDC not showing 120 days column 2019-06-10 18:15:43 +05:30
Deepesh Garg
ebeafa55ca fix: Total Amount fix in journal entry (#17880) 2019-06-10 17:42:52 +05:30
sahil28297
3720126ee9 fix(patch): escape illegal characters to avoid SQL syntax error (#17890) 2019-06-10 17:39:42 +05:30
Deepesh Garg
b9102bba48 fix: GSTR-1 Report fixes (#17885) 2019-06-10 17:39:23 +05:30
rohitwaghchaure
dde4f93137
Merge pull request #17881 from rohitwaghchaure/cogs_only_for_material_issue_in_ste_develop
fix: set COGS for material issue only
2019-06-10 16:57:23 +05:30
Suraj Shetty
a08ab14d80
Merge pull request #17887 from scmmishra/academy-lms-fixes
fix: null cards visible on xs
2019-06-10 14:24:23 +05:30