nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-04 10:14:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,227 Commits 572 Branches 1,792 Tags
37e2e7ee615ebae005b4ebd73bc239b96eb7d6ef
Commit Graph

58227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
frappe-pr-bot
37e2e7ee61 chore: sync sr_CS translation to version-16-hotfix 2026-06-29 11:41:02 +00:00
frappe-pr-bot
2a1cc6b290 chore: sync sr translation to version-16-hotfix 2026-06-29 11:41:02 +00:00
frappe-pr-bot
f38717a90b chore: sync sl translation to version-16-hotfix 2026-06-29 11:41:02 +00:00
frappe-pr-bot
f1ec5ecd66 chore: sync ru translation to version-16-hotfix 2026-06-29 11:41:02 +00:00
frappe-pr-bot
9ff8c9d5d4 chore: sync pt_BR translation to version-16-hotfix 2026-06-29 11:41:02 +00:00
frappe-pr-bot
1df472c798 chore: sync pt translation to version-16-hotfix 2026-06-29 11:41:01 +00:00
frappe-pr-bot
a1263e5173 chore: sync pl translation to version-16-hotfix 2026-06-29 11:41:01 +00:00
frappe-pr-bot
06f8df5380 chore: sync nl translation to version-16-hotfix 2026-06-29 11:41:01 +00:00
frappe-pr-bot
f107928ae1 chore: sync nb translation to version-16-hotfix 2026-06-29 11:41:01 +00:00
frappe-pr-bot
66fabd90a0 chore: sync my translation to version-16-hotfix 2026-06-29 11:41:01 +00:00
frappe-pr-bot
54e55b85a0 chore: sync ko translation to version-16-hotfix 2026-06-29 11:41:01 +00:00
frappe-pr-bot
4f1d9f8940 chore: sync it translation to version-16-hotfix 2026-06-29 11:41:01 +00:00
frappe-pr-bot
adca6c8a28 chore: sync id translation to version-16-hotfix 2026-06-29 11:41:01 +00:00
frappe-pr-bot
38be905e2d chore: sync hu translation to version-16-hotfix 2026-06-29 11:41:01 +00:00
frappe-pr-bot
23d299c78e chore: sync hr translation to version-16-hotfix 2026-06-29 11:41:00 +00:00
frappe-pr-bot
b5fc9d815e chore: sync hi translation to version-16-hotfix 2026-06-29 11:41:00 +00:00
frappe-pr-bot
a686f96374 chore: sync fr translation to version-16-hotfix 2026-06-29 11:41:00 +00:00
frappe-pr-bot
e9a9921d0e chore: sync fi translation to version-16-hotfix 2026-06-29 11:41:00 +00:00
frappe-pr-bot
e329e324c0 chore: sync fa translation to version-16-hotfix 2026-06-29 11:41:00 +00:00
frappe-pr-bot
9230a36c80 chore: sync es translation to version-16-hotfix 2026-06-29 11:41:00 +00:00
frappe-pr-bot
65e0293eb7 chore: sync eo translation to version-16-hotfix 2026-06-29 11:41:00 +00:00
frappe-pr-bot
65002c2f71 chore: sync de translation to version-16-hotfix 2026-06-29 11:41:00 +00:00
frappe-pr-bot
f07d59c91d chore: sync da translation to version-16-hotfix 2026-06-29 11:40:59 +00:00
frappe-pr-bot
3fe6612fd8 chore: sync cs translation to version-16-hotfix 2026-06-29 11:40:59 +00:00
frappe-pr-bot
b3923bb963 chore: sync bs translation to version-16-hotfix 2026-06-29 11:40:59 +00:00
frappe-pr-bot
86908a8b09 chore: sync ar translation to version-16-hotfix 2026-06-29 11:40:59 +00:00
frappe-pr-bot
b7eac0f3b3 chore: sync af translation to version-16-hotfix 2026-06-29 11:40:59 +00:00
frappe-pr-bot
43808af50c chore: add uz translation to version-16-hotfix 2026-06-29 11:40:59 +00:00
frappe-pr-bot
272d2f0728 chore: add bg translation to version-16-hotfix 2026-06-29 11:40:59 +00:00
rohitwaghchaure
5aa62d1cda fix: update_qty_in_future_sle skips SLEs with same posting datetime (#56612) 2026-06-29 15:38:35 +05:30
ruthra kumar
1a348d8e6e Merge pull request #56598 from frappe/mergify/bp/version-16-hotfix/pr-54597 
fix: adjust outstanding amount calculation in purchase and sales registers (backport #54597)
 2026-06-29 11:30:40 +05:30
ruthra kumar
1eed77e605 Merge pull request #56038 from frappe/mergify/bp/version-16-hotfix/pr-56034 
refactor(test): remove custom utility for company creation (backport #56034)
 2026-06-29 11:19:49 +05:30
ruthra kumar
490e125267 fix: manual backport of #55896 2026-06-29 11:09:23 +05:30
Sowmiya P K
1a2a9b6cfc fix: adjust outstanding amount calculation in purchase and sales registers 
(cherry picked from commit 6115af720b)

# Conflicts:
#	erpnext/accounts/report/purchase_register/purchase_register.py
 2026-06-29 10:52:49 +05:30
ruthra kumar
93b28f3337 refactor(test): update assertion for new test records 
(cherry picked from commit afeaba5142)
 2026-06-29 09:41:48 +05:30
ruthra kumar
1a9fcfb0cc refactor(test): broken test case in accounts controller 
(cherry picked from commit 59a69fc497)
 2026-06-29 09:41:48 +05:30
ruthra kumar
a8aa73baae refactor(test): remove even more dead code 
(cherry picked from commit 3d109571ee)
 2026-06-29 09:41:48 +05:30
ruthra kumar
65202d2be1 refactor(tests): reuse persistent master data instead of creating company per test 
Replace per-test company creation in setUp() with persistent master data
from BootStrapTestData. Add Test PCV Company to test_records.json so it
becomes a persistent fixture rather than a throwaway created per test run.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit 6e62750c2f)

# Conflicts:
#	erpnext/accounts/report/financial_ratios/test_financial_ratios.py
 2026-06-29 09:41:47 +05:30
MochaMind
1cc2890f3e chore: update POT file (#56591) 2026-06-28 21:26:46 +02:00
mergify[bot]
e834098c28 fix: sync Stock Reconciliation difference amount with GL after reposting (backport #56574) (#56585) 
* fix: sync Stock Reconciliation difference amount with GL after reposting (#56574)

* fix: sync Stock Reconciliation difference amount with GL after reposting

* fix: placement of recalculate differece amount function

(cherry picked from commit c7ef42ef98)

# Conflicts:
#	erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
#	erpnext/stock/stock_ledger.py

* chore: fix conflicts

Removed unused import and fixed import order.

* chore: fix conflicts

Refactor update_rate_on_stock_reconciliation to use recalculation method for difference amount.

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2026-06-27 17:08:54 +05:30
Mihir Kandoi
655d6dac87 Merge pull request #56587 from frappe/mergify/bp/version-16-hotfix/pr-56586 
fix: party aliases should be no copy (backport #56586)
 2026-06-27 16:44:33 +05:30
Shllokkk
36a9c7a0d3 Merge pull request #56386 from frappe/mergify/bp/version-16-hotfix/pr-56337 
fix: show contextual balance label on party dashboard for net balances (backport #56337)
 2026-06-27 16:36:07 +05:30
Mihir Kandoi
b35c5c1568 chore: resolve conflicts 2026-06-27 16:34:53 +05:30
Mihir Kandoi
e64e9866fb chore: fix conflicts 2026-06-27 16:34:20 +05:30
mergify[bot]
b292be34cb chore(crm_settings): remove unused delete_custom_fields import (backport #56558) (#56583) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-06-27 16:29:48 +05:30
Mihir Kandoi
0b42241682 fix: party aliases should be no copy 
(cherry picked from commit 057af21cd8)

# Conflicts:
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/selling/doctype/customer/customer.json
 2026-06-27 10:55:31 +00:00
mergify[bot]
df1b4431b6 fix: do not allow closing the accounting period for future dates (backport #56551) (#56577) 
fix: do not allow closing the accounting period for future dates (#56551)

(cherry picked from commit 5e60e4faa7)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2026-06-27 12:04:11 +05:30
mergify[bot]
112b773193 chore: removing controllers from pre-commit eslint hooks exclude list (backport #56575) (#56579) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-06-27 01:37:18 +05:30
mergify[bot]
b4d83e542a fix: ignored posting time 00:00:00 in RIV (backport #56571) (#56573) 
fix: ignored posting time 00:00:00 in RIV (#56571)

(cherry picked from commit 31f89b72b4)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2026-06-26 19:42:45 +05:30
mergify[bot]
9bc240c4f0 ci: bump pre-commit actions to v3.0.1 (backport #56562) (#56567) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-06-26 17:06:08 +05:30