Gursheen Anand
|
82b613353b
|
fix: validate gl for previous fiscal year
(cherry picked from commit a1d108c062)
|
2024-03-21 05:30:35 +00:00 |
|
ruthra kumar
|
67481ad062
|
Merge pull request #40574 from frappe/mergify/bp/version-14-hotfix/pr-39717
refactor: Transaction Deletion record for large volumes (backport #39717)
|
2024-03-21 10:18:07 +05:30 |
|
ruthra kumar
|
1515bb7f0b
|
refactor: replace get_job with create_job_id utility method
|
2024-03-21 09:53:55 +05:30 |
|
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
|
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 |
|
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 |
|
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
|
cfed706c15
|
fix(Supplier Quotation Comparison): group by options
(cherry picked from commit 87e36d290e)
|
2024-03-19 11:51:37 +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 |
|