nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-30 15:09:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,213 Commits 617 Branches 1,804 Tags
a4633d6e7545b684653e716af8f897ec8def2ed8
Commit Graph

878 Commits

Author SHA1 Message Date
ruthra kumar
1ea3daeb17 Merge pull request #48267 from frappe/mergify/bp/version-15-hotfix/pr-48266 
fix: customer_group import from lead to customer (backport #48266)
 2025-06-30 10:48:20 +05:30
mergify[bot]
af55ce0f6c fix: use label "State/Province" for translatability (backport #48273) (#48286) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: use label "State/Province" for translatability (#48273)
 2025-06-26 20:49:06 +02:00
0xD0M1M0
5463a8b6cf fix: customer_group import from lead to customer (#48266) 
In case customization happens and the lead has the field "customer_group", the get_mapped_doc function would fail and be overwritten by the default value.

(cherry picked from commit 1b18105bce)
 2025-06-25 21:26:40 +00:00
mergify[bot]
2d7a7d9988 fix(open_opportunity): remove company=null filter (backport #48222) (#48224) 
* fix(open_opportunity): remove company=null filter (#48222)

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
(cherry picked from commit c8c1c96298)

# Conflicts:
#	erpnext/crm/number_card/open_opportunity/open_opportunity.json

* chore: resolve conflicts

---------

Co-authored-by: Akhil Narang <me@akhilnarang.dev>
 2025-06-24 11:56:08 +05:30
Khushi Rawat
881dcf817f fix: resolved conflicts 2025-06-20 14:23:02 +05:30
khushi8112
c07d5b6dec chore: remove unused import 
(cherry picked from commit a1c0727d7b)
 2025-06-20 07:29:35 +00:00
khushi8112
4c2f555379 refactor: remove test case 
(cherry picked from commit 4a027125bc)
 2025-06-20 07:29:35 +00:00
khushi8112
27b5d9493a feat: add search field for contract doctype 
(cherry picked from commit 0665691b88)
 2025-06-20 07:29:35 +00:00
khushi
b3c43e8527 feat: add naming series for Contract Doctype 
(cherry picked from commit bf56c73c6c)

# Conflicts:
#	erpnext/crm/doctype/contract/contract.json
 2025-06-20 07:29:35 +00:00
khushi
1005ee64cd refactor: remove autoname 
(cherry picked from commit a4bb7c4e95)
 2025-06-20 07:29:34 +00:00
khushi
8150638519 chore: linters check 
(cherry picked from commit f7e63936a9)
 2025-06-20 07:29:34 +00:00
khushi
194e15fe6e chore: test contract autoname 
(cherry picked from commit b55d1e61c7)
 2025-06-20 07:29:34 +00:00
khushi
1223f5551f fix: contract autoname 
(cherry picked from commit e13e2bffe2)
 2025-06-20 07:29:33 +00:00
ruthra kumar
c09b258d57 chore: resolve conflicts 2025-05-26 17:48:11 +05:30
ruthra kumar
9abac4c6df refactor: fetch party name on selection 
(cherry picked from commit 752024e222)
 2025-05-26 12:11:31 +00:00
ruthra kumar
48f786e493 refactor: full name field in contract 
(cherry picked from commit 016924361a)

# Conflicts:
#	erpnext/crm/doctype/contract/contract.json
 2025-05-26 12:11:30 +00:00
ruthra kumar
0adb7156cd fix: dont auto-fetch latest exchange rate 
- also use correct currency field for comparison

(cherry picked from commit 4ccd0a7407)
 2025-05-07 05:47:33 +00:00
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