nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-15 23:54:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,546 Commits 397 Branches 1,698 Tags
4d8984e4e962562c768227d72f36326eff8f8fe0
Commit Graph

51546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ljain112
4d8984e4e9 fix: resolve conflicts 2025-04-08 15:54:44 +05:30
Gursheen Anand
b7ae17aaaf fix(portal): context pay_amount for button 
(cherry picked from commit 7efb5a8cb5)

# Conflicts:
#	erpnext/templates/pages/order.html
 2025-04-08 09:33:20 +00:00
Gursheen Anand
b0302d71b7 fix(portal): payment amount for orders 
(cherry picked from commit c18ff5bd25)

# Conflicts:
#	erpnext/templates/pages/order.py
 2025-04-08 09:33:20 +00:00
Gursheen Anand
cf7252d3e7 fix: check payments against orders for getting request amount 
(cherry picked from commit f7face43cd)

# Conflicts:
#	erpnext/accounts/doctype/payment_request/payment_request.py
 2025-04-08 09:33:19 +00:00
rohitwaghchaure
bbc9cedf4d Merge pull request #46916 from frappe/mergify/bp/version-15-hotfix/pr-46898 
fix: removed hardcoded search fields to fix performance issue (backport #46898)
 2025-04-08 14:18:16 +05:30
rohitwaghchaure
b824038d37 chore: fix conflicts 2025-04-08 13:32:49 +05:30
ruthra kumar
b730fdd007 Merge pull request #46930 from frappe/mergify/bp/version-15-hotfix/pr-46821 
fix: removed customer_group query in customer.js (backport #46821)
 2025-04-08 13:09:37 +05:30
Shariq Ansari
df744135ff Merge pull request #46927 from frappe/mergify/bp/version-15-hotfix/pr-46903 
fix: restrict customer change if creating from opportunity (backport #46903)
 2025-04-08 13:08:34 +05:30
ljain112
1aac8d31f4 fix: removed customer_group query in customer.js 
(cherry picked from commit f49adfdd98)
 2025-04-08 07:28:31 +00:00
Shariq Ansari
26611475f6 fix: restrict customer change if creating from opportunity 
(cherry picked from commit dc4819e897)
 2025-04-08 06:37:36 +00:00
ruthra kumar
5b3ae9508a Merge pull request #46925 from frappe/mergify/bp/version-15-hotfix/pr-46709 
fix: user permissions in sales and purchase report (backport #46709)
 2025-04-08 11:52:46 +05:30
ruthra kumar
81f061634e Merge pull request #46926 from frappe/mergify/bp/version-15-hotfix/pr-46819 
fix: Fix fieldtype in UnReconcile dialog (backport #46819)
 2025-04-08 11:51:56 +05:30
rohitwaghchaure
1e4918fb17 Merge pull request #46918 from frappe/mergify/bp/version-15-hotfix/pr-46893 
fix: inventory dimensions columns visibility depends on filter (backport #46893)
 2025-04-08 11:48:20 +05:30
Corentin Forler
7dfff8d3a2 fix: Fix fieldtype in UnReconcile dialog 
(cherry picked from commit 665645721b)
 2025-04-08 05:56:37 +00:00
ljain112
c705623fdc fix: user permissions in sales and purchase report 
(cherry picked from commit f4bc1dfd00)
 2025-04-08 05:41:01 +00:00
ruthra kumar
6ba4c092ba Merge pull request #46921 from frappe/mergify/bp/version-15-hotfix/pr-46804 
fix: update outstanding with precision (backport #46804)
 2025-04-08 11:08:09 +05:30
ljain112
e1154090f6 fix: update outstanding with precision 
(cherry picked from commit aadda9f606)
 2025-04-08 04:29:48 +00:00
Rohit Waghchaure
fe0e5c2d48 fix: inventory dimensions columns visibility depends on filter 
(cherry picked from commit 2b411fb7f5)
 2025-04-08 03:21:15 +00:00
Rohit Waghchaure
48822f6fee fix: removed hardcoded search fields to fix performance issue 
(cherry picked from commit 216bf2456e)

# Conflicts:
#	erpnext/manufacturing/doctype/bom/bom.py
 2025-04-08 03:20:13 +00:00
Raffael Meyer
8276e8e8b3 chore: fix german translations (#46912) 2025-04-08 02:39:04 +02:00
mergify[bot]
8b11d13cd4 fix: pos opening entry's status not getting updated on cancel (backport #46909) (#46911) 
fix: pos opening entry's status not getting updated on cancel (#46909)

(cherry picked from commit 6fae98afda)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-04-07 21:03:20 +05:30
mergify[bot]
999ab28bf0 fix: validate if pos is opened before pos invoice creation (backport #46907) (#46910) 
fix: validate if pos is opened before pos invoice creation (#46907)

* fix: validate if pos is opened before pos invoice creation

* fix: added title on throw dialog

* test: fixed failing test

(cherry picked from commit 3de1b22480)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-04-07 20:54:23 +05:30
ruthra kumar
ed36fc0530 Merge pull request #46905 from frappe/mergify/bp/version-15-hotfix/pr-46895 
fix: empty party filter on change of party type in General Ledger Report (backport #46895)
 2025-04-07 17:56:07 +05:30
ljain112
95cc2827c6 fix: empty party filter on change of party type in General Ledger Report. 
(cherry picked from commit 9c68bc22fa)
 2025-04-07 12:13:16 +00:00
ruthra kumar
03aa5a1294 Merge pull request #46902 from frappe/mergify/bp/version-15-hotfix/pr-46900 
fix: remove against_voucher and against_voucher_type column from General Ledger Report (backport #46900)
 2025-04-07 17:36:42 +05:30
ljain112
ba1e7e17fb fix: remove against_voucher from General Ledger Report 
(cherry picked from commit 6d1f119a0f)
 2025-04-07 17:14:07 +05:30
ruthra kumar
6adf79b8a5 Merge pull request #46897 from frappe/mergify/bp/version-15-hotfix/pr-46728 
fix: update posting date before running validations (backport #46728)
 2025-04-07 14:49:14 +05:30
Dany Robert
2bf44dc326 fix: update posting date before running validations 
(cherry picked from commit d04dbd8ed9)
 2025-04-07 09:01:59 +00:00
ruthra kumar
1500691bca Merge pull request #46844 from frappe/mergify/bp/version-15-hotfix/pr-46823 
chore: update links to Frappe School (backport #46823)
 2025-04-07 11:45:25 +05:30
ruthra kumar
3d57916832 chore: resolve conflict 2025-04-07 11:28:39 +05:30
ruthra kumar
4e9a3b687f Merge pull request #46891 from frappe/mergify/bp/version-15-hotfix/pr-46637 
fix(payment term): allocate payment amount when payment term is fetched from order (backport #46637)
 2025-04-07 11:25:45 +05:30
rohitwaghchaure
3181dc8ed1 Merge pull request #46885 from frappe/mergify/bp/version-15-hotfix/pr-46836 
fix: remove all serial/batch fields when use button is unselected (backport #46836)
 2025-04-07 11:07:12 +05:30
venkat102
ea289a40fb fix: update payment amount if automatically_fetch_payment_terms is enabled 
(cherry picked from commit 7bf1a39861)
 2025-04-07 05:34:25 +00:00
venkat102
3b66c48479 test: validate payment schedule based on invoice amount 
(cherry picked from commit 7785296573)
 2025-04-07 05:34:25 +00:00
venkat102
1b9980bb86 fix(payment term): allocate payment amount when payment term is fetched from order 
(cherry picked from commit 5618859bd8)
 2025-04-07 05:34:25 +00:00
ruthra kumar
d54b39b3a7 Merge pull request #46889 from frappe/mergify/bp/version-15-hotfix/pr-46784 
fix: correct mapping(schedule_date) sales order to material request (backport #46784)
 2025-04-07 11:03:43 +05:30
MohsinAli
e2c8ed2afd fix: correct mapping(schedule_date) sales order to material request 
(cherry picked from commit 732e950265)
 2025-04-07 05:15:13 +00:00
ruthra kumar
0c6c654a39 Merge pull request #46886 from frappe/mergify/bp/version-15-hotfix/pr-46743 
fix: include auto_reconcile_vouchers flag in background job (backport #46743)
 2025-04-07 10:40:30 +05:30
venkat102
26f93f57b8 fix: include auto_reconcile_vouchers flag in background job 
(cherry picked from commit 35fbbc2057)
 2025-04-07 04:51:00 +00:00
Mihir Kandoi
13f1afa141 fix: remove all serial/batch fields when use button is unselected 
(cherry picked from commit 22ffdb9e77)
 2025-04-07 04:50:55 +00:00
rohitwaghchaure
f3eeb77ef3 Merge pull request #46838 from frappe/st35124 
fix: use work_order bom_no if no bom present in operation
 2025-04-07 10:18:20 +05:30
ruthra kumar
83b72dc1b3 Merge pull request #46883 from frappe/mergify/bp/version-15-hotfix/pr-46727 
fix: use docstatus for status filter (backport #46727)
 2025-04-07 10:18:08 +05:30
rethik
ab52524f12 fix: use docstatus for status filter 
(cherry picked from commit 31e59354c9)
 2025-04-07 04:43:47 +00:00
mergify[bot]
c1fe8f6000 fix: pos closed dialog on pos closing entry (backport #46881) (#46882) 
fix: pos closed dialog on pos closing entry (#46881)

(cherry picked from commit 21954b9f9c)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-04-06 21:32:17 +05:30
rohitwaghchaure
79e8bfe213 Merge pull request #46880 from frappe/mergify/bp/version-15-hotfix/pr-46845 
fix: slow query (backport #46845)
 2025-04-06 18:52:15 +05:30
ruthra kumar
8d3fef3195 Merge pull request #46878 from frappe/mergify/bp/version-15-hotfix/pr-46716 
feat(Customer): add Dunning to dashboard (backport #46716)
 2025-04-06 16:52:07 +05:30
rohitwaghchaure
7c3467d1ff Merge pull request #46879 from frappe/mergify/bp/version-15-hotfix/pr-46875 
perf: Stock entry cancel is slow (backport #46875)
 2025-04-06 16:25:54 +05:30
rohitwaghchaure
4bcf052220 chore: fix conflicts 2025-04-06 16:25:20 +05:30
Rohit Waghchaure
23dc9d5872 fix: slow query 
(cherry picked from commit f82c8ea5eb)

# Conflicts:
#	erpnext/stock/deprecated_serial_batch.py
 2025-04-06 10:41:44 +00:00
Türker Tunalı
1bdfd33816 perf: Stock entry cancel is slow 
Some queries still use "timestamp" function instead of "posting_datetime". In my instance single stock entry cancel ends with request timeout. Using "posting_datetime" field directly improves the situation.

cont: https://github.com/frappe/erpnext/pull/46293
(cherry picked from commit ddbb44c6a2)
 2025-04-06 10:40:32 +00:00