2 New test cases added.
1. Standalone Cr notes will be reported as normal Invoices
2. Cr notes against an Invoice will not overallocate qty if there are
multiple instances of same item
perf: index against_sales_invoice field on DN items (#34509)
This is used on Sales invoice dashboard and takes a lot of time to load
as db size increases.
Results:
Before: ~10-20 seconds to load dashboard
After: few milliseconds because of index
[skip ci]
(cherry picked from commit 109a9f1390)
Co-authored-by: Ankush Menat <ankush@frappe.io>
feat: bank reconciliation and plaid changes (#33986)
fix: plaid link refresh: update account ids
fix: plaid transactions for credit cards & add accounts on link refresh if they don't exist
fix: bank reconciliation amount matching
fix: bank reconciliation dialog usability
feat: rewrite bank transaction reconciliation to allow multiple transactions to reconcile against vouchers before clearance
fix: matching transaction amounts and race condition bug
fix: ensure there is a reference number in plaid transactions and other tweaks
feat: add references to Payroll Entry Bank Journal Entry
feat: only clear Voucher once all Bank GLEs are allocated to Bank Transactions
fix: strange type error
feat: add payment method field to bank and plaid transactions and prepopulate relevant bank reconciliation new voucher fields
feat: bank reconciliation - allow bank transactions to reconcile against themselves for when there are banking amendments
fix: bank transaction self-reconcile bug and tidy
fix: bank reconciliation datatable index update
Co-authored-by: Richard Case <110036763+casesolved-co-uk@users.noreply.github.com>
* feat: Filter out alternative item rows in taxes and totals for Quotation
- Added a Quotation Item field `is_alternative_item`
- Use filtered rows for taxes and totals computation
(cherry picked from commit 91982d1e4f)
# Conflicts:
# erpnext/selling/doctype/quotation_item/quotation_item.json
* feat: Consider filtered items table in JS for totals computation
- Set `_items` as filtered rows if quotation else the entire table. Set at entry point of JS API
- Use `_items` instead of `items` to compute taxes and charges. Exclude alternative item rows
(cherry picked from commit f19eadab9a)
* feat: Dialog to select alternative item before creating Sales order
- Users can leave the row blank in the dialog if original item is to be used
- Else users can select an alternative item against an original item
- In the document, users must check `Is Alternative Item` if needed and also specify which item it is an altenrative to since there are no documented mappings
(cherry picked from commit cef7dfd0b4)
# Conflicts:
# erpnext/selling/doctype/quotation/quotation.js
# erpnext/selling/doctype/quotation_item/quotation_item.json
* feat: Filter rows to be mapped on server side mapping function
- Pass dialog selections to `make_sales_order`
- Map either original item or its alternative depending on mapping
- Only qty check for simple rows (without alternatives and not an alternative itself)
(cherry picked from commit 94cacb60de)
* chore: Validate 'alternative_to' field values, must be a valid non-alterntaive item from table
(cherry picked from commit fa9b327501)
* fix: Iterate over list instead of map's output and formatting
(cherry picked from commit ece6358e60)
* fix: Consider only ordered alternative/original item for Quotation status
- The original and its alternatives make a set of items where one is chosen
- While setting order status of Quotation, check if the chosen item from the set is fully ordered or not
- Filter out unselected items from the set
- Create a map containing the set of items and if they were ordered or not for ease of grouping
- The simple items will work as it used to
(cherry picked from commit b3fe7c6dad)
* chore: Code simplification
- Map is not required, avoid filter multiple times, use single loop instead
- Better variable name
- Reduce LOC
(cherry picked from commit 03321f5f13)
* refactor: Order based alternative items mapping
- Alternatives must be followed by a non-alternative item row
- On submit, store non-alternative rows in hidden checkbox to avoid recomputation
- Check for valid/mappable rows by row name
- UI: Select from table rows.Add single row for original/alternative item in dialog
- UI: Indicator for alternative items in dialog grid
- UI: Indicator legend and description of table
- DB: Added check field 'Has Alternative Item' not to be confused with 'Has Alternative' in Mfg
(cherry picked from commit db2076db69)
# Conflicts:
# erpnext/selling/doctype/quotation_item/quotation_item.json
* test: Alternative items in Quotation
- Taxes and totals, mapping, back updation
(cherry picked from commit 74fab53e28)
* fix: Use block variable
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit 3c96791d52)
* fix: Handle `Get Items From` in Sales Order
- Map all non alternatives from Quotation to SO if no selected items
- Show disclaimer mentioning that Qtns with alternatives must be mapped to SO from the Qtn form
(cherry picked from commit 19456127cf)
* fix: Map only non alternative items from Quotation in Sales Invoice
- Since there's no item selection, only Quotation selection :/
(cherry picked from commit 6b789e2f04)
* fix: Merge conflicts
---------
Co-authored-by: marination <maricadsouza221197@gmail.com>
fix: Total row in trail balance report (#34395)
* fix: Total row in trail balance report
* fix: Calculate total after preparing opening and closing
(cherry picked from commit c6999fc687)
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
fix: set tax category from address before executing `get_regional_address_details` (#34372)
(cherry picked from commit 5c06620f97)
Co-authored-by: Sagar Vora <sagar@resilient.tech>
fix: Use customer name instead of name(id) in PSOA (#34412)
(cherry picked from commit fa776d2987)
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
chore: Improve Turkish language translation
chore: Improve Turkish language translation
(cherry picked from commit fa6d37542b)
Co-authored-by: Mehmet Demirel <unibravo@gmail.com>
'Remarks' field is moved in migrate_gl_to_payment_ledger patch itself
from versions highers than v14.18.2. Removing it from patches.txt
(cherry picked from commit 9d0a1149d8)
