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.

Sign up for GitHub

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

Jump to bottom

chore: release v13 #36762

Merged
merged 5 commits into from
Aug 22, 2023
Merged

chore: release v13 #36762

merged 5 commits into from
Aug 22, 2023

Commits on Aug 16, 2023

  1. fix: disallow mulitple SO with same PO No 

    (cherry picked from commit dbd3fdb)
    @ruthra-kumar @mergify
    ruthra-kumar authored and mergify[bot] committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    3b9ac9f View commit details
    Browse the repository at this point in the history

  2. refactor(test): don't set po_no by default 

    (cherry picked from commit 64614cd)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/test_delivery_note.py
    @ruthra-kumar @mergify
    ruthra-kumar authored and mergify[bot] committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    006da22 View commit details
    Browse the repository at this point in the history

  3. chore: resolve conflict

    @ruthra-kumar
    ruthra-kumar committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    8292980 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #36671 from frappe/mergify/bp/version-13-hotfix/pr… 

    …-36590

fix: disallow mulitple SO with same Purchase Order No if not enabled in Settings (backport #36590)
    @ruthra-kumar
    ruthra-kumar authored Aug 16, 2023
    Configuration menu
    Copy the full SHA
    066cf0e View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. fix: timeout error coming during reposting (backport #36715) (#36753) 

    fix: timeout error coming during reposting (#36715)

(cherry picked from commit 620b21f)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
    @mergify @rohitwaghchaure
    mergify[bot] and rohitwaghchaure authored Aug 22, 2023
    Configuration menu
    Copy the full SHA
    783bb93 View commit details
    Browse the repository at this point in the history