nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 00:25:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,808 Commits 400 Branches 1,698 Tags
52db89f73fa6e663477edde2fd7e080758bc004c
Commit Graph

52808 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
l0gesh29
52db89f73f fix: table render issue on pop-up edit 
(cherry picked from commit 3431c6c90e)
 2025-08-12 05:10:22 +00:00
Khushi Rawat
4f72635698 Merge pull request #49100 from frappe/mergify/bp/version-15-hotfix/pr-48862 
feat: show party name in reports (backport #48862)
 2025-08-11 18:25:50 +05:30
khushi8112
0e7f778b3f fix: show name of the employee in general ledger report 
(cherry picked from commit 70411ec086)
 2025-08-11 12:24:45 +00:00
khushi8112
d6e9216a45 chore: code format 
(cherry picked from commit b0c0a86fcf)
 2025-08-11 12:24:45 +00:00
khushi8112
9cd60531d2 feat: add customer name column in gross profit report 
(cherry picked from commit 9dee411eb5)
 2025-08-11 12:24:44 +00:00
khushi8112
3763ad451b feat: add party name in GL entries 
(cherry picked from commit 3d94a7cf2c)
 2025-08-11 12:24:44 +00:00
khushi8112
680fa3b8f3 feat: add party name column in general ledger report 
(cherry picked from commit 5f24061dd4)
 2025-08-11 12:24:44 +00:00
ruthra kumar
0644c78c2e Merge pull request #49097 from frappe/mergify/bp/version-15-hotfix/pr-49093 
fix: allow creation of root accounts in account tree view  (backport #49093)
 2025-08-11 17:44:51 +05:30
Lakshit Jain
c2ad5d0fc7 Merge pull request #49093 from ljain112/fix-account-coa 
fix: allow creation of root accounts in account tree view

(cherry picked from commit d45cd5af2b)
 2025-08-11 11:38:30 +00:00
Asmita Hase
6de74697c9 Merge pull request #49095 from frappe/mergify/bp/version-15-hotfix/pr-49088 
fix: Include Employee party type in Receivable and Payable account filters (backport #49088)
 2025-08-11 17:01:48 +05:30
Assem Bahnasy
e762007e0e refactor: Move Employee inclusion to SQL level to preserve search semantics 
(cherry picked from commit 8a9bf166c6)
 2025-08-11 11:15:19 +00:00
Assem Bahnasy
c462219dd7 refactor: Use parameterized SQL queries to prevent injection and handle None values 
(cherry picked from commit a08c7f37d3)
 2025-08-11 11:15:19 +00:00
ruthra kumar
0cd9330e44 Merge pull request #49085 from frappe/mergify/bp/version-15-hotfix/pr-48730 
fix(regional-uae): mark export items as zero rated (backport #48730)
 2025-08-11 12:35:56 +05:30
ruthra kumar
faba523086 chore: resolve conflict 2025-08-11 11:41:10 +05:30
Dany Robert
90913c66ae fix: handle case where taxes is added invoice changed to non-export later 
(cherry picked from commit 29c3ef8280)
 2025-08-11 06:06:08 +00:00
Dany Robert
d47c25287d chore: code styling 
(cherry picked from commit c8940a39b3)
 2025-08-11 06:06:08 +00:00
Dany Robert
614d38d0e6 fix: show message only if no tax is applied 
(cherry picked from commit 38471995e7)
 2025-08-11 06:06:08 +00:00
Dany Robert
534b27afa5 chore: linters 
(cherry picked from commit eb6c8d8938)
 2025-08-11 06:06:07 +00:00
Dany Robert
faae734797 fix: avoid property setter for custom field 
(cherry picked from commit 0c15b65756)
 2025-08-11 06:06:07 +00:00
Dany Robert
68c65866bf fix: simplify export determination logic 
(cherry picked from commit d25846f383)
 2025-08-11 06:06:07 +00:00
Dany Robert
62db42cf2f fix(regional-uae): restrict zero rated export to invoice 
(cherry picked from commit 1170e4fb2c)
 2025-08-11 06:06:06 +00:00
Dany Robert
106b83e9f9 fix(regional-uae): split export determination 
(cherry picked from commit dc72e6cf36)
 2025-08-11 06:06:06 +00:00
Dany Robert
9df6424a20 fix(regional-uae): mark export items as zero rated 
(cherry picked from commit b8224693c4)

# Conflicts:
#	erpnext/patches.txt
 2025-08-11 06:06:06 +00:00
Mihir Kandoi
474ddbae0c Merge pull request #49083 from frappe/mergify/bp/version-15-hotfix/pr-48691 
fix: handle negative inventory check (#48558) (backport #48691)
 2025-08-11 10:45:20 +05:30
Vishist16
9da2be2325 fix: handle negative inventory check (#48558) (#48691) 
* fix: handle negative inventory check (#48558)

* fix: updated DocField via Desk UI as suggested

* fix: update DocField via Desk UI and fix linting issues

(cherry picked from commit 3ee23d9ee8)
 2025-08-11 05:00:20 +00:00
mergify[bot]
15e8fa3189 Merge pull request #49081 from frappe/mergify/bp/version-15-hotfix/pr-49068 
fix(job-card): Add filter to item_code query for scrap_items to exclude disabled (backport #49068)
 2025-08-11 10:25:21 +05:30
Mihir Kandoi
02d2ad6442 Merge pull request #49080 from frappe/mergify/bp/version-15-hotfix/pr-49071 
feat: add item_name column to Material Request dialog in Purchase Order (backport #49071)
 2025-08-11 10:11:47 +05:30
navinrc
eafe33a176 feat: add item_name column to Material Request dialog in Purchase Order 
(cherry picked from commit 4312719010)
 2025-08-11 04:33:31 +00:00
rohitwaghchaure
bb2c21be44 Merge pull request #49029 from IMS94/fix/pick-list-barcode-scanner-serial-assignment-hotfix 
fix: Pick List barcode scanner and manual picking issues
 2025-08-08 19:53:21 +05:30
Asmita Hase
418d14ecc9 Merge pull request #49054 from frappe/mergify/bp/version-15-hotfix/pr-49053 
fix: dont validate account type while creating journal entry for employee party type (backport #49053)
 2025-08-08 14:19:17 +05:30
Asmita Hase
d3dde833f7 fix: dont validate account type in for employee party type 
(cherry picked from commit e7a2ff1884)
 2025-08-08 08:28:37 +00:00
Asmita Hase
0e56c47a4c Merge pull request #49052 from frappe/mergify/bp/version-15-hotfix/pr-49051 2025-08-08 13:56:38 +05:30
Asmita Hase
5f2725f61f chore: trigger create_advance_payment_ledger_records patch 
(cherry picked from commit 6d908f44a5)
 2025-08-08 07:29:33 +00:00
Mihir Kandoi
b45d74c56e Merge pull request #49049 from frappe/mergify/bp/version-15-hotfix/pr-48813 
fix(purchase invoice): filter only enabled account (backport #48813)
 2025-08-08 11:11:43 +05:30
mithili
90e583db19 chore: add back filter 
(cherry picked from commit 23308f6d10)
 2025-08-08 05:25:04 +00:00
mithili
0d47eb1fa0 fix: add condition to fetch active accounts 
(cherry picked from commit 7c8dd86a35)
 2025-08-08 05:25:04 +00:00
mithili
b060cdb4f5 fix(purchase invoice): filter only enabled account 
(cherry picked from commit c3111db6e2)
 2025-08-08 05:25:04 +00:00
Asmita Hase
09c96d6a83 Merge pull request #49044 from frappe/mergify/bp/version-15-hotfix/pr-49042 
fix: flag on journal entry to ignore party account type validation if required (backport #49042)
 2025-08-07 18:17:15 +05:30
Asmita Hase
8a3fdb4ec2 fix: added a flag on journal entry to ignore party account type validation if required 
(cherry picked from commit 0665d13fd3)
 2025-08-07 12:30:05 +00:00
rohitwaghchaure
96e467670a Merge pull request #49035 from frappe/mergify/bp/version-15-hotfix/pr-49022 
fix: zero valuation rate for the batch (backport #49022)
 2025-08-07 14:34:46 +05:30
rohitwaghchaure
105838091e chore: fix conflicts 2025-08-07 14:10:21 +05:30
Rohit Waghchaure
90a0873044 fix: zero valuation rate for the batch 
(cherry picked from commit c8410cb5ca)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
 2025-08-07 08:25:51 +00:00
rohitwaghchaure
965de96251 Merge pull request #49012 from rohitwaghchaure/fixed-support-43860 
fix: stock reservation Delivered Qty against the batch
 2025-08-07 12:27:54 +05:30
ruthra kumar
1a57f603fb Merge pull request #49031 from frappe/mergify/bp/version-15-hotfix/pr-48208 
feat: added chart of accounts and tax template for australian localisation (backport #48208)
 2025-08-07 10:36:52 +05:30
Jeba Jebas
36cb5b6589 feat: added chart of accounts and tax template for australian localisation (#48208) 
* Add Australian Localisation Setup

* feat: added chart of accounts and tax template for australian localisation

* chore: linter fix

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
(cherry picked from commit bb62a01c0d)
 2025-08-07 04:39:17 +00:00
Imesha Sudasingha
dab6bb8e05 style: apply pre-commit formatting fixes 2025-08-07 05:15:42 +05:30
Imesha Sudasingha
eebeb36b6c refactor: combine duplicate pick_manually handlers in pick_list.js 2025-08-07 05:09:46 +05:30
Imesha Sudasingha
38c886db8b fix: Pick List barcode scanner and manual picking issues 
- Fix barcode scanner serial_no_field configuration from 'not_supported' to 'serial_no'
- Add conditional serial assignment in create_pick_list to respect pick_manually flag
- Add client-side handler to clear auto-assigned data when switching to manual picking
- Add server-side validation to ensure data consistency
 2025-08-07 05:04:25 +05:30
Diptanil Saha
f4f1fdedee Merge pull request #49025 from frappe/mergify/bp/version-15-hotfix/pr-49023 
fix: NoneType error on applying presentation_currency filter on financial statements and trial balance report (backport #49023)
 2025-08-07 02:27:43 +05:30
diptanilsaha
24ca7bb64f fix: nonetype error on applying presentation_currency filter on financial statements and trial balance report 
(cherry picked from commit d7e22de44c)
 2025-08-06 20:41:36 +00:00