nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-12 11:25:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,117 Commits 432 Branches 1,737 Tags
606ac2a91ac1212a7fda71aef1e8a57caafbf635
Commit Graph

56117 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Abdeali Chharchhoda
606ac2a91a refactor: not warn when filter field is missing in FS reports 
(cherry picked from commit d905f78984)
 2026-01-24 07:08:08 +00:00
mergify[bot]
8946f12677 fix: update country_wise_tax.json for Algerian Taxes (backport #51878) (#52038) 
fix: update country_wise_tax.json for Algerian Taxes (#51878)

* Algeria chart of accounts

Algeria chart of accounts

* Update Algeria Chart Of Account

* Algeria chart of account

* Algeria Chart of Account

Algeria Chart of Account

* Modify Algeria tax entries in country_wise_tax.json

Updated tax rates and account names for Algeria.

* Rename account for Algeria tax from VAT to TVA

Rename account for Algeria tax from VAT to TVA

(cherry picked from commit e810cd8440)

Co-authored-by: HALFWARE <contact@half-ware.com>
 2026-01-24 06:48:16 +00:00
mergify[bot]
e9f3f0f445 fix: Ensure paid_amount is always numeric before calling allocate_amount_to_references (backport #50935) (#52036) 
fix: Ensure paid_amount is always numeric before calling allocate_amount_to_references (#50935)

fix: ensure paid_amount is not null in allocate_party_amount_against_ref_docs
(cherry picked from commit 50b3396064)

Co-authored-by: El-Shafei H. <el.shafei.developer@gmail.com>
 2026-01-24 12:03:34 +05:30
ruthra kumar
ba38bc3eaf Merge pull request #52026 from frappe/mergify/bp/version-16-hotfix/pr-51756 
fix: disable asset repair when status is fully depreciated (backport #51756)
 2026-01-24 09:46:53 +05:30
rohitwaghchaure
b4572978f9 Merge pull request #52031 from frappe/mergify/bp/version-16-hotfix/pr-52024 
fix: Bin reserved qty for production for extra material transfer (backport #52024)
 2026-01-24 08:47:44 +05:30
Rohit Waghchaure
bf53133f94 fix: Bin reserved qty for production for extra material transfer 
(cherry picked from commit f5378b6573)
 2026-01-23 15:45:46 +00:00
Mihir Kandoi
23c902c317 Merge pull request #52022 from frappe/mergify/bp/version-16-hotfix/pr-51999 
fix(stock): use purchase UOM in Supplier Quotation items (backport #51999)
 2026-01-23 19:21:12 +05:30
SowmyaArunachalam
13e4849c43 fix: disable asset repair when status is fully depreciated 
(cherry picked from commit 66fe1aa85d)
 2026-01-23 11:38:39 +00:00
Bharathidhasan06
f97b850077 fix(stock): use purchase UOM in Supplier Quotation items 
(cherry picked from commit 2606ca6fa9)
 2026-01-23 08:34:36 +00:00
rohitwaghchaure
b3e12f9acb Merge pull request #52015 from frappe/mergify/bp/version-16-hotfix/pr-52006 
fix: negative stock for purchase return (backport #52006)
 2026-01-23 13:22:36 +05:30
Rohit Waghchaure
fb3fb8ca5e fix: negative stock for purchae return 
(cherry picked from commit d68a04ad16)
 2026-01-23 06:04:02 +00:00
rohitwaghchaure
e2232340dc Merge pull request #52005 from frappe/mergify/bp/version-16-hotfix/pr-51989 
fix: autofill warehouse for packed items (backport #51989)
 2026-01-22 23:56:30 +05:30
Sudharsanan11
881562fc37 fix: autofill warehouse for packed items 
(cherry picked from commit 3f8a0a4833)
 2026-01-22 17:28:22 +00:00
Mihir Kandoi
dcd6279d47 Merge pull request #51983 from frappe/mergify/bp/version-16-hotfix/pr-51908 
fix: throw if item order field is not set in subcontracting controller (backport #51908)
 2026-01-22 10:53:05 +05:30
Mihir Kandoi
041a7c5a57 Merge pull request #51982 from frappe/mergify/bp/version-16-hotfix/pr-51929 
fix: calculate weighted average rate for customer provided items in subcontracting inward order (backport #51929)
 2026-01-22 10:51:54 +05:30
Mihir Kandoi
27ffef41a7 Merge pull request #51980 from frappe/mergify/bp/version-16-hotfix/pr-51966 
fix(customer): add customer group filters (backport #51966)
 2026-01-22 10:42:45 +05:30
Mihir Kandoi
9038f19fb6 Merge pull request #51978 from frappe/mergify/bp/version-16-hotfix/pr-51967 
fix(project): add missing counter to project update naming series (backport #51967)
 2026-01-22 10:38:33 +05:30
ljain112
264855e5e1 fix: throw if item order field is not set in subcontracting controller 
(cherry picked from commit d256365f4a)
 2026-01-22 05:05:22 +00:00
ljain112
7120fbd14b fix: calculate weighted average rate for customer provided items in subcontracting inward order 
(cherry picked from commit 37ee560eae)
 2026-01-22 05:02:16 +00:00
SowmyaArunachalam
b1716bfeef fix(customer): add customer group filters 
(cherry picked from commit 1e3db9f916)
 2026-01-22 04:57:04 +00:00
ravibharathi656
37a237dbb7 fix(project): add missing counter to project update naming series 
(cherry picked from commit 49e64f4e1c)
 2026-01-22 04:53:10 +00:00
Mihir Kandoi
be9112b6fc Merge pull request #51972 from frappe/mergify/bp/version-16-hotfix/pr-51968 2026-01-22 09:04:25 +05:30
Mihir Kandoi
2f240f3553 Merge pull request #51970 from frappe/mergify/bp/version-16-hotfix/pr-51964 
fix: create DN btn should not be shown if it cannot be created (backport #51964)
 2026-01-21 22:54:50 +05:30
Mihir Kandoi
c7c7a55a58 fix: rejected qty in PR doesn't consider conversion factor 
(cherry picked from commit 343ee9695b)
 2026-01-21 17:21:00 +00:00
Mihir Kandoi
30e6b5daac fix: create DN btn should not be shown if it cannot be created 
(cherry picked from commit 70ec977cb2)
 2026-01-21 17:09:48 +00:00
Mihir Kandoi
0b5cc039b6 Merge pull request #51962 from frappe/mergify/bp/version-16-hotfix/pr-51958 
fix!: force user to enter batch or serial for serial/batch items (backport #51958)
 2026-01-21 16:38:31 +05:30
Mihir Kandoi
6fa60d2f1a fix: tests 
(cherry picked from commit 035b3cb61e)
 2026-01-21 10:53:46 +00:00
Mihir Kandoi
91199ea9c9 fix: force user to enter batch or serial for serial/batch items 
(cherry picked from commit 7170a1bd78)
 2026-01-21 10:53:46 +00:00
Mihir Kandoi
e23ba0e852 Merge pull request #51960 from frappe/mergify/bp/version-16-hotfix/pr-51947 
fix: job cards should not be deleted on close of WO (backport #51947)
 2026-01-21 16:03:09 +05:30
Mihir Kandoi
7c2bbe0d82 fix: job cards should not be deleted on close of WO 
(cherry picked from commit c919b1de38)
 2026-01-21 10:17:16 +00:00
Mihir Kandoi
0a2234a814 Merge pull request #51951 from frappe/mergify/bp/version-16-hotfix/pr-51948 
fix: warehouse permissions in MR incorrectly ignored (backport #51948)
 2026-01-21 14:05:14 +05:30
Mihir Kandoi
504c84e28a fix: warehouse permissions in MR incorrectly ignored 
(cherry picked from commit 5bacb67d36)
 2026-01-21 07:36:22 +00:00
Mihir Kandoi
cf130ff865 Merge pull request #51936 from frappe/mergify/bp/version-16-hotfix/pr-51934 
fix: validation message in stock reco row idx (backport #51934)
 2026-01-20 21:05:40 +05:30
Mihir Kandoi
176096bc5b fix: validation message in stock reco row idx 
(cherry picked from commit 3960c01798)
 2026-01-20 15:17:53 +00:00
rohitwaghchaure
e854eafc0b Merge pull request #51933 from frappe/mergify/bp/version-16-hotfix/pr-51930 
Revert "perf: prevent duplicate reposting for the same item" (backport #51930)
 2026-01-20 20:05:41 +05:30
rohitwaghchaure
72cdddbeda Revert "perf: prevent duplicate reposting for the same item" 
(cherry picked from commit 6e4b90055f)
 2026-01-20 14:19:47 +00:00
mergify[bot]
c9d7c6cd42 fix: continuous raw material consumption with bom validation (backport #51914) (#51919) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-01-20 12:56:27 +00:00
Diptanil Saha
8393c3c32d Merge pull request #51922 from frappe/mergify/bp/version-16-hotfix/pr-51887 
fix(bank_account): `is_company_account` related validations (backport #51887)
 2026-01-20 18:09:01 +05:30
Mihir Kandoi
5752d2e0a1 Merge pull request #51926 from frappe/mergify/bp/version-16-hotfix/pr-51909 
fix: allow creation of DN in SI for items not having DN reference (backport #51909)
 2026-01-20 18:03:35 +05:30
rohitwaghchaure
f25558b4d7 Merge pull request #51924 from frappe/mergify/bp/version-16-hotfix/pr-51920 
perf: prevent duplicate reposting for the same item (backport #51920)
 2026-01-20 18:01:21 +05:30
Mihir Kandoi
fef6df709d fix: allow creation of DN in SI for items not having DN reference 
(cherry picked from commit b691de0147)
 2026-01-20 12:14:59 +00:00
Rohit Waghchaure
3ac431bd50 perf: prevent duplicate reposting for the same item 
(cherry picked from commit 7535931571)
 2026-01-20 12:09:03 +00:00
diptanilsaha
5d5d208a49 fix(bank_account): validation for is_company_account 
(cherry picked from commit 7532ab01d6)
 2026-01-20 11:53:16 +00:00
ruthra kumar
9535f3d583 Merge pull request #51916 from frappe/mergify/bp/version-16-hotfix/pr-51671 
fix(accounts): add missing accounting dimensions in advance taxes and charges (backport #51671)
 2026-01-20 17:19:35 +05:30
Nikhil Kothari
673635e2c3 fix(accounts): add missing accounting dimensions in advance taxes and charges 
(cherry picked from commit 22e9cb4cf4)

# Conflicts:
#	erpnext/patches.txt
 2026-01-20 17:04:51 +05:30
Mihir Kandoi
37e241ba15 Merge pull request #51897 from frappe/mergify/bp/version-16-hotfix/pr-51895 
fix: overproduction % not considered when making WO from SO (backport #51895)
 2026-01-20 13:25:01 +05:30
Mihir Kandoi
fb669eb6f4 fix: overproduction % not considered when making WO from SO 
(cherry picked from commit edba9efb5e)
 2026-01-20 07:34:24 +00:00
ruthra kumar
232225d753 Merge pull request #51891 from frappe/mergify/bp/version-16-hotfix/pr-51561 
fix: delete advance ledger entries  while reconciling payment entry (backport #51561)
 2026-01-20 08:17:44 +05:30
ruthra kumar
80cbd851d1 Merge pull request #51893 from frappe/mergify/bp/version-16-hotfix/pr-51886 
fix(accounts_controller): make return message translatable (backport #51886)
 2026-01-20 08:13:12 +05:30
ruthra kumar
5474ac298d Merge pull request #51884 from frappe/mergify/bp/version-16-hotfix/pr-51830 
fix(manufacturing): consider process loss qty while validating the work order (backport #51830)
 2026-01-20 08:08:29 +05:30