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: release v13 #35902

Merged
merged 12 commits into from
Jun 28, 2023
Merged

chore: release v13 #35902

merged 12 commits into from
Jun 28, 2023

Commits on Jun 21, 2023

  1. Configuration menu
    Copy the full SHA
    0fe95bf View commit details
    Browse the repository at this point in the history
  2. Fixes issue of asset value_after_depreciation field getting updated t…

    …wice if workflow is enabled in Journal Entry (#35821)
    
    * Fixes issue of asset value_after_depreciation field getting updated twice if workflow is enabled in Journal Entry
    
    * chore: remove unnecessary line break
    
    * chore: formatting
    
    ---------
    
    Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
    saeedkola and anandbaburajan committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    000ebe4 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. Configuration menu
    Copy the full SHA
    6c4dff3 View commit details
    Browse the repository at this point in the history
  2. chore: asset scrap and restore fixes [v14] (backport #35851) (#35854)

    * chore: asset scrap and restore fixes [v14] (#35851)
    
    chore: better err msg on cancelling JE for asset scrap and allow restoring non-depr assets
    (cherry picked from commit 69780da)
    
    # Conflicts:
    #	erpnext/assets/doctype/asset/depreciation.py
    
    * chore: fix conflict
    
    ---------
    
    Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
    mergify[bot] and anandbaburajan committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    8939e95 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2023

  1. fix: show non-depreciable assets in fixed asset register (backport #3…

    …5858) (#35861)
    
    fix: show non-depreciable assets in fixed asset register (#35858)
    
    fix: show non-depr assets in fixed asset register
    (cherry picked from commit 42d0944)
    
    Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
    mergify[bot] and anandbaburajan committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    2e2c319 View commit details
    Browse the repository at this point in the history
  2. fix: use correct fieldname for purchase receipt column in item_wise_p…

    …urchase_register report (backport #35828) (#35848)
    
    fix: use correct fieldname for purchase receipt column in item_wise_purcchase_register report
    
    (cherry picked from commit dcfc86e)
    
    Co-authored-by: phot0n <ritwikpuri5678@gmail.com>
    mergify[bot] and phot0n committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    de529f0 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2023

  1. fix: frappe.exceptions.DoesNotExistError: DocType KSA VAT Setting (#3…

    …5797)
    
    fix: frappe.exceptions.DoesNotExistError: DocType KSA VAT Setting not found
    
    When migrating from v12->v13 migration fails
    While migrating the doctype is not reloaded before adding permission. #35795
    ashish-greycube committed Jun 24, 2023
    Configuration menu
    Copy the full SHA
    3785fe6 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. fix(ux): PO Get Items From Open Material Requests (backport #35894) (#…

    …35896)
    
    fix(ux): PO Get Items From Open Material Requests
    
    (cherry picked from commit 3a00bf8)
    
    Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
    mergify[bot] and s-aga-r committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    12b6257 View commit details
    Browse the repository at this point in the history
  2. fix: TDS amount calculation post LDC breach (#35886)

    * fix: TDS amount calculation post LDC breach
    
    (cherry picked from commit 1f9ef6c)
    
    # Conflicts:
    #	erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
    
    * chore: resolve conflicts
    
    ---------
    
    Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
    mergify[bot] and deepeshgarg007 committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    4dd088c View commit details
    Browse the repository at this point in the history
  3. fix: filter parent warehouses not showing (backport #35897) (#35900)

    * fix: filter parent warehouses not showing (#35897)
    
    (cherry picked from commit af418d2)
    
    * chore: add company filter for parent warehouse
    
    ---------
    
    Co-authored-by: HLD <hanglaoda@hotmail.com>
    Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
    3 people committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    bcfd770 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. perf: improve item wise register reports (backport #35908) (#35912)

    perf: improve item wise register reports (#35908)
    
    (cherry picked from commit 33ee011)
    
    Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
    mergify[bot] and anandbaburajan committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    4134459 View commit details
    Browse the repository at this point in the history
  2. fix: asset movement (backport #35918) (#35924)

    * fix: asset movement (#35918)
    
    fix: asset movement fixes
    (cherry picked from commit e16c148)
    
    # Conflicts:
    #	erpnext/assets/doctype/asset_movement/asset_movement.py
    
    * chore: fix conflict
    
    ---------
    
    Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
    mergify[bot] and anandbaburajan committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    0bcd047 View commit details
    Browse the repository at this point in the history