CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-25 07:38:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,270 Commits 404 Branches 1,704 Tags
v13.54.2
Commit Graph

42270 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
ba7a822682 Merge pull request #37389 from frappe/mergify/bp/version-13/pr-37385 
refactor: multiple service providers for Currency Exchange rates (backport #37385)
v13.54.2 		2023-10-07 19:28:53 +05:30
ruthra kumar
32ae68eb5c refactor: access_key field for service_provider 
(cherry picked from commit 22fb65621c)
 2023-10-07 12:46:52 +00:00
ruthra kumar
9eb02637d8 refactor: selectable exchange rate service providers 
(cherry picked from commit 55dfd8e995)
 2023-10-07 12:46:52 +00:00
Frappe PR Bot
fa0eef96b9 chore(release): Bumped to Version 13.54.1 
## [13.54.1](https://github.com/frappe/erpnext/compare/v13.54.0...v13.54.1) (2023-10-05)

### Bug Fixes

* change currency exchange API to api.frankfurter.app ([1da808a](1da808a125))
v13.54.1 		2023-10-05 03:51:29 +00:00
ruthra kumar
ee42b0a16b Merge pull request #37365 from frappe/mergify/bp/version-13/pr-37355 
fix: change currency exchange API to api.frankfurter.app (backport #37355)
 2023-10-05 09:20:03 +05:30
ruthra kumar
40e475836e refactor(test): update exchange rate based on 'frankfurter' provider 
(cherry picked from commit a3fd4db450)
 2023-10-05 03:14:51 +00:00
dsnetprofitxl
1da808a125 fix: change currency exchange API to api.frankfurter.app 
(cherry picked from commit 76919c4af2)
 2023-10-05 03:14:49 +00:00
Frappe PR Bot
b0708d29a8 chore(release): Bumped to Version 13.54.0 
# [13.54.0](https://github.com/frappe/erpnext/compare/v13.53.0...v13.54.0) (2023-10-04)

### Bug Fixes

* incorrect stock ledger entries in DN (backport [#36944](https://github.com/frappe/erpnext/issues/36944)) ([#37067](https://github.com/frappe/erpnext/issues/37067)) ([5833c4d](5833c4dae2))
* trial balance report freezes when adding filters (backport [#37264](https://github.com/frappe/erpnext/issues/37264)) ([#37267](https://github.com/frappe/erpnext/issues/37267)) ([ff6b38c](ff6b38c9e7))
* Update `advance_paid` in SO/PO after unlinking from advance entry ([a6bef64](a6bef64c8e))

### Features

* `Stock Ledger Variance` report (backport [#37165](https://github.com/frappe/erpnext/issues/37165)) ([#37184](https://github.com/frappe/erpnext/issues/37184)) ([5092ea1](5092ea175e))
* provision to make reposting entries from Stock and Account Value Comparison Report (backport [#35365](https://github.com/frappe/erpnext/issues/35365)) ([#37171](https://github.com/frappe/erpnext/issues/37171)) ([48eb6a6](48eb6a6573))
v13.54.0 		2023-10-04 04:15:19 +00:00
ruthra kumar
caa8417306 Merge pull request #37340 from frappe/version-13-hotfix 
chore: release v13
 2023-10-04 09:43:53 +05:30
mergify[bot]
ff6b38c9e7 fix: trial balance report freezes when adding filters (backport #37264) (#37267) 
fix: trial balance report freezes when adding filters (#37264)

fix: Only add onclick if correct data is returned

workaround for https://github.com/frappe/datatable/issues/177

(cherry picked from commit 2dc95e5d59)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-09-27 12:37:10 +05:30
Frappe PR Bot
4285bbcdc0 chore: release v13 (#37245) 
* feat: provision to make reposting entries from Stock and Account Value Comparison Report (backport #35365) (#37171)

* feat: provision to make reposting entries from Stock and Account Value Comparison Report

(cherry picked from commit 7b818e9d34)

* fix: `linter`

* fix(ux): throw if no row selected to create repost entries

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>

* fix: incorrect stock ledger entries in DN (backport #36944) (#37067)

* fix: incorrect stock ledger entries in DN (#36944)

(cherry picked from commit 0e83190c19)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/delivery_note.json

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>

* feat: `Stock Ledger Variance` report (backport #37165) (#37184)

feat: `Stock Ledger Variance` report (#37165)

* feat: `Stock Ledger Variance` report

* refactor: `get_data()`

(cherry picked from commit acda72d616)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>

* fix: Update `advance_paid` in SO/PO after unlinking from advance entry

(cherry picked from commit 426350eee6)

* test: Impact on SO of advance PE submit and unlinking/replacement by SI

(cherry picked from commit 8a4954d713)

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2023-09-27 09:25:47 +05:30
ruthra kumar
b6dc47ec8a Merge pull request #37197 from frappe/mergify/bp/version-13-hotfix/pr-37069 
fix: Recalculate `advance_paid` in SO/PO after unlinking from advance entry (backport #37069)
 2023-09-23 11:05:10 +05:30
marination
d0c6f286cf test: Impact on SO of advance PE submit and unlinking/replacement by SI 
(cherry picked from commit 8a4954d713)
 2023-09-22 03:06:37 +00:00
marination
a6bef64c8e fix: Update advance_paid in SO/PO after unlinking from advance entry 
(cherry picked from commit 426350eee6)
 2023-09-22 03:06:36 +00:00
mergify[bot]
5092ea175e feat: Stock Ledger Variance report (backport #37165) (#37184) 
feat: `Stock Ledger Variance` report (#37165)

* feat: `Stock Ledger Variance` report

* refactor: `get_data()`

(cherry picked from commit acda72d616)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-09-21 07:59:13 +00:00
mergify[bot]
5833c4dae2 fix: incorrect stock ledger entries in DN (backport #36944) (#37067) 
* fix: incorrect stock ledger entries in DN (#36944)

(cherry picked from commit 0e83190c19)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/delivery_note.json

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-09-20 18:12:08 +05:30
mergify[bot]
48eb6a6573 feat: provision to make reposting entries from Stock and Account Value Comparison Report (backport #35365) (#37171) 
* feat: provision to make reposting entries from Stock and Account Value Comparison Report

(cherry picked from commit 7b818e9d34)

* fix: `linter`

* fix(ux): throw if no row selected to create repost entries

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-09-20 11:14:48 +00:00
Frappe PR Bot
7c1288f726 chore(release): Bumped to Version 13.53.0 
# [13.53.0](https://github.com/frappe/erpnext/compare/v13.52.15...v13.53.0) (2023-09-19)

### Bug Fixes

* fetch logic for repay_from_salary in loan_repayment [v13] ([#37136](https://github.com/frappe/erpnext/issues/37136)) ([d4f8b05](d4f8b057e1))

### Features

* provision to create RIV from `Stock Ledger Invariant Check` report (backport [#37115](https://github.com/frappe/erpnext/issues/37115)) ([#37149](https://github.com/frappe/erpnext/issues/37149)) ([86b152f](86b152fe5c))
v13.53.0 		2023-09-19 13:22:41 +00:00
Deepesh Garg
c89715d6da Merge pull request #37154 from frappe/version-13-hotfix 
chore: release v13
 2023-09-19 18:50:07 +05:30
Anand Baburajan
d4f8b057e1 fix: fetch logic for repay_from_salary in loan_repayment [v13] (#37136) 
fix: fetch logic for repay_from_salary in loan_repayment
 2023-09-19 15:18:17 +05:30
mergify[bot]
86b152fe5c feat: provision to create RIV from Stock Ledger Invariant Check report (backport #37115) (#37149) 
* feat: provision to create RIV from `Stock Ledger Invariant Check` report (#37115)

* feat: provision to create RIV from `Stock Ledger Invariant Check` report

* fix: `linter`

(cherry picked from commit 9c9d0ecb73)

# Conflicts:
#	erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-09-19 09:19:46 +00:00
Frappe PR Bot
11b16569e5 chore(release): Bumped to Version 13.52.15 
## [13.52.15](https://github.com/frappe/erpnext/compare/v13.52.14...v13.52.15) (2023-09-12)

### Bug Fixes

* prorate factor for subscription plan ([#36953](https://github.com/frappe/erpnext/issues/36953)) ([9a15ed8](9a15ed8083))
v13.52.15 		2023-09-12 12:21:41 +00:00
Deepesh Garg
cd99630457 Merge pull request #37044 from frappe/version-13-hotfix 
chore: release v13
 2023-09-12 17:50:08 +05:30
Frappe PR Bot
efab1e7361 chore(release): Bumped to Version 13.52.14 
## [13.52.14](https://github.com/frappe/erpnext/compare/v13.52.13...v13.52.14) (2023-09-10)

### Bug Fixes

* prorate factor for subscription plan ([#36953](https://github.com/frappe/erpnext/issues/36953)) ([d7f09f8](d7f09f8795))
v13.52.14 		2023-09-10 18:30:02 +00:00
Deepesh Garg
63a6e7e35c Merge pull request #37018 from frappe/mergify/bp/version-13/pr-37009 
fix: prorate factor for subscription plan (#36953)
 2023-09-10 23:58:35 +05:30
Gursheen Kaur Anand
d7f09f8795 fix: prorate factor for subscription plan (#36953) 
(cherry picked from commit fc79af5926)
(cherry picked from commit 9a15ed8083)
 2023-09-10 17:58:33 +00:00
Deepesh Garg
437a294621 Merge pull request #37009 from frappe/mergify/bp/version-13-hotfix/pr-36953 
fix: prorate factor for subscription plan (#36953)
 2023-09-10 12:21:09 +05:30
Gursheen Kaur Anand
9a15ed8083 fix: prorate factor for subscription plan (#36953) 
(cherry picked from commit fc79af5926)
 2023-09-10 06:06:12 +00:00
mergify[bot]
3a49d4f9b3 chore: asset finance books validation (backport #36979) (#36982) 
* chore: asset finance books validation (#36979)

(cherry picked from commit 0077659e93)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.py

* chore: fix conflicts

* chore: fix tests

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-09-06 15:39:44 +05:30
Frappe PR Bot
8b2c6ed61a chore(release): Bumped to Version 13.52.13 
## [13.52.13](https://github.com/frappe/erpnext/compare/v13.52.12...v13.52.13) (2023-09-06)

### Bug Fixes

* ask for asset related accounts only when needed (backport [#36960](https://github.com/frappe/erpnext/issues/36960)) ([#36972](https://github.com/frappe/erpnext/issues/36972)) ([3a71fa9](3a71fa9d96))
* update repay_from_salary, payment_account and payroll_payable_account fields ([#36949](https://github.com/frappe/erpnext/issues/36949)) ([6f40d0c](6f40d0cdf6))
v13.52.13 		2023-09-06 07:24:52 +00:00
Deepesh Garg
4f98e958a1 Merge pull request #36962 from frappe/version-13-hotfix 
chore: release v13
 2023-09-06 12:52:49 +05:30
mergify[bot]
3a71fa9d96 fix: ask for asset related accounts only when needed (backport #36960) (#36972) 
fix: ask for asset related accounts only when needed (#36960)

* fix: only ask for asset_received_but_not_billed account when needed

* chore: remove unnecessary if condition

* fix: only ask for expenses_included_in_asset_valuation account when needed

(cherry picked from commit 174f95d699)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-09-05 18:14:49 +05:30
Anand Baburajan
6f40d0cdf6 fix: update repay_from_salary, payment_account and payroll_payable_account fields (#36949) 
* fix: update repay_from_salary, payment_account and payroll_payable_account fields

* chore: formatting
 2023-09-05 12:43:09 +05:30
Anand Baburajan
5bd6c27b05 chore: patch to correct asset values if je has workflow [v13] (#36916) 
chore: patch to correct asset values if je has workflow
 2023-09-02 18:32:23 +05:30
Frappe PR Bot
9876019c69 chore(release): Bumped to Version 13.52.12 
## [13.52.12](https://github.com/frappe/erpnext/compare/v13.52.11...v13.52.12) (2023-08-22)

### Bug Fixes

* disallow mulitple SO with same PO No ([3b9ac9f](3b9ac9f46a))
* timeout error coming during reposting (backport [#36715](https://github.com/frappe/erpnext/issues/36715)) ([#36753](https://github.com/frappe/erpnext/issues/36753)) ([783bb93](783bb93913))
v13.52.12 		2023-08-22 16:59:52 +00:00
Deepesh Garg
f4fb878282 Merge pull request #36762 from frappe/version-13-hotfix 
chore: release v13
 2023-08-22 22:28:20 +05:30
mergify[bot]
783bb93913 fix: timeout error coming during reposting (backport #36715) (#36753) 
fix: timeout error coming during reposting (#36715)

(cherry picked from commit 620b21fec5)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-08-22 13:22:48 +05:30
Frappe PR Bot
cfbd9af100 chore(release): Bumped to Version 13.52.11 
## [13.52.11](https://github.com/frappe/erpnext/compare/v13.52.10...v13.52.11) (2023-08-17)

### Bug Fixes

* disallow mulitple SO with same PO No ([bdaae81](bdaae81171))
v13.52.11 		2023-08-17 10:12:01 +00:00
ruthra kumar
966c296872 Merge pull request #36680 from frappe/mergify/bp/version-13/pr-36590 
fix: disallow mulitple SO with same Purchase Order No if not enabled in Settings (backport #36590)
 2023-08-17 15:40:34 +05:30
ruthra kumar
0ff871e38e chore: resolve conflict 2023-08-17 09:11:47 +05:30
ruthra kumar
9df10dbc40 refactor(test): don't set po_no by default 
(cherry picked from commit 64614cd915)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/test_delivery_note.py
 2023-08-17 03:33:56 +00:00
ruthra kumar
bdaae81171 fix: disallow mulitple SO with same PO No 
(cherry picked from commit dbd3fdbb41)
 2023-08-17 03:33:56 +00:00
ruthra kumar
066cf0e3bc Merge pull request #36671 from frappe/mergify/bp/version-13-hotfix/pr-36590 
fix: disallow mulitple SO with same Purchase Order No if not enabled in Settings (backport #36590)
 2023-08-16 16:21:33 +05:30
ruthra kumar
829298066f chore: resolve conflict 2023-08-16 15:02:04 +05:30
ruthra kumar
006da22d3f refactor(test): don't set po_no by default 
(cherry picked from commit 64614cd915)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/test_delivery_note.py
 2023-08-16 09:12:18 +00:00
ruthra kumar
3b9ac9f46a fix: disallow mulitple SO with same PO No 
(cherry picked from commit dbd3fdbb41)
 2023-08-16 09:12:17 +00:00
Frappe PR Bot
8f977f40f0 chore(release): Bumped to Version 13.52.10 
## [13.52.10](https://github.com/frappe/erpnext/compare/v13.52.9...v13.52.10) (2023-08-16)

### Bug Fixes

* Allow backdated repayment cancels for term loans ([c417365](c417365e03))
* payment allocation in invoice payment schedule ([#36440](https://github.com/frappe/erpnext/issues/36440)) ([e5b3860](e5b38607ce))

### Performance Improvements

* **invoice:** Faster return amount query (backport [#36556](https://github.com/frappe/erpnext/issues/36556)) ([#36558](https://github.com/frappe/erpnext/issues/36558)) ([a801bba](a801bba83e))
v13.52.10 		2023-08-16 02:46:48 +00:00
Deepesh Garg
3bc7c88133 Merge pull request #36657 from frappe/version-13-hotfix 
chore: release v13
 2023-08-16 08:15:05 +05:30
mergify[bot]
84b6f68108 chore: add validation for depreciation expense account in asset category (backport #36659) (#36662) 
chore: add validation for depreciation expense account in asset category (#36659)

(cherry picked from commit e0c79d3b53)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-08-15 18:26:33 +05:30
mergify[bot]
e5b38607ce fix: payment allocation in invoice payment schedule (#36440) 
fix: payment allocation in invoice payment schedule (#36440)
 2023-08-13 13:21:04 +05:30