Frappe PR Bot
|
13dfbe3d80
|
chore(release): Bumped to Version 14.70.3
## [14.70.3](https://github.com/frappe/erpnext/compare/v14.70.2...v14.70.3) (2024-05-29)
### Bug Fixes
* add in some indices to speed up Purchase Order deletion ([c16c41e](c16c41ee59))
* Add to Cart button width for Mobile/Tablet ([819ced4](819ced4cb3))
* cost center filter according to the company in project ([7035969](7035969db7))
* cost center filter according to the company in project ([0cf97f2](0cf97f2559))
* cost center filter according to the company in project ([459d136](459d136368))
* dict can not be used as parameter ([#41598](https://github.com/frappe/erpnext/issues/41598)) ([649c192](649c192abe))
* Fetch outstanding and total amount for reference journal entry ([50f6afd](50f6afd588))
* set expense account as Assets RBNB only if it is booked in linked PR ([#41368](https://github.com/frappe/erpnext/issues/41368)) ([014486d](014486de39))
* Update depreciation schedule via asset repair ([#41344](https://github.com/frappe/erpnext/issues/41344)) ([eb418e8](eb418e8659))
v14.70.3
|
2024-05-29 07:52:36 +00:00 |
|
ruthra kumar
|
7e3c15e0b6
|
Merge pull request #41665 from frappe/version-14-hotfix
chore: release v14
|
2024-05-29 13:21:18 +05:30 |
|
Nabin Hait
|
eb418e8659
|
fix: Update depreciation schedule via asset repair (#41344)
* fix: Update depreciation schedule via asset repair
* fix: test cases related to modified depreciation schedule
|
2024-05-29 11:07:03 +05:30 |
|
Nabin Hait
|
014486de39
|
fix: set expense account as Assets RBNB only if it is booked in linked PR (#41368)
* fix: set expense account as Assets RBNB only if it is booked in linked PR
* fix: broken translations
|
2024-05-29 10:46:06 +05:30 |
|
Akhil Narang
|
fcb2f4f084
|
Merge pull request #41624 from frappe/mergify/bp/version-14-hotfix/pr-41601
fix: add in some indices to speed up Purchase Order deletion (backport #41601)
|
2024-05-27 13:31:51 +05:30 |
|
Akhil Narang
|
308f200793
|
Merge pull request #41610 from frappe/mergify/bp/version-14-hotfix/pr-41609
refactor: use `json` directly instead of using `frappe.json` (backport #41609)
|
2024-05-27 13:31:29 +05:30 |
|
Akhil Narang
|
4fcfbe6e9f
|
Merge pull request #41597 from frappe/mergify/bp/version-14-hotfix/pr-41576
chore: sync ruff config with framework (backport #41576)
|
2024-05-27 13:31:22 +05:30 |
|
Akhil Narang
|
5b2c13dacf
|
refactor: use json directly instead of using frappe.json (#41609)
(cherry picked from commit 3f06f1905f)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
|
2024-05-27 07:26:24 +00:00 |
|
Ankush Menat
|
76b7884fb7
|
ci: ruff only fix imports
(cherry picked from commit 85b1a8001b)
|
2024-05-27 07:26:14 +00:00 |
|
Ankush Menat
|
518dad8ecb
|
ci: dont auto apply fixes
I've personally encountered ~5 instances of bad auto fixes, let
developers apply the fixes.
(cherry picked from commit 3b4913ec81)
|
2024-05-27 07:26:14 +00:00 |
|
Akhil Narang
|
220ae118e8
|
chore: resolve conflicts
|
2024-05-27 07:25:29 +00:00 |
|
Akhil Narang
|
f1f2f6e338
|
chore: resolve conflicts
|
2024-05-27 07:25:29 +00:00 |
|
Akhil Narang
|
c16c41ee59
|
fix: add in some indices to speed up Purchase Order deletion
`tabSales Order`.`inter_company_order_reference`
`tabSales Invoice Item`.`purchase_order`
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
(cherry picked from commit 0303d7dbdc)
# Conflicts:
# erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
# erpnext/selling/doctype/sales_order/sales_order.json
|
2024-05-27 07:25:29 +00:00 |
|
ruthra kumar
|
dcffb3886b
|
Merge pull request #41648 from frappe/mergify/bp/version-14-hotfix/pr-41401
fix: cost center filter according to the company in project (backport #41401)
|
2024-05-27 10:41:59 +05:30 |
|
Nihantra C. Patel
|
7035969db7
|
fix: cost center filter according to the company in project
(cherry picked from commit 501c6aa126)
|
2024-05-27 04:41:12 +00:00 |
|
Nihantra C. Patel
|
0cf97f2559
|
fix: cost center filter according to the company in project
(cherry picked from commit cfde8088b4)
|
2024-05-27 04:41:12 +00:00 |
|
Nihantra C. Patel
|
459d136368
|
fix: cost center filter according to the company in project
(cherry picked from commit 249e8264dd)
|
2024-05-27 04:41:11 +00:00 |
|
ruthra kumar
|
a2bfe31876
|
Merge pull request #40289 from Nihantra-Patel/fix_button_size_for_add_to_cart
fix: Add to Cart button width for Mobile/Tablet
|
2024-05-24 10:57:15 +05:30 |
|
ruthra kumar
|
75b021dc23
|
Merge pull request #41604 from frappe/mergify/bp/version-14-hotfix/pr-41603
refactor: remove 'format:' based naming in internal doctypes (backport #41603)
|
2024-05-24 10:54:45 +05:30 |
|
ruthra kumar
|
b2e2e951da
|
Merge pull request #41606 from frappe/mergify/bp/version-14-hotfix/pr-41594
refactor: 'Payment Period Based On Invoice Date' report (backport #41594)
|
2024-05-24 10:54:07 +05:30 |
|
ruthra kumar
|
0f9b5074a6
|
chore: resolve conflicts
|
2024-05-23 17:47:47 +05:30 |
|
ruthra kumar
|
190900cd1b
|
refactor: replace against_voucher with against_voucher_no
(cherry picked from commit c4e2abb973)
|
2024-05-23 12:16:41 +00:00 |
|
ruthra kumar
|
3512f7d528
|
refactor: remove debit and credit
(cherry picked from commit 014b542cf3)
|
2024-05-23 12:16:40 +00:00 |
|
ruthra kumar
|
0dc2f78a2e
|
refactor: query payment ledger for payments
(cherry picked from commit cb3c20dcd3)
|
2024-05-23 12:16:40 +00:00 |
|
ruthra kumar
|
c834a9de85
|
refactor: remove 'format:' based naming in internal doctypes
(cherry picked from commit e2ec3e453a)
# Conflicts:
# erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json
# erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json
|
2024-05-23 12:15:21 +00:00 |
|
Frappe PR Bot
|
c910b8ab03
|
chore(release): Bumped to Version 14.70.2
## [14.70.2](https://github.com/frappe/erpnext/compare/v14.70.1...v14.70.2) (2024-05-23)
### Bug Fixes
* Fetch outstanding and total amount for reference journal entry ([94c3ee6](94c3ee645d))
v14.70.2
|
2024-05-23 11:01:54 +00:00 |
|
ruthra kumar
|
b9ebb50a02
|
Merge pull request #41600 from frappe/mergify/bp/version-14/pr-40957
fix: Fetch correct outstanding and total amount for reference journal entry (backport #40920) (backport #40957)
|
2024-05-23 16:30:31 +05:30 |
|
ruthra kumar
|
38cc28a4c3
|
chore: resolve conflicts
(cherry picked from commit 5230d411bf)
|
2024-05-23 10:39:16 +00:00 |
|
ruthra kumar
|
bbb9b9e3b6
|
chore: remove unused imports
(cherry picked from commit a6bf7c1ebd)
|
2024-05-23 10:39:15 +00:00 |
|
Nabin Hait
|
94c3ee645d
|
fix: Fetch outstanding and total amount for reference journal entry
(cherry picked from commit f331f9b15c)
# Conflicts:
# erpnext/accounts/doctype/payment_entry/payment_entry.js
# erpnext/accounts/doctype/payment_entry/payment_entry.py
(cherry picked from commit 50f6afd588)
|
2024-05-23 10:39:15 +00:00 |
|
ruthra kumar
|
4d8c35aa5d
|
Merge pull request #40957 from frappe/mergify/bp/version-14-hotfix/pr-40920
fix: Fetch correct outstanding and total amount for reference journal entry (backport #40920)
|
2024-05-23 16:08:14 +05:30 |
|
ruthra kumar
|
5230d411bf
|
chore: resolve conflicts
|
2024-05-23 15:42:34 +05:30 |
|
ruthra kumar
|
a6bf7c1ebd
|
chore: remove unused imports
|
2024-05-23 15:42:34 +05:30 |
|
Nabin Hait
|
50f6afd588
|
fix: Fetch outstanding and total amount for reference journal entry
(cherry picked from commit f331f9b15c)
# Conflicts:
# erpnext/accounts/doctype/payment_entry/payment_entry.js
# erpnext/accounts/doctype/payment_entry/payment_entry.py
|
2024-05-23 15:42:34 +05:30 |
|
rohitwaghchaure
|
649c192abe
|
fix: dict can not be used as parameter (#41598)
|
2024-05-23 15:37:00 +05:30 |
|
Frappe PR Bot
|
b7d6a54bed
|
chore(release): Bumped to Version 14.70.1
## [14.70.1](https://github.com/frappe/erpnext/compare/v14.70.0...v14.70.1) (2024-05-22)
### Bug Fixes
* minor Dr and Cr between Purchase Receipt and Purchase Invoice ([82d206b](82d206b709))
* possible sql error on General Ledger ([dfb4c47](dfb4c47089))
* print format bold for field "total" ([89d507e](89d507e07e))
* priority not working for multiple pricing rules (backport [#41516](https://github.com/frappe/erpnext/issues/41516)) ([#41524](https://github.com/frappe/erpnext/issues/41524)) ([97fdda8](97fdda8a7c))
* typerror on hide_fields ([331a743](331a743d69))
* validate reorder group warehouse (backport [#41478](https://github.com/frappe/erpnext/issues/41478)) ([#41479](https://github.com/frappe/erpnext/issues/41479)) ([2659535](26595351cc))
v14.70.1
|
2024-05-22 08:46:30 +00:00 |
|
ruthra kumar
|
05e4dae1b8
|
Merge pull request #41575 from frappe/version-14-hotfix
chore: release v14
|
2024-05-22 14:15:11 +05:30 |
|
mergify[bot]
|
97fdda8a7c
|
fix: priority not working for multiple pricing rules (backport #41516) (#41524)
* fix: priority not working for multiple pricing rules (#41516)
(cherry picked from commit 5cf5b18aea)
# Conflicts:
# erpnext/accounts/doctype/pricing_rule/pricing_rule.json
# erpnext/accounts/doctype/pricing_rule/pricing_rule.py
# erpnext/patches.txt
* chore: fix conflicts
* chore: fix conflicts
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-05-20 13:39:39 +05:30 |
|
ruthra kumar
|
9802333397
|
Merge pull request #41527 from frappe/mergify/bp/version-14-hotfix/pr-41523
fix: minor Dr and Cr between Purchase Receipt and Purchase Invoice (backport #41523)
|
2024-05-20 08:32:24 +05:30 |
|
ruthra kumar
|
82d206b709
|
fix: minor Dr and Cr between Purchase Receipt and Purchase Invoice
This applies for Provisional Accounting for Non-stock items
(cherry picked from commit 1c0a24424a)
|
2024-05-17 12:21:28 +00:00 |
|
ruthra kumar
|
80810c2ebb
|
Merge pull request #41518 from frappe/mergify/bp/version-14-hotfix/pr-41517
fix: typerror on hide_fields (backport #41517)
|
2024-05-17 14:54:06 +05:30 |
|
ruthra kumar
|
331a743d69
|
fix: typerror on hide_fields
(cherry picked from commit deb9766f2a)
|
2024-05-17 14:51:57 +05:30 |
|
ruthra kumar
|
32a1fea8f0
|
Merge pull request #41512 from frappe/mergify/bp/version-14-hotfix/pr-41511
fix: possible sql error on General Ledger (backport #41511)
|
2024-05-17 11:17:24 +05:30 |
|
ruthra kumar
|
dfb4c47089
|
fix: possible sql error on General Ledger
(cherry picked from commit 76131f8e10)
|
2024-05-17 05:26:54 +00:00 |
|
mergify[bot]
|
0cbf049608
|
chore(BOM Explorer): display items in the same order as in the BOM (backport #41496) (#41510)
chore(BOM Explorer): display items in the same order as in the BOM (#41496)
(cherry picked from commit bd381cc0c6)
Co-authored-by: Samuel Danieli <23150094+scdanieli@users.noreply.github.com>
|
2024-05-17 09:37:03 +05:30 |
|
ruthra kumar
|
3f0cb47464
|
Merge pull request #41500 from frappe/mergify/bp/version-14-hotfix/pr-40072
fix: print format bold for field "total" (backport #40072)
|
2024-05-16 15:35:48 +05:30 |
|
Nihantra C. Patel
|
89d507e07e
|
fix: print format bold for field "total"
(cherry picked from commit 3c9640df27)
|
2024-05-16 10:04:03 +00:00 |
|
mergify[bot]
|
26595351cc
|
fix: validate reorder group warehouse (backport #41478) (#41479)
fix: validate reorder group warehouse (#41478)
(cherry picked from commit 0363afcfd0)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-05-15 15:15:41 +05:30 |
|
Frappe PR Bot
|
dfaca93292
|
chore(release): Bumped to Version 14.70.0
# [14.70.0](https://github.com/frappe/erpnext/compare/v14.69.1...v14.70.0) (2024-05-15)
### Bug Fixes
* "Based on" field always has the value "Not applicable" ([1078a98](1078a98cce))
* address filter and quotation to for prospect ([c9e7f45](c9e7f450c5))
* address filter and quotation to for prospect ([6902780](690278042d))
* address filter and quotation to for prospect ([754e193](754e193c76))
* consistent use of "Address & Contact" (backport [#41386](https://github.com/frappe/erpnext/issues/41386)) ([#41387](https://github.com/frappe/erpnext/issues/41387)) ([256d6a4](256d6a47ac))
* data getting override in delivery trip (backport [#41431](https://github.com/frappe/erpnext/issues/41431)) ([#41432](https://github.com/frappe/erpnext/issues/41432)) ([5366356](5366356400))
* Default dates in report ([c3244f0](c3244f009b))
* default fiscal year ([7a380f5](7a380f584d))
* Duplicate party name column in AR/AP report ([a8be5f0](a8be5f0789))
* PSOA ageing ([e69e540](e69e5404d3))
### Features
* allow to pick manually qty / batches / serial nos (backport [#40723](https://github.com/frappe/erpnext/issues/40723)) ([#41435](https://github.com/frappe/erpnext/issues/41435)) ([7b28d7d](7b28d7d2b8))
v14.70.0
|
2024-05-15 05:12:14 +00:00 |
|
Deepesh Garg
|
40de3f3481
|
Merge pull request #41458 from frappe/version-14-hotfix
chore: release v14
|
2024-05-15 10:40:58 +05:30 |
|