fix: improve "Update Items" modal (#36105)
* fix: make "Update Items" modal larger
* fix: remove conversion factor from overview
Conversion factor doesn't make much sense without two different UOMs
next to it, hence moving it to row detail view
(cherry picked from commit d5fe1432f8)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix!: require sender and message for contact us page (#34707)
* fix: require sender and message for contact us page
* refactor: dont override frappe.send_message from client side
used override_whitelisted_method hook for the same
(cherry picked from commit f193393f57)
Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>
* fix: Taxes aren't discounted on early payment discount
- Deductions in payment entry must be split into income loss and tax loss
- Compute total discount in percentage, makes discounting different amounts proportionately easier
(cherry picked from commit 768c3a4927)
* fix: Recalculate difference amount after setting deductions
(cherry picked from commit 75ec0a0a85)
* fix: Set deductions in base currency
- Use field precision to get more accurate values
(cherry picked from commit dc2998f544)
* fix: Back update discounted amount in Invoice based on discount type
- Discount value was always trated as a percentage on back updation
(cherry picked from commit 2ae5834290)
* test: PE from SI with early payment discount amount & PE assertions in discount % test
(cherry picked from commit c217bb2018)
* fix: Set deduction amount in company currency on Doctype
- Even via JS, deductions amount is always in company currency
- Since there is nothing dynamic about this field, set it in the doctype spec itself
- fixed: Inconsistency between label currency and field currency formatted value
(cherry picked from commit 7f2e7badff)
* fix: Don't add to deductions if amount is 0
- misc: better docstring
(cherry picked from commit f02fc8acf0)
* fix: Paid amount must be discounted considering accounting currency
- Accounting is in the same currency if party currency and company currency is the same
- If accounting is in the same currency, paid and recvd amount is in the base currency
- Then, discount amount must also be in the base currency as it is deducted from paid amount
- Received amount must be in base currency if not multi currency
- cleanup: Deductions setting broken into smaller functions
(cherry picked from commit 761f68d7bf)
* fix: Multi-currency SI with base currency PE
- Return total discount loss in base currency
- Allocate payment based on terms: Set allocated amount in references table in base currency if accounting is in that currency
- Allocate payment based on terms: While back updating set paid amount (payment schedule) in transaction currency always
- minor: discount msgprint in correct currency
(cherry picked from commit b09c2381ca)
* test: Multi currency SI with multi-currency accounting and single currency accounting + Early payment discount
(cherry picked from commit 9abf0ef615)
# Conflicts:
# erpnext/accounts/doctype/payment_entry/test_payment_entry.py
* fix: Handle rounding more gracefully
- Round off pending discount loss to avoid miniscule losses rounded to 0.0 that are added in deductions
- Use base amounts to calculate base losses instead of using conversion factor which increases rounding error
- Round of total base loss instead of individual income and tax losses to reduce rounding error
- Use default round off account for pending rounding loss in deductions
(cherry picked from commit caa1a3dccf)
* fix: Provision to apply early payment discount if payment is recorded late
- Party could have paid on time but payment is recorded late
- Prompt for reference date so that discount is applied while mapping
- Prompt only if discount in payment schedule of valid doctypes
- test: Reference date and impact on PE
- `make_payment_entry` (JS) must be able to access `this`
(cherry picked from commit d6d0163514)
# Conflicts:
# erpnext/accounts/doctype/payment_entry/payment_entry.py
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
# erpnext/buying/doctype/purchase_order/purchase_order.js
# erpnext/public/js/controllers/transaction.js
* feat: Make Tax loss booking optional
- Checkbox in Accounts Settings
- Apply checkbox in PE deductions setting logic
- Adjust tests
(cherry picked from commit 216a46bd66)
# Conflicts:
# erpnext/accounts/doctype/accounts_settings/accounts_settings.json
* fix: Merge conflicts
* fix: 'Donation' does not have `company_currency` field
- Make sure check uses this field only for eligible documents
---------
Co-authored-by: marination <maricadsouza221197@gmail.com>
* chore: Update user manual link (#34478)
* chore: Update user manual link (#34478)
(cherry picked from commit be723bb9d4)
# Conflicts:
# erpnext/patches.txt
* chore: resolve conflicts
* chore: Update version
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
* chore: Update version
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
---------
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
* fix: Overallocation of 'qty' from Cr Notes to Parent Invoice
Cr Notes 'qty' are overallocated to parent invoice, when there are
mulitple instances of same item in Invoice.
(cherry picked from commit e2f19c6a14)
* refactor: Ignore linked Cr Notes in Report output
(cherry picked from commit d0715a82eb)
* test: Gross Profit report output for Cr notes
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
(cherry picked from commit cc61daeec4)
* fix: incorrect depr schedules after asset repair [v13] (#34520)
* fix: incorrect schedule after repair for WDV and DD
* chore: only fix schedules for assets with calc_depr true
* fix: incorrect schedule after repair for straight line and manual
* refactor: calc depr in asset repair and if statement (#34526)
refactor: minor asset repair of calc depr and if statement
* fix(client): Amount calculation for 0 qty debit notes (#34455)
fix(client): Amount calculation for 0 qty debit notes (#34455)
fix(client): Amount calculaton for 0 qty debit notes
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
(cherry picked from commit ee6c107d58)
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
* fix: german translations (#34312)
fix: german translations (#34312)
fix: some german translations
(cherry picked from commit 59c2e7ec3e)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
* fix: exchange gain/loss GL's should be removed if advance is cancelled (#34529)
* fix: report GL for invoice when advance has different exchange rate
If deferred revenue/expense is enabled for any item, don't repost.
* test: cancelling advance should remove exchange gain/loss
If there are no deferred revenue/expense cancelling advance should
cancel the exchange gain/loss booked due to different exchange rates
of payment and its linked invoice
---------
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
fix(minor): Dirty the form after clicking on Get advances button in Invoices (#34323)
fix(minor): Dirty form after clicking on Get advances button
(cherry picked from commit 2feb27e399)
Co-authored-by: Marica <maricadsouza221197@gmail.com>
fix: Amount for debit and credit notes with 0 qty line items (#33902)
(cherry picked from commit 47c91324b1)
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
fix(UX): dont apply price list when changing batch on mapped docs (#31503)
fix(UX): dont apply price list batch change on mapped docs
(cherry picked from commit 7e40c86c56)
Co-authored-by: Ankush Menat <ankush@frappe.io>
* fix: transaction date gets unset in material request (#31327)
* fix: set date correctly in material request
* fix: use only `transaction_date` in `get_item_details`
* fix: resolve merge conflict
Co-authored-by: Sagar Vora <sagar@resilient.tech>
fix: TypeError in add_indicator_for_multicompany (#31042)
Minor fix in add_indicator_for_multicompany
In case of multi-company transactions add (+) buttons in connection dashboard pf customer aren't being loaded due to TypeError (TypeError: e.dashboard.stats_area.removeClass is not a function) created by "frm.dashboard.stats_area.removeClass('hidden');" during the stats section creation.
(cherry picked from commit 867f2c6282)
Co-authored-by: Deepak <36790711+dpk404@users.noreply.github.com>
- `set_missing_values` in SE will set actual qty, transfer qty and calculate rate/amount
- Re-use `set_missing_values` wherever SE is doc is being mapped
(cherry picked from commit 90a8e924f5)
