Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,248 Commits 3 Branches 0 Tags
Commit Graph

561 Commits

Author SHA1 Message Date
Pranav Nachanekar
0800031c0d Addee email to appointment doctyoe 
and asthetic changes
 2019-09-23 11:26:46 +05:30
Pranav Nachanekar
6b0fea16b6 Added buttons to linked docs 2019-09-23 11:26:18 +05:30
Pranav Nachanekar
9c0f462336 Fixed Syntax errors 2019-09-20 10:51:56 +05:30
Pranav Nachanekar
aa7d0c0163 Merge branch 'develop' of https://github.com/0Pranav/erpnext into develop 2019-09-20 10:47:18 +05:30
Pranav Nachanekar
73420e462f Added email 2019-09-20 10:44:52 +05:30
Pranav Nachanekar
fa4a2a53e8 Added email 2019-09-20 10:41:59 +05:30
Pranav Nachanekar
df1a5a9633 Added flow for verifying emails 2019-09-20 10:08:48 +05:30
Pranav Nachanekar
5324234bd0 Removed required lead 2019-09-20 10:08:26 +05:30
Pranav Nachanekar
ca2509423a Added permissions for HR manager 2019-09-19 12:36:51 +05:30
Pranav Nachanekar
4109f88c04 Linked send_reminder in calendar event 
to Appointment Booking Settings
 2019-09-19 12:08:10 +05:30
Pranav Nachanekar
5bf52ebed6 limit assigment load to appointment day 2019-09-19 11:47:54 +05:30
Pranav Nachanekar
ec1dae023c styling 2019-09-18 16:13:29 +05:30
Pranav Nachanekar
7d476a3e35 Moved lead assignment to the controller 2019-09-18 15:33:31 +05:30
Pranav Nachanekar
3c8bea65ef Merged with local 2019-09-18 10:39:11 +05:30
Pranav Nachnekar
57c311f8e9
Merge branch 'develop' into develop 2019-09-18 10:33:39 +05:30
Pranav Nachanekar
91a564989f Styling and PR review changes 2019-09-17 16:58:41 +05:30
Suraj Shetty
627a3dcd6d feat: Default energy point rules (#19003) 
* feat: Add default energy point rules during install

* fix: Add completed_by field to task doctype

* fix: Rule data

* fix: Add default rules for opportunity

* fix: Add a patch to create default energy point rules

* fix: Default success action message

* fix: Use .items() instead of .iteritems()

* fix: Add "create_default_energy_points" patch entry

* fix: Reload Energy Point Rule to fix patch

* fix: Import frappe
 2019-09-17 15:54:41 +05:30
Pranav Nachnekar
33daf281bd
Merge branch 'develop' into develop 2019-09-17 14:14:16 +05:30
Pranav Nachnekar
a8752db012
Typo and styling fixes 
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
 2019-09-16 20:02:20 +05:30
Rushabh Mehta
72dcb51177 fix(minor): opportunity_from may not be selected (#19063) 2019-09-16 14:47:43 +05:30
Pranav Nachanekar
018f0d3bbd Fixed issue: agents weren't looked up in settings 2019-09-13 16:52:06 +05:30
Pranav Nachanekar
1cd762e9d0 Added ajuto assignment 2019-09-13 15:56:54 +05:30
Pranav Nachanekar
cf045d86b0 fixed typo 2019-09-13 15:55:54 +05:30
Pranav Nachanekar
a3b8c77af1 Fixed leads 2019-09-12 15:19:22 +05:30
Pranav Nachanekar
1564f1476c Added customer to calender event 2019-09-12 14:24:28 +05:30
Pranav Nachanekar
469247bf73 Change max date of datepicker 
to number of days in future as specified by the settings
 2019-09-12 11:15:42 +05:30
Pranav Nachanekar
a2dbd391b3 Add lead and calender event to appointments 2019-09-12 10:48:26 +05:30
Pranav Nachanekar
8051ca1859 Limit advance booking of appointments 2019-09-12 10:47:45 +05:30
Pranav Nachanekar
249cdd92e0 Added uniqueness check for offset 2019-09-11 14:59:25 +05:30
Pranav Nachanekar
e543fc483f Removed email reminders 
As it will be handled by calender event in the future
 2019-09-11 14:59:13 +05:30
Pranav Nachanekar
0cc837eac5 Create event for the appointment 
TODO: Add lead and employee to this
 2019-09-11 14:12:30 +05:30
Pranav Nachanekar
5038d6a6db Removed appointment tests 
TODO: Write better tests after adding lead and calender event generation
 2019-09-11 10:31:04 +05:30
Pranav Nachanekar
2d7370a525 Moved delete_appointment 2019-09-10 16:46:17 +05:30
Pranav Nachanekar
c4950a0281 Added doctype 
availabitlity of slots added
 2019-09-10 15:10:51 +05:30
Pranav Nachanekar
5c211d8abf fixed codacy 2019-09-10 11:52:55 +05:30
Pranav Nachanekar
06facea895 added doctype 2019-09-09 17:09:03 +05:30
Pranav Nachanekar
110f4ea0c9 Formatting 2019-09-09 17:04:25 +05:30
Pranav Nachanekar
db21f86b26 Removed unneccessary doctype 2019-09-09 17:01:40 +05:30
Pranav Nachanekar
5945144c08 Added tests 2019-09-09 16:35:48 +05:30
Pranav Nachanekar
10711dd09d Refactor UI 2019-09-09 15:41:20 +05:30
Pranav Nachanekar
48e43e2421 build fix 2019-09-09 14:43:55 +05:30
Pranav Nachanekar
217aadba7e Better autoname 2019-09-09 14:43:41 +05:30
Nabin Hait
eb2ab3bf76
Merge branch 'develop' into develop 2019-09-05 14:59:16 +05:30
pranav nachnekar
d272fd42c9 changed Autoname 2019-09-03 14:16:56 +05:30
Rohan
7fa3f3fe98 fix: include start and end date for contract status (#18866) 2019-09-03 14:16:12 +05:30
pranav nachnekar
a3d04cdbca A 2019-09-03 13:17:35 +05:30
pranav nachnekar
eb4fa966b0 Added validation for timezones 2019-09-03 12:04:23 +05:30
pranav nachnekar
ad6151b690 Added guest permissions 2019-09-03 12:04:13 +05:30
pranav nachnekar
64095084e7 Removed end time in favor of appointment duration 2019-09-03 12:03:14 +05:30
Himanshu
fffdb6f575 feat(Contacts): Multiple Emails in a Contact (#18675) 
* feat: render multiple addresses

* feat: move to newer contacts structure

* fix: iterate over valid variable

* fix: use primary label instead of bold letters

* fix: call popup get contact name from number

* fix: make contact structure  call popup compatible

* fix: query

* fix: add city, state and country

* fix: display address

* fix: get address in single line

* fix: review fixes

* fix: translation strings

* fix: fix query for contacts

* fix: remove references of mobile_no
 2019-09-02 15:57:45 +05:30