nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-16 16:15:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,520 Commits 398 Branches 1,698 Tags
6adf79b8a5ea4e7804c7610356ea4694fbe1a8cc
Commit Graph

51520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
rohitwaghchaure
c5710dcbe2 Merge pull request #46873 from frappe/mergify/bp/version-15-hotfix/pr-46853 
fix: stock entry repack amount calculation (backport #46853)
 2025-04-06 16:09:57 +05:30
barredterra
1128b5f09c feat(Customer): add Dunning to dashboard 
(cherry picked from commit 638d825d8c)
 2025-04-06 10:21:31 +00:00
ruthra kumar
8617ea5685 Merge pull request #46877 from frappe/mergify/bp/version-15-hotfix/pr-46658 
chore: adjusted dimension placement in Accounts Payable (backport #46658)
 2025-04-06 15:44:19 +05:30
Sruthy
6b3e64c0cc chore: adjusted dimension placement in Accounts Payable 
(cherry picked from commit 361a55a703)
 2025-04-06 10:10:33 +00:00
Rohit Waghchaure
8c61639062 fix: stock entry repack amount calculation 
(cherry picked from commit 544ceb93cd)
 2025-04-06 04:16:16 +00:00
rohitwaghchaure
51c18217fa Merge pull request #46842 from frappe/mergify/bp/version-15-hotfix/pr-46832 
fix: set draft QC in purchase document on creation of qc (backport #46832)
 2025-04-06 09:45:25 +05:30
Sagar Vora
679397528a Merge pull request #46871 from frappe/mergify/bp/version-15-hotfix/pr-46870 
perf: reduce query when validating any doc (backport #46870)
 2025-04-05 23:42:18 +05:30
Sagar Vora
890abf6b90 perf: reduce query when validating any doc 
(cherry picked from commit b863296e53)
 2025-04-05 18:10:06 +00:00
mergify[bot]
86853224c3 refactor(Payment Entry): reduce indentation (backport #46864) (#46867) 
refactor(Payment Entry): reduce indentation (#46864)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2025-04-05 17:39:42 +02:00
mergify[bot]
d7bb4a288c fix: make message translatable (backport #46863) (#46866) 
fix: make message translatable (#46863)

(cherry picked from commit 7d12e9afd4)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2025-04-05 17:37:36 +02:00
mergify[bot]
fcade5d8cd fix: Translate UnReconcile dialog title (backport #46818) (#46861) 
fix: Translate UnReconcile dialog title

(cherry picked from commit f2cfb03c2c)

Co-authored-by: Corentin Forler <corentin@dokos.io>
 2025-04-05 17:37:08 +02:00
mergify[bot]
f63595cf0c fix(Dunning): undefined variable (backport #46868) (#46869) 
fix(Dunning): undefined variable (#46868)

(cherry picked from commit 04df09cfca)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2025-04-05 17:36:43 +02:00
ruthra kumar
e8efa6d331 Merge pull request #46857 from frappe/mergify/bp/version-15-hotfix/pr-46625 
refactor: Update Bank Transaction `set_query` implemetation (backport #46625)
 2025-04-05 07:36:37 +05:30
ruthra kumar
a6834f3875 chore: resolve conflict 2025-04-05 07:32:15 +05:30
Abdeali Chharchhoda
3dc29cbec8 chore: formatting 
(cherry picked from commit 4ae11d4384)

# Conflicts:
#	erpnext/accounts/doctype/bank_transaction/bank_transaction.js
 2025-04-05 01:35:11 +00:00
Abdeali Chharchhoda
5d47db78e6 fix: add Not Cancelled filter for payment_entry in Bank Transaction 
(cherry picked from commit 85dd1dd4c7)
 2025-04-05 01:35:11 +00:00
Abdeali Chharchhoda
a19eece881 refactor: move payment_document query to setup 
(cherry picked from commit 257802aeda)

# Conflicts:
#	erpnext/accounts/doctype/bank_transaction/bank_transaction.js
 2025-04-05 01:35:11 +00:00
Md Hussain Nagaria
2dfe13e183 chore: update links to Frappe School (#46823) 
(cherry picked from commit ef4f662c31)

# Conflicts:
#	erpnext/accounts/workspace/accounting/accounting.json
#	erpnext/buying/workspace/buying/buying.json
#	erpnext/manufacturing/workspace/manufacturing/manufacturing.json
#	erpnext/projects/workspace/projects/projects.json
#	erpnext/selling/workspace/selling/selling.json
#	erpnext/stock/workspace/stock/stock.json
 2025-04-02 06:46:29 +00:00
Rohit Waghchaure
54159b9e5e fix: set draft QC in purchase document on creation of qc 
(cherry picked from commit 2553dea78e)
 2025-04-01 14:17:39 +00:00
Sagar Vora
36aa308bce Merge pull request #46834 from frappe/mergify/bp/version-15-hotfix/pr-46829 
fix: use `grand_total_diff` instead of `rounding_adjustment` in `taxes_and_totals` (backport #46829)
 2025-04-01 14:47:03 +05:30
Mihir Kandoi
c6979ab260 fix: use work_order bom_no if no bom present in operation 2025-04-01 14:45:24 +05:30
mergify[bot]
80f144ac22 fix: pos checking opened entry closed or not (backport #46726) (#46830) 
fix: pos checking opened entry closed or not (#46726)

* fix: pos checking opened entry closed or not

* fix: linter issue

* fix: linter issue

(cherry picked from commit 5d5b6acc79)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-04-01 13:54:29 +05:30
vishakhdesai
55b17b918f fix: use grand_total_diff instead of rounding_adjustment in taxes_and_totals 
(cherry picked from commit fd252da6b1)
 2025-04-01 13:34:30 +05:30
rohitwaghchaure
27ea95236f Merge pull request #46817 from frappe/mergify/bp/version-15-hotfix/pr-46815 
feat: allow UOMs to select for which conversion rate defined in item (backport #46815)
 2025-04-01 08:31:52 +05:30
rohitwaghchaure
c762a8903b Merge pull request #46824 from frappe/mergify/bp/version-15-hotfix/pr-46808 
fix: condition to update the last purchase rate (backport #46808)
 2025-04-01 08:31:30 +05:30
Rohit Waghchaure
353fa0cbc3 fix: condition to update the last puurchase rate 
(cherry picked from commit bad901e7da)
 2025-03-31 15:15:20 +00:00