fix(defaults): apply discount and provisonal defaults from item group and brand if available (#37466)
(cherry picked from commit 1612d7ba3f)
Co-authored-by: David Arnold <dgx.arnold@gmail.com>
fix: avoid name clash in delivery stop (#37306)
* fix(stock): avoid name clash in delivery stop with Document.lock()
* chore(stock): format delivery stop json according to doctype builder
(cherry picked from commit 681782121c)
Co-authored-by: David Arnold <dgx.arnold@gmail.com>
feat(delivery): link to delivery notes list view from delivery trip
(cherry picked from commit 85488cd0dc)
Co-authored-by: David Arnold <dgx.arnold@gmail.com>
* feat: allow return of components for SCO that don't have SCR created
(cherry picked from commit 8e3b9ec879)
* fix: consider returned qty while calculating unsupplied qty
(cherry picked from commit 3290df5593)
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
* refactor: rename field `Over Order Allowance` to `Blanket Order Allowance`
(cherry picked from commit 8ffa2bfe25)
* chore: patch to rename field `over_order_allowance`
(cherry picked from commit fcfcf6957e)
# Conflicts:
# erpnext/patches.txt
* chore: `conflicts`
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
chore: fixed test case non_internal_transfer_delivery_note (#37671)
(cherry picked from commit 2bcff4c7f2)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* fix(delivery): rename dt fetch stop action (backport #37605) (#37606)
fix(delivery): rename dt fetch stop action
(cherry picked from commit 79d51a0a0b)
Co-authored-by: David Arnold <dgx.arnold@gmail.com>
* fix: incorrect cost center in the purchase invoice (backport #37591) (#37609)
* fix: incorrect cost center in the purchase invoice (#37591)
(cherry picked from commit 14b009b093)
# Conflicts:
# erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* fix(minor): filter bank accounts in bank statement import (#37525)
fix(minor): filter bank accounts in bank statement import (#37525)
fix: filter by company in bank account
(cherry picked from commit 9d392970f0)
Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
* fix: set empty value for tax template in item details (#37496)
* fix: set empty value for tax template in item details (#37496)
* fix: empty tax template for items with invalid templates
* fix: test for empty tax template
* fix: test for item tax template calculation
* fix: test for pos inv tax template calculation
(cherry picked from commit b0d440c34b)
# Conflicts:
# erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py
* chore: resolve conflicts
---------
Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
* fix(minor): filter tax template based on company in subscription (#37562)
fix: filter tax template based on company
(cherry picked from commit 1a2f659de2)
Co-authored-by: Gursheen Anand <gursheen@frappe.io>
* fix: Cash flow mapping fix (#37522)
Cash flow mapping fix
* fix: remove from or target warehouse for non internal transfer entries (backport #37612) (#37628)
fix: remove from or target warehouse for non internal transfer entries (#37612)
(cherry picked from commit 5136fe196b)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* Revert "fix: set empty value for tax template in item details (#37496)"
Revert "fix: set empty value for tax template in item details (#37496)"
This reverts commit ec208b8df5.
* refactor: gain_loss posting date fields in the allocation table
(cherry picked from commit 55dbcee36a)
* refactor: introduce fields in popup
(cherry picked from commit 5323bb7bee)
* refactor: pass gain loss posting date to controller
(cherry picked from commit 7e600a6494)
* test: varying posting date for gain loss journal
(cherry picked from commit 514d5434a3)
* fix: overallocation on Payment with PO/SO
(cherry picked from commit 23df4205f8)
# Conflicts:
# erpnext/accounts/utils.py
* test: overalloction on reconciliation when PO is involved
(cherry picked from commit 946228d783)
* refactor(test): make use of utility methods
(cherry picked from commit 547993f801)
* chore: fix flakiness `test_sales_order_partial_advance_payment`
(cherry picked from commit 4dff2c7a0d)
* chore: resolve conflict
* fix: close employee loan on write off (#37638)
* fix: exclude written off amount while calculating loan repayment
* fix: revert exclude written off amount while calculating loan repayment
* fix: close employee loan on write off
* refactor: button on PE to filter associated Journals
(cherry picked from commit 150728deaa)
# Conflicts:
# erpnext/accounts/doctype/payment_entry/payment_entry.js
* chore: resolve conflict
* fix: incorrect process loss validation for multiple finished items (backport #37576) (#37656)
fix: incorrect process loss validation for multiple finished items (#37576)
(cherry picked from commit 92cbe580e6)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* chore: fixed test cases related to Internal Transfer (#37659)
* fix: GL Entries for receiving non CWIP assets using Purchase Receipt (#37660)
* fix: GL Entries for receiving non CWIP assets using Purchase Receipt
* fix: rearrange functions
* chore: rearrange functions
* chore: rearrange functions
* fix: Purchase Invoice GL entires for assets
* test: cwip accounting unit tests
* chore: Attribute error
* chore: Purchase Invoice tests
* chore: Missing asset account
* chore: Missing asset account
* chore: update tests
* fix: Internal transfer GL Entries
* test: Deprecate tests
* test: Depricate tests
* test: Depricate tests
* chore: make `Reserve Stock` checkbox visible in SO
* refactor: rename field `Auto Reserve Stock for Sales Order`
* feat: add fields to hold SO and SO Item ref in PR Item
* test: Deprecate tests
* test: Depricate tests
* test: Depricate tests
* refactor: Remove expense included in valuation accounts
* chore: Add back default in transit warehousefield
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
* fix: wrong german translation (#37658)
---------
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: David Arnold <dgx.arnold@gmail.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
Co-authored-by: Gursheen Anand <gursheen@frappe.io>
Co-authored-by: saeedkola <mohammedsaeedk@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: incorrect process loss validation for multiple finished items (#37576)
(cherry picked from commit 92cbe580e6)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
* fix: exclude written off amount while calculating loan repayment
* fix: revert exclude written off amount while calculating loan repayment
* fix: close employee loan on write off
