Commit Graph

228 Commits

Author SHA1 Message Date
Himanshu Warekar
c207c457a5 Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to 2020-04-06 11:34:27 +05:30
Shivam Mishra
3251e1304c
fix: lms quiz type error (#21152) 2020-04-03 10:08:19 +05:30
Himanshu Warekar
841be6713b Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to 2020-03-13 19:40:00 +05:30
Suraj Shetty
2f67647f7b Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations 2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9 fix: Incorrect translation syntax 2020-01-29 15:06:18 +05:30
Pranav Nachnekar
c1312700e8 feat: create appoitnemnt against customer (#20457) 2020-01-28 17:50:47 +05:30
Himanshu Warekar
c9f497d7c0 feat: move subject and sender fields to json 2020-01-13 16:26:40 +05:30
0Pranav
e786eea7db remove comments 2019-12-18 16:25:26 +05:30
0Pranav
84ae2cc543 fix: defualt timezone not getting selected 2019-12-18 15:47:10 +05:30
0Pranav
d3605d2354 fix: issue in javascript timezones 2019-12-11 15:02:23 +05:30
Pranav Nachnekar
6aa763221b fix: rename appointment booking route (#19886)
* rename appoinment booking route

* fix: replace all references to book-appointment route
2019-12-10 21:35:28 +05:30
Pranav Nachnekar
ae02b4119d add init.py for appointment modules (#19823) 2019-12-09 19:03:35 +05:30
0Pranav
fb1e87710b Tweaks to success redirect
- 5 seconds wait before redirect
- Edited description for URL in settings
2019-11-26 12:14:41 +05:30
0Pranav
511780a4d4 feat: configurable redirect on success 2019-11-14 12:47:08 +05:30
0Pranav
793ba8fc06 pretty timezone names 2019-11-14 11:25:49 +05:30
0Pranav
c31808f5b2 fix margins 2019-11-13 16:47:51 +05:30
0Pranav
6e6954cab8 timezone aware datetime 2019-11-13 16:00:59 +05:30
0Pranav
b1e9fb9e14 fix: buttons on page of appointment scheduling 2019-11-13 15:32:56 +05:30
0Pranav
67f191df4e padding fixes for timeslot divs 2019-11-13 14:14:10 +05:30
0Pranav
c72e1f812d adjust padding for appointment booking 2019-11-13 12:59:05 +05:30
0Pranav
a92f060740 multiple fixes in index.js 2019-11-13 12:13:42 +05:30
0Pranav
f25e2a29f7 fix:formatting 2019-11-13 12:01:36 +05:30
0Pranav
db64c69dac fix: reference before assignement error 2019-11-13 11:12:38 +05:30
0Pranav
83100c9c84 Add comemnts for tz conversions 2019-11-07 13:37:11 +05:30
0Pranav
0671ea8137 use frappe.Redirect instead of DoesNotExistError 2019-11-07 13:31:56 +05:30
0Pranav
76b20a5fa4 crack some one liners 2019-11-07 13:24:59 +05:30
0Pranav
151853b887 remove unneccessary imports 2019-11-07 12:55:43 +05:30
0Pranav
51208b3f0b fix:formatting 2019-11-07 12:54:48 +05:30
0Pranav
75db6f7073 convert indentation to tabs 2019-11-07 12:47:00 +05:30
Pranav Nachnekar
af18b2cdc5
Merge branch 'develop' into scheduling-ui-rewrite 2019-11-04 04:38:59 +00:00
0Pranav
3609872760 rename function 2019-11-01 12:06:42 +05:30
0Pranav
6de68c8671 avoid repetition on get_form date 2019-11-01 09:51:32 +05:30
0Pranav
957c9f5ff0 fix:comments 2019-11-01 09:36:45 +05:30
0Pranav
e494144c96 merge settings fetch, add helpers 2019-10-31 15:38:39 +05:30
0Pranav
d1c530c564 fix: merge settings into one call 2019-10-31 15:36:33 +05:30
rohitwaghchaure
5ff377e2bb fix: product link not working in website (#19373) 2019-10-23 11:09:21 +05:30
0Pranav
ad013264eb fix:margins 2019-10-15 16:45:37 +05:30
0Pranav
7c27436d21 fix:visibilty for forms 2019-10-15 16:45:24 +05:30
0Pranav
29c7d5fc63 fix:margins 2019-10-15 16:43:18 +05:30
Pranav Nachanekar
2c99594688 remove: styles for non existant radio 2019-10-09 15:22:57 +05:30
Pranav Nachanekar
e434e8e2e2 fix: formatting 2019-10-09 14:08:01 +05:30
Pranav Nachanekar
25148d0de5 fix:readability 2019-10-04 11:32:39 +05:30
Pranav Nachanekar
9e36a9ee04 fix: move enable check to serverside 2019-10-04 11:28:29 +05:30
Pranav Nachanekar
faf39ecef4 fix:removed print statements 2019-10-04 11:12:50 +05:30
Pranav Nachanekar
22189ec9e8 remove unnecessary doctype 'Timezone' 2019-10-04 11:07:04 +05:30
Pranav Nachanekar
afe52e8e09 feat: add check for toggling the route 2019-10-03 16:35:08 +05:30
Pranav Nachanekar
59c543570a feat: made timeslots into flex 2019-10-03 13:18:13 +05:30
Pranav Nachanekar
4856645b6d fix:styling for time-slot 2019-10-03 12:45:42 +05:30
Pranav Nachanekar
93670fedda timezone manipulation using pytz 2019-10-03 11:58:02 +05:30
Pranav Nachanekar
c6da5fb38e fix:guess timezone using moment 2019-10-03 11:56:23 +05:30