nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-08 01:28:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,628 Commits 411 Branches 1,714 Tags
2eb7a688cba73582e57f58905a8e68d401b92987
Commit Graph

51628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frappe PR Bot
2eb7a688cb chore(release): Bumped to Version 15.57.5 
## [15.57.5](https://github.com/frappe/erpnext/compare/v15.57.4...v15.57.5) (2025-04-14)

### Bug Fixes

* revert [#46900](https://github.com/frappe/erpnext/issues/46900) - against_voucher filter in general ledger ([969c354](969c3549d5))
v15.57.5 		2025-04-14 08:24:20 +00:00
ruthra kumar
19a5b923b9 Merge pull request #47053 from frappe/mergify/bp/version-15/pr-47049 
Revert "fix: remove against_voucher and against_voucher_type column from General Ledger Report" (backport #47049)
 2025-04-14 13:52:55 +05:30
ruthra kumar
a0908522c1 chore: resolve conflict 2025-04-14 13:21:33 +05:30
ruthra kumar
969c3549d5 fix: revert #46900 - against_voucher filter in general ledger 
(cherry picked from commit adb331ef71)

# Conflicts:
#	erpnext/accounts/report/general_ledger/general_ledger.py
 2025-04-14 07:49:32 +00:00
Frappe PR Bot
1da2577035 chore(release): Bumped to Version 15.57.4 
## [15.57.4](https://github.com/frappe/erpnext/compare/v15.57.3...v15.57.4) (2025-04-13)

### Bug Fixes

* Group GLs by account for TB generation ([70fa366](70fa366216))
v15.57.4 		2025-04-13 14:13:43 +00:00
Deepesh Garg
e5d0ab6bab Merge pull request #47045 from frappe/mergify/bp/version-15/pr-47044 
fix: Group GLs by account for TB generation
 2025-04-13 19:42:19 +05:30
Deepesh Garg
70fa366216 fix: Group GLs by account for TB generation 
(cherry picked from commit f894c6d275)
(cherry picked from commit 416d9bce2c)
 2025-04-13 14:02:23 +00:00
Frappe PR Bot
065c9fa85f chore(release): Bumped to Version 15.57.3 
## [15.57.3](https://github.com/frappe/erpnext/compare/v15.57.2...v15.57.3) (2025-04-12)

### Bug Fixes

* correct doctype in item_wise_purchase register ([cd68832](cd68832aa0))
v15.57.3 		2025-04-12 02:01:06 +00:00
ruthra kumar
bcb45ce8ef Merge pull request #47031 from frappe/mergify/bp/version-15/pr-47012 
fix: correct doctype in item_wise_purchase register (backport #47012)
 2025-04-12 07:29:44 +05:30
ljain112
cd68832aa0 fix: correct doctype in item_wise_purchase register 
(cherry picked from commit b8b8dce733)
 2025-04-12 01:41:15 +00:00
Frappe PR Bot
8a33866a8c chore(release): Bumped to Version 15.57.2 
## [15.57.2](https://github.com/frappe/erpnext/compare/v15.57.1...v15.57.2) (2025-04-11)

### Bug Fixes

* condition for use_batchwise_valuation ([18dd128](18dd128838))
* removed display depends on ([b8436db](b8436dbd21))
v15.57.2 		2025-04-11 15:16:34 +00:00
rohitwaghchaure
d3a987800b Merge pull request #47025 from frappe/mergify/bp/version-15/pr-47021 
fix: removed display depends on (backport #47020) (backport #47021)
 2025-04-11 20:45:07 +05:30
rohitwaghchaure
1e19bc7f3f Merge pull request #47024 from frappe/mergify/bp/version-15/pr-47023 
fix: condition for use_batchwise_valuation (backport #47022) (backport #47023)
 2025-04-11 20:44:54 +05:30
rohitwaghchaure
fa7675488d chore: fix conflicts 2025-04-11 20:26:43 +05:30
Rohit Waghchaure
b8436dbd21 fix: removed display depends on 
(cherry picked from commit e0bf45e03b)
(cherry picked from commit 00b25537f4)

# Conflicts:
#	erpnext/stock/doctype/stock_settings/stock_settings.json
 2025-04-11 14:24:37 +00:00
Rohit Waghchaure
18dd128838 fix: condition for use_batchwise_valuation 
(cherry picked from commit cc171d9706)
(cherry picked from commit 0ff7465e27)
 2025-04-11 14:24:31 +00:00
Frappe PR Bot
ff41ed534b chore(release): Bumped to Version 15.57.1 
## [15.57.1](https://github.com/frappe/erpnext/compare/v15.57.0...v15.57.1) (2025-04-11)

### Bug Fixes

* allow to use batchwise valuation for moving average items ([dded682](dded682feb))
v15.57.1 		2025-04-11 12:22:21 +00:00
rohitwaghchaure
f2684d9b4c Merge pull request #47018 from frappe/mergify/bp/version-15/pr-47017 
fix: allow to use batch-wise valuation for moving average items (backport #47015) (backport #47017)
 2025-04-11 17:50:55 +05:30
Rohit Waghchaure
dded682feb fix: allow to use batchwise valuation for moving average items 
(cherry picked from commit 65ba79bb85)
(cherry picked from commit e479975f54)
 2025-04-11 11:56:35 +00:00
Frappe PR Bot
1326ba5326 chore(release): Bumped to Version 15.57.0 
# [15.57.0](https://github.com/frappe/erpnext/compare/v15.56.0...v15.57.0) (2025-04-10)

### Bug Fixes

* bypass validation during reposting ([eaaac6e](eaaac6e596))
* item code not showing in the error message ([837509a](837509ae47))
* Recreate Stock Ledgers issue ([3db70fe](3db70febe1))
* remove get_items query.run outside of if condition ([bff4902](bff4902993))
* test file for v15 ([88f1cf2](88f1cf2943))

### Features

* available serial no report ([0f6a7ed](0f6a7edb53))

### Performance Improvements

* take query out of loop ([c7fead6](c7fead6bb0))
v15.57.0 		2025-04-10 07:31:47 +00:00
rohitwaghchaure
d047c965c6 Merge pull request #46990 from frappe/mergify/bp/version-15/pr-46947 
feat: available serial no report (backport #46383) (backport #46947)
 2025-04-10 12:59:58 +05:30
rohitwaghchaure
72e9844d27 Merge pull request #46987 from frappe/mergify/bp/version-15/pr-46985 
fix: item code not showing in the error message (backport #46933) (backport #46985)
 2025-04-10 12:59:36 +05:30
rohitwaghchaure
528b7534f7 Merge pull request #46991 from frappe/mergify/bp/version-15/pr-46989 
fix: Recreate Stock Ledgers issue (backport #46965) (backport #46989)
 2025-04-10 12:59:23 +05:30
rohitwaghchaure
3141e4a54f Merge pull request #46992 from frappe/mergify/bp/version-15/pr-46988 
fix: bypass validation during reposting (backport #46978) (backport #46988)
 2025-04-10 12:59:02 +05:30
Rohit Waghchaure
eaaac6e596 fix: bypass validation during reposting 
(cherry picked from commit 3697b9fd9b)
(cherry picked from commit 01aad96b10)
 2025-04-10 06:52:18 +00:00
Rohit Waghchaure
3db70febe1 fix: Recreate Stock Ledgers issue 
(cherry picked from commit 229a4cef45)
(cherry picked from commit b819e0a61b)
 2025-04-10 06:52:17 +00:00
Mihir Kandoi
88f1cf2943 fix: test file for v15 
(cherry picked from commit cc7756dd49)
 2025-04-10 06:14:40 +00:00
Mihir Kandoi
81f3f43e14 refactor: split and clean execute function to be more readable 
(cherry picked from commit 036af54d54)
(cherry picked from commit 6fedb7b9db)
 2025-04-10 06:14:40 +00:00
Mihir Kandoi
c7fead6bb0 perf: take query out of loop 
(cherry picked from commit 26de902496)
(cherry picked from commit 9af50528f1)
 2025-04-10 06:14:40 +00:00
Mihir Kandoi
bff4902993 fix: remove get_items query.run outside of if condition 
(cherry picked from commit 80c17cc005)
(cherry picked from commit e7b5303782)
 2025-04-10 06:14:39 +00:00
Mihir Kandoi
9cdd32ad6b refactor: import functions in new report instead of redundant code 
(cherry picked from commit 501f07803e)
(cherry picked from commit 0ec026ec7e)
 2025-04-10 06:14:39 +00:00
Mihir Kandoi
0f6a7edb53 feat: available serial no report 
(cherry picked from commit 5592d8e87f)
(cherry picked from commit c472af87b2)
 2025-04-10 06:14:39 +00:00
Rohit Waghchaure
837509ae47 fix: item code not showing in the error message 
(cherry picked from commit 86dee69c2f)
(cherry picked from commit 663e2b7e6c)
 2025-04-10 06:02:32 +00:00
Frappe PR Bot
52257c946e chore(release): Bumped to Version 15.56.0 
# [15.56.0](https://github.com/frappe/erpnext/compare/v15.55.5...v15.56.0) (2025-04-08)

### Bug Fixes

* **accounting:** update outstanding amount based on update_outstanding_for_self ([fb06f88](fb06f886d2))
* add `Not Cancelled` filter for `payment_entry` in Bank Transaction ([5d47db7](5d47db78e6))
* check payments against orders for getting request amount ([cf7252d](cf7252d3e7))
* condition to update the last puurchase rate ([353fa0c](353fa0cbc3))
* correct mapping(schedule_date) sales order to material request ([e2c8ed2](e2c8ed2afd))
* correct payment request amount ([23c76aa](23c76aa530))
* decimal values causing incorrect batch picking ([c5efdda](c5efddae16))
* do not use self object for setting party and party type ([d1311e6](d1311e619d))
* **Dunning:** undefined variable (backport [#46868](https://github.com/frappe/erpnext/issues/46868)) ([#46869](https://github.com/frappe/erpnext/issues/46869)) ([f63595c](f63595cf0c))
* empty party filter on change of party type in General Ledger Report. ([95cc282](95cc2827c6))
* expense account in the stock entry ([62f342e](62f342ef8b))
* Fix fieldtype in UnReconcile dialog ([7dfff8d](7dfff8d3a2))
* for deadlock issue keep status as In Progress ([34e66b1](34e66b1b27))
* ignore backflush setting on subcontracting return ([ca56150](ca56150918))
* improved rounding adjustment when applying discount (backport [#46720](https://github.com/frappe/erpnext/issues/46720)) ([7b864be](7b864bece8))
* include auto_reconcile_vouchers flag in background job ([26f93f5](26f93f57b8))
* incorrect condition ([502b8f2](502b8f25b3))
* inventory dimensions columns visibility depends on filter ([fe0e5c2](fe0e5c2d48))
* make message translatable (backport [#46863](https://github.com/frappe/erpnext/issues/46863)) ([#46866](https://github.com/frappe/erpnext/issues/46866)) ([d7bb4a2](d7bb4a288c))
* multiple Bank Reconciliation Tool issues ([#46644](https://github.com/frappe/erpnext/issues/46644)) ([e168483](e168483a58))
* **payment term:** allocate payment amount when payment term is fetched from order ([1b9980b](1b9980bb86))
* **portal:** context pay_amount for button ([b7ae17a](b7ae17aaaf))
* **portal:** payment amount for orders ([b0302d7](b0302d71b7))
* pos checking opened entry closed or not (backport [#46726](https://github.com/frappe/erpnext/issues/46726)) ([#46830](https://github.com/frappe/erpnext/issues/46830)) ([80f144a](80f144ac22))
* pos closed dialog on pos closing entry (backport [#46881](https://github.com/frappe/erpnext/issues/46881)) ([#46882](https://github.com/frappe/erpnext/issues/46882)) ([c1fe8f6](c1fe8f6000))
* pos opening entry's status not getting updated on cancel (backport [#46909](https://github.com/frappe/erpnext/issues/46909)) ([#46911](https://github.com/frappe/erpnext/issues/46911)) ([8b11d13](8b11d13cd4))
* remove against_voucher from General Ledger Report ([ba1e7e1](ba1e7e17fb))
* remove all serial/batch fields when use button is unselected ([13f1afa](13f1afa141))
* removed customer_group query in customer.js ([1aac8d3](1aac8d31f4))
* removed hardcoded search fields to fix performance issue ([48822f6](48822f6fee))
* resolve conflicts ([4d8984e](4d8984e4e9))
* restrict customer change if creating from opportunity ([2661147](26611475f6))
* set draft QC in purchase document on creation of qc ([54159b9](54159b9e5e))
* slow query ([23dc9d5](23dc9d5872))
* slow query ([af0fb13](af0fb131a2))
* stock entry repack amount calculation ([8c61639](8c61639062))
* Translate UnReconcile dialog title (backport [#46818](https://github.com/frappe/erpnext/issues/46818)) ([#46861](https://github.com/frappe/erpnext/issues/46861)) ([fcade5d](fcade5d8cd))
* update outstanding with precision ([e115409](e1154090f6))
* update payment amount if automatically_fetch_payment_terms is enabled ([ea289a4](ea289a40fb))
* update posting date before running validations ([2bf44dc](2bf44dc326))
* use `grand_total_diff` instead of `rounding_adjustment` in `taxes_and_totals` ([55b17b9](55b17b918f))
* use docstatus for status filter ([ab52524](ab52524f12))
* use get instead of dot operator to access dict value ([f2df8e5](f2df8e531d))
* use work_order bom_no if no bom present in operation ([c6979ab](c6979ab260))
* user permissions in sales and purchase report ([c705623](c705623fdc))
* validate if pos is opened before pos invoice creation (backport [#46907](https://github.com/frappe/erpnext/issues/46907)) ([#46910](https://github.com/frappe/erpnext/issues/46910)) ([999ab28](999ab28bf0))
* valuation rate not updating for raw materials ([454dd3a](454dd3a2f1))

### Features

* allow UOMs to select for which converstion rate defined in item master ([288aad6](288aad6f5d))
* **Customer:** add Dunning to dashboard ([1128b5f](1128b5f09c))
* option to recreate Stock Ledger Entries against stock transactions ([64fdcb7](64fdcb752d))

### Performance Improvements

* reduce query when validating any doc ([890abf6](890abf6b90))
* Stock entry cancel is slow ([1bdfd33](1bdfd33816))
v15.56.0 		2025-04-08 13:08:39 +00:00
ruthra kumar
c4ab17b947 Merge pull request #46940 from frappe/version-15-hotfix 
chore: release v15
 2025-04-08 18:37:09 +05:30
rohitwaghchaure
10cf575bba Merge pull request #46946 from frappe/mergify/bp/version-15-hotfix/pr-46942 
fix: ignore backflush setting on subcontracting return (backport #46942)
 2025-04-08 18:12:52 +05:30
Mihir Kandoi
ca56150918 fix: ignore backflush setting on subcontracting return 
(cherry picked from commit 7479e1ec32)
 2025-04-08 12:15:44 +00:00
ruthra kumar
617bebfa8f Merge pull request #46945 from frappe/mergify/bp/version-15-hotfix/pr-46892 
fix: use get instead of dot operator to access dict value to prevent no attribute error (backport #46892)
 2025-04-08 17:20:45 +05:30
Mihir Kandoi
f2df8e531d fix: use get instead of dot operator to access dict value 
(cherry picked from commit 7fb75f0482)
 2025-04-08 11:34:11 +00:00
ruthra kumar
c47b3c3642 Merge pull request #46932 from frappe/mergify/bp/version-15-hotfix/pr-46626 
fix: correct payment request amount (backport #46626)
 2025-04-08 16:56:25 +05:30
ruthra kumar
e271933e43 chore: resolve conflict 2025-04-08 16:33:07 +05:30
ljain112
23c76aa530 fix: correct payment request amount 
(cherry picked from commit 913c60d77b)

# Conflicts:
#	erpnext/accounts/doctype/payment_request/payment_request.py
 2025-04-08 16:33:07 +05:30
ruthra kumar
bed960df36 Merge pull request #46939 from frappe/mergify/bp/version-15-hotfix/pr-39701 
fix: check order paid amount before payment request (backport #39701)
 2025-04-08 16:30:28 +05:30
ruthra kumar
36bc87270c Merge pull request #46936 from frappe/mergify/bp/version-15-hotfix/pr-46631 
fix: update outstanding for self (backport #46631)
 2025-04-08 16:21:49 +05:30
ljain112
4d8984e4e9 fix: resolve conflicts 2025-04-08 15:54:44 +05:30
ruthra kumar
4eb0f39af7 chore: pass doctype and name 2025-04-08 15:15:24 +05:30
Gursheen Anand
b7ae17aaaf fix(portal): context pay_amount for button 
(cherry picked from commit 7efb5a8cb5)

# Conflicts:
#	erpnext/templates/pages/order.html
 2025-04-08 09:33:20 +00:00
Gursheen Anand
b0302d71b7 fix(portal): payment amount for orders 
(cherry picked from commit c18ff5bd25)

# Conflicts:
#	erpnext/templates/pages/order.py
 2025-04-08 09:33:20 +00:00
Gursheen Anand
cf7252d3e7 fix: check payments against orders for getting request amount 
(cherry picked from commit f7face43cd)

# Conflicts:
#	erpnext/accounts/doctype/payment_request/payment_request.py
 2025-04-08 09:33:19 +00:00
ruthra kumar
d6b488f529 chore: resolve conflict 2025-04-08 14:36:15 +05:30