Gursheen Kaur Anand
|
33e0371c4d
|
Merge pull request #40571 from frappe/mergify/bp/version-14-hotfix/pr-40563
fix: use `Text Editor` for rendering tax breakup table (backport #40563)
|
2024-03-20 20:39:19 +05:30 |
|
Gursheen Anand
|
381899bf5f
|
chore: resolve conflicts
|
2024-03-20 20:25:31 +05:30 |
|
Rohit Waghchaure
|
1df54114a8
|
chore: fixed test case
|
2024-03-20 20:20:44 +05:30 |
|
Gursheen Anand
|
cf3b0ee41e
|
chore: resolve conflicts
|
2024-03-20 20:15:20 +05:30 |
|
Gursheen Anand
|
957f55f6b1
|
chore: resolve conflicts
|
2024-03-20 20:12:36 +05:30 |
|
Rohit Waghchaure
|
77349a0af6
|
chore: fix test case
|
2024-03-20 20:09:22 +05:30 |
|
Rohit Waghchaure
|
c36a5d1ba3
|
chore: fix backport issues
|
2024-03-20 20:09:22 +05:30 |
|
rohitwaghchaure
|
44d4096ba1
|
chore: fix conflicts
|
2024-03-20 20:09:22 +05:30 |
|
rohitwaghchaure
|
a694a92df9
|
chore: fix conflicts
|
2024-03-20 20:09:22 +05:30 |
|
rohitwaghchaure
|
1c7128e77b
|
chore: fix conflicts
|
2024-03-20 20:09:22 +05:30 |
|
rohitwaghchaure
|
c147ec168f
|
chore: fix conflicts
|
2024-03-20 20:09:22 +05:30 |
|
rohitwaghchaure
|
717442c01f
|
chore: fix conflicts
|
2024-03-20 20:09:22 +05:30 |
|
Rohit Waghchaure
|
ce7a53f810
|
chore: remove microsecond from posting_datetime
(cherry picked from commit a73ba2c0d2)
# Conflicts:
# erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
|
2024-03-20 20:08:37 +05:30 |
|
Rohit Waghchaure
|
1767dada8d
|
test: test cases to test clash timestamp entries
(cherry picked from commit f04676aaed)
|
2024-03-20 20:08:36 +05:30 |
|
Rohit Waghchaure
|
5e68ebd030
|
perf: new column posting datetime in SLE to optimize stock ledger related queries
(cherry picked from commit d80ca523a4)
|
2024-03-20 20:07:36 +05:30 |
|
ruthra kumar
|
87fdb4e720
|
chore: resolve conflicts
|
2024-03-20 19:58:18 +05:30 |
|
ruthra kumar
|
e5722a772a
|
chore: fix linting issue in JS
(cherry picked from commit 02c522b7cd)
|
2024-03-20 14:13:21 +00:00 |
|
ruthra kumar
|
35fcd032ad
|
refactor(test): test cases modified to handle new approach
(cherry picked from commit 81309576b0)
# Conflicts:
# erpnext/setup/demo.py
# erpnext/setup/doctype/transaction_deletion_record/test_transaction_deletion_record.py
|
2024-03-20 14:13:21 +00:00 |
|
ruthra kumar
|
1fe14334f3
|
refactor: ability to process in single transaction
(cherry picked from commit a158b825d7)
|
2024-03-20 14:13:20 +00:00 |
|
ruthra kumar
|
b429f75d65
|
refactor: link running doc validation to company master
(cherry picked from commit 5a3afea8c7)
# Conflicts:
# erpnext/setup/doctype/company/company.js
# erpnext/setup/doctype/company/company.py
|
2024-03-20 14:13:20 +00:00 |
|
ruthra kumar
|
fab5c1170d
|
chore: rename entry point
(cherry picked from commit 5fe0b20be1)
|
2024-03-20 14:13:19 +00:00 |
|
ruthra kumar
|
d496a1e58e
|
chore: move status and error log to their own section
(cherry picked from commit 3cec62d4f8)
|
2024-03-20 14:13:19 +00:00 |
|
ruthra kumar
|
6ae9eb250f
|
refactor: minor UI tweaks
(cherry picked from commit 0455d0c46c)
|
2024-03-20 14:13:19 +00:00 |
|
ruthra kumar
|
5e590389f3
|
refactor: exception propogation
(cherry picked from commit 4a55240e63)
|
2024-03-20 14:13:18 +00:00 |
|
ruthra kumar
|
1110dd93ff
|
chore: code cleanup
(cherry picked from commit eea260b9f9)
|
2024-03-20 14:13:17 +00:00 |
|
ruthra kumar
|
0ea9ce7a5a
|
refactor: better method naming
(cherry picked from commit 30463657bf)
|
2024-03-20 14:13:17 +00:00 |
|
ruthra kumar
|
cf6cb80d18
|
refactor: barebones hook on all doctypes with 'company' field
(cherry picked from commit ec194ef076)
|
2024-03-20 14:13:16 +00:00 |
|
ruthra kumar
|
e908003358
|
refactor: make sure only one task is running for doc
(cherry picked from commit 78c9cc63b1)
|
2024-03-20 14:13:16 +00:00 |
|
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 |
|