Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Weekly release for version-13 #31137

Merged
merged 62 commits into from
May 26, 2022
Merged

Conversation

deepeshgarg007
Copy link
Member

No description provided.

mergify bot and others added 30 commits May 18, 2022 12:44
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 6d6616d)

Co-authored-by: Ankush Menat <me@ankush.dev>
* test: simplify job card tests

(cherry picked from commit e625394)

* 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 66cf9aa)

Co-authored-by: Ankush Menat <ankush@frappe.io>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Since few email servers (like outlook) strips out link in the button making them unclickable.

(cherry picked from commit a29b92f)
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 348a674)

Co-authored-by: Wolfram Schmidt <wolfram.schmidt@phamos.eu>
…1099)

test: search test failing because of stale data (#31098)

(cherry picked from commit a36174a)

Co-authored-by: Ankush Menat <me@ankush.dev>
* 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 e07ce6e)

# 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 9f6e106)

* chore: conflicts

* chore: missing conflict resolution changes

Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
…1105)

chore: error logging for auto material requests (#31103)

(cherry picked from commit ecb39d8)

Co-authored-by: Ankush Menat <me@ankush.dev>
- 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
feat(Employee Advance): add 'Returned' and 'Partly Claimed and Returned'
(cherry picked from commit 8fd0b3b)
deepeshgarg007 and others added 19 commits May 25, 2022 11:33
(cherry picked from commit 5b87264)

# Conflicts:
#	erpnext/accounts/doctype/journal_entry/journal_entry.py
(cherry picked from commit 65232ed)

# Conflicts:
#	erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
#	erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
(cherry picked from commit bc34737)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
…-31004

fix: duplicate entries in payment terms report output (backport #31004)
(cherry picked from commit a1f53f8)
(cherry picked from commit 9e4a360)
fix: Chart data for monthly periodicity in Cash Flow report
(cherry picked from commit c5e922c)
…-31129

fix: Loan Doc query in Bank Reconciliation Statement (backport #31129)
…-31039

fix: Chart data for monthly periodicity in Cash Flow report (backport #31039)
fix: timesheet fetching in sales invoice
…-26916

fix: Account currency validation for first transaction (backport #26916)
…backport #31085) (#31135)

Co-authored-by: sersaber <93864988+sersaber@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.31.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 9, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants