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

Merged
merged 17 commits into from
Jun 21, 2023
Merged

chore: release v13 #35806

merged 17 commits into from
Jun 21, 2023

Commits on Jun 15, 2023

  1. fix: don't add GL Entry for Acc. Depr. while scrapping non-depreciabl…

    …e assets (backport #35714) (#35716)
    
    * fix: don't add GL Entry for Acc. Depr. while scrapping non-depreciable assets (#35714)
    
    fix: on asset scrap, don't add gl entry for acc. depr. if no acc. depr.
    (cherry picked from commit bb39a2c)
    
    # Conflicts:
    #	erpnext/assets/doctype/asset/depreciation.py
    
    * chore: fix conflict
    
    ---------
    
    Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
    mergify[bot] and anandbaburajan committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    0e11317 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2023

  1. Configuration menu
    Copy the full SHA
    b95d459 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #35730 from deepeshgarg007/tax_ithholding_v13

    fix: Incorrect field while calculating Tax withholding net total
    deepeshgarg007 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    1685305 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    571c977 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    bcc8a45 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #35733 from deepeshgarg007/tax_withholding_limit_c…

    …onsumed
    
    fix: Incorrect field while calculating Tax withholding net total
    deepeshgarg007 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    e37b6bb View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2023

  1. fix: add validation for QI in PR (backport #35677) (#35758)

    fix: add validation for QI in PR
    
    (cherry picked from commit 2c1ab56)
    
    Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
    mergify[bot] and s-aga-r committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    0a8b714 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2023

  1. fix: loan interest accrual date (#35695)

    fix: loan interest accrual date (#35695)
    
    fix: loan interest accrual date
    
    ---------
    
    Co-authored-by: Abhinav Raut <abhinav.raut@zerodha.com>
    Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
    (cherry picked from commit 2a24423)
    
    Co-authored-by: Abhinav Raut <abhinavrautcs@gmail.com>
    mergify[bot] and abhinavxd committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    46d0b7d View commit details
    Browse the repository at this point in the history
  2. fix: Allocated amount validation for other party types (#35741)

    * fix: Allocated amount validation for other party types (#35741)
    
    * fix: Allocated amount validation for other party types
    
    * chore: Validation for return allocations
    
    * chore: minor typo
    
    ---------
    
    Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
    (cherry picked from commit 9d27a25)
    
    * chore: remove unnecessary donor party type check
    
    ---------
    
    Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
    Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
    3 people committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    3d0add8 View commit details
    Browse the repository at this point in the history
  3. fix: account group totals calculation to consider include_in_gross

    (cherry picked from commit 8dcb930)
    akurungadam authored and mergify[bot] committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    f22969d View commit details
    Browse the repository at this point in the history
  4. refactor: remove unused parameters

    (cherry picked from commit 50822f2)
    akurungadam authored and mergify[bot] committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    c6885e6 View commit details
    Browse the repository at this point in the history
  5. refactor: merge separate loops for calculating group / leaf node totals

    rename function
    remove return statement as the list is  mutated
    
    (cherry picked from commit 1a3b9c5)
    akurungadam authored and mergify[bot] committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    a53832e View commit details
    Browse the repository at this point in the history
  6. fix: add total col for gross and net profit

    (cherry picked from commit cb9b4fb)
    akurungadam authored and mergify[bot] committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    e899c30 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #35780 from frappe/mergify/bp/version-13-hotfix/pr…

    …-35320
    
    fix: Gross and Net Profit Report - incorrect calculation of totals (backport #35320)
    ruthra-kumar committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    af10d80 View commit details
    Browse the repository at this point in the history
  8. fix: fix get outstanding invoices btn and add get outstanding orders …

    …btn (backport #35776) (#35788)
    
    * fix: fix get outstanding invoices btn and add get outstanding orders btn (#35776)
    
    * fix: fix get outstanding invoices btn and add get outstanding orders btn
    
    * chore: remove unnecessary arg
    
    (cherry picked from commit c1da3dd)
    
    # Conflicts:
    #	erpnext/accounts/doctype/payment_entry/payment_entry.json
    #	erpnext/accounts/doctype/payment_entry/payment_entry.py
    
    * chore: resolving conflicts
    
    * chore: resolving conflicts properly
    
    ---------
    
    Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
    mergify[bot] and anandbaburajan committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    04990d5 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. perf: index purpose in Stock Entry (backport #35782) (#35784)

    * perf: index `purpose` in `Stock Entry`
    
    (cherry picked from commit 4f941ac)
    
    # Conflicts:
    #	erpnext/stock/doctype/stock_entry/stock_entry.json
    
    * chore: `conflicts`
    
    ---------
    
    Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
    mergify[bot] and s-aga-r committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    7239e83 View commit details
    Browse the repository at this point in the history
  2. fix: date and finance book fixes in fixed asset register (backport #3…

    …5751) (#35800)
    
    * fix: date and finance book fixes in fixed asset register (#35751)
    
    * fix: handle finance books properly and show all assets by default in fixed asset register
    
    * chore: rename value to depr amount
    
    * chore: get asset value for correct fb properly
    
    * chore: rename include_default_book_entries to include_default_book_assets
    
    (cherry picked from commit 0d12588)
    
    # Conflicts:
    #	erpnext/assets/report/fixed_asset_register/fixed_asset_register.py
    
    * chore: resolving conflicts and renaming entries to assets
    
    * chore: formatting
    
    ---------
    
    Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
    mergify[bot] and anandbaburajan committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    aa8446d View commit details
    Browse the repository at this point in the history