Diptanil Saha
|
b5f8f2b6fa
|
Merge pull request #50292 from frappe/mergify/bp/version-15-hotfix/pr-50291
fix: added validation for default accounts on company (backport #50291)
|
2025-11-01 10:04:59 +05:30 |
|
Diptanil Saha
|
1a3652bee1
|
chore: resolve conflict
|
2025-10-31 17:34:15 +05:30 |
|
Mihir Kandoi
|
253b945816
|
Merge pull request #50287 from frappe/revert-50107-mergify/bp/version-15-hotfix/pr-50013
Revert "refactor: add supplier filter in buying (backport #50013)"
|
2025-10-31 15:46:29 +05:30 |
|
diptanilsaha
|
d9d9230d4a
|
fix: added validation for default accounts on company
(cherry picked from commit 4af1ae1470)
# Conflicts:
# erpnext/setup/doctype/company/company.py
|
2025-10-31 10:07:42 +00:00 |
|
rohitwaghchaure
|
668ec641c1
|
Merge pull request #50290 from rohitwaghchaure/fixed-github-50262
fix: job card timer
|
2025-10-31 14:33:23 +05:30 |
|
Rohit Waghchaure
|
053765a466
|
fix: job card timer
|
2025-10-31 14:06:22 +05:30 |
|
Mihir Kandoi
|
288570acde
|
Revert "refactor: add supplier filter in buying (backport #50013) (#50107)"
This reverts commit abb210bd18.
|
2025-10-31 13:59:58 +05:30 |
|
rohitwaghchaure
|
83f4970255
|
Merge pull request #50277 from aerele/support-51587
fix(pos): order pos invoices by timestamp
|
2025-10-30 18:49:44 +05:30 |
|
Kavin
|
12903b11ed
|
fix(pos): order pos invoices by timestamp
|
2025-10-30 18:16:11 +05:30 |
|
rohitwaghchaure
|
7658076070
|
Merge pull request #50271 from frappe/mergify/bp/version-15-hotfix/pr-50270
fix: set valuation rate for rejected serial/batch item (backport #50270)
|
2025-10-30 09:27:57 +05:30 |
|
rohitwaghchaure
|
b019d2f45e
|
chore: fix linters issue
|
2025-10-30 09:06:37 +05:30 |
|
venkat102
|
397bc96b40
|
test: add unit test for valuation rate on rejected serial/batch item
(cherry picked from commit d002959d35)
|
2025-10-30 03:32:00 +00:00 |
|
venkat102
|
f72d14b1ca
|
fix: set valuation rate for rejected serial/batch item
(cherry picked from commit 614402cf6c)
|
2025-10-30 03:31:59 +00:00 |
|
rohitwaghchaure
|
0405d82b75
|
Merge pull request #50266 from frappe/mergify/bp/version-15-hotfix/pr-50264
fix: allow bulk edit for bill of material items (backport #50264)
|
2025-10-30 08:58:13 +05:30 |
|
Rohit Waghchaure
|
afe42ee3e9
|
fix: allow bulk edit for bill of material items
(cherry picked from commit 1f74e06791)
|
2025-10-29 12:51:38 +00:00 |
|
rohitwaghchaure
|
ba700bce90
|
Merge pull request #50252 from frappe/mergify/bp/version-15-hotfix/pr-50247
fix: provision to find and fix incorrect serial and batch bundles (backport #50247)
|
2025-10-28 18:21:46 +05:30 |
|
Rohit Waghchaure
|
22767410d5
|
fix: provision to find and fix incorrect serial and batch bundles
(cherry picked from commit 10ad56060c)
|
2025-10-28 12:15:11 +00:00 |
|
Diptanil Saha
|
89e7a260fd
|
Merge pull request #50251 from frappe/mergify/bp/version-15-hotfix/pr-50137
fix(payment-reco): recalculate amount based on allocated amount (backport #50137)
|
2025-10-28 17:34:10 +05:30 |
|
l0gesh29
|
2a90bffb5f
|
fix: recalculate amount based on allocated amount
(cherry picked from commit 5a7a6a9bd5)
|
2025-10-28 11:58:10 +00:00 |
|
Diptanil Saha
|
7434522ea1
|
Merge pull request #50250 from frappe/mergify/bp/version-15-hotfix/pr-50220
fix(gross profit): remove customer name from columns (backport #50220)
|
2025-10-28 15:37:53 +05:30 |
|
ravibharathi656
|
158e1b28a9
|
fix: avoid group columns mutation
(cherry picked from commit 7ce81127d2)
|
2025-10-28 09:51:23 +00:00 |
|
ravibharathi656
|
a7672530f4
|
fix(gross profit): remove customer name from columns
(cherry picked from commit 0009925af0)
|
2025-10-28 09:51:23 +00:00 |
|
Diptanil Saha
|
ad33735541
|
Merge pull request #50245 from frappe/mergify/bp/version-15-hotfix/pr-50213
fix(Bank Transaction)!: make transaction ID non-unique (backport #50213)
|
2025-10-28 10:20:49 +05:30 |
|
Diptanil Saha
|
977f385006
|
chore: resolve conflict
|
2025-10-28 09:07:14 +05:30 |
|
barredterra
|
b52b04a10c
|
fix(Bank Transaction): make transaction ID non-unique
(cherry picked from commit a2a41a0eaa)
# Conflicts:
# erpnext/accounts/doctype/bank_transaction/bank_transaction.json
|
2025-10-28 02:45:52 +00:00 |
|
Diptanil Saha
|
05b89b4121
|
Merge pull request #50243 from frappe/mergify/bp/version-15-hotfix/pr-49599
fix(accounts): reference get_payment_mode_account correctly in Sales Invoice (backport #49599)
|
2025-10-28 08:08:36 +05:30 |
|
Diptanil Saha
|
36983c97cb
|
chore: resolve conflict
|
2025-10-28 08:06:10 +05:30 |
|
KerollesFathy
|
23006601b2
|
fix(accounts): update payment mode account retrieval to use namespaced function
(cherry picked from commit 0af74aef00)
# Conflicts:
# erpnext/public/js/controllers/accounts.js
|
2025-10-27 16:50:10 +00:00 |
|
rohitwaghchaure
|
37e9461ece
|
Merge pull request #50239 from frappe/mergify/bp/version-15-hotfix/pr-50233
fix: optimized the slow query to get the batch-wise available qty (backport #50233)
|
2025-10-27 17:31:15 +05:30 |
|
Mihir Kandoi
|
126d79dcd2
|
Merge pull request #50241 from frappe/mergify/bp/version-15-hotfix/pr-50221
fix: Pass uom field name to update existing item qty (backport #50221)
|
2025-10-27 17:29:29 +05:30 |
|
Kavin
|
93b2786865
|
fix: Pass uom field name to update existing item qty
(cherry picked from commit 23d69389ec)
|
2025-10-27 11:48:44 +00:00 |
|
rohitwaghchaure
|
2680f85430
|
chore: fix linters issue
|
2025-10-27 17:06:45 +05:30 |
|
rohitwaghchaure
|
2d7fde024d
|
chore: fix conflicts
|
2025-10-27 16:57:00 +05:30 |
|
Rohit Waghchaure
|
85bf9366b0
|
fix: optimized the slow query to get the batchwise available qty
(cherry picked from commit 9c21567309)
# Conflicts:
# erpnext/stock/serial_batch_bundle.py
|
2025-10-27 11:19:24 +00:00 |
|
Khushi Rawat
|
86f507bb6e
|
Merge pull request #50238 from frappe/mergify/bp/version-15-hotfix/pr-50222
fix(asset depreciations and balances): showing opening entries (backport #50222)
|
2025-10-27 16:35:46 +05:30 |
|
ravibharathi656
|
81f19b950d
|
fix(asset depreciations and balances): showing opening entries
(cherry picked from commit d3afa67be3)
|
2025-10-27 10:48:36 +00:00 |
|
Mihir Kandoi
|
7b4eac2294
|
Merge pull request #50236 from Abdeali099/fix-msg
fix: add message for missing purchase orders in production plan
|
2025-10-27 15:54:09 +05:30 |
|
Diptanil Saha
|
aff4b62258
|
Merge pull request #50234 from frappe/mergify/bp/version-15-hotfix/pr-50039
fix(journal-entry): allow copy account currency when duplicating JV (backport #50039)
|
2025-10-27 15:36:40 +05:30 |
|
Abdeali Chharchhoda
|
5798409f69
|
fix: add message for missing purchase orders in production plan
|
2025-10-27 15:09:22 +05:30 |
|
Bhavan23
|
1b227b8b4f
|
fix(journal-entry): allow copy account currency when duplicating JV
(cherry picked from commit 76748e4573)
|
2025-10-27 08:45:01 +00:00 |
|
Diptanil Saha
|
4eca7f0524
|
Merge pull request #50230 from frappe/mergify/bp/version-15-hotfix/pr-50103
fix: fiscal year overlap validation for company-specific years (backport #50103)
|
2025-10-27 11:01:57 +05:30 |
|
rehansari26
|
4bb66179ab
|
test: replace get_doc with new_doc in fiscal year tests
(cherry picked from commit d59e55fb08)
|
2025-10-27 05:08:36 +00:00 |
|
Rehan Ansari
|
d84a29e1a1
|
test: fiscal year overlap validation for company-specific years
(cherry picked from commit 94ae098854)
|
2025-10-27 05:08:36 +00:00 |
|
Rehan Ansari
|
482a796212
|
fix: fiscal year overlap validation for company-specific years
(cherry picked from commit 57aaf34d3e)
|
2025-10-27 05:08:36 +00:00 |
|
Diptanil Saha
|
41694d3751
|
Merge pull request #50223 from frappe/mergify/bp/version-15-hotfix/pr-49889
feat: add project filter to Delayed Tasks Summary report (backport #49889)
|
2025-10-24 22:27:54 +05:30 |
|
Rehan Ansari
|
82ca729e2b
|
feat: add project filter to Delayed Tasks Summary report
(cherry picked from commit 88097e78d2)
|
2025-10-24 16:42:15 +00:00 |
|
rohitwaghchaure
|
e67361257e
|
Merge pull request #50216 from frappe/mergify/bp/version-15-hotfix/pr-50215
fix: get valuation rate based of previous SLEs for material receipt (backport #50215)
|
2025-10-24 00:05:12 +05:30 |
|
Rohit Waghchaure
|
e9f4a34d8d
|
fix: get valuation rate based of previous SLEs for material receipt
(cherry picked from commit fa9ef6708f)
|
2025-10-23 18:30:20 +00:00 |
|
Khushi Rawat
|
c6c4e31b32
|
Merge pull request #50211 from frappe/mergify/bp/version-15-hotfix/pr-50209
fix: set status to Draft for auto-created assets from Purchase Receipt (backport #50209)
|
2025-10-23 23:33:42 +05:30 |
|
khushi8112
|
ee5e4eccec
|
fix: set default value for as zero for additional asset cost
|
2025-10-23 22:51:30 +05:30 |
|