nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 16:45:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,861 Commits 401 Branches 1,700 Tags
890ce4a6766a2ed957fb4d22c837ef32105ccd48
Commit Graph

51861 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marica
890ce4a676 Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-46214 2025-05-13 17:07:43 +02:00
Marica
2960d0dce1 Merge pull request #47537 from frappe/mergify/bp/version-15-hotfix/pr-38530 
refactor: Consolidate duplicate zero-quantity Items checks for transactions. (backport #38530)
 2025-05-13 16:55:54 +02:00
mergify[bot]
56d0357f6f feat: add routing/sequencing to work order operations (backport #46975) (#47534) 
* feat: add routing/sequencing to work order operations (#46975)

* feat: add routing/sequencing to work order operations

* fix: add validation and remove reorderin for non sequence id operations

* chore: readability

* fix: logical error

* fix: logical error

* chore: added row number in error message

(cherry picked from commit f1159b6ea6)

# Conflicts:
#	erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json

* chore: resolve conflicts

---------

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2025-05-13 19:02:01 +05:30
marination
5b50d5abf2 fix: Broken test + use super() appropriately 
- test: Remove `test_bom_qty`. It had invalid code. Its been removed from develop. There wasn't a strong case being tested.
 2025-05-13 14:42:57 +02:00
marination
9cede83de1 fix: Conflicts 2025-05-13 14:26:54 +02:00
Bernd Oliver Sünderhauf
a8b982dd0a chore: Adapt translations to reworded message. 
(cherry picked from commit 3688d9412e)

# Conflicts:
#	erpnext/translations/tr.csv
 2025-05-13 12:13:56 +00:00
Bernd Oliver Sünderhauf
cf45ffdabe refactor: Consolidate duplicate zero-quantity transaction Items checks. 
(cherry picked from commit 4918aeb4c6)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/stock_entry.py
 2025-05-13 12:13:47 +00:00
Bernd Oliver Sünderhauf
e91a0acbb3 test: Add, expand and refine test-cases for zero-quantity transactions. 
(cherry picked from commit b2d8a44199)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
#	erpnext/stock/doctype/stock_entry/stock_entry.py
 2025-05-13 12:13:46 +00:00
Khushi Rawat
fbbae80f92 Merge pull request #47533 from frappe/mergify/bp/version-15-hotfix/pr-47530 
feat: non depreciable asset category (backport #47530)
 2025-05-13 17:23:09 +05:30
Khushi Rawat
dcfae61a7a fix: resolved conflicts 2025-05-13 17:07:14 +05:30
marination
3deb11e5b2 fix: Merge conflicts 2025-05-13 13:35:19 +02:00
Khushi Rawat
242a119f95 fix: only depreciable category assets are allowed for depreciation 
(cherry picked from commit d715db1226)
 2025-05-13 11:34:35 +00:00
Khushi Rawat
a75931c90f fix: do not mandate depreciation accounts for non depreciable asset category 
(cherry picked from commit 32cb7d6388)
 2025-05-13 11:34:35 +00:00
Khushi Rawat
96d3bfd2d9 feat: add non depreciable category checkbox in asset category 
(cherry picked from commit fbbfd6531b)

# Conflicts:
#	erpnext/assets/doctype/asset_category/asset_category.json
 2025-05-13 11:34:35 +00:00
ruthra kumar
165a4fcef6 Merge pull request #47527 from frappe/mergify/bp/version-15-hotfix/pr-47520 
fix: ignore "Account Closing Balance" doctype on Period Closing Voucher cancellation (backport #47520)
 2025-05-13 15:10:13 +05:30
ruthra kumar
29b35d6eb0 Merge pull request #47522 from frappe/mergify/bp/version-15-hotfix/pr-47468 
fix(payment-reconciliation): use reconciliation_takes_effect_on from company (backport #47468)
 2025-05-13 15:03:59 +05:30
ljain112
39c029133f fix: ignore "Account Closing Balance" doctype on Period Closing Voucher cancellation 
(cherry picked from commit d6602d63fc)
 2025-05-13 09:21:31 +00:00
ruthra kumar
7f55d59a7b chore: drop redundant patch 2025-05-13 14:45:51 +05:30
ruthra kumar
95f21e5ecd Merge pull request #47523 from frappe/mergify/bp/version-15-hotfix/pr-47521 
fix: condition for advance_account assignment (backport #47521)
 2025-05-13 14:31:29 +05:30
Bhavan23
bafd9ed15e chore: simplify repeated condition checks 
(cherry picked from commit 7bc62cedc6)
 2025-05-13 14:14:13 +05:30
Bhavan23
25fabda40a fix(payment-reconciliation): use reconciliation_takes_effect_on from company 
(cherry picked from commit 19f1ffbdc2)
 2025-05-13 14:14:10 +05:30
ljain112
b6e5e3347d fix: condition for advance_account assignment 
(cherry picked from commit ded46ce3d8)
 2025-05-13 08:43:18 +00:00
ruthra kumar
2868446292 Merge pull request #47517 from frappe/mergify/bp/version-15-hotfix/pr-47367 
fix: Use `Currency` instead of `Float` in GL report to show details (backport #47367)
 2025-05-13 13:08:32 +05:30
Abdeali Chharchhodawala
811fe4fee6 Merge pull request #47367 from Abdeali099/gl-report-field-float-to-currency 
fix: Use `Currency` instead of `Float` in GL report to show details
(cherry picked from commit e4e0bb68ec)
 2025-05-13 05:57:49 +00:00
mergify[bot]
b6bf13ff02 refactor: available serial no report (backport #47333) (#47500) 
* refactor: available serial no report

(cherry picked from commit 74eb611563)

* chore: further optimizations

(cherry picked from commit 653e0a2e3a)

---------

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2025-05-12 23:29:51 +05:30
ruthra kumar
b82e2585d5 Merge pull request #47508 from frappe/mergify/bp/version-15-hotfix/pr-47243 
fix: accumulate values for all the fiscal years in Profit And Loss Statement (backport #47243)
 2025-05-12 17:09:57 +05:30
ruthra kumar
9ca96a63c3 refactor(test): don't default to accumulate 
(cherry picked from commit 54e4e7918e)
 2025-05-12 16:54:14 +05:30
ruthra kumar
98cb9c6b96 test: accumulate filter on P&L report 
(cherry picked from commit afff6b84ce)
 2025-05-12 16:54:09 +05:30
ruthra kumar
d61a85e316 fix: typo 
(cherry picked from commit 61d13ce232)
 2025-05-12 11:17:32 +00:00
ljain112
6dbdc36af9 fix: accumulate values for all the fiscal years in Profit And Loss Statement 
(cherry picked from commit 6851322361)
 2025-05-12 11:17:32 +00:00
mergify[bot]
b18692c120 fix: POS non-stock item mistakenly hidden as unavailable (backport #47493) (#47506) 
fix: POS non-stock item mistakenly hidden as unavailable (#47493)

(cherry picked from commit 57f3489dfa)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-05-12 15:10:11 +05:30
mergify[bot]
309ea7b9cf fix: added PR/PI overbilling validation (backport #47385) (#47497) 
* fix: added PR/PI overbilling validation

(cherry picked from commit f4ffc57b51)

* test: added test

(cherry picked from commit b406ec724b)

* fix: linter error

(cherry picked from commit 27e842ba02)

---------

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2025-05-11 14:31:46 +05:30
Mihir Kandoi
775b2432ab Merge pull request #47494 from frappe/mergify/bp/version-15-hotfix/pr-47481 
fix: timesheet portal showing total billing hours (backport #47481)
 2025-05-10 12:04:04 +05:30
Mihir Kandoi
64ae4e1fec fix: timesheet portal showing total billing hours 
(cherry picked from commit b04a07fda0)
 2025-05-10 06:09:25 +00:00
ruthra kumar
005014ef6a Merge pull request #47482 from frappe/mergify/bp/version-15-hotfix/pr-47380 
fix: broken CI - uae vat 201 tests failing (backport #47380)
 2025-05-09 15:00:55 +05:30
ruthra kumar
4a37f2a925 fix: broken test suite due to incorrect OR filter 
(cherry picked from commit 37d74e387d)
 2025-05-09 09:13:26 +00:00
ruthra kumar
870be7a79b Merge pull request #47467 from frappe/mergify/bp/version-15-hotfix/pr-47462 
Update event.js (backport #47462)
 2025-05-08 14:13:19 +05:30
Yaiphalemba Mangshatabam
67d24e9635 fix: typo in event.js 
"Sales Partners" -> "Sales Partner"

(cherry picked from commit edee75c757)
 2025-05-08 08:40:56 +00:00
rohitwaghchaure
3ba7bb3ab7 Merge pull request #47454 from frappe/mergify/bp/version-15-hotfix/pr-47452 
fix: warning message for COGS account in the stock entry (backport #47452)
 2025-05-08 13:58:08 +05:30
rohitwaghchaure
72ec3f3d18 Merge pull request #47458 from frappe/mergify/bp/version-15-hotfix/pr-47457 
fix: error while making SABB for backdated stock reco (backport #47457)
 2025-05-08 13:57:43 +05:30
Rohit Waghchaure
7ba7d1a2a4 fix: error while making SABB for backdated stock reco 
(cherry picked from commit ad25636afb)
 2025-05-07 15:49:10 +00:00
Rohit Waghchaure
7abe199e2a fix: warning message for COGS account in the stock entry 
(cherry picked from commit bba6b0ff45)
 2025-05-07 10:50:21 +00:00
mergify[bot]
09e7bfbacb perf: Skip link checking on repost's remove_attached_file (backport #45061) (#47450) 
perf: Skip link checking on repost's remove_attached_file (#45061)

This is internal detail, doesn't need to do horrible link checks in
framework.

(cherry picked from commit 4f690affc9)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2025-05-07 14:04:12 +05:30
ruthra kumar
ef7b09fc11 Merge pull request #47448 from frappe/mergify/bp/version-15-hotfix/pr-47447 
fix: dont auto-fetch latest exchange rate (backport #47447)
 2025-05-07 11:22:50 +05:30
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
rohitwaghchaure
d8fb11009f Merge pull request #47440 from frappe/mergify/bp/version-15-hotfix/pr-47435 
fix: stock reco recalculate qty not works for opening stock reco (backport #47435)
 2025-05-06 18:45:43 +05:30
Rohit Waghchaure
2bd30e3c46 fix: stock reco recalculate qty not works for opening stock reco 
(cherry picked from commit 97095c7d24)
 2025-05-06 12:57:56 +00:00
rohitwaghchaure
fb56db1166 Merge pull request #47437 from frappe/mergify/bp/version-15-hotfix/pr-47397 
fix: precision issue (backport #47397)
 2025-05-06 17:50:26 +05:30
Rohit Waghchaure
b6908a79bd fix: precision issue 
(cherry picked from commit 69bee93bfd)
 2025-05-06 11:59:50 +00:00
mergify[bot]
f4551bb918 feat!: configure which rate is used to auto-update price list (backport #47417) 
Co-authored-by: Sagar Vora <16315650+sagarvora@users.noreply.github.com>
 2025-05-06 17:00:03 +05:30