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 #35474

Merged
merged 11 commits into from
May 31, 2023
Merged

chore: release v13 #35474

merged 11 commits into from
May 31, 2023

Commits on May 24, 2023

  1. fix: incorrect depr schedule and posting dates on selling of existing… 

    … assets [v13] (#35404)

fix: calc depr amount properly on selling of existing assets and fix incorrect posting dates
    @anandbaburajan
    anandbaburajan authored May 24, 2023
    Configuration menu
    Copy the full SHA
    20d3381 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2023

  1. fix(Gross Profit): 'company' column is ambiguous in filter 

    (cherry picked from commit 448712f)
    @ruthra-kumar @mergify
    ruthra-kumar authored and mergify[bot] committed May 25, 2023
    Configuration menu
    Copy the full SHA
    270eb1d View commit details
    Browse the repository at this point in the history

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

    …-35417

fix(Gross Profit): 'company' column is ambiguous in filter (backport #35417)
    @ruthra-kumar
    ruthra-kumar authored May 25, 2023
    Configuration menu
    Copy the full SHA
    4f5ee68 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2023

  1. fix: incorrect POS Reserved Qty in Stock Projected Qty Report (#3… 

    …5437)

* fix: incorrect `POS Reserved Qty` in `Stock Projected Qty` Report

(cherry picked from commit 027de41)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice/pos_invoice.py

* chore: `conflicts`

---------

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
    @mergify @s-aga-r
    mergify[bot] and s-aga-r authored May 29, 2023
    Configuration menu
    Copy the full SHA
    139a193 View commit details
    Browse the repository at this point in the history

  2. fix: force to do reposting for cancelled document 

    (cherry picked from commit 6e661e7)

# Conflicts:
#	erpnext/controllers/stock_controller.py
    @rohitwaghchaure @mergify
    rohitwaghchaure authored and mergify[bot] committed May 29, 2023
    Configuration menu
    Copy the full SHA
    0228933 View commit details
    Browse the repository at this point in the history

  3. chore: conflicts

    @s-aga-r
    s-aga-r committed May 29, 2023
    Configuration menu
    Copy the full SHA
    44cb628 View commit details
    Browse the repository at this point in the history

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

    …-35328

fix: force to do reposting for cancelled document (backport #35328)
    @s-aga-r
    s-aga-r authored May 29, 2023
    Configuration menu
    Copy the full SHA
    3e95d56 View commit details
    Browse the repository at this point in the history

  5. fix: monthly WDV depr schedule for existing assets [v13] (#35461) 

    fix: monthly wdv depr schedule for existing assets
    @anandbaburajan
    anandbaburajan authored May 29, 2023
    Configuration menu
    Copy the full SHA
    6f43829 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2023

  1. fix: retention stock entry: grab conversion factor from source 

    (cherry picked from commit 6954f53)
    @marc-dll @mergify
    marc-dll authored and mergify[bot] committed May 30, 2023
    Configuration menu
    Copy the full SHA
    d8dd22a View commit details
    Browse the repository at this point in the history

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

    …-35459

fix: retention stock entry: grab conversion factor from source (backport #35459)
    @s-aga-r
    s-aga-r authored May 30, 2023
    Configuration menu
    Copy the full SHA
    00fd08c View commit details
    Browse the repository at this point in the history

  3. feat: Allow ceil & floor functions in salary slip formulae (#35475)

    @ruchamahabal
    ruchamahabal authored May 30, 2023
    Configuration menu
    Copy the full SHA
    63fba9d View commit details
    Browse the repository at this point in the history