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

561 Commits

Author SHA1 Message Date
Rohit Waghchaure
7b8e1e0891 fix: lead date comparison issue 2020-01-22 16:36:14 +05:30
Himanshu Warekar
303f085499 Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to 2020-01-19 11:45:24 +05:30
Jigar Tarpara
f5374c182e Bug Fix (#20330) 
* Bug Fix

auto_close_after_days field is in Selling Settings

* fix: close_opportunity_after_days field is in selling settings

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-01-17 11:54:25 +05:30
0Pranav
6280609c25 enhancement: add territory wise sales report 2020-01-14 15:53:35 +05:30
Himanshu Warekar
c9f497d7c0 feat: move subject and sender fields to json 2020-01-13 16:26:40 +05:30
Himanshu Warekar
e5692e035a Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to 2020-01-13 15:17:32 +05:30
deepeshgarg007
d7427919a4 fix: Address section rearrange and minor bug fixes 2019-12-24 16:45:09 +05:30
Rohan
ff98a52834
Merge branch 'develop' into v12-lead-address-contact 2019-12-24 11:21:08 +05:30
Pranav Nachnekar
8bada8759a fix: wrap scheduled_time with getdate() (#20044) 
* fix: wrap `scheduled_time` with `getdate()`

Handles inconsistent data returned from the ORM.

* fix: use `getdate()` instead of `date()`
 2019-12-23 18:19:29 +05:30
Himanshu Warekar
c7feea830f feat: Email Append To 2019-12-12 21:12:17 +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
Rohan
05222270e1
Merge branch 'develop' into v12-lead-address-contact 2019-12-06 14:25:30 +05:30
Pranav Nachnekar
114e0db419 fix: query for finding lost quotation (#19800) 
* fix: query for finding lost quotation

* Update opportunity.py
 2019-12-04 15:31:43 +05:30
Rucha Mahabal
2fa204d8be fix: render_template for subject in Email Campaign (#19772) 2019-12-02 16:26:10 +05:30
Rohan Bansal
c59ac36378 fix: use new Contact schema 2019-11-28 12:25:38 +05:30
Rohan Bansal
fd46fef857 fix: add designation to Lead 2019-11-28 12:23:33 +05:30
Rohan Bansal
75da5af900 fix: set missing values 2019-11-28 12:23:05 +05:30
Rohan Bansal
f9e2bfcc29 fix: conditionally set lead title as organization or person 2019-11-28 12:23:05 +05:30
Rohan Bansal
312210c2b0 feat: create address and contact after lead creation 2019-11-28 12:22:47 +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
2515022377 add condition for zero appointment slots 2019-11-26 10:55:28 +05:30
0Pranav
b84e56ebb5 fix:travis tests 2019-11-25 17:32:02 +05:30
0Pranav
f9dec5201f fix:tests 2019-11-25 16:42:07 +05:30
0Pranav
3ec5eabaf6 formatting 2019-11-25 14:11:31 +05:30
0Pranav
f2752bf38c fix: tests for python2 2019-11-25 14:09:49 +05:30
0Pranav
ae90ea9547 fix:travis errors 2019-11-20 15:24:33 +05:30
0Pranav
682956543e fix travis 2019-11-20 11:45:14 +05:30
0Pranav
fe2147a496 fix travis 2019-11-20 11:37:49 +05:30
0Pranav
dbde140e46 fix: save method of Appointment Booking Setting 2019-11-20 10:30:41 +05:30
0Pranav
c8e66a0f71 Infer number_of_agents from agent_list in apppointment booking settings 2019-11-20 10:27:59 +05:30
0Pranav
539ea2cefb Rename doctype Appointment Booking Slots 2019-11-19 10:59:24 +05:30
0Pranav
511780a4d4 feat: configurable redirect on success 2019-11-14 12:47:08 +05:30
Pranav Nachnekar
ccd9b38463
Merge branch 'develop' into scheduling-ui-rewrite 2019-11-13 11:41:41 +00:00
0Pranav
cce000a6d0 remove: commented code 2019-11-13 11:48:37 +05:30
Nabin Hait
4c7ac65db1 fix: Made Campaign for field mandatory 2019-11-11 17:19:52 +05:30
FinByz Tech Pvt. Ltd
88de00fb94 Rendered Email template in email Campaign 2019-11-11 17:17:21 +05:30
0Pranav
75db6f7073 convert indentation to tabs 2019-11-07 12:47:00 +05:30
0Pranav
fce8f36bb2 don't change lead if assigned 2019-11-07 12:37:28 +05:30
0Pranav
6f1d2eeffd changes to suggestions made by shivam 2019-11-06 11:57:37 +05:30
0Pranav
d1ee962d4b seperate function for sending confirmation 2019-11-05 14:53:36 +05:30
Pranav Nachnekar
4d3dc87a1a
Apply suggestions from code review 
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
 2019-11-05 04:32:06 +00:00
0Pranav
e573bd9074 remove unnecessary variable 2019-11-01 12:47:11 +05:30
0Pranav
53ec8c6322 Merge branch 'develop' of https://github.com/0Pranav/erpnext into scheduling-ui-rewrite 2019-11-01 12:40:08 +05:30
0Pranav
97f6576213 prettify confirmation email 2019-11-01 12:36:06 +05:30
0Pranav
54f33f4e5d move utility functions 2019-11-01 12:14:21 +05:30
0Pranav
4701bc8bfc Add ignore permissions for opportunity 2019-11-01 09:36:29 +05:30
0Pranav
60093d98b0 auto assign before creating event 2019-10-31 15:37:57 +05:30
Deepesh Garg
6208755d54 fix: Unable to add details in quotation and opportunity (#19354) 2019-10-21 13:29:44 +05:30
0Pranav
2f9ef85614 fix:typo 2019-10-15 16:44:28 +05:30
0Pranav
3d73a4f944 fix:readability for user 2019-10-15 16:43:40 +05:30
Himanshu
eba3a8e802 fix: get contact details (#19281) 2019-10-11 10:43:24 +05:30
Rohit Waghchaure
4494d46020 fix: name 'link_link_doctype' is not defined 2019-10-10 14:17:06 +05:30
Pranav Nachanekar
aa918e8528 moved validations to sepeate functions 2019-10-09 15:49:48 +05:30
Pranav Nachanekar
9ccc43980b Merge branch 'develop' of https://github.com/0Pranav/erpnext into develop 2019-10-09 14:17:37 +05:30
Pranav Nachnekar
50e66d81de
fix: use get_single_value 
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
 2019-10-09 08:43:18 +00:00
Pranav Nachanekar
604febb398 fix: set_verified method contained js 2019-10-09 14:09:47 +05:30
Pranav Nachnekar
96930e25f3
fix: readability 
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
 2019-10-09 08:31:37 +00:00
Pranav Nachnekar
5e4ec85574
remove:unnecessary translation 
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
 2019-10-09 08:23:54 +00:00
Pranav Nachnekar
1f1b7eb7d5
Merge branch 'develop' into develop 2019-10-07 06:12:45 +00:00
Pranav Nachanekar
e18388ade3 fix:add exception for no opportunity 2019-10-04 16:32:32 +05:30
Pranav Nachanekar
911e034d1c fix: syntax error 2019-10-04 15:50:02 +05:30
Pranav Nachanekar
0082b78075 fix:incosistent tabs and spaces 2019-10-04 15:36:36 +05:30
Pranav Nachanekar
bfe18d6085 feat:assign appointments from opportunity 2019-10-04 14:41:54 +05:30
Pranav Nachanekar
c1bc0f9dfb fix: added sections for settings 2019-10-04 11:36:53 +05:30
Pranav Nachanekar
25148d0de5 fix:readability 2019-10-04 11:32:39 +05:30
Pranav Nachanekar
22189ec9e8 remove unnecessary doctype 'Timezone' 2019-10-04 11:07:04 +05:30
Pranav Nachanekar
a1d39cab21 fix: travis 2019-10-03 18:26:02 +05:30
Pranav Nachanekar
d40c020e0e fix:variable names 2019-10-03 17:43:31 +05:30
Pranav Nachanekar
bec88bc52a fix: exists return tuple not string 2019-10-03 16:58:38 +05:30
Pranav Nachanekar
afe52e8e09 feat: add check for toggling the route 2019-10-03 16:35:08 +05:30
Pranav Nachanekar
72aac09d62 fix:remove tearDown from test 2019-10-03 16:09:50 +05:30
Pranav Nachanekar
43331564b4 fix:class variable in tests 2019-10-03 15:29:09 +05:30
Pranav Nachanekar
42cf5f279f fix:added class variables to test 2019-10-03 14:26:21 +05:30
Pranav Nachanekar
8640a01f85 remove duplicate day validation 2019-10-03 13:32:57 +05:30
Pranav Nachanekar
1dccc039b7 fix:add tear down to tests 2019-10-03 13:32:46 +05:30
Pranav Nachanekar
76cbb9132f fix: more test errors 2019-10-03 12:50:55 +05:30
Pranav Nachanekar
c5420bb453 fix: remove validation for repeated days 2019-10-03 12:06:43 +05:30
Pranav Nachanekar
1dcedb5054 fix: empty leads and appointment in test 2019-10-03 11:56:54 +05:30
gavin
be8f6f0d65 fix: report ~ lead conversion time (#19232) 2019-10-03 11:36:04 +05:30
Rohan
d463c346fe fix: set no-copy on some contract fields (#19208) 2019-09-30 16:37:29 +05:30
Pranav Nachanekar
2ea9b3e6f2 fix:test appointments 2019-09-30 15:35:38 +05:30
Mangesh-Khairnar
d8763d7d65 fix: allow rename/merge in opportunity (#19202) 2019-09-30 14:39:46 +05:30
Pranav Nachanekar
7f4bc64d22 fix:appointment tests exist check 2019-09-30 13:58:42 +05:30
Himanshu
25ab1e41df fix(Contact): mobile_no re-introduced and travis fixes (#19009) 
* fix: mobile_no re-introduced

* fix: test cases

* fix: set email as primary

* fix: add primary email and phone

* fix: utils for contact creation

* chore: remove = from dict
 2019-09-30 10:08:15 +05:30
Pranav Nachanekar
fd46bf2616 fix codacy 2019-09-25 16:01:48 +05:30
Pranav Nachanekar
774167192a Merge branch 'develop' of https://github.com/0Pranav/erpnext into develop 2019-09-25 13:12:32 +05:30
Pranav Nachanekar
291e161793 Added permissions for sales user 2019-09-25 13:11:04 +05:30
Pranav Nachanekar
9f86022c2b fix: Error in test setUp 2019-09-24 16:07:41 +05:30
Pranav Nachanekar
c9cf5aebea Changed required values, add clientside validation 2019-09-24 12:08:37 +05:30
Nabin Hait
7ab861fe95
Merge branch 'develop' into develop 2019-09-24 11:50:38 +05:30
Pranav Nachanekar
558d44e519 Removed auto-assignment for unverified appointments 2019-09-24 11:33:57 +05:30
Mangesh-Khairnar
5dcf2c669f chore: remove unlinked letter head references (#19138) 2019-09-24 09:53:06 +05:30
Pranav Nachanekar
8393ebbbca Fixed missing permission in update 2019-09-23 17:14:31 +05:30
Pranav Nachanekar
8b744b2d03 Added request verification and url encoding 2019-09-23 15:55:35 +05:30
Pranav Nachanekar
a35e34b5f0 FIxed typos and create_lead method 2019-09-23 14:38:22 +05:30
Pranav Nachanekar
3eccb84eaa Fixed update method 2019-09-23 14:25:42 +05:30
Pranav Nachanekar
b6b27d9256 Corrected moving to doctype for email 2019-09-23 14:16:13 +05:30
Pranav Nachanekar
7b7962d28c Added test cases 2019-09-23 13:05:18 +05:30
Pranav Nachanekar
dcfc849946 Moved email to appoitnmetn doctype 2019-09-23 11:52:26 +05:30
Pranav Nachanekar
f8cc86bfed Moved email from class variable to doctype 
Formatting
Made methods which link other doctypes idempotent
 2019-09-23 11:28:05 +05:30