ruthra kumar
|
e142daca7f
|
chore: hide docfield in list view
(cherry picked from commit 98afb4d468)
|
2024-03-20 14:13:15 +00:00 |
|
ruthra kumar
|
962105bc87
|
refactor: validations to prevent duplicate jobs
(cherry picked from commit 31a2da552b)
|
2024-03-20 14:13:15 +00:00 |
|
ruthra kumar
|
e600109872
|
refactor: no copy on summary table and more validations
(cherry picked from commit 55e93b3fe1)
|
2024-03-20 14:13:15 +00:00 |
|
ruthra kumar
|
97ed905627
|
refactor: reset all flags and remove unwanted code
(cherry picked from commit 2dbe68a09d)
|
2024-03-20 14:13:14 +00:00 |
|
ruthra kumar
|
c38cfd14f3
|
chore: show correct status in list view
(cherry picked from commit 1014940953)
|
2024-03-20 14:13:14 +00:00 |
|
ruthra kumar
|
341e467056
|
refactor: validate status before running events
(cherry picked from commit 86b5e2e277)
|
2024-03-20 14:13:14 +00:00 |
|
ruthra kumar
|
833df2c76b
|
refactor: make Excluded doctype table read only
(cherry picked from commit 7c4cff2649)
|
2024-03-20 14:13:13 +00:00 |
|
ruthra kumar
|
a303788c71
|
chore: remove unwanted UI code
(cherry picked from commit b98a5e4edc)
|
2024-03-20 14:13:13 +00:00 |
|
ruthra kumar
|
0d791f594f
|
refactor: use separate child table for summary
(cherry picked from commit 49d3bcbc8d)
|
2024-03-20 14:13:13 +00:00 |
|
ruthra kumar
|
b1367e839c
|
refactor: chained callback
(cherry picked from commit b12ca65fcc)
|
2024-03-20 14:13:12 +00:00 |
|
ruthra kumar
|
e56138ddb0
|
refactor: reorder flags in Tasks section
(cherry picked from commit cccb2d5141)
|
2024-03-20 14:13:12 +00:00 |
|
ruthra kumar
|
c9d77044b0
|
refactor: use flags to decide on current stage
(cherry picked from commit 6a77d86a53)
# Conflicts:
# erpnext/setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.py
|
2024-03-20 14:13:12 +00:00 |
|
ruthra kumar
|
5542985e25
|
refactor: UI trigger
(cherry picked from commit 8944ab8b6a)
|
2024-03-20 14:13:11 +00:00 |
|
ruthra kumar
|
52d22d8b55
|
refactor: tasks section and UI niceties
(cherry picked from commit d0dc2c6e77)
|
2024-03-20 14:13:11 +00:00 |
|
ruthra kumar
|
7280a76f73
|
refactor: set status and trigger job on submit
(cherry picked from commit 6fbb67b1d2)
|
2024-03-20 14:13:10 +00:00 |
|
ruthra kumar
|
07c98146c5
|
refactor: more options for 'status' and move it to top
(cherry picked from commit 0d65d878de)
# Conflicts:
# erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py
|
2024-03-20 14:13:10 +00:00 |
|
Ankush Menat
|
e922ac7c31
|
fix: style for tax breakup
(cherry picked from commit 967540da18)
# Conflicts:
# erpnext/public/scss/erpnext.scss
|
2024-03-20 13:12:16 +00:00 |
|
Gursheen Anand
|
bba1ac5735
|
fix: use Text Editor for rendering tax breakup table
(cherry picked from commit 1c63983873)
# Conflicts:
# erpnext/accounts/doctype/pos_invoice/pos_invoice.py
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
# erpnext/accounts/doctype/sales_invoice/sales_invoice.py
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/buying/doctype/purchase_order/purchase_order.py
# erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
# erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/quotation/quotation.py
# erpnext/selling/doctype/sales_order/sales_order.py
# erpnext/stock/doctype/delivery_note/delivery_note.json
# erpnext/stock/doctype/delivery_note/delivery_note.py
# erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
|
2024-03-20 13:12:15 +00:00 |
|
Ankush Menat
|
a0156e1e47
|
fix: style for tax breakup
(cherry picked from commit 967540da18)
# Conflicts:
# erpnext/public/scss/erpnext.scss
|
2024-03-20 13:06:47 +00:00 |
|
Gursheen Anand
|
7df09d18e1
|
fix: use Text Editor for rendering tax breakup table
(cherry picked from commit 1c63983873)
# Conflicts:
# erpnext/accounts/doctype/pos_invoice/pos_invoice.py
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
# erpnext/accounts/doctype/sales_invoice/sales_invoice.py
# erpnext/buying/doctype/purchase_order/purchase_order.json
# erpnext/buying/doctype/purchase_order/purchase_order.py
# erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
# erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
# erpnext/selling/doctype/quotation/quotation.json
# erpnext/selling/doctype/quotation/quotation.py
# erpnext/selling/doctype/sales_order/sales_order.py
# erpnext/stock/doctype/delivery_note/delivery_note.json
# erpnext/stock/doctype/delivery_note/delivery_note.py
# erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
|
2024-03-20 13:06:46 +00:00 |
|
Frappe PR Bot
|
b6575176f7
|
chore(release): Bumped to Version 14.65.4
## [14.65.4](https://github.com/frappe/erpnext/compare/v14.65.3...v14.65.4) (2024-03-20)
### Bug Fixes
* added index for voucher_detail_no in gl entry ([a1c8b93](a1c8b93e99))
* currency symbol for Landed Cost Voucher Amount (backport [#40550](https://github.com/frappe/erpnext/issues/40550)) ([#40553](https://github.com/frappe/erpnext/issues/40553)) ([7851311](785131121d))
* Data too long for column 'stock_queue' ([#40450](https://github.com/frappe/erpnext/issues/40450)) ([3340463](3340463b8e))
* flaky ecommerce test case ([#40534](https://github.com/frappe/erpnext/issues/40534)) ([b197c19](b197c1926f))
* get unique provisional accounts ([39d958c](39d958c507))
* index error on Exchange Rate Revaluation creation ([8813b6b](8813b6b2fd))
* invalid exchange loss booking on invoice againts base accounts ([a27f386](a27f386665))
* missing range for ageing summary ([9f0ad7a](9f0ad7a4ea))
* provisional entry for non-stock item ([0aef7f9](0aef7f9671))
* **Supplier Quotation Comparison:** group by options ([cfed706](cfed706c15))
* Update Existing Price List Rate not working (backport [#40333](https://github.com/frappe/erpnext/issues/40333)) ([#40526](https://github.com/frappe/erpnext/issues/40526)) ([64f1844](64f1844bc8))
* warehouse issue in pick list ([#40453](https://github.com/frappe/erpnext/issues/40453)) ([5a2eaf9](5a2eaf9092))
v14.65.4
|
2024-03-20 05:23:36 +00:00 |
|
rohitwaghchaure
|
edce5770f0
|
Merge pull request #40537 from frappe/version-14-hotfix
chore: release v14
|
2024-03-20 10:52:20 +05:30 |
|
mergify[bot]
|
785131121d
|
fix: currency symbol for Landed Cost Voucher Amount (backport #40550) (#40553)
* fix: currency symbol for Landed Cost Voucher Amount (#40550)
(cherry picked from commit 0725707cb1)
# Conflicts:
# erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-03-19 23:37:32 +05:30 |
|
Nabin Hait
|
419f2a5192
|
Merge pull request #40519 from nabinhait/provisional-entry-fix
fix: provisional entry for non-stock item
|
2024-03-19 21:58:56 +05:30 |
|
Nabin Hait
|
39d958c507
|
fix: get unique provisional accounts
|
2024-03-19 21:06:16 +05:30 |
|
Nabin Hait
|
a1c8b93e99
|
fix: added index for voucher_detail_no in gl entry
|
2024-03-19 18:35:11 +05:30 |
|
Nabin Hait
|
0aef7f9671
|
fix: provisional entry for non-stock item
|
2024-03-19 18:29:37 +05:30 |
|
mergify[bot]
|
64f1844bc8
|
fix: Update Existing Price List Rate not working (backport #40333) (#40526)
* fix: Update Existing Price List Rate not working (#40333)
(cherry picked from commit 09ea7edb86)
# Conflicts:
# erpnext/selling/doctype/sales_order/test_sales_order.py
# erpnext/setup/demo_data/item.json
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-03-19 18:11:50 +05:30 |
|
ruthra kumar
|
b197c1926f
|
fix: flaky ecommerce test case (#40534)
* refactor(test): make use of fixtures
* refactor(test): rating are now restricted with [0..1]
* refactor(test): remove superfluous setup override
|
2024-03-19 17:54:35 +05:30 |
|
Raffael Meyer
|
76f27d99bb
|
Merge pull request #40547 from frappe/mergify/bp/version-14-hotfix/pr-40546
fix(Supplier Quotation Comparison): group by options (backport #40546)
|
2024-03-19 13:07:40 +01:00 |
|
barredterra
|
d0a0a35d72
|
chore: remove accidentally added file
|
2024-03-19 12:53:20 +01:00 |
|
barredterra
|
cfed706c15
|
fix(Supplier Quotation Comparison): group by options
(cherry picked from commit 87e36d290e)
|
2024-03-19 11:51:37 +00:00 |
|
barredterra
|
3b2044dcd7
|
chore: resolve conflicts
|
2024-03-19 12:46:14 +01:00 |
|
barredterra
|
7f2a54d95b
|
refactor: usage of in_list
(cherry picked from commit d238751e6b)
# Conflicts:
# erpnext/accounts/doctype/payment_entry/payment_entry.js
# erpnext/buying/doctype/purchase_order/purchase_order.js
# erpnext/public/js/controllers/accounts.js
# erpnext/public/js/controllers/buying.js
# erpnext/public/js/controllers/transaction.js
# erpnext/public/js/utils/sales_common.js
# erpnext/templates/form_grid/item_grid.html
|
2024-03-19 11:12:58 +00:00 |
|
Gursheen Kaur Anand
|
93fe136386
|
Merge pull request #40530 from frappe/mergify/bp/version-14-hotfix/pr-40528
fix(minor): missing range for ageing summary in PSOA (backport #40528)
|
2024-03-19 12:44:16 +05:30 |
|
Gursheen Anand
|
9f0ad7a4ea
|
fix: missing range for ageing summary
(cherry picked from commit 643cc022fd)
|
2024-03-19 07:11:18 +00:00 |
|
ruthra kumar
|
59a9a41e9d
|
Merge pull request #40522 from frappe/mergify/bp/version-14-hotfix/pr-40502
refactor: toggle between 'http' and 'https' on exchange rate API (backport #40502)
|
2024-03-19 10:37:32 +05:30 |
|
ruthra kumar
|
33efa6960d
|
chore: resolve conflicts
|
2024-03-19 10:14:24 +05:30 |
|
ruthra kumar
|
379616ab4b
|
refactor: toggle between 'http' and 'https' on exchange rate API
(cherry picked from commit 8b81274769)
# Conflicts:
# erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py
|
2024-03-19 04:29:44 +00:00 |
|
ruthra kumar
|
8cb1293ffc
|
Merge pull request #40515 from frappe/mergify/bp/version-14-hotfix/pr-40511
fix: invalid exchange loss booking on invoice against base accounts (backport #40511)
|
2024-03-18 21:05:51 +05:30 |
|
ruthra kumar
|
fe78214ea4
|
refactor(test): ensure Exchange gain/loss journals aren't created
(cherry picked from commit e1c2d006ca)
|
2024-03-18 15:14:44 +00:00 |
|
ruthra kumar
|
a27f386665
|
fix: invalid exchange loss booking on invoice againts base accounts
(cherry picked from commit 3d5dba6976)
|
2024-03-18 15:14:44 +00:00 |
|
Danny
|
ee7bd98878
|
fix: pass empty string email content of pos invoice
|
2024-03-18 10:47:42 -04:00 |
|
Gursheen Anand
|
fe3bee44e2
|
fix: show correct variance for durations with no vouchers
(cherry picked from commit bc78bc33f1)
|
2024-03-18 05:53:57 +00:00 |
|
Gursheen Anand
|
c3b8c00070
|
test: sales partner targets with invoices
(cherry picked from commit 1a3ea0c108)
|
2024-03-18 05:53:57 +00:00 |
|
Gursheen Anand
|
f9ab763cc8
|
fix: achieved targets for sales partners
(cherry picked from commit 1ac888715c)
|
2024-03-18 05:53:57 +00:00 |
|
ruthra kumar
|
c4c0510a1b
|
Merge pull request #40496 from frappe/mergify/bp/version-14-hotfix/pr-40495
fix: index error on Exchange Rate Revaluation creation (backport #40495)
|
2024-03-17 08:10:46 +05:30 |
|
ruthra kumar
|
8813b6b2fd
|
fix: index error on Exchange Rate Revaluation creation
(cherry picked from commit bb279e368c)
|
2024-03-17 02:21:33 +00:00 |
|
ruthra kumar
|
a0e839e31a
|
Merge pull request #40489 from frappe/mergify/bp/version-14-hotfix/pr-40485
refactor: validate SO and SI references in Delivery Notes (backport #40485)
|
2024-03-16 15:28:12 +05:30 |
|
ruthra kumar
|
9d827e84be
|
chore: resolve conflicts
|
2024-03-16 15:02:23 +05:30 |
|