nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-30 12:08:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,511 Commits 454 Branches 1,744 Tags
3181dc8ed17ee01ac70f680a8a08bb0f75bc9557
Commit Graph

861 Commits

Author SHA1 Message Date
Nabin Hait
4e688778dc chore: linter issue 2025-03-07 10:28:52 +05:30
Nabin Hait
60364f6dc9 chore: conflicts 2025-03-06 18:14:09 +05:30
Shariq Ansari
de46165768 fix: Allow rename prospect doctype (#46352) 
fix: allow rename prospect doctype
(cherry picked from commit 884709deb8)

# Conflicts:
#	erpnext/crm/doctype/prospect/prospect.json
 2025-03-06 11:50:08 +00:00
venkat102
7e85a123b2 fix(report): add options to multiselectlist fields 
(cherry picked from commit 8785342fce)

# Conflicts:
#	erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js
#	erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js
 2025-02-13 08:47:15 +00:00
Shariq Ansari
6149306b78 fix: only system manager was able to create customer & prospect 
(cherry picked from commit 716edeb465)
 2025-02-04 06:41:09 +00:00
Shariq Ansari
afd2529c2a chore: resolved conflict 2025-02-03 13:26:33 +05:30
Shariq Ansari
86edcfc1fd fix: renamed Commments Tab to Notes tab in Lead doctype 
(cherry picked from commit 018df3135a)

# Conflicts:
#	erpnext/crm/doctype/lead/lead.json
 2025-02-03 07:53:32 +00:00
mahsem
0e088dde36 fix: postal_code_move_and_fixes 
(cherry picked from commit 185bbb4c20)
 2025-01-23 10:48:01 +00:00
mergify[bot]
bf8d6ae6bf feat: add option to update modified on communication recieved (backport #45307) (#45310) 
* feat: add option to update modified on communication recieved (#45307)

(cherry picked from commit aa38895caf)

# Conflicts:
#	erpnext/crm/doctype/crm_settings/crm_settings.json

* chore: resolve conflict

---------

Co-authored-by: Ejaaz Khan <67804911+iamejaaz@users.noreply.github.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2025-01-21 20:21:46 +05:30
ruthra kumar
3d4a4e661c chore: resolve conflicts 2024-12-23 11:14:33 +05:30
barredterra
e6390bfba1 fix: permissions for marking Quotation as lost 
(cherry picked from commit 4d5241486f)

# Conflicts:
#	erpnext/crm/doctype/competitor/competitor.json
#	erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
 2024-12-23 05:41:57 +00:00
Sugesh393
db21def58b fix: add company dynamic filters in number cards 
(cherry picked from commit 4e7725de66)
 2024-11-26 05:24:57 +00:00
Shariq Ansari
4dcaf42bc5 fix: cannot create opp from lead without prospect 
(cherry picked from commit 603383bca7)
 2024-10-30 08:18:53 +00:00
Shariq Ansari
9e56f213a3 fix: lead create opp from connection not working 
(cherry picked from commit 0dc518b1c3)
 2024-10-21 14:57:43 +00:00
Nihantra C. Patel
85d74050e1 fix: #42014 --resolve conflicts 2024-10-07 14:51:04 +05:30
Nihantra Patel
5a2a404a50 fix: creation of contact, customer, opportunity, quotation and prospect from lead --prettier 
(cherry picked from commit 5844897c34)

# Conflicts:
#	erpnext/crm/doctype/lead/lead.js
 2024-09-19 05:58:01 +00:00
Nihantra Patel
ef10c4ea4f fix: creation of contact, customer, opportunity, quotation and prospect from lead 
(cherry picked from commit 8304d19e8b)

# Conflicts:
#	erpnext/crm/doctype/lead/lead.js
 2024-09-19 05:58:01 +00:00
Shariq Ansari
557ef5d214 fix: create_address is failing 
(cherry picked from commit acc1d52ac8)
 2024-09-18 17:01:49 +00:00
Shariq Ansari
d6a3d0d468 fix: create and link address while creating prospect & customer 
(cherry picked from commit 035c15794c)
 2024-09-16 16:46:01 +00:00
Nabin Hait
f060534625 feat: API for crm integration 
(cherry picked from commit b7bf9f80f2)
 2024-09-14 08:59:51 +00:00
Smit Vora
3a149b3c9b chore: resolve conflicts 2024-08-24 12:38:49 +05:30
ljain112
7401dc4015 fix: do not copy date fields in opportunity doctype 
(cherry picked from commit 74afa57a9f)

# Conflicts:
#	erpnext/crm/doctype/opportunity/opportunity.json
 2024-08-23 08:48:33 +00:00
Nihantra Patel
33542cb909 fix: update the testcase format 
(cherry picked from commit ee44022249)
 2024-08-20 05:11:02 +00:00
Nihantra Patel
549dc286d0 fix: update the testcase format 
(cherry picked from commit 29d50b770e)
 2024-08-20 05:11:02 +00:00
Nihantra Patel
f547befeb9 fix: Create Sales Order from Quotation for Prospect 
(cherry picked from commit 2f63fae31d)

# Conflicts:
#	erpnext/selling/doctype/quotation/quotation.py
 2024-08-20 05:11:02 +00:00
Corentin Forler
d8939e0bb0 fix: Sort lists before calling itertools.groupby 
(cherry picked from commit 45a6ecbd38)
 2024-08-09 06:23:57 +00:00
Dietmar Fischer
94f4c92a03 fix: pre-commit for better code formatting 
(cherry picked from commit 511a0b9f37)
 2024-08-07 14:29:48 +00:00
Dietmar Fischer
3cac4a598f feat: changes in opportunity.py to show contacts and addresses from referenced and opportunities 
(cherry picked from commit 61576ca030)
 2024-08-07 14:29:47 +00:00
ruthra kumar
05c606b65d refactor(test): use test fixture and supply from and to dates 
(cherry picked from commit 4253caf910)
 2024-08-05 09:39:30 +00:00
ruthra kumar
52578b03b4 refactor: consider empty-string as Not Assigned 
(cherry picked from commit 213b2ba942)
 2024-08-05 09:39:30 +00:00
ruthra kumar
8978a54479 refactor: report columns should be based on from and to dates 
(cherry picked from commit 751a25c4b7)
 2024-08-05 09:39:30 +00:00
ruthra kumar
b44598cb7a refactor: make 'from_date' and 'to_date' mandatory 
(cherry picked from commit 3617b41b95)
 2024-08-05 09:39:30 +00:00
ruthra kumar
48e05b6110 refactor: date filters should be explicit 
(cherry picked from commit 40c166a0a0)
 2024-08-05 09:39:30 +00:00
mergify[bot]
3536a754ff fix: lead status filter (backport #41816) (#42046) 
fix: lead status filter (#41816)

(cherry picked from commit 8ae2b8ff8c)

Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com>
 2024-06-26 17:47:30 +05:30
mergify[bot]
d30aee5dd6 fix: link opportunity in prospect after creating opportunity from prospect (backport #41769) (#41777) 
fix: link opportunity in prospect after creating opportunity from prospect (#41769)

(cherry picked from commit 12e48f0b63)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-06-04 21:50:18 +05:30
Nihantra C. Patel
3068dad410 fix: rendering the email template when user HTML 
(cherry picked from commit 7cb66f7fd3)
 2024-04-26 07:41:37 +00:00
Akhil Narang
7828eee014 fix(treewide): manual ruff fixes 
(cherry picked from commit f63396ef47)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 16:11:10 +05:30
Akhil Narang
960ef14b7a refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 14:15:58 +05:30
Deepesh Garg
313350534f fix: Remove custom queries for customer 
(cherry picked from commit 60ba25caf2)
 2024-03-16 14:34:36 +00:00
mergify[bot]
7d3d2eb928 ci: add prettier to pre-commit (backport #40206) (#40362) 
* ci: add prettier to pre-commit

(cherry picked from commit 2c16036ef3)

* style: format js files

---------

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2024-03-11 10:47:18 +05:30
Nihantra C. Patel
1c5a7e29f2 fix: translatable columns in Sales Pipeline Analytics report 
(cherry picked from commit c5050c935b)
 2024-02-22 14:54:53 +00:00
barredterra
f7706211ea feat: set lead name from email 
(cherry picked from commit ceeb724acc)
 2023-12-14 12:49:41 +00:00
Shariq Ansari
cb9589b8ef fix: get dynamic link with parenttype contact 
(cherry picked from commit 3d7ad71b22)
 2023-12-04 13:51:36 +00:00
mergify[bot]
5e6a4d257e feat: enable automatic type annotations (backport #38452) (#38454) 
feat: enable automatic type annotations (#38452)

(cherry picked from commit 63313eef6f)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-11-30 14:43:16 +05:30
Shariq Ansari
b1b065daf1 fix: create contact if existing customer doesn't have contact 
(cherry picked from commit 23b0b8ba36)
 2023-11-28 14:20:10 +00:00
Raffael Meyer
ea2c3487a3 feat: new Report "Lost Quotations" (#38309) 
(cherry picked from commit 477d9fa87e)
 2023-11-24 21:28:38 +00:00
mergify[bot]
77b1eedcf4 chore: refetch item images on transaction save (backport #38095) (#38099) 
chore: refetch item images on transaction save (#38095)

chore: re fetch item images on transaction save
(cherry picked from commit e93a19ffb5)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-11-14 20:11:19 +05:30
Deepesh Garg
6d43f90dc2 Merge branch 'develop' of https://github.com/frappe/erpnext into lead_details_qb 2023-10-09 19:23:16 +05:30
ruthra kumar
f388864fd5 fix: fetch company details for Lead based quotation 2023-10-05 13:13:11 +05:30
Deepesh Garg
25718f5cc7 chore: rewrite query using query builder 2023-10-01 13:27:44 +05:30