mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-15 11:09:17 +00:00
* fix(Sales Order): only show permitted actions (cherry picked from commitc29d955371) # Conflicts: # erpnext/selling/doctype/sales_order/sales_order.js * fix(Delivery Note): only show permitted actions (cherry picked from commit418bdc1dcc) # Conflicts: # erpnext/stock/doctype/delivery_note/delivery_note.js * fix: consistent query field name in item wise purchase register with item wise sales register * chore: resolve conflicts * refactor: remove use of can_create for Payment Request (#41647) (cherry picked from commit47bc5691a1) * fix: incorrect against_account upon reposting (cherry picked from commit20c4098399) * fix: asset value correction in fixed asset register (#41943) * fix: timeout while cancelling LCV (#42030) fix: timeout while canelling LCV --------- Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com> Co-authored-by: ljain112 <ljain112@gmail.com> Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com> Co-authored-by: ruthra kumar <ruthra@erpnext.com> Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>