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

711 Commits

Author SHA1 Message Date
Shivam Mishra
9a4d603403 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-09-25 11:44:37 +05:30
Rucha Mahabal
46d4180381
refactor: Issue form cleaned up and renamed Minutes to First Response field (#23066) 
* refactor: re-order fields in Issue DocType

* refactor: rename Mins to First Response to First Response Time

* refactor: First Response Time Reports for Issue and Opportunity

* fix: added patch for renamed fields and setting durations

* chore: update CRM and Support Desk Pages for Response Time reports

* fix: first response time for opportunity report

* fix: patch

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-09-23 16:53:16 +05:30
Rucha Mahabal
979ad180fa fix: update rfq item in postprocess 2020-09-03 11:03:22 +05:30
Rucha Mahabal
a1b5d57076 test: make rfq from opportunity 2020-09-02 13:14:01 +05:30
Rucha Mahabal
d2881ba4dd fix: set conversion factor while creating RFQ from Opportunity 2020-09-02 11:52:59 +05:30
Suraj Shetty
f39bb116cc Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-08-27 19:27:49 +05:30
Suraj Shetty
b6ebcd7559 refactor: Replace darkgray indicator with gray indicator 2020-08-27 18:57:18 +05:30
prssanna
744169833c fix: replace indicator color darkgrey with darkgray 2020-08-27 17:06:10 +05:30
Michelle Alva
7a927cefbd
fix: Social Media Status hidden in Mobie View (#23158) 2020-08-26 10:32:26 +05:30
Marica
3e966d6889
Merge branch 'develop' into crm-reports 2020-08-24 19:42:18 +05:30
Anupam K
64e84643fb lost opportunity 2020-08-24 18:01:28 +05:30
Suraj Shetty
6f9f40992c Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-08-23 16:33:50 +05:30
Marica
c23797e350
fix: Create Opportunity without Default Company from Email (#23097) 
* fix: Create Opoortunity without Default Company from Email

* fix: Add Prompt to Select Company

* Update communication.js

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-08-20 19:12:12 +05:30
Anupam Kumar
e447c79f9d
fix: Quotation lost reason options fix (#22814) 
* adding patch and lost reason child tables

* fix: conflict resolved
 2020-08-13 09:20:36 +05:30
Abhishek Balam
d0ae92d4bd fix: moved company field, renamed to 'More Information' 2020-08-11 17:39:17 +05:30
Abhishek Balam
9f6d114265 fix: Change Source section name to 'Company Information' 2020-08-11 16:16:05 +05:30
Abhishek Balam
ef3b82dae2
fix(CRM): Move Source section above Follow Up section In Opportunity (#22974) 
* fix: move source section above follow up

* fix: only moving source field to 1st section
 2020-08-11 16:05:02 +05:30
Abhishek Balam
c992616d35 fix: change opportunity to 'Converted' when items not selected in opportunity itself for making quotation and sales order 2020-08-11 15:22:54 +05:30
marination
a07973cfa5 fix: Creating opportunity from email 2020-08-10 12:39:42 +05:30
Anupam K
d01caac852 report lead detail 2020-08-10 09:39:58 +05:30
Shivam Mishra
11111cd9a9 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-07-30 21:29:02 +05:30
Anupam K
6bab21483c report lost opportunity 2020-07-30 00:41:06 +05:30
Anupam K
61bfb8c817 Merge branch 'develop' of https://github.com/frappe/erpnext into crm-reports 2020-07-29 15:45:55 +05:30
Anupam K
9ceeefbd2b refactor: CRM Reports 2020-07-27 19:56:07 +05:30
Abhishek Balam
cb45836cda
feat(CRM): Email Group Option In Email Campaign (#22731) 
* new parent updating logic, made requested changes

* feat: adding Email Group option in Email Campaign

* fix: inv commas
 2020-07-23 19:07:11 +05:30
Shivam Mishra
1358efe896 feat: update icons 2020-07-23 17:02:32 +05:30
Anupam Kumar
04a76285e2
fix: Unable to change link from new lead to existing customer (#22787) 
* Unable to change link from new lead to existing customer

* Unable to change link from new lead to existing customer

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-07-23 16:30:56 +05:30
Deepesh Garg
c88a3b4bf9
Merge pull request #22765 from anupamvs/rfq 
feat: Provision to make RFQ against Opportunity
 2020-07-22 18:28:48 +05:30
Anupam Kumar
e519334dfc
feat: Export CRM dashboard (#22778) 
* feat: Exported CRM dashboard

* feat: Export CRM Dashboard

* fix: adding company in all dashboard and number card
 2020-07-22 18:16:57 +05:30
Anupam K
5bd0b93acf fix: cur_frm -> frm 2020-07-22 18:10:57 +05:30
Anupam K
de417d2774 feat: Provision to make RFQ against Opportunity 2020-07-22 01:05:32 +05:30
Deepesh Garg
2af43b3df6
fix: linting 2020-07-15 21:54:28 +05:30
Deepesh Garg
f5a457c397
Merge branch 'develop' into lead-owner-efficiency 2020-07-13 11:32:09 +05:30
Anupam K
cd445786fe making owner fieldtype to link 2020-07-12 20:03:15 +05:30
Michelle Alva
5d514fe4df
fix: grammatical fixes in module onboarding (#22580) 
* fix: grammatical fixes in module onboarding

* fix: more grammatical changes for consistency

* fix: Reorder Stock Onboarding

* fix: update success message

* fix: change order of stock onboarding steps

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-08 14:25:51 +05:30
rohitwaghchaure
3431d42d12
Merge pull request #22610 from frappe/lead-creation-from-email 
fix: Creating Lead from email
 2020-07-08 12:27:18 +05:30
Anupam K
8bc92b90f5 updating lead.py 2020-07-08 00:56:21 +05:30
Anupam K
e88f2bb053 number card filter 2020-07-06 12:34:05 +05:30
Rohan
9c25101d9b
feat: add ability for a contract to be authorised internally (#22095) 
* Added ability for a contract to be signed by a company user before being sent out

* feat: contract signed by stays even after reload (#402)

* format: use new JSON format

Co-authored-by: Neil Lasrado <neil@digithinkit.com>
Co-authored-by: nehasacher143 <45919049+nehasacher143@users.noreply.github.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-06-23 17:39:37 +05:30
Anupam Kumar
71da90034d
fix: resetting lost reason in opportunity and quotation (#22378) 2020-06-22 18:27:14 +05:30
Anupam Kumar
77673e27e0
enable Lead create by email (#22314) 
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2020-06-18 17:46:20 +05:30
Anupam K
234b5f9a8c sm-post-permission-fix 2020-06-14 10:34:58 +05:30
Anupam K
c2d1ed7a34 Merge branch 'develop' of https://github.com/frappe/erpnext into opportunity-dashboard 2020-06-14 00:09:45 +05:30
Anupam K
65e7a2e7a6 opportunity-dashboard-fix 2020-06-14 00:05:38 +05:30
Deepesh Garg
dcdd1f3d9b
Merge pull request #22227 from frappe/opportunity-dashboard 
fix: Links in opportunity dashboard
 2020-06-13 22:16:10 +05:30
Anupam K
8bc414620b opportunity-dashboard-fix 2020-06-13 13:11:43 +05:30
Anupam Kumar
8385fed042
crm onboarding typos (#22008) 2020-05-28 22:14:59 +05:30
Shivam Mishra
6621e22c02
refactor: clean up desk pages (#22004) 
* refactor: clean up desk pages

* refactor: update label for CRM
 2020-05-28 14:48:50 +05:30
Anupam Kumar
f10771029a
CRM dashboard fixes (#21989) 2020-05-28 13:34:55 +05:30
Anupam Kumar
a77032f926
onbarding steps fix (#21959) 2020-05-27 20:20:20 +05:30
Anupam Kumar
ab250e4ed5
enable Allow Rename in sales stage (#21799) 2020-05-20 16:15:48 +05:30
Nabin Hait
7cbbd68176 fix: CRM module dashboard and onboarding 2020-05-20 12:55:34 +05:30
Nabin Hait
189be3c68b Merge branch 'crm-onboarding' of https://github.com/anupamvs/erpnext into anupamvs-crm-onboarding 2020-05-20 12:07:55 +05:30
Raffael Meyer
3bce13eaa2
fix: remove guest access (#21693) 2020-05-17 20:58:37 +05:30
Anupam K
79a8bd1cdf CRM Onboarding 2020-05-14 18:42:44 +05:30
Anupam K
1aaedd68b9 Twitter and LinkedIn Auth fix 2020-05-13 17:55:18 +05:30
rohitwaghchaure
f0385d0671
Merge pull request #21638 from MyuddinKhatri/lead-update-fix-v13 
fix(crm): fix lead while updating contact details (develop)
 2020-05-08 10:37:11 +05:30
rohitwaghchaure
67c33d1f8b
Merge pull request #21643 from sahil28297/fix_lead_name 
fix(lead): strip lead_name before splitting
 2020-05-08 10:35:48 +05:30
Sahil Khan
b1385f676a fix(lead): strip lead_name before splitting 2020-05-07 16:47:41 +05:30
Myuddin khatri
fc0e45d79c solved merge conflicts 2020-05-07 15:38:20 +05:30
Anupam K
d078883cd4 fixing callback urls 2020-05-06 01:13:51 +05:30
Rohan Bansal
7835bf91e4 fix: AttributeError 2020-04-29 13:10:53 +05:30
Rohan Bansal
76825ab2bd fix: update lead if contact details are changed 2020-04-28 16:13:53 +05:30
Anupam K
01d0b373e0 Review changes 2020-04-28 00:21:10 +05:30
Anupam K
cc9dbb912e Adding campaign card in CRM Desk 2020-04-27 22:37:02 +05:30
Rucha Mahabal
e34ec70d44 fix(Desk Page): Number of Open Leads not visible on Shortcut Card 2020-04-26 23:40:37 +05:30
rohitwaghchaure
77403abadd
Merge branch 'develop' into social-media-integration-feat 2020-04-25 17:37:24 +05:30
Anupam K
524eb6ce9b freeze screen while posting and login 2020-04-25 00:35:26 +05:30
Anupam K
e01723e360 Review changes 2020-04-23 23:02:08 +05:30
Anupam K
39911b40f0 setting end date in email campaign 2020-04-23 14:14:49 +05:30
Anupam K
4e2256f2e3 Linkedin, Twitter Integration 2020-04-21 22:07:03 +05:30
Anupam K
790b9ee8d0 Merge branch 'develop' of https://github.com/frappe/erpnext into social-media-integration-feat 2020-04-18 01:51:47 +05:30
Anupam K
c12a40c923 Linkedin, Twitter Integration 2020-04-18 01:50:18 +05:30
Anupam K
22318b2eb6 Linkedin, Twitter Integration 2020-04-18 01:46:38 +05:30
Anupam K
d683dc250d Linkedin, Twitter Integration 2020-04-18 00:48:34 +05:30
Anupam K
9ee8110411 Adding Calendar view for Opportunity 2020-04-15 18:37:35 +05:30
Anupam K
c4c44a9a2b Initial JS setup 2020-04-15 12:58:24 +05:30
Shivam Mishra
ebcc46d837
feat: updated desk pages (#21138) 2020-04-10 18:52:05 +05:30
gavin
74dd0e12e7
fix: enable validations for email and phone data fields (#21199) 2020-04-08 12:59:15 +05:30
Deepesh Garg
d14598bc51
Merge pull request #21180 from KanchanChauhan/address-from-lead 
fix: (minor) Mandatory field missing to create address from lead
 2020-04-07 12:22:54 +05:30
Himanshu Warekar
48307513c1 fix: update modified for opportunity 2020-04-07 09:06:03 +05:30
Kanchan Chauhan
4791e313db fix: Mandatory field missing to create address from lead 2020-04-06 23:56:23 +05:30
Himanshu Warekar
c207c457a5 Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to 2020-04-06 11:34:27 +05:30
Saurabh
84b93414d0 fix: typo 2020-03-31 15:58:00 +05:30
Saurabh
6c8d63f3b9 fix: provision to setup new address from lead if address creation break due to mandatory exception 2020-03-31 15:58:00 +05:30
Saurabh
e567563aa1 fix: if mandatory fields are missing do not create address against lead 2020-03-31 15:58:00 +05:30
Ahmad M Abdelrahman
06b3f6f781
Remove Campagin restrection (#21024) 
Lead Source Now is an independent doctype.
forcing the user to add Campaign is not valid 
Solution
Show Campaign keeping it optional and keep the user to be free to add or remove data
 2020-03-31 10:38:49 +05:30
Suraj Shetty
3cf0dc966c fix: Add currency in options of Opportunity Amount 
- To show currect symbol in list view
 2020-03-20 12:51:16 +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
Shivam Mishra
451382e08e feat: update desk pages 2020-03-12 16:34:34 +05:30
Shivam Mishra
1fd1852c6a
Merge branch 'develop' into yet-another-desk 2020-03-10 18:20:27 +05:30
Shivam Mishra
0310366d5a fix (cleanup): remove incomplete dependencies data 2020-03-05 11:28:40 +05:30
Shivam Mishra
8a8e8d6c5c feat: added base pages for desk 2020-03-02 16:56:31 +05:30
Himanshu
83acff9680
Merge branch 'develop' into opportunity-fix 2020-02-21 19:47:41 +05:30
prssanna
3218730a16 fix: set query on change in opportunity_from value 2020-02-20 16:14:44 +05:30
Deepesh Garg
cf8e2732c9
Merge pull request #20428 from 0Pranav/territory-sales-pipeline 
feat: add territory wise sales report
 2020-02-06 13:11:07 +05:30
Pranav Nachnekar
d64135b2d2
fix: linking party in calendar event of appointment (#20458) 2020-01-29 13:01:25 +05:30
Pranav Nachnekar
c1312700e8 feat: create appoitnemnt against customer (#20457) 2020-01-28 17:50:47 +05:30
Deepesh Garg
1d279c30bb
Merge pull request #20386 from rohitwaghchaure/fixed_lead_date_comparision_issue_develop 
fix: lead date comparison issue
 2020-01-23 15:22:53 +05:30
Rohit Waghchaure
0251e33f31 fix: lead details duplicate entries 2020-01-22 16:59:36 +05:30
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