Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,663 Commits 3 Branches 0 Tags 1 GiB
564d23fa8d
Commit Graph

722 Commits

Author SHA1 Message Date
Anupam
a6ce1244a0 fix: sider issues 2021-07-29 10:43:21 +05:30
Anupam
47a651a80f fix: removing depends_on for contact fields 2021-07-28 18:21:19 +05:30
Anupam
49cfac0ef0 feat: added basic info. of lead in header part 2021-07-28 17:51:35 +05:30
Anupam
f4f0dde838 feat: unlinking dynamic links on trash 2021-07-28 16:16:52 +05:30
Anupam
ee1089ca4f Merge branch 'develop' of https://github.com/frappe/erpnext into campaign-module 2021-07-27 16:49:24 +05:30
Anupam
f1c697ca75 fix: sider issue 2021-07-27 16:49:04 +05:30
Nabin Hait
11475487fb fix: merge conflict 2021-07-16 15:58:50 +05:30
Ashish Shah
c0817838d9
fix: when lead is created with mobile_no, mobile_no value gets lost (#26298) 
Summary: When a Lead is created with mobile_no, mobile_no value gets lost (mobile_no value is overwritten by phone value)
It is backport of https://github.com/frappe/erpnext/pull/26116

Steps to reproduce
[1]Create a Lead.
[2]Enter 
Person Name(lead_name): before_fix
Under Contact section, 
enter Phone(phone): 11 and 
Mobile No.(mobile_no):22
[3]Save it
[4] F12, 
cur_frm.doc.phone : 11 (correct)
cur_frm.doc.mobile_no : 11 (incorrect, it should be 22)
[5]Under Address & Contact section ,check contact_html it shows
before_fix
Phone: 11 (Primary label is missing)
Phone: 22 (incorrect, it should be Mobile No:22, also Primary label is missing)


Actual:
mobile_no value is lost. it is overwritten by phone value
following is image with error (before fix)
![image](https://user-images.githubusercontent.com/29812965/122664017-54b2e880-d1bc-11eb-8e4c-767a23ed7eb7.png)


Expected:
mobile_no value should be retained
following is image after fix
![image](https://user-images.githubusercontent.com/29812965/122664037-64323180-d1bc-11eb-8f6f-7628cdaa7adc.png)
 2021-07-02 15:16:42 +05:30
Ashish Shah
4e6805b04e
fix: When Lead is created with mobile_no, mobile_no value gets lost (it is overwritten by phon value) (#26116) 
Steps to reproduce
[1]Create a Lead.
[2]Enter Person Name(lead_name): XX
   under Contact section, enter Phone(phone): 11 and Mobile No.(mobile_no):22
[3]Save it
[4] F12, 
cur_frm.doc.phone : 11 (correct)
cur_frm.doc.mobile_no : 11 (incorrect)
[5]Under Address & Contact section ,check contact_html it shows
ty
Phone: 22 (correct)
Phone: 11 (in correct)


Actual:
mobile_no value is lost. it is overwritten by phone value

Expected:
mobile_no value should be retained
 2021-07-02 13:35:04 +05:30
Mohammed Yusuf Shaikh
ad6f20c5c7
fix: Added permission for employee to book appointment (#26255) 2021-07-02 12:32:22 +05:30
Mohammed Yusuf Shaikh
6c2f66b0a4
fix: Added permission for employee to book appointment (#26266) 2021-07-02 12:21:44 +05:30
Anupam
03f7609a8b fix: moving campaign from selling to CRM 2021-06-30 18:18:03 +05:30
Rucha Mahabal
a9b5dc6030
fix: chart not visible for First Response Time reports (#26032) (#26185) 2021-06-24 11:53:28 +05:30
Rucha Mahabal
7dbb032468
fix: chart not visible for First Response Time reports (#26032) 2021-06-24 10:41:56 +05:30
Anupam
dc448c2f51 refactor: lead 2021-06-17 00:28:03 +05:30
Nabin Hait
0950481253 fix: merge conflict 2021-06-15 20:18:06 +05:30
Rucha Mahabal
3f45901f25
fix: invalid 'depends_on' expression in opportunity (#25955) 2021-06-04 11:16:38 +05:30
Rucha Mahabal
3e92089200
fix: invalid 'depends_on' expression in opportunity (#25953) 2021-06-04 11:15:38 +05:30
Ankush Menat
ff96bdf0c1
fix(ux): fix unstranslated text in msgprint/throw 2021-05-25 20:59:20 +05:30
Suraj Shetty
81d49e9c71 fix: Use extend_cscript function to properly extend class methods to cscript 2021-05-21 17:03:09 +05:30
Faris Ansari
69eb6d476e Merge remote-tracking branch 'upstream/develop' into esbuild 2021-05-07 15:21:33 +05:30
Faris Ansari
1fe891b287 refactor: Replace Class.extend with native class 2021-04-23 08:04:00 +05:30
Anupam Kumar
986452107b
fix: Lead Source's module (#24583) 
* fix: Lead Source's module

* fix: patch fix
 2021-04-09 18:15:51 +05:30
Walstan Baptista
d6360755b9
chore: frappe.whitelist for doc methods (#25068) 
* chore: frappe.whitelist for doc methods

* fix: incorrect spelling

* fix: sider issue

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-03-31 12:30:32 +05:30
Anupam Kumar
b4e842e25e
fix: opportunity-quotation mapping order status (#25001) 2021-03-25 11:45:57 +05:30
Shridhar Patil
58399f6524
fix: next follow up date should be always greater then current time (#24308) 2021-02-22 19:37:38 +05:30
Raffael Meyer
d44e60f17c
feat: add Print Language to Lead and Opportunity (#24317) 
* fix: move "Print Language" to "More Information"

* feat: add "Print Language" in "More Information"

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-02-18 16:24:37 +05:30
Jannat Patel
0a7939277c
fix: dynamic links for reports (#24462) 
* fix: dynamic links for reports

* fix: revert changes for payment period report

* fix: link doctypes
 2021-02-11 20:11:06 +05:30
Shariq Ansari
47f784aa9c
fix: Lead not getting linked to call logs (#24593) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-11 13:23:51 +05:30
Suraj Shetty
dcc9947d10 fix: Update call_popup 
- Setup missed & call ended listeners
- Show contacts based on links
 2021-02-08 20:13:23 +05:30
Anupam Kumar
7d64a291b8
fix: contact permmission issue (#24503) 2021-02-02 12:43:13 +05:30
prssanna
a3585e40f7 style: fix formatting 2021-02-01 19:50:27 +05:30
Suraj Shetty
0a8939e1c1 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-29 08:56:22 +05:30
leela
3234df5581 feat: improved call log doctype 
* Added links and some more fields into Call Log Doctype
* Display call info in the call log link pages
 2021-01-28 18:34:58 +05:30
Jannat Patel
02a7af1e6c
fix: full form for opportunity in crm dashboard (#24436) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-01-22 10:03:29 +05:30
Shivam Mishra
64fa0e8729 fix: wrap assignees in a list 2020-12-22 12:32:36 +05:30
Anurag Mishra
7e641f457c
Merge pull request #24166 from scmmishra/appointment-fix 
fix: wrap assignees in a list
 2020-12-17 16:00:48 +05:30
Shivam Mishra
1872e2c1ac fix: wrap assignees in a list 2020-12-17 14:29:52 +05:30
Shivam Mishra
fd044b032f Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into desk-enhancements 2020-12-16 13:21:10 +05:30
Suraj Shetty
dc13d4b0fc Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-12-11 12:57:04 +05:30
Rushabh Mehta
fec8dba16c fix(merge): merge develop 2020-12-08 16:23:09 +05:30
Kenneth Sequeira
85af44b7ed fix: client side UX fixes 2020-12-07 11:18:20 +05:30
Kenneth Sequeira
5f95ba57a8 fix: py code clean up and doc help 2020-12-07 10:45:13 +05:30
Kenneth Sequeira
c4eb41c92b fix; styling for sider 2020-12-04 15:00:22 +05:30
Shivam Mishra
2fa3cac814 feat: update workspace folders 2020-12-03 15:48:57 +05:30
Shivam Mishra
2895645f86 feat: rename desk page to workspace 2020-12-03 15:39:53 +05:30
Kenneth Sequeira
131e46bab7 chore: add help section for Jinja 2020-12-02 21:37:55 +05:30
Kenneth Sequeira
9abc685504 feat: add jinja templating in contract template 2020-12-02 21:13:50 +05:30
Shivam Mishra
9aaca25edb feat: update desk page json 2020-12-01 13:39:54 +05:30
Shivam Mishra
de68f74b4c chore: update all desk pages 2020-12-01 12:51:38 +05:30
Shivam Mishra
27e7c264f2 fix: link type 2020-11-30 14:58:16 +05:30
Shivam Mishra
61388d412b feat: update desk pages 2020-11-30 14:58:00 +05:30
Kenneth Sequeira
39102e68df fix: make contract template editable (#23891) 2020-11-30 14:58:00 +05:30
Raffael Meyer
fbcc3c1b70
fix: Translatable strings (#23783) 
* fix: start_pattern

* fix: translatable strings

* fix: add missing semicolon (task)

* fix: add missing semicolon (setup_wizard)

* fix: text should start on the same line

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: move out HTML element as variable

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: pull out message, translate "Undo".

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: typo

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: text should start on the same line

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* Revert "fix: start_pattern"

This reverts commit decc62e2ab75f45db1df022fe13780c2d0d2560d.

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-11-25 09:11:51 +05:30
Kenneth Sequeira
c5966d3d70
fix: make contract template editable (#23891) 2020-11-15 09:44:36 +05:30
Shivam Mishra
55f52e8135 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-13 20:09:22 +05:30
Anupam
7db38058f3 fix: displayings mandatory address field in Lead form 2020-10-13 17:33:58 +05:30
Anupam
3245eaaeb0 fix: displayings mandatory address field in Lead form 2020-10-13 15:35:10 +05:30
Anupam
77cf53201a feat: open lead status on next contact date 2020-09-28 18:38:41 +05:30
rohitwaghchaure
7b2f141d0d
Merge pull request #23441 from anupamvs/lead-contact-detail 
fix: flushing contact details, generates assignment rule issues
 2020-09-28 13:30:09 +05:30
Anupam
519a00ce44 fix: flushing contact details, generating assignment rule issues 2020-09-28 13:10:06 +05:30
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