- if donations and subscriptions are set up in the same dashboard, membership payments also trigger payment webhook
- in order to differentiate there is already a check for RP's auto generated description but if subscriptions are configured using subscription links, RP doesn't send descriptions
- use invoice_id to ignore such payments instead
* fix: Job Card excess transfer behaviour
- Block excess transfer of items if not allowed in settings
- Behaviour made consistent with js behaviour (button disappears if not pending and not allowed in settings)
- Test for same case
(cherry picked from commit e07ce6efe0)
# Conflicts:
# erpnext/manufacturing/doctype/job_card/test_job_card.py
* chore: Run `_validate_over_transfer` only if excess transfer is blocked in settings
(cherry picked from commit 9f6e10663b)
* chore: conflicts
* chore: missing conflict resolution changes
Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
fix translation German "Designation" (#31082)
changed "Bezeichnung" to "Position" as the is more precice in the field of employment which erpnext refers to here
(cherry picked from commit 348a674df9)
Co-authored-by: Wolfram Schmidt <wolfram.schmidt@phamos.eu>
* test: simplify job card tests
(cherry picked from commit e625394488)
* fix: creation of corrective job card fails
This used to fail because sub_operations is a child table that's not
initalized by default till v13, in develop branch we init tables with
empty list.
(cherry picked from commit 66cf9aa344)
Co-authored-by: Ankush Menat <ankush@frappe.io>
fix: always update item_name for stock entry (#31068)
If item_name is already set and for some reason becomes outdated then
it's not updated in backend.
Fix: always set item_name and stock_uom when fetching item details
(cherry picked from commit 6d6616dbcd)
Co-authored-by: Ankush Menat <me@ankush.dev>
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>
* fix: IN time not captured in Attendance through Employee Checkin (#31029)
(cherry picked from commit 1b7ce9649b)
# Conflicts:
# erpnext/hr/doctype/employee_checkin/test_employee_checkin.py
* fix: conflicts
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
This is an automatic backport of pull request #31006 done by [Mergify](https://mergify.com).
---
<details>
<summary>Mergify commands and options</summary>
<br />
More conditions and actions can be found in the [documentation](https://docs.mergify.com/).
You can also trigger Mergify actions by commenting on this pull request:
- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR on its base branch
- `@Mergifyio update` will merge the base branch into this PR
- `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch
Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can:
- look at your merge queues
- generate the Mergify configuration with the config editor.
Finally, you can contact us on https://mergify.com
</details>
fix: prevent bypassing forced valuation rate
if you edit "margin_rate_or_amount" after saving DN then based on
selected margin the rate gets updated which isn't valuation rate.
(cherry picked from commit ee0a277540)
Co-authored-by: Ankush Menat <me@ankush.dev>
