nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-29 14:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,787 Commits 617 Branches 1,804 Tags
106b83e9f94c5bcd3725d957070a6aff7e3f8dc0
Commit Graph

41587 Commits

Author SHA1 Message Date
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
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
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
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
5f2725f61f chore: trigger create_advance_payment_ledger_records patch 
(cherry picked from commit 6d908f44a5)
 2025-08-08 07:29:33 +00:00
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
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
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
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
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
Rohit Waghchaure
849f646bd2 fix: stock reservation Delivered Qty against the batch 2025-08-06 22:29:45 +05:30
Rohit Waghchaure
e693ab76fa fix: timeout while submitting purchase receipt 
(cherry picked from commit c433943c46)
 2025-08-06 14:36:34 +00:00
khushi8112
e1121d1c68 chore: format code 
(cherry picked from commit a33bcb47b3)
 2025-08-06 11:44:55 +00:00
khushi8112
5224b6677d fix: fetch revaluated asset value for all the assets 
(cherry picked from commit 67ec4fa477)
 2025-08-06 11:44:55 +00:00
Asmita Hase
2d420ed661 chore: removed uncessary comment 
(cherry picked from commit b4f831a931)
 2025-08-06 06:16:55 +00:00
Asmita Hase
4cc9061990 chore: add account type to employee advance account in standard chart of accounts 
(cherry picked from commit a273147b6e)
 2025-08-06 06:16:54 +00:00
Asmita Hase
5266690cd8 refactor: get advance payment doctypes from hooks 
(cherry picked from commit 2cb2e05b19)
 2025-08-06 06:16:54 +00:00
ruthra kumar
2af2002431 chore: resolve linting issue 2025-08-06 09:56:39 +05:30
ruthra kumar
1070322695 Merge branch 'version-15' into version-15-hotfix 2025-08-05 21:41:58 +05:30
ravibharathi656
e822a74479 test: add test for cost center allocation commercial rounding 
(cherry picked from commit dd24cce509)

# Conflicts:
#	erpnext/accounts/doctype/cost_center_allocation/test_cost_center_allocation.py
 2025-08-05 20:29:25 +05:30
venkat102
e36e5027d7 fix: do not split round off when there is a cost center allocation 
(cherry picked from commit f0df41d521)
 2025-08-05 14:47:51 +00:00
ruthra kumar
f97e29058c Merge pull request #48993 from frappe/mergify/bp/version-15-hotfix/pr-48947 
fix(process statement of accounts): make date fields mandatory (backport #48947)
 2025-08-05 17:08:55 +05:30
mergify[bot]
964f9275dc feat: add non-negative constraint to batch size and sub operation time fields (backport #48948) (#48991) 
* feat: add non-negative constraint to batch size and sub operation time fields

(cherry picked from commit f4722d3b24)

# Conflicts:
#	erpnext/manufacturing/doctype/operation/operation.json
#	erpnext/manufacturing/doctype/sub_operation/sub_operation.json

* chore: resolve conflicts

* chore: resolve conflicts

* chore: resolve conflicts

---------

Co-authored-by: KerollesFathy <kerolles.f@outlook.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2025-08-05 11:19:46 +00:00
Mihir Kandoi
f3895e9dc9 Merge pull request #48992 from frappe/mergify/bp/version-15-hotfix/pr-48949 
feat: add Manufacture section to project dashboard to show linked Work Orders (backport #48949)
 2025-08-05 16:48:33 +05:30
ravibharathi656
3e8deeed07 fix(process statement of accounts): make date fields mandatory 
(cherry picked from commit 23bc180d98)
 2025-08-05 11:06:47 +00:00
mergify[bot]
84e91e0c7c feat: Add non-negative constraint to completed qty fields in job card and time log (backport #48946) (#48989) 
* feat: Add non-negative constraint to completed qty fields in job card and time log

(cherry picked from commit c30665fda7)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.json
#	erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json

* chore: resolve conflicts

* chore: resolve conflicts

---------

Co-authored-by: KerollesFathy <kerolles.f@outlook.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2025-08-05 11:06:43 +00:00
KerollesFathy
83e9842dd3 feat: add 'Manufacture' section to project dashboard and show linked Work Orders 
(cherry picked from commit 2729d7521d)
 2025-08-05 10:59:44 +00:00
Khushi Rawat
3760ff8a7a Merge pull request #48977 from frappe/mergify/bp/version-15-hotfix/pr-48968 
fix: validate asset before submitting depreciation schedule (backport #48968)
 2025-08-05 16:28:03 +05:30
Khushi Rawat
ddecce400a Merge pull request #48987 from frappe/mergify/bp/version-15-hotfix/pr-48929 
chore: add translation function on remarks in asset depreciation entry  (backport #48929)
 2025-08-05 16:27:47 +05:30
ruthra kumar
6367bd9561 Merge pull request #48985 from frappe/mergify/bp/version-15-hotfix/pr-48798 
feat: add show_amount_in_company_currency in gl report (backport #48798)
 2025-08-05 16:26:37 +05:30
ruthra kumar
104569318e Merge pull request #48982 from frappe/mergify/bp/version-15-hotfix/pr-48909 
fix(tax withholding details): avoid voucher duplication (backport #48909)
 2025-08-05 16:25:48 +05:30
Khushi Rawat
4a8465df90 chore: resolved conflicts 2025-08-05 16:05:54 +05:30
Khushi Rawat
78857cd798 fix: add missing parentheses 
(cherry picked from commit a60db40fd2)
 2025-08-05 10:26:31 +00:00
Ernesto Ruiz
2c9ee7ae14 chore: add translation function on remark in setup_journal_entry_metadata in depreciation.py 
(cherry picked from commit 803180d5de)

# Conflicts:
#	erpnext/assets/doctype/asset/depreciation.py
 2025-08-05 10:26:31 +00:00
Ernesto Ruiz
4a5e0b181f chore: add translation function on remarks in make_journal_entry in asset.py 
(cherry picked from commit 119904e44f)
 2025-08-05 10:26:31 +00:00
Khushi Rawat
35f826c499 chore: remove duplicate code 2025-08-05 15:54:11 +05:30
Diptanil Saha
b565d4f0a8 Merge pull request #48983 from diptanilsaha/pos_grand_total_default_mop 
refactor(pos): disable grand total to default mode of payment
 2025-08-05 15:24:32 +05:30
l0gesh29
b964b122ed feat: add show_amount_in_company_currency in gl report 
(cherry picked from commit 468e5e9b2e)
 2025-08-05 09:52:53 +00:00
ravibharathi656
cee9f200ad fix(tax withholding details): avoid voucher duplication 
(cherry picked from commit 8837016243)
 2025-08-05 09:46:51 +00:00
ruthra kumar
214f15e700 Merge pull request #48972 from frappe/mergify/bp/version-15-hotfix/pr-48718 
refactor: process subscriptions in batch wise (backport #48718)
 2025-08-05 15:13:00 +05:30