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

Fetch from Upstream #76

Merged
merged 577 commits into from
Aug 8, 2023
Merged

Fetch from Upstream #76

merged 577 commits into from
Aug 8, 2023
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Apr 12, 2023

  1. chore: update CODEOWNERS (#34817) 

    * chore: update CODEOWNERS

[skip ci]

(cherry picked from commit aa8b241)

# Conflicts:
#	CODEOWNERS

* fix: conflicts

* chore: remove duplicates

* chore: remove duplicates

---------

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
    @mergify @nextchamp-saqib
    mergify[bot] and nextchamp-saqib committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    7655a4f View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2023

  1. fix: unable to change company for manual Serial No entry 

    (cherry picked from commit fb3271c)

# Conflicts:
#	erpnext/stock/doctype/serial_no/serial_no.json
    @s-aga-r @mergify
    s-aga-r authored and mergify[bot] committed Apr 15, 2023
    Configuration menu
    Copy the full SHA
    5d51103 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2023

  1. chore: conflicts

    @s-aga-r
    s-aga-r committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    98ed644 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2023

  1. fix: change discuss forum url (#34891) 

    fix: change discuss forum url (#34891)

[skip ci]

(cherry picked from commit dd93ea0)

Co-authored-by: MohsinAli <mmatiyailol@gmail.com>
    @mergify @mohsinalimat
    mergify[bot] and mohsinalimat committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    ba984ac View commit details
    Browse the repository at this point in the history

  2. Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr… 

    …-34858
    @s-aga-r
    s-aga-r committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    3f4c322 View commit details
    Browse the repository at this point in the history

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

    …-34858

fix: unable to change `company` for manual `Serial No` entry (backport #34858)
    @s-aga-r
    s-aga-r committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    a2d2beb View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2023

  1. Merge pull request #34906 from frappe/version-13-hotfix 

    chore: release v13
    @deepeshgarg007
    deepeshgarg007 committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    5c6134f View commit details
    Browse the repository at this point in the history

  2. chore(release): Bumped to Version 13.49.13 

    ## [13.49.13](v13.49.12...v13.49.13) (2023-04-19)

### Bug Fixes

* change discuss forum url ([#34891](#34891)) ([ba984ac](ba984ac))
* unable to change `company` for manual `Serial No` entry ([5d51103](5d51103))
    @frappe-bot
    frappe-bot committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    acecd07 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2023

  1. fix: internal Purchase Receipt GL Entries 

    (cherry picked from commit 6fca9ad)
    @s-aga-r @mergify
    s-aga-r authored and mergify[bot] committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    b73422e View commit details
    Browse the repository at this point in the history

  2. test: add test case for internal PR GL Entries 

    (cherry picked from commit c86c543)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
    @s-aga-r @mergify
    s-aga-r authored and mergify[bot] committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    046bf64 View commit details
    Browse the repository at this point in the history

  3. fix(test): `test_backdated_stock_reco_cancellation_future_negative_st… 

    …ock`

(cherry picked from commit 11c8503)
    @s-aga-r @mergify
    s-aga-r authored and mergify[bot] committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    d010b04 View commit details
    Browse the repository at this point in the history

  4. fix: PermissionError in Work Order 

    (cherry picked from commit 8108b2d)
    @s-aga-r @mergify
    s-aga-r authored and mergify[bot] committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    5680045 View commit details
    Browse the repository at this point in the history

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

    …-34953

fix: `PermissionError` in Work Order (backport #34953)
    @s-aga-r
    s-aga-r committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    ebf8deb View commit details
    Browse the repository at this point in the history

  6. chore: conflicts

    @s-aga-r
    s-aga-r committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    102ac9f View commit details
    Browse the repository at this point in the history

  7. Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr… 

    …-34912
    @s-aga-r
    s-aga-r committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    983140a View commit details
    Browse the repository at this point in the history

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

    …-34912

fix: internal Purchase Receipt GL Entries (backport #34912)
    @s-aga-r
    s-aga-r committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    813b4d4 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2023

  1. fix: Advance payment against payment terms (#34872) 

    * fix: Advance payment against payment terms (#34872)

(cherry picked from commit 5c75894)

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

* chore: resolve conflicts

* chore: fix tests

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
    @mergify @deepeshgarg007
    mergify[bot] and deepeshgarg007 committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    d215a85 View commit details
    Browse the repository at this point in the history

  2. fix: validation for internal transfer entry 

    (cherry picked from commit 19911b4)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.js
    @rohitwaghchaure @mergify
    rohitwaghchaure authored and mergify[bot] committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    91b5a33 View commit details
    Browse the repository at this point in the history

  3. chore: fix conflicts

    @rohitwaghchaure
    rohitwaghchaure committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    82b46f2 View commit details
    Browse the repository at this point in the history

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

    …-34980

fix: validation for internal transfer entry (backport #34980)
    @rohitwaghchaure
    rohitwaghchaure committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    9957981 View commit details
    Browse the repository at this point in the history

  5. fix: SLA permissions (#34981) 

    (cherry picked from commit ac87179)

# Conflicts:
#	erpnext/support/doctype/service_level_agreement/service_level_agreement.json
    @ankush @mergify
    ankush authored and mergify[bot] committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    c1187be View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2023

  1. chore: conflicts

    @s-aga-r
    s-aga-r committed Apr 22, 2023
    Configuration menu
    Copy the full SHA
    cfa1a2b View commit details
    Browse the repository at this point in the history

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

    …-34981

fix: SLA permissions (backport #34981)
    @s-aga-r
    s-aga-r committed Apr 22, 2023
    Configuration menu
    Copy the full SHA
    7759d1e View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2023

  1. fix: value of depreciable assets not updating after manual depr entry… 

    … [v14] (backport #35010) (#35029)

* fix: value of depreciable assets not updating after manual depr entry [v14] (#35010)

* fix: update value of asset with calc_depr on after manual depr entry

* fix: value of asset with calc_depr on after manual depr entry not reflecting in asset_depr_and_bal report

* chore: add validation for depr journal entry

* test: manual_depr_for_depreciable_asset and manual_depr_w_incorrect_jv_voucher_type

* chore: unlink depreciable asset from manual depr entry

(cherry picked from commit 3c75e55)

# Conflicts:
#	erpnext/accounts/doctype/journal_entry/journal_entry.js

* chore: fixed conflicts

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
    @mergify @anandbaburajan
    mergify[bot] and anandbaburajan committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    9087ac0 View commit details
    Browse the repository at this point in the history

  2. chore: set correct currency symbol in salary register for multi-curre… 

    …ncy salary slip
    @saurabh6790
    saurabh6790 committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    83afaf4 View commit details
    Browse the repository at this point in the history

  3. fix: use filter_by_finance_book instead of only_depreciable_assets in… 

    … fixed asset register (backport #35031) (#35036)

fix: use filter_by_finance_book instead of only_depreciable_assets in fixed asset register (#35031)

fix: use filter_by_finance_book instead of only_depreciable_assets
(cherry picked from commit e08d636)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
    @mergify @anandbaburajan
    mergify[bot] and anandbaburajan committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    be2095a View commit details
    Browse the repository at this point in the history

  4. fix: wrong qty of remaining work orders to be created when using "Cre… 

    …ate" > "Work Order" (#34726)

* fix: convert asynchronous field update to synchronous

* fix: wrong qty of remaining work orders to be created when using "Create" > "Work Order"
    @danjeremynavarro
    danjeremynavarro committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    189b020 View commit details
    Browse the repository at this point in the history

  5. fix: Payment Request flow fixes from Order to Payment Entry (#33350) 

    * fix: Payment Request flow fixes from Order to Payment Entry

(cherry picked from commit dc17898)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.js
#	erpnext/public/js/controllers/transaction.js

* chore: Update test case

(cherry picked from commit e25b98b)

* chore: More fixes

(cherry picked from commit 31c95de)

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
    @mergify @deepeshgarg007
    mergify[bot] and deepeshgarg007 committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    d5a80b5 View commit details
    Browse the repository at this point in the history

  6. fix: Unable to allocate advance against invoice (#35007) 

    fix: Unable to allocate advance against invoice (#35007)

(cherry picked from commit f7b50f2)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
    @mergify @deepeshgarg007
    mergify[bot] and deepeshgarg007 committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    61a3121 View commit details
    Browse the repository at this point in the history

  7. fix: Payment entry with TDS in bank reco statement (#34961) 

    fix: Payment entry with TDS in bank reco statement (#34961)

(cherry picked from commit ecea9b4)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
    @mergify @deepeshgarg007
    mergify[bot] and deepeshgarg007 committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    5f28b1d View commit details
    Browse the repository at this point in the history

  8. Merge pull request #35033 from frappe/version-13-hotfix 

    chore: release v13
    @deepeshgarg007
    deepeshgarg007 committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    b85d894 View commit details
    Browse the repository at this point in the history

  9. chore(release): Bumped to Version 13.49.14 

    ## [13.49.14](v13.49.13...v13.49.14) (2023-04-25)

### Bug Fixes

* `PermissionError` in Work Order ([5680045](5680045))
* Advance payment against payment terms ([#34872](#34872)) ([d215a85](d215a85))
* internal Purchase Receipt GL Entries ([b73422e](b73422e))
* Payment entry with TDS in bank reco statement ([#34961](#34961)) ([5f28b1d](5f28b1d))
* Payment Request flow fixes from Order to Payment Entry ([#33350](#33350)) ([d5a80b5](d5a80b5))
* SLA permissions ([#34981](#34981)) ([c1187be](c1187be))
* **test:** `test_backdated_stock_reco_cancellation_future_negative_stock` ([d010b04](d010b04))
* Unable to allocate advance against invoice ([#35007](#35007)) ([61a3121](61a3121))
* use filter_by_finance_book instead of only_depreciable_assets in fixed asset register (backport [#35031](#35031)) ([#35036](#35036)) ([be2095a](be2095a))
* validation for internal transfer entry ([91b5a33](91b5a33))
* value of depreciable assets not updating after manual depr entry [v14] (backport [#35010](#35010)) ([#35029](#35029)) ([9087ac0](9087ac0))
* wrong qty of remaining work orders to be created when using "Create" > "Work Order" ([#34726](#34726)) ([189b020](189b020))
    @frappe-bot
    frappe-bot committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    1d6917f View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2023

  1. chore: fix linter

    @saurabh6790
    saurabh6790 committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    31bda37 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #35032 from saurabh6790/salary-register-report-fix 

    chore: set correct currency symbol in salary register for multi-currency salary slip
    @saurabh6790
    saurabh6790 committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    297facc View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2023

  1. chore: set correct currency symbol in salary register for multi-curre… 

    …ncy salary slip

(cherry picked from commit 83afaf4)
    @saurabh6790 @mergify
    saurabh6790 authored and mergify[bot] committed Apr 27, 2023
    Configuration menu
    Copy the full SHA
    cef7126 View commit details
    Browse the repository at this point in the history

  2. chore: fix linter 

    (cherry picked from commit 31bda37)
    @saurabh6790 @mergify
    saurabh6790 authored and mergify[bot] committed Apr 27, 2023
    Configuration menu
    Copy the full SHA
    fc42e02 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #35073 from frappe/mergify/bp/version-13/pr-35032 

    chore: set correct currency symbol in salary register for multi-currency salary slip (backport #35032)
    @deepeshgarg007
    deepeshgarg007 committed Apr 27, 2023
    Configuration menu
    Copy the full SHA
    784ea7c View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2023

  1. fix: Hyperlink in Quality Inspection Summary 

    (cherry picked from commit 72dd788)
    @nihantra @mergify
    nihantra authored and mergify[bot] committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    54388e8 View commit details
    Browse the repository at this point in the history

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

    …-35081

fix: Hyperlink in Quality Inspection Summary (backport #35081)
    @s-aga-r
    s-aga-r committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    5746ddc View commit details
    Browse the repository at this point in the history

Commits on May 1, 2023

  1. fix: per_billed condition for Payment Entry (#34969) 

    fix: per_billed condition for Payment Entry (#34969)

fix: per_billed condition for Payment Entry (#34969)

(cherry picked from commit d6bc8bb)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit f9f42c7)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
    @mergify
    mergify[bot] committed May 1, 2023
    Configuration menu
    Copy the full SHA
    563e5c0 View commit details
    Browse the repository at this point in the history

  2. fix: Naming series error in Journal Entry template (#35084) 

    fix: Naming series error in Journal Entry template (#35084)

(cherry picked from commit f3b3dab)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
    @mergify @deepeshgarg007
    mergify[bot] and deepeshgarg007 committed May 1, 2023
    Configuration menu
    Copy the full SHA
    d3c769c View commit details
    Browse the repository at this point in the history

  3. fix: allow user to set standard deductions in income tax slab without… 

    … allowing other exemptions
    @saurabh6790
    saurabh6790 committed May 1, 2023
    Configuration menu
    Copy the full SHA
    c5261cd View commit details
    Browse the repository at this point in the history

  4. feat: validate repost item valuation against accounts freeze date 

    (cherry picked from commit 61f0513)

# Conflicts:
#	erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py
    @rtdany10 @mergify
    rtdany10 authored and mergify[bot] committed May 1, 2023
    Configuration menu
    Copy the full SHA
    a852dc1 View commit details
    Browse the repository at this point in the history

  5. chore: pre-commit 

    (cherry picked from commit be15419)

# Conflicts:
#	erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py
    @rtdany10 @mergify
    rtdany10 authored and mergify[bot] committed May 1, 2023
    Configuration menu
    Copy the full SHA
    6992e72 View commit details
    Browse the repository at this point in the history

  6. fix: check for session user rather than owner 

    (cherry picked from commit b482e38)
    @rtdany10 @mergify
    rtdany10 authored and mergify[bot] committed May 1, 2023
    Configuration menu
    Copy the full SHA
    7d6e2f9 View commit details
    Browse the repository at this point in the history

  7. chore: pre-commit 

    (cherry picked from commit 88a0aa4)
    @rtdany10 @mergify
    rtdany10 authored and mergify[bot] committed May 1, 2023
    Configuration menu
    Copy the full SHA
    198a64d View commit details
    Browse the repository at this point in the history

  8. fix: conflicts

    @rohitwaghchaure
    rohitwaghchaure committed May 1, 2023
    Configuration menu
    Copy the full SHA
    6bdf143 View commit details
    Browse the repository at this point in the history

  9. fix: handle expected_value_after_useful_life properly in asset value … 

    …adjustment (backport #35117) (#35120)

fix: handle expected_value_after_useful_life properly in asset value adjustment (#35117)

(cherry picked from commit 80230fe)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
    @mergify @anandbaburajan
    mergify[bot] and anandbaburajan committed May 1, 2023
    Configuration menu
    Copy the full SHA
    635559d View commit details
    Browse the repository at this point in the history

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

    …-33013

fix: validate repost item valuation against accounts freeze date (backport #33013)
    @rohitwaghchaure
    rohitwaghchaure committed May 1, 2023
    Configuration menu
    Copy the full SHA
    078161c View commit details
    Browse the repository at this point in the history

  11. fix: don't allow to make reposting for the closed period 

    (cherry picked from commit f751727)

# Conflicts:
#	erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
#	erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
    @rohitwaghchaure @mergify
    rohitwaghchaure authored and mergify[bot] committed May 1, 2023
    Configuration menu
    Copy the full SHA
    b31d8ee View commit details
    Browse the repository at this point in the history

  12. fix: conflicts

    @rohitwaghchaure
    rohitwaghchaure committed May 1, 2023
    Configuration menu
    Copy the full SHA
    b19b0a4 View commit details
    Browse the repository at this point in the history

  13. fix: conflicts

    @rohitwaghchaure
    rohitwaghchaure committed May 1, 2023
    Configuration menu
    Copy the full SHA
    778ba69 View commit details
    Browse the repository at this point in the history

  14. fix: test case

    @rohitwaghchaure
    rohitwaghchaure committed May 1, 2023
    Configuration menu
    Copy the full SHA
    db6d0e0 View commit details
    Browse the repository at this point in the history

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

    …-35118

fix: don't allow to make reposting for the closed period (backport #35118)
    @rohitwaghchaure
    rohitwaghchaure committed May 1, 2023
    Configuration menu
    Copy the full SHA
    740313f View commit details
    Browse the repository at this point in the history

Commits on May 2, 2023

  1. Merge pull request #35114 from saurabh6790/consider-standard-exemption 

    fix: allow user to set standard deductions in income tax slab without allowing other exemptions
    @saurabh6790
    saurabh6790 committed May 2, 2023
    Configuration menu
    Copy the full SHA
    2f74026 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2023

  1. fix: handle finance book properly in trial balance and general ledger (… 

    …#35136)

fix: handle finance book properly in trial balance and general ledger [v14] (#35136)

fix: handle FBs properly in general ledger and trial balance
(cherry picked from commit 344c339)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
    @mergify @anandbaburajan
    mergify[bot] and anandbaburajan committed May 3, 2023
    Configuration menu
    Copy the full SHA
    9a37603 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #35130 from frappe/version-13-hotfix 

    chore: release v13
    @deepeshgarg007
    deepeshgarg007 committed May 3, 2023
    Configuration menu
    Copy the full SHA
    cb0d567 View commit details
    Browse the repository at this point in the history

  3. chore(release): Bumped to Version 13.50.0 

    # [13.50.0](v13.49.14...v13.50.0) (2023-05-03)

### Bug Fixes

* allow user to set standard deductions in income tax slab without allowing other exemptions ([c5261cd](c5261cd))
* check for session user rather than owner ([7d6e2f9](7d6e2f9))
* conflicts ([778ba69](778ba69))
* conflicts ([b19b0a4](b19b0a4))
* conflicts ([6bdf143](6bdf143))
* don't allow to make reposting for the closed period ([b31d8ee](b31d8ee))
* handle expected_value_after_useful_life properly in asset value adjustment (backport [#35117](#35117)) ([#35120](#35120)) ([635559d](635559d))
* handle finance book properly in trial balance and general ledger ([#35136](#35136)) ([9a37603](9a37603))
* Hyperlink in Quality Inspection Summary ([54388e8](54388e8))
* Naming series error in Journal Entry template ([#35084](#35084)) ([d3c769c](d3c769c))
* per_billed condition for Payment Entry ([#34969](#34969)) ([563e5c0](563e5c0))
* test case ([db6d0e0](db6d0e0))

### Features

* validate repost item valuation against accounts freeze date ([a852dc1](a852dc1))
    @frappe-bot
    frappe-bot committed May 3, 2023
    Configuration menu
    Copy the full SHA
    ef2d4fe View commit details
    Browse the repository at this point in the history

Commits on May 6, 2023

  1. fix: handle empty FBs properly in TB and GL [v14] (backport #35189) (#… 

    …35192)

fix: handle empty FBs properly in TB and GL [v14] (#35189)

fix: handle empty FBs properly in TB and GL
(cherry picked from commit ed5f39c)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
    @mergify @anandbaburajan
    mergify[bot] and anandbaburajan committed May 6, 2023
    Configuration menu
    Copy the full SHA
    e2af66c View commit details
    Browse the repository at this point in the history

  2. fix: handle empty FBs properly in TB and GL [v14] (backport #35189) (… 

    …backport #35192) (#35195)

fix: handle empty FBs properly in TB and GL [v14] (backport #35189) (#35192)

fix: handle empty FBs properly in TB and GL [v14] (#35189)

fix: handle empty FBs properly in TB and GL
(cherry picked from commit ed5f39c)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
(cherry picked from commit e2af66c)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
    @mergify
    mergify[bot] committed May 6, 2023
    Configuration menu
    Copy the full SHA
    af8142c View commit details
    Browse the repository at this point in the history

  3. chore(release): Bumped to Version 13.50.1 

    ## [13.50.1](v13.50.0...v13.50.1) (2023-05-06)

### Bug Fixes

* handle empty FBs properly in TB and GL [v14] (backport [#35189](#35189)) (backport [#35192](#35192)) ([#35195](#35195)) ([af8142c](af8142c))
    @frappe-bot
    frappe-bot committed May 6, 2023
    Configuration menu
    Copy the full SHA
    40cfd52 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2023

  1. Merge pull request #35223 from frappe/version-13-hotfix 

    chore: release v13
    @deepeshgarg007
    deepeshgarg007 committed May 10, 2023
    Configuration menu
    Copy the full SHA
    2825253 View commit details
    Browse the repository at this point in the history

  2. chore(release): Bumped to Version 13.50.2 

    ## [13.50.2](v13.50.1...v13.50.2) (2023-05-10)

### Bug Fixes

* handle empty FBs properly in TB and GL [v14] (backport [#35189](#35189)) ([#35192](#35192)) ([e2af66c](e2af66c))
    @frappe-bot
    frappe-bot committed May 10, 2023
    Configuration menu
    Copy the full SHA
    1380f7a View commit details
    Browse the repository at this point in the history

  3. fix(Salary Slip): exchange rate overwritten on form load (#507) (#35245)

    @ruchamahabal
    ruchamahabal committed May 10, 2023
    Configuration menu
    Copy the full SHA
    8b3d6ee View commit details
    Browse the repository at this point in the history

Commits on May 11, 2023

  1. fix: internal transfer condition 

    (cherry picked from commit b5a2ccf)
    @rohitwaghchaure @mergify
    rohitwaghchaure authored and mergify[bot] committed May 11, 2023
    Configuration menu
    Copy the full SHA
    a1d7170 View commit details
    Browse the repository at this point in the history

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

    …-35158

fix: internal transfer condition (backport #35158)
    @rohitwaghchaure
    rohitwaghchaure committed May 11, 2023
    Configuration menu
    Copy the full SHA
    8b9f8c6 View commit details
    Browse the repository at this point in the history

  3. fix: internal transfer condition 

    (cherry picked from commit b5a2ccf)
(cherry picked from commit a1d7170)
    @rohitwaghchaure @mergify
    rohitwaghchaure authored and mergify[bot] committed May 11, 2023
    Configuration menu
    Copy the full SHA
    ac26e4b View commit details
    Browse the repository at this point in the history

  4. Merge pull request #35260 from frappe/mergify/bp/version-13/pr-35259 

    fix: internal transfer condition (backport #35158) (backport #35259)
    @rohitwaghchaure
    rohitwaghchaure committed May 11, 2023
    Configuration menu
    Copy the full SHA
    48e5846 View commit details
    Browse the repository at this point in the history

  5. chore(release): Bumped to Version 13.50.3 

    ## [13.50.3](v13.50.2...v13.50.3) (2023-05-11)

### Bug Fixes

* internal transfer condition ([ac26e4b](ac26e4b))
    @frappe-bot
    frappe-bot committed May 11, 2023
    Configuration menu
    Copy the full SHA
    7626d51 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2023

  1. fix: update reference data for statistical component

    @saurabh6790
    saurabh6790 committed May 12, 2023
    Configuration menu
    Copy the full SHA
    77f548c View commit details
    Browse the repository at this point in the history

Commits on May 13, 2023

  1. fix: add missing options for Content Align 

    (cherry picked from commit d16caa2)
    @s-aga-r @mergify
    s-aga-r authored and mergify[bot] committed May 13, 2023
    Configuration menu
    Copy the full SHA
    e37b903 View commit details
    Browse the repository at this point in the history

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

    …-35275

fix: add missing options for `Content Align` (backport #35275)
    @s-aga-r
    s-aga-r committed May 13, 2023
    Configuration menu
    Copy the full SHA
    4a9ad09 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2023

  1. refactor: replace join with sub-query for fetching accounts

    @ruthra-kumar
    ruthra-kumar committed May 14, 2023
    Configuration menu
    Copy the full SHA
    e6a9252 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2023

  1. Merge pull request #35267 from saurabh6790/fix-statistical-component-… 

    …calculation

fix: update reference data for statistical component
    @saurabh6790
    saurabh6790 committed May 15, 2023
    Configuration menu
    Copy the full SHA
    c7c2bad View commit details
    Browse the repository at this point in the history

Commits on May 16, 2023

  1. fix: cancelled vouchers in tax withheld vouchers list (#35309) 

    fix: cancelled vouchers in tax withheld vouchers list (#35309)

(cherry picked from commit 776a830)

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
    @mergify @ruthra-kumar
    mergify[bot] and ruthra-kumar committed May 16, 2023
    Configuration menu
    Copy the full SHA
    188cfc2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #35323 from frappe/version-13-hotfix 

    chore: release v13
    @deepeshgarg007
    deepeshgarg007 committed May 16, 2023
    Configuration menu
    Copy the full SHA
    f5f88bb View commit details
    Browse the repository at this point in the history

  3. chore(release): Bumped to Version 13.50.4 

    ## [13.50.4](v13.50.3...v13.50.4) (2023-05-16)

### Bug Fixes

* add missing options for `Content Align` ([e37b903](e37b903))
* cancelled vouchers in tax withheld vouchers list ([#35309](#35309)) ([188cfc2](188cfc2))
* internal transfer condition ([a1d7170](a1d7170))
* **Salary Slip:** exchange rate overwritten on form load ([#507](#507)) ([#35245](#35245)) ([8b3d6ee](8b3d6ee))
* update reference data for statistical component ([77f548c](77f548c))
    @frappe-bot
    frappe-bot committed May 16, 2023
    Configuration menu
    Copy the full SHA
    c2ae8ea View commit details
    Browse the repository at this point in the history

Commits on May 17, 2023

  1. fix: consider 0 if rate/qty are null (backport #35338) (#35341) 

    fix: consider 0 if rate/qty are null (#35338)

[skip ci]

(cherry picked from commit e5c86bc)

Co-authored-by: Ankush Menat <ankush@frappe.io>
    @mergify @ankush
    mergify[bot] and ankush committed May 17, 2023
    Configuration menu
    Copy the full SHA
    387f8b9 View commit details
    Browse the repository at this point in the history

  2. fix: depreciation schedule for existing assets [v14] (backport #35255) ( 

    #35347)

* fix: depreciation schedule for existing assets [v14] (#35255)

* fix: depreciation schedule for existing assets

* chore: correct logic for existing assets and fix test

(cherry picked from commit 0a080ef)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.py

* chore: fix conflict

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
    @mergify @anandbaburajan
    mergify[bot] and anandbaburajan committed May 17, 2023
    Configuration menu
    Copy the full SHA
    7506132 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2023

  1. fix: tds incorrectly calculated for invoice that are below threshold 

    Two purchase invoices for the same supplier, using different tax
withholding categories have this issue.

| Category | single | cumulative |
|----------+--------+------------|
| cat1     |    100 |        500 |
| cat2     |   1000 |       5000 |

1. PINV1 of net total: 105/- uses cat1. TDS is calculated as it
breached single threshold
2. PINV2 of net total: 200/- uses cat2. TDS incorrectly calculated as
PINV1 already has TDS calculated and 'consider_party_ledger_amount' is enabled.

(cherry picked from commit 84b7c1b)
    @ruthra-kumar @mergify
    ruthra-kumar authored and mergify[bot] committed May 18, 2023
    Configuration menu
    Copy the full SHA
    6c170ab View commit details
    Browse the repository at this point in the history

  2. fix(test): cumulative threshold checks 

    (cherry picked from commit 132846b)
    @ruthra-kumar @mergify
    ruthra-kumar authored and mergify[bot] committed May 18, 2023
    Configuration menu
    Copy the full SHA
    06deecb View commit details
    Browse the repository at this point in the history

  3. fix: bypass flag in Customer Group wasn't effective 

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

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

    …-35142

fix: ineffective bypass flag for Credit Limit in Customer Group (backport #35142)
    @ruthra-kumar
    ruthra-kumar committed May 18, 2023
    Configuration menu
    Copy the full SHA
    6191cfe View commit details
    Browse the repository at this point in the history

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

    …-35335

fix: tds incorrectly calculated for invoice that are below threshold (backport #35335)
    @ruthra-kumar
    ruthra-kumar committed May 18, 2023
    Configuration menu
    Copy the full SHA
    9af4e11 View commit details
    Browse the repository at this point in the history

  6. fix: tds incorrectly calculated for invoice that are below threshold 

    Two purchase invoices for the same supplier, using different tax
withholding categories have this issue.

| Category | single | cumulative |
|----------+--------+------------|
| cat1     |    100 |        500 |
| cat2     |   1000 |       5000 |

1. PINV1 of net total: 105/- uses cat1. TDS is calculated as it
breached single threshold
2. PINV2 of net total: 200/- uses cat2. TDS incorrectly calculated as
PINV1 already has TDS calculated and 'consider_party_ledger_amount' is enabled.

(cherry picked from commit 84b7c1b)
    @ruthra-kumar @mergify
    ruthra-kumar authored and mergify[bot] committed May 18, 2023
    Configuration menu
    Copy the full SHA
    2e3f8e8 View commit details
    Browse the repository at this point in the history

  7. fix(test): cumulative threshold checks 

    (cherry picked from commit 132846b)
    @ruthra-kumar @mergify
    ruthra-kumar authored and mergify[bot] committed May 18, 2023
    Configuration menu
    Copy the full SHA
    d316955 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #35360 from frappe/mergify/bp/version-13/pr-35335 

    fix: tds incorrectly calculated for invoice that are below threshold (backport #35335)
    @ruthra-kumar
    ruthra-kumar committed May 18, 2023
    Configuration menu
    Copy the full SHA
    2747df7 View commit details
    Browse the repository at this point in the history

  9. chore(release): Bumped to Version 13.50.5 

    ## [13.50.5](v13.50.4...v13.50.5) (2023-05-18)

### Bug Fixes

* tds incorrectly calculated for invoice that are below threshold ([2e3f8e8](2e3f8e8))
* **test:** cumulative threshold checks ([d316955](d316955))
    @frappe-bot
    frappe-bot committed May 18, 2023
    Configuration menu
    Copy the full SHA
    6bc8749 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2023

  1. Merge pull request #35299 from ruthra-kumar/replace_join_with_subquery 

    refactor: replace join with subquery in PCV
    @ruthra-kumar
    ruthra-kumar committed May 19, 2023
    Configuration menu
    Copy the full SHA
    f7ed4ec View commit details
    Browse the repository at this point in the history

Commits on May 20, 2023

  1. fix: allow over-payment against SO (#35079) 

    fix: allow over-payment against SO (#35079)

(cherry picked from commit 870b02b)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
    @mergify @barredterra @deepeshgarg007
    3 people committed May 20, 2023
    Configuration menu
    Copy the full SHA
    eb243c2 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2023

  1. fix: Incorrect Earned Leaves Proration (#35156)

    @JunKangChin
    JunKangChin committed May 21, 2023
    Configuration menu
    Copy the full SHA
    dc04b24 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2023

  1. fix: non manufacturing items/fixed asset items in BOM 

    (cherry picked from commit aba8431)
    @rohitwaghchaure @mergify
    rohitwaghchaure authored and mergify[bot] committed May 22, 2023
    Configuration menu
    Copy the full SHA
    66ba74f View commit details
    Browse the repository at this point in the history

  2. fix: get_query filters

    @rohitwaghchaure
    rohitwaghchaure committed May 22, 2023
    Configuration menu
    Copy the full SHA
    2aa7729 View commit details
    Browse the repository at this point in the history

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

    …-35227

fix: non manufacturing items/fixed asset items in BOM (backport #35227)
    @rohitwaghchaure
    rohitwaghchaure committed May 22, 2023
    Configuration menu
    Copy the full SHA
    7740923 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2023

  1. fix: error while saving job card 

    (cherry picked from commit a209fb4)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.json
    @Vishnu7025 @mergify
    Vishnu7025 authored and mergify[bot] committed May 23, 2023
    Configuration menu
    Copy the full SHA
    d6427cf View commit details
    Browse the repository at this point in the history

  2. fix: use flt instead of mandatory field 

    (cherry picked from commit 8c34cc0)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.json
    @Vishnu7025 @mergify
    Vishnu7025 authored and mergify[bot] committed May 23, 2023
    Configuration menu
    Copy the full SHA
    f63b866 View commit details
    Browse the repository at this point in the history

  3. chore: conflicts

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

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

    …-35380

fix: TypeError while saving Job card (backport #35380)
    @s-aga-r
    s-aga-r committed May 23, 2023
    Configuration menu
    Copy the full SHA
    75f4a61 View commit details
    Browse the repository at this point in the history

  5. fix: change field-type to remove currency field from total row in export

    @saurabh6790
    saurabh6790 committed May 23, 2023
    Configuration menu
    Copy the full SHA
    f65be40 View commit details
    Browse the repository at this point in the history

  6. fix: Pick List TypeError 

    (cherry picked from commit a111917)
    @s-aga-r @mergify
    s-aga-r authored and mergify[bot] committed May 23, 2023
    Configuration menu
    Copy the full SHA
    137898d View commit details
    Browse the repository at this point in the history

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

    …-35303

fix: Pick List TypeError (backport #35303)
    @s-aga-r
    s-aga-r committed May 23, 2023
    Configuration menu
    Copy the full SHA
    97f9c0d View commit details
    Browse the repository at this point in the history

  8. fix: linter

    @saurabh6790
    saurabh6790 committed May 23, 2023
    Configuration menu
    Copy the full SHA
    0a42e6f View commit details
    Browse the repository at this point in the history

  9. Merge pull request #35387 from saurabh6790/minor-fix 

    fix: change field-type to remove currency field from total row in export
    @saurabh6790
    saurabh6790 committed May 23, 2023
    Configuration menu
    Copy the full SHA
    1e1dddf View commit details
    Browse the repository at this point in the history

Commits on May 24, 2023

  1. Merge pull request #35393 from frappe/version-13-hotfix 

    chore: release v13
    @deepeshgarg007
    deepeshgarg007 committed May 24, 2023
    Configuration menu
    Copy the full SHA
    166ec0e View commit details
    Browse the repository at this point in the history

  2. chore(release): Bumped to Version 13.50.6 

    ## [13.50.6](v13.50.5...v13.50.6) (2023-05-24)

### Bug Fixes

* allow over-payment against SO ([#35079](#35079)) ([eb243c2](eb243c2))
* bypass flag in Customer Group wasn't effective ([f0c9d89](f0c9d89))
* change field-type to remove currency field from total row in export ([f65be40](f65be40))
* consider 0 if rate/qty are null (backport [#35338](#35338)) ([#35341](#35341)) ([387f8b9](387f8b9))
* depreciation schedule for existing assets [v14] (backport [#35255](#35255)) ([#35347](#35347)) ([7506132](7506132))
* error while saving job card ([d6427cf](d6427cf))
* get_query filters ([2aa7729](2aa7729))
* Incorrect Earned Leaves Proration ([#35156](#35156)) ([dc04b24](dc04b24))
* linter ([0a42e6f](0a42e6f))
* non manufacturing items/fixed asset items in BOM ([66ba74f](66ba74f))
* Pick List TypeError ([137898d](137898d))
* tds incorrectly calculated for invoice that are below threshold ([6c170ab](6c170ab))
* **test:** cumulative threshold checks ([06deecb](06deecb))
* use flt instead of mandatory field ([f63b866](f63b866))
    @frappe-bot
    frappe-bot committed May 24, 2023
    Configuration menu
    Copy the full SHA
    fd04bd0 View commit details
    Browse the repository at this point in the history

  3. 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 committed 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 committed 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 committed 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 committed 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 committed 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 committed 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 committed May 30, 2023
    Configuration menu
    Copy the full SHA
    63fba9d View commit details
    Browse the repository at this point in the history

Commits on May 31, 2023

  1. Merge pull request #35474 from frappe/version-13-hotfix 

    chore: release v13
    @deepeshgarg007
    deepeshgarg007 committed May 31, 2023
    Configuration menu
    Copy the full SHA
    839a1f0 View commit details
    Browse the repository at this point in the history

  2. chore(release): Bumped to Version 13.51.0 

    # [13.51.0](v13.50.6...v13.51.0) (2023-05-31)

### Bug Fixes

* force to do reposting for cancelled document ([0228933](0228933))
* **Gross Profit:** 'company' column is ambiguous in filter ([270eb1d](270eb1d))
* incorrect `POS Reserved Qty` in `Stock Projected Qty` Report ([#35437](#35437)) ([139a193](139a193))
* incorrect depr schedule and posting dates on selling of existing assets [v13] ([#35404](#35404)) ([20d3381](20d3381))
* monthly WDV depr schedule for existing assets [v13] ([#35461](#35461)) ([6f43829](6f43829))
* retention stock entry: grab conversion factor from source ([d8dd22a](d8dd22a))

### Features

* Allow ceil & floor functions in salary slip formulae ([#35475](#35475)) ([63fba9d](63fba9d))
    @frappe-bot
    frappe-bot committed May 31, 2023
    Configuration menu
    Copy the full SHA
    b5b34c1 View commit details
    Browse the repository at this point in the history

  3. chore: remove whitelisting for method not accessed from UI 

    (cherry picked from commit 517d8a0)
    @sagarvora @mergify
    sagarvora authored and mergify[bot] committed May 31, 2023
    Configuration menu
    Copy the full SHA
    f0580b0 View commit details
    Browse the repository at this point in the history

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

    …-35500
    @sagarvora
    sagarvora committed May 31, 2023
    Configuration menu
    Copy the full SHA
    169af8f View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2023

  1. refactor: simplify group by invoice logic 

    (cherry picked from commit 092c4b4)
    @ruthra-kumar @mergify
    ruthra-kumar authored and mergify[bot] committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    e3a8a8d View commit details
    Browse the repository at this point in the history

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

    …-35112

refactor(Gross Profit): simplify group by invoice logic (backport #35112)
    @ruthra-kumar
    ruthra-kumar committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    202513a View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2023

  1. fix: Task gantt popup style 

    (cherry picked from commit f7b2d10)
    @surajshetty3416 @mergify
    surajshetty3416 authored and mergify[bot] committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    5544801 View commit details
    Browse the repository at this point in the history

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

    …-35530

fix: Task gantt popup style and info (backport #35530)
    @surajshetty3416
    surajshetty3416 committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    09cf050 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2023

  1. fix: Interest Accrual on Loan Topup (#35555) 

    fix: Interest Accrual on Loan Topup (#35555)

* fix: Interest Accrual on Loan Topup

* chore: CI

* chore: Ignore test

(cherry picked from commit 2ffcca6)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
    @mergify @deepeshgarg007
    mergify[bot] and deepeshgarg007 committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    1415f40 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #35570 from frappe/version-13-hotfix 

    chore: release v13
    @deepeshgarg007
    deepeshgarg007 committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    1897d6f View commit details
    Browse the repository at this point in the history

  3. chore(release): Bumped to Version 13.51.1 

    ## [13.51.1](v13.51.0...v13.51.1) (2023-06-07)

### Bug Fixes

* Interest Accrual on Loan Topup ([#35555](#35555)) ([1415f40](1415f40))
* Task gantt popup style ([5544801](5544801))
    @frappe-bot
    frappe-bot committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    f182fc1 View commit details
    Browse the repository at this point in the history

  4. fix: Asset Depreciation Ledger Report - Add Total Row Checkbox Enabled

    @ajayn1991
    ajayn1991 committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    3831c79 View commit details
    Browse the repository at this point in the history

  5. fix: Project in item-wise sales register (#35596) 

    fix: Project in item-wise sales register (#35596)

(cherry picked from commit f732cac)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
    @mergify @deepeshgarg007
    mergify[bot] and deepeshgarg007 committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    9d5b500 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2023

  1. fix: calculate wdv depr schedule properly for existing assets [v13] (#… 

    …35615)

* fix: calculate wdv depr schedule properly for existing assets

* fix: calculate wdv depr schedule properly for existing assets properly
    @anandbaburajan
    anandbaburajan committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    97f4af8 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. fix: CSS not applied to product title (backport #35582) (#35635) 

    In an erpnext website, the /all-products route shows website items that have been published to the web site.

In the list view (erpnext/e_commerce/product_ui/list.js), the css class is null for the product title. Instead, inline style statements have been added in that can not be modified by overriding CSS.

This fix uses a similar approach to that which is taken in the grid view (erpnext/e_commerce/product_ui/grid.js). It removes the null CSS parameter in the product title link as well as the inline style statement. Then, as in the grid view, the product title is wrapped in a div tag with the product_title CSS class.

This makes it possible to style the product title as desired with a CSS override.
    @trustedcomputer
    trustedcomputer committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    1b69b37 View commit details
    Browse the repository at this point in the history

  2. fix: don't set default payment amount in case of invoice return (back… 

    …port #35645) (#35648)

* fix: don't set default payment amount in case of invoice return (#35645)

(cherry picked from commit 79483cc)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js

* chore: fixing conflict

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
    @mergify @anandbaburajan
    mergify[bot] and anandbaburajan committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    8e3636f View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. fix: savepoint policy assignment submission, log errors & inform the … 

    …user about failures (#35507)
    @ruchamahabal
    ruchamahabal committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    4a35ff0 View commit details
    Browse the repository at this point in the history

  2. perf: refactor get_all_nodes in Org Chart

    @ruchamahabal
    ruchamahabal committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    986a90e View commit details
    Browse the repository at this point in the history

  3. test: get children for org chart

    @ruchamahabal
    ruchamahabal committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    a24d488 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #35663 from ruchamahabal/perf-org-charts-v13

    @ruchamahabal
    ruchamahabal committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    5b37abd View commit details
    Browse the repository at this point in the history

  5. Stock aging report fix when called in dashboard chart (backport #35671)… 

    … (#35676)

fix: get_range_age conditions fixed (#35671)

see #35669

(cherry picked from commit 9f669d4)

Co-authored-by: Hossein Yousefian <86075967+ihosseinu@users.noreply.github.com>
    @mergify @ihesamyou
    mergify[bot] and ihesamyou committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    4f79214 View commit details
    Browse the repository at this point in the history

  6. fix: make showing taxes as table in print configurable (#35672) 

    * fix: make showing taxes as table in print configurable (#35672)

(cherry picked from commit 491a50a)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json

* chore: fixing conflicts

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
    @mergify @anandbaburajan
    mergify[bot] and anandbaburajan committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    4c2c037 View commit details
    Browse the repository at this point in the history

  7. fix(accounts): validate payment entry references with latest data. (b… 

    …ackport #31166) (#35674)

* fix(accounts): validate payment entry references with latest data. (#31166)

* test: payment entry over allocation.

* fix: validate allocated_amount against latest outstanding amount.

* fix: payment entry get outstanding documents for advance payments

* fix: only fetch latest outstanding_amount.

* fix: throw if reference is allocated

* test: throw error if a reference has been partially allocated after inital creation.

* chore: test name

* fix: remove unused part of test

* chore: linter

* chore: more user friendly error messages

* fix: only validate outstanding amount if partly paid and don't filter by cost center

* chore: minor refactor for doc.cost_center

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit 20de27d)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/test_payment_entry.py

* chore: resolve conflicts

* chore: resolve more conflicts

* chore: don't validate allocated amount in case of donation

---------

Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
    @mergify @dj12djdjs
    @deepeshgarg007 @anandbaburajan
    4 people committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    4d4f218 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. fix: Lower deduction certificate not getting applied (#35667) 

    * fix: Lower deduction certificate not getting applied (#35667)

(cherry picked from commit 937c0fe)

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

* chore: Resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
    @mergify @deepeshgarg007
    mergify[bot] and deepeshgarg007 committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    c2bf8e3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #35665 from frappe/version-13-hotfix 

    chore: release v13
    @deepeshgarg007
    deepeshgarg007 committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    e75ca14 View commit details
    Browse the repository at this point in the history

  3. chore(release): Bumped to Version 13.51.2 

    ## [13.51.2](v13.51.1...v13.51.2) (2023-06-14)

### Bug Fixes

* **accounts:** validate payment entry references with latest data. (backport [#31166](#31166)) ([#35674](#35674)) ([4d4f218](4d4f218))
* Asset Depreciation Ledger Report - Add Total Row Checkbox Enabled ([3831c79](3831c79))
* calculate wdv depr schedule properly for existing assets [v13] ([#35615](#35615)) ([97f4af8](97f4af8))
* CSS not applied to product title (backport [#35582](#35582)) ([#35635](#35635)) ([1b69b37](1b69b37))
* don't set default payment amount in case of invoice return (backport [#35645](#35645)) ([#35648](#35648)) ([8e3636f](8e3636f))
* Lower deduction certificate not getting applied ([#35667](#35667)) ([c2bf8e3](c2bf8e3))
* make showing taxes as table in print configurable ([#35672](#35672)) ([4c2c037](4c2c037))
* Project in item-wise sales register ([#35596](#35596)) ([9d5b500](9d5b500))
* savepoint policy assignment submission, log errors & inform the user about failures ([#35507](#35507)) ([4a35ff0](4a35ff0))

### Performance Improvements

* refactor `get_all_nodes` in Org Chart ([986a90e](986a90e))
    @frappe-bot
    frappe-bot committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    9a65925 View commit details
    Browse the repository at this point in the history

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 @anandbaburajan
    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. fix: Incorrect field while calculating Tax withholding net total

    @deepeshgarg007
    deepeshgarg007 committed Jun 16, 2023
    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
    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. fix: Incorrect field while calculating Tax withholding net total 

    (cherry picked from commit b95d459)
    @deepeshgarg007 @mergify
    deepeshgarg007 authored and mergify[bot] committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    f8a8cf3 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #35731 from frappe/mergify/bp/version-13/pr-35730 

    fix: Incorrect field while calculating Tax withholding net total (#35730)
    @deepeshgarg007
    deepeshgarg007 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    513da54 View commit details
    Browse the repository at this point in the history

  5. chore(release): Bumped to Version 13.51.3 

    ## [13.51.3](v13.51.2...v13.51.3) (2023-06-16)

### Bug Fixes

* Incorrect field while calculating Tax withholding net total ([f8a8cf3](f8a8cf3))
    @frappe-bot
    frappe-bot committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    ac9f1fe View commit details
    Browse the repository at this point in the history

  6. fix: Incorrect field while calculating Tax withholding net total

    @deepeshgarg007
    deepeshgarg007 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    571c977 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'version-13-hotfix' into tax_withholding_limit_consumed

    @deepeshgarg007
    deepeshgarg007 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    bcc8a45 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #35733 from deepeshgarg007/tax_withholding_limit_c… 

    …onsumed

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

  9. fix: Incorrect field while calculating Tax withholding net total 

    (cherry picked from commit 571c977)

# Conflicts:
#	erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
    @deepeshgarg007 @mergify
    deepeshgarg007 authored and mergify[bot] committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    a98a13b View commit details
    Browse the repository at this point in the history

  10. chore: resolve conflicts

    @deepeshgarg007
    deepeshgarg007 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    d49a8ad View commit details
    Browse the repository at this point in the history

  11. Merge pull request #35734 from frappe/mergify/bp/version-13/pr-35733 

    fix: Incorrect field while calculating Tax withholding net total (backport #35733)
    @deepeshgarg007
    deepeshgarg007 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    eaa1589 View commit details
    Browse the repository at this point in the history

  12. chore(release): Bumped to Version 13.51.4 

    ## [13.51.4](v13.51.3...v13.51.4) (2023-06-16)

### Bug Fixes

* Incorrect field while calculating Tax withholding net total ([a98a13b](a98a13b))
    @frappe-bot
    frappe-bot committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    6400a57 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 @s-aga-r
    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 @abhinavxd
    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>
    @mergify @deepeshgarg007 @anandbaburajan
    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: 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>
(cherry picked from commit 3d0add8)
    @mergify
    mergify[bot] committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    75b3423 View commit details
    Browse the repository at this point in the history

  4. fix: account group totals calculation to consider include_in_gross 

    (cherry picked from commit 8dcb930)
    @akurungadam @mergify
    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

  5. refactor: remove unused parameters 

    (cherry picked from commit 50822f2)
    @akurungadam @mergify
    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

  6. 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 @mergify
    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

  7. fix: add total col for gross and net profit 

    (cherry picked from commit cb9b4fb)
    @akurungadam @mergify
    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

  8. 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
    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

  9. Merge pull request #35775 from frappe/mergify/bp/version-13/pr-35771 

    fix: Allocated amount validation for other party types (#35741)
    @deepeshgarg007
    deepeshgarg007 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    2a6e802 View commit details
    Browse the repository at this point in the history

  10. chore(release): Bumped to Version 13.51.5 

    ## [13.51.5](v13.51.4...v13.51.5) (2023-06-19)

### Bug Fixes

* Allocated amount validation for other party types ([#35741](#35741)) ([75b3423](75b3423))
    @frappe-bot
    frappe-bot committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    0ec74b0 View commit details
    Browse the repository at this point in the history

  11. 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 @anandbaburajan
    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 @s-aga-r
    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 @anandbaburajan
    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

Commits on Jun 21, 2023

  1. Merge pull request #35806 from frappe/version-13-hotfix 

    chore: release v13
    @deepeshgarg007
    deepeshgarg007 committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    51dd0ec View commit details
    Browse the repository at this point in the history

  2. chore(release): Bumped to Version 13.51.6 

    ## [13.51.6](v13.51.5...v13.51.6) (2023-06-21)

### Bug Fixes

* account group totals calculation to consider include_in_gross ([f22969d](f22969d))
* add total col for gross and net profit ([e899c30](e899c30))
* add validation for QI in PR (backport [#35677](#35677)) ([#35758](#35758)) ([0a8b714](0a8b714))
* Allocated amount validation for other party types ([#35741](#35741)) ([3d0add8](3d0add8))
* date and finance book fixes in fixed asset register (backport [#35751](#35751)) ([#35800](#35800)) ([aa8446d](aa8446d))
* don't add GL Entry for Acc. Depr. while scrapping non-depreciable assets (backport [#35714](#35714)) ([#35716](#35716)) ([0e11317](0e11317))
* fix get outstanding invoices btn and add get outstanding orders btn (backport [#35776](#35776)) ([#35788](#35788)) ([04990d5](04990d5))
* Incorrect field while calculating Tax withholding net total ([571c977](571c977))
* Incorrect field while calculating Tax withholding net total ([b95d459](b95d459))
* loan interest accrual date ([#35695](#35695)) ([46d0b7d](46d0b7d))

### Performance Improvements

* index `purpose` in `Stock Entry` (backport [#35782](#35782)) ([#35784](#35784)) ([7239e83](7239e83))
    @frappe-bot
    frappe-bot committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    60a170d View commit details
    Browse the repository at this point in the history

  3. chore: remove whitelisting for methods not used from UI (#35592)

    @DaizyModi
    DaizyModi committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    0fe95bf View commit details
    Browse the repository at this point in the history

  4. 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 @anandbaburajan
    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. fix: employee link fields in payroll reports (#619) (#35845)

    @ruchamahabal
    ruchamahabal committed Jun 22, 2023
    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 @anandbaburajan
    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 @anandbaburajan
    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 @phot0n
    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
    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 @s-aga-r
    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 @deepeshgarg007
    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>
    @mergify @kisshang1993 @s-aga-r
    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 @anandbaburajan
    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 @anandbaburajan
    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

  3. Merge pull request #35902 from frappe/version-13-hotfix 

    chore: release v13
    @deepeshgarg007
    deepeshgarg007 committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    41902c3 View commit details
    Browse the repository at this point in the history

  4. chore(release): Bumped to Version 13.51.7 

    ## [13.51.7](v13.51.6...v13.51.7) (2023-06-28)

### Bug Fixes

* asset movement (backport [#35918](#35918)) ([#35924](#35924)) ([0bcd047](0bcd047))
* employee link fields in payroll reports ([#619](#619)) ([#35845](#35845)) ([6c4dff3](6c4dff3))
* filter parent warehouses not showing (backport [#35897](#35897)) ([#35900](#35900)) ([bcfd770](bcfd770))
* frappe.exceptions.DoesNotExistError: DocType KSA VAT Setting ([#35797](#35797)) ([3785fe6](3785fe6)), closes [#35795](#35795)
* show non-depreciable assets in fixed asset register (backport [#35858](#35858)) ([#35861](#35861)) ([2e2c319](2e2c319))
* TDS amount calculation post LDC breach ([#35886](#35886)) ([4dd088c](4dd088c))
* use correct fieldname for purchase receipt column in item_wise_purchase_register report (backport [#35828](#35828)) ([#35848](#35848)) ([de529f0](de529f0))
* **ux:** PO Get Items From Open Material Requests (backport [#35894](#35894)) ([#35896](#35896)) ([12b6257](12b6257))

### Performance Improvements

* improve item wise register reports (backport [#35908](#35908)) ([#35912](#35912)) ([4134459](4134459))
    @frappe-bot
    frappe-bot committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    2648912 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. chore: update translations (#35905) 

    chore: update translations

chore: update translations
(cherry picked from commit 1d1103f)

Co-authored-by: RJPvT <48353029+RJPvT@users.noreply.github.com>
    @mergify @RJPvT
    mergify[bot] and RJPvT committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    18c3a66 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2023

  1. feat(DATEV): against account for opening entries (#35941) 

    * fix: add missing german translations

* feat(DATEV): against account for opening entries

Allow to specify a separate temporary against account
for opening entries

* feat(DATEV Settings): validate account no. length

* style: format with black

* style: format with black

* test: new settings field, rename filter
    @barredterra
    barredterra committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    0602ddc View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2023

  1. fix: Expense Account filter in Sales Invoice (#35944) 

    fix: Expense Account filter in Sales Invoice (#35944)

(cherry picked from commit d54f524)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
    @mergify @deepeshgarg007
    mergify[bot] and deepeshgarg007 committed Jul 1, 2023
    Configuration menu
    Copy the full SHA
    b63fbe4 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2023

  1. fix: reposting has not changed valuation rate 

    (cherry picked from commit c0c693d)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
    @rohitwaghchaure @mergify
    rohitwaghchaure authored and mergify[bot] committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    d4e680c View commit details
    Browse the repository at this point in the history

  2. fix: conflicts

    @rohitwaghchaure
    rohitwaghchaure committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    b9833db View commit details
    Browse the repository at this point in the history

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

    …-35955

fix: incorrect reposting causing stock adjustment entry (backport #35955)
    @rohitwaghchaure
    rohitwaghchaure committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    407e5b5 View commit details
    Browse the repository at this point in the history

  4. chore: bump pandas (#35939)

    @barredterra
    barredterra committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    da1218f View commit details
    Browse the repository at this point in the history

  5. fix: Update no copy for received_qty field (#35965) 

    * fix: Update no copy for received_qty field (#35965)

(cherry picked from commit 5448859)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json

* chore: resolve conflicts

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
    @mergify @deepeshgarg007
    mergify[bot] and deepeshgarg007 committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    10c9640 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2023

  1. fix: Further sort purchase_order_analysis to get consistent response

    @surajshetty3416
    surajshetty3416 committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    0ef0ff4 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #35986 from frappe/fix-report-sorting

    @surajshetty3416
    surajshetty3416 committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    9b9d839 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2023

  1. Merge pull request #35997 from frappe/version-13-hotfix 

    chore: release v13
    @deepeshgarg007
    deepeshgarg007 committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    fd84119 View commit details
    Browse the repository at this point in the history

  2. chore(release): Bumped to Version 13.52.0 

    # [13.52.0](v13.51.7...v13.52.0) (2023-07-05)

### Bug Fixes

* conflicts ([b9833db](b9833db))
* Expense Account filter in Sales Invoice ([#35944](#35944)) ([b63fbe4](b63fbe4))
* Further sort purchase_order_analysis to get consistent response ([0ef0ff4](0ef0ff4))
* reposting has not changed valuation rate ([d4e680c](d4e680c))
* Update no copy for received_qty field ([#35965](#35965)) ([10c9640](10c9640))

### Features

* **DATEV:** against account for opening entries ([#35941](#35941)) ([0602ddc](0602ddc))
    @frappe-bot
    frappe-bot committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    77d019c View commit details
    Browse the repository at this point in the history

  3. fix(Payment Entry): compare rounded amount (#36011) 

    fix(Payment Entry): compare rounded amount (#36011)

(cherry picked from commit 4badac8)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
    @mergify @barredterra
    mergify[bot] and barredterra committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    b04c190 View commit details
    Browse the repository at this point in the history

  4. fix(Payment Entry): compare rounded amount (#36011) 

    fix(Payment Entry): compare rounded amount (#36011)

(cherry picked from commit 4badac8)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit b04c190)
    @mergify
    mergify[bot] committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    a370dc3 View commit details
    Browse the repository at this point in the history

  5. fix(Payment Entry): compare rounded amount (#36011) 

    fix(Payment Entry): compare rounded amount (#36011)
    @deepeshgarg007
    deepeshgarg007 committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    a7d26b0 View commit details
    Browse the repository at this point in the history

  6. chore(release): Bumped to Version 13.52.1 

    ## [13.52.1](v13.52.0...v13.52.1) (2023-07-05)

### Bug Fixes

* **Payment Entry:** compare rounded amount ([#36011](#36011)) ([a7d26b0](a7d26b0))
* **Payment Entry:** compare rounded amount ([#36011](#36011)) ([a370dc3](a370dc3))
    @frappe-bot
    frappe-bot committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    1116cee View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2023

  1. fix: gst_hsn_code is ambiguous on gst reports

    @ruthra-kumar
    ruthra-kumar committed Jul 8, 2023
    Configuration menu
    Copy the full SHA
    3a00052 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #36028 from ruthra-kumar/fix_ambiguous_gst_hsn_code 

    fix: gst_hsn_code is ambiguous on gst reports
    @ruthra-kumar
    ruthra-kumar committed Jul 8, 2023
    Configuration menu
    Copy the full SHA
    93acde7 View commit details
    Browse the repository at this point in the history

  3. fix: gst_hsn_code is ambiguous on gst reports 

    (cherry picked from commit 3a00052)
    @ruthra-kumar @mergify
    ruthra-kumar authored and mergify[bot] committed Jul 8, 2023
    Configuration menu
    Copy the full SHA
    2893ae7 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #36031 from frappe/mergify/bp/version-13/pr-36028 

    fix: gst_hsn_code is ambiguous on gst reports (backport #36028)
    @ruthra-kumar
    ruthra-kumar committed Jul 8, 2023
    Configuration menu
    Copy the full SHA
    a4d8f9c View commit details
    Browse the repository at this point in the history

  5. chore(release): Bumped to Version 13.52.2 

    ## [13.52.2](v13.52.1...v13.52.2) (2023-07-08)

### Bug Fixes

* gst_hsn_code is ambiguous on gst reports ([2893ae7](2893ae7))
    @frappe-bot
    frappe-bot committed Jul 8, 2023
    Configuration menu
    Copy the full SHA
    6490b7d View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2023

  1. Revert "perf: improve item wise register reports (backport #35908) (#… 

    …35912)"

This reverts commit 4134459.
    @deepeshgarg007
    deepeshgarg007 committed Jul 9, 2023
    Configuration menu
    Copy the full SHA
    b992366 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #36034 from frappe/revert-35912-mergify/bp/version… 

    …-13-hotfix/pr-35908

Revert "perf: improve item wise register reports (backport #35908)"
    @deepeshgarg007
    deepeshgarg007 committed Jul 9, 2023
    Configuration menu
    Copy the full SHA
    4b20f2a View commit details
    Browse the repository at this point in the history

  3. Revert "perf: improve item wise register reports (backport #35908) (#… 

    …35912)"

This reverts commit 4134459.

(cherry picked from commit b992366)
    @deepeshgarg007 @mergify
    deepeshgarg007 authored and mergify[bot] committed Jul 9, 2023
    Configuration menu
    Copy the full SHA
    0feb393 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #36035 from frappe/mergify/bp/version-13/pr-36034 

    Revert "perf: improve item wise register reports (backport #35908)" (backport #36034)
    @deepeshgarg007
    deepeshgarg007 committed Jul 9, 2023
    Configuration menu
    Copy the full SHA
    5cfe419 View commit details
    Browse the repository at this point in the history

  5. chore(release): Bumped to Version 13.52.3 

    ## [13.52.3](v13.52.2...v13.52.3) (2023-07-09)

### Reverts

* Revert "perf: improve item wise register reports (backport #35908) (#35912)" ([0feb393](0feb393)), closes [#35908](#35908) [#35912](#35912)
    @frappe-bot
    frappe-bot committed Jul 9, 2023
    Configuration menu
    Copy the full SHA
    77eb11a View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. chore: add asset depr posting error in error log (backport #36052) (#… 

    …36056)

chore: add asset depr posting error in error log (#36052)

(cherry picked from commit 0f9a6ee)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
    @mergify @anandbaburajan
    mergify[bot] and anandbaburajan committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    2732276 View commit details
    Browse the repository at this point in the history

  2. fix: precision causing outstanding issue on partly paid invoices (#36030 

    )

fix: precision causing outstanding issue on partly paid invoices (#36030)

* fix: precision causing outstanding issue on partly paid invoices

* chore: linters

(cherry picked from commit 5c820ec)

Co-authored-by: Dany Robert <danyrt@wahni.com>
    @mergify @rtdany10
    mergify[bot] and rtdany10 committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    cf3ec93 View commit details
    Browse the repository at this point in the history

  3. fix: single column indexes (#32425) 

    fix: single column indexes (#32425)

refactor: move single column indexes to doctypes
(cherry picked from commit 8d1db0e)

Co-authored-by: Ankush Menat <ankush@frappe.io>
    @mergify @ankush
    mergify[bot] and ankush committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    53f7764 View commit details
    Browse the repository at this point in the history

  4. fix: also check on_hold (#35910)

    @RJPvT
    RJPvT committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    5aa02b8 View commit details
    Browse the repository at this point in the history

  5. refactor(Payment Entry): translatable strings (#36017) 

    * refactor(Payment Entry): translatable strings (#36017)

* refactor(Payment Entry): translatable strings

* fix: German translations

(cherry picked from commit af28f95)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.py
#	erpnext/translations/de.csv

* chore: resolve conflicts

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
    @mergify @barredterra
    mergify[bot] and barredterra committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    0248fee View commit details
    Browse the repository at this point in the history

  6. Revert "fix: gst_hsn_code is ambiguous on gst reports" (#36072)

    @anandbaburajan
    anandbaburajan committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    06c85fa View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. fix: payment entry voucher_type error (#35779) 

    * fix: payment entry `voucher_type` error (#35779)

* fix: payment entry `voucher_type` error

* chore: linters

(cherry picked from commit 361a357)

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

* chore: resolve conflicts

---------

Co-authored-by: Dany Robert <danyrt@wahni.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
    @mergify @rtdany10 @deepeshgarg007
    3 people committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    9c3ec41 View commit details
    Browse the repository at this point in the history

  2. fix(Employee Advance): check if return amount is set before validating ( 

    #36080)
    @ruchamahabal
    ruchamahabal committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    beaf13e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'version-13' into version-13-hotfix

    @deepeshgarg007
    deepeshgarg007 committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    6f2fb89 View commit details
    Browse the repository at this point in the history

  4. fix: incorrect status in MR created from PP (backport #36085) (#36087) 

    fix: incorrect status in MR created from PP (#36085)

(cherry picked from commit be58812)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
    @mergify @s-aga-r
    mergify[bot] and s-aga-r committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    e05bb10 View commit details
    Browse the repository at this point in the history

  5. fix: error messages while evaluating formulas and handle line boundar… 

    …ies (#35989)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
    @saurabh6790 @ruchamahabal
    saurabh6790 and ruchamahabal committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    4af57a7 View commit details
    Browse the repository at this point in the history

  6. fix: circular dependency during reposting causing timeout error 

    (cherry picked from commit c16a581)
    @rohitwaghchaure @mergify
    rohitwaghchaure authored and mergify[bot] committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    ba69be1 View commit details
    Browse the repository at this point in the history

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

    …-36088

fix: circular dependency during reposting causing timeout error (backport #36088)
    @rohitwaghchaure
    rohitwaghchaure committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    1d6bc68 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #36084 from frappe/version-13-hotfix 

    chore: release v13
    @deepeshgarg007
    deepeshgarg007 committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    30c9b15 View commit details
    Browse the repository at this point in the history

  9. chore(release): Bumped to Version 13.52.4 

    ## [13.52.4](v13.52.3...v13.52.4) (2023-07-11)

### Bug Fixes

* also check on_hold ([#35910](#35910)) ([5aa02b8](5aa02b8))
* circular dependency during reposting causing timeout error ([ba69be1](ba69be1))
* **Employee Advance:** check if return amount is set before validating ([#36080](#36080)) ([beaf13e](beaf13e))
* error messages while evaluating formulas and handle line boundaries ([#35989](#35989)) ([4af57a7](4af57a7))
* gst_hsn_code is ambiguous on gst reports ([3a00052](3a00052))
* incorrect status in MR created from PP (backport [#36085](#36085)) ([#36087](#36087)) ([e05bb10](e05bb10))
* payment entry `voucher_type` error ([#35779](#35779)) ([9c3ec41](9c3ec41))
* **Payment Entry:** compare rounded amount ([#36011](#36011)) ([b04c190](b04c190))
* precision causing outstanding issue on partly paid invoices ([#36030](#36030)) ([cf3ec93](cf3ec93))
* single column indexes ([#32425](#32425)) ([53f7764](53f7764))

### Reverts

* Revert "perf: improve item wise register reports (backport #35908) (#35912)" ([b992366](b992366)), closes [#35908](#35908) [#35912](#35912)
    @frappe-bot
    frappe-bot committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    12e27e9 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. fix: allow manual asset receipt mov from nowhere (backport #36093) (#… 

    …36095)

* fix: allow manual asset receipt mov from nowhere (#36093)

(cherry picked from commit 4aaa1a1)

# Conflicts:
#	erpnext/assets/doctype/asset_movement/asset_movement.py

* chore: fix conflict

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
    @mergify @anandbaburajan
    mergify[bot] and anandbaburajan committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    2993eb5 View commit details
    Browse the repository at this point in the history

  2. ci: regen release notes with GH API (backport #36098) (#36100) 

    ci: regen release notes with GH API (#36098)

[skip ci]

(cherry picked from commit 0340bfc)

Co-authored-by: Ankush Menat <ankush@frappe.io>
    @mergify @ankush
    mergify[bot] and ankush committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    82e2ff8 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2023

  1. ci: fix repo name in relase notes workflow 

    [skip ci]

(cherry picked from commit b5f6a1c)
    @ankush
    ankush committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    6b113c6 View commit details
    Browse the repository at this point in the history

  2. fix: improve "Update Items" modal (#36105) 

    fix: improve "Update Items" modal (#36105)

* fix: make "Update Items" modal larger

* fix: remove conversion factor from overview

Conversion factor doesn't make much sense without two different UOMs
next to it, hence moving it to row detail view

(cherry picked from commit d5fe143)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
    @mergify @barredterra
    mergify[bot] and barredterra committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    3bc899f View commit details
    Browse the repository at this point in the history

  3. fix: HSN code not showing up in GST itemised register reports (#36142) 

    fix: hsn code not showing up in gst itemised registers
    @anandbaburajan
    anandbaburajan committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    1d3917b View commit details
    Browse the repository at this point in the history

  4. fix: HSN code not showing up in GST itemised register reports (backport 

    #36142) (#36143)

fix: HSN code not showing up in GST itemised register reports (#36142)

fix: hsn code not showing up in gst itemised registers
(cherry picked from commit 1d3917b)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
    @mergify @anandbaburajan
    mergify[bot] and anandbaburajan committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    73366de View commit details
    Browse the repository at this point in the history

  5. chore(release): Bumped to Version 13.52.5 

    ## [13.52.5](v13.52.4...v13.52.5) (2023-07-14)

### Bug Fixes

* HSN code not showing up in GST itemised register reports (backport [#36142](#36142)) ([#36143](#36143)) ([73366de](73366de))
    @frappe-bot
    frappe-bot committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    cefa78b View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2023

  1. perf: index in Item and Item Variant Attribute (backport #36133) (#… 

    …36145)

* perf: index `variant_of` and `attribute` in `Item Variant Attribute`

(cherry picked from commit e4128a5)

* perf: index `disabled` in `Item`

(cherry picked from commit 04400eb)

# Conflicts:
#	erpnext/stock/doctype/item/item.json

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
    @mergify @s-aga-r
    mergify[bot] and s-aga-r committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    120de24 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. chore: add validation for account type of party type and account (#36141 

    )

chore: add validation for account type of party type and account (#36141)

chore: add validation to check if account type of party type and account match
(cherry picked from commit 305c379)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
    @mergify @anandbaburajan
    mergify[bot] and anandbaburajan committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    287c67f View commit details
    Browse the repository at this point in the history

  2. chore: use consistent quotes 

    (cherry picked from commit bccb718)
    @sagarvora @mergify
    sagarvora authored and mergify[bot] committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    a93c4b6 View commit details
    Browse the repository at this point in the history

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

    …-36163
    @sagarvora
    sagarvora committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    4854c2e View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. Merge pull request #36178 from frappe/version-13-hotfix 

    chore: release v13
    @deepeshgarg007
    deepeshgarg007 committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    9566f41 View commit details
    Browse the repository at this point in the history

  2. chore(release): Bumped to Version 13.52.6 

    ## [13.52.6](v13.52.5...v13.52.6) (2023-07-18)

### Bug Fixes

* allow manual asset receipt mov from nowhere (backport [#36093](#36093)) ([#36095](#36095)) ([2993eb5](2993eb5))
* HSN code not showing up in GST itemised register reports ([#36142](#36142)) ([1d3917b](1d3917b))
* improve "Update Items" modal ([#36105](#36105)) ([3bc899f](3bc899f))

### Performance Improvements

* index in `Item` and `Item Variant Attribute` (backport [#36133](#36133)) ([#36145](#36145)) ([120de24](120de24))
    @frappe-bot
    frappe-bot committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    128ea0d View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2023

  1. fix: allow both custodian and location while creating asset (backport #… 

    …36263) (#36270)

fix: allow both custodian and location while creating asset (#36263)

(cherry picked from commit 2b47f58)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
    @mergify @anandbaburajan
    mergify[bot] and anandbaburajan committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    e4f28e8 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. fix: apply discount on item after applying price list (#36125)

    @anandbaburajan
    anandbaburajan committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    bde9e89 View commit details
    Browse the repository at this point in the history

  2. fix: group by in fixed asset register (copy #36310) (#36312) 

    fix: group by in fixed asset register

(cherry picked from commit 1151e47)

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
    @mergify @anandbaburajan
    mergify[bot] and anandbaburajan committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    a5e1c47 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. Merge pull request #36295 from frappe/version-13-hotfix 

    chore: release v13
    @deepeshgarg007
    deepeshgarg007 committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    ded3b62 View commit details
    Browse the repository at this point in the history

  2. chore(release): Bumped to Version 13.52.7 

    ## [13.52.7](v13.52.6...v13.52.7) (2023-07-26)

### Bug Fixes

* allow both custodian and location while creating asset (backport [#36263](#36263)) ([#36270](#36270)) ([e4f28e8](e4f28e8))
* apply discount on item after applying price list ([#36125](#36125)) ([bde9e89](bde9e89))
* group by in fixed asset register (copy [#36310](#36310)) ([#36312](#36312)) ([a5e1c47](a5e1c47))
    @frappe-bot
    frappe-bot committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    46966f4 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2023

  1. fix: removed "fetch_from" (backport #36365) (#36387) 

    fix: removed "fetch_from"

* fix: removed ("fetch_from": "goal.objective")
The field ended up being disabled because of this.

(cherry picked from commit 1c687a4)

Co-authored-by: xdlumertz <alexandrelumertz@gmail.com>
    @mergify @AlexandreLumertz
    mergify[bot] and AlexandreLumertz committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    c574494 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2023

  1. fix: only publish repost progress to doc subscriber (backport #36400) (… 

    …#36403)

* fix: only publish repost progress to doc subscriber (#36400)

Huge size of string gets blasted to everyone on site. Due to some memory
leak (cause unknown) till sockets are open the strings are also in
process' memory.

related frappe/frappe#21863

(cherry picked from commit c0642cf)

# Conflicts:
#	erpnext/stock/stock_ledger.py

* chore: conflicts

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
    @mergify @ankush
    mergify[bot] and ankush committed Jul 29, 2023
    Configuration menu
    Copy the full SHA
    e9df064 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. perf: use LEFT JOIN instead of NOT EXISTS (backport #36221) (#36384) 

    * perf: use `LEFT JOIN` instead of `NOT EXISTS`

(cherry picked from commit 58d8675)

# Conflicts:
#	erpnext/manufacturing/doctype/bom_update_log/bom_updation_utils.py

* fix: long queue `process_boms_cost_level_wise`

(cherry picked from commit 148d466)

* chore: `conflicts`

* fix: failing test case

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
    @mergify @s-aga-r
    mergify[bot] and s-aga-r committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    cdc86bd View commit details
    Browse the repository at this point in the history

  2. fix: added validation for unique serial numbers in pos invoice (#36302) 

    * fix: added validation for unique serial numbers in pos invoice

* fix: updated title of validation

* fix: removed extra whitespace

* fix: added validation for duplicate batch numbers

---------

Co-authored-by: Ritvik Sardana <ritviksardana@Ritviks-MacBook-Air.local>
    @RitvikSardana
    RitvikSardana and Ritvik Sardana committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    a165b37 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2023

  1. Merge pull request #36441 from frappe/version-13-hotfix 

    chore: release v13
    @deepeshgarg007
    deepeshgarg007 committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    348e461 View commit details
    Browse the repository at this point in the history

  2. chore(release): Bumped to Version 13.52.8 

    ## [13.52.8](v13.52.7...v13.52.8) (2023-08-01)

### Bug Fixes

* added validation for unique serial numbers in pos invoice ([#36302](#36302)) ([a165b37](a165b37))
* only publish repost progress to doc subscriber (backport [#36400](#36400)) ([#36403](#36403)) ([e9df064](e9df064))
* removed "fetch_from" (backport [#36365](#36365)) ([#36387](#36387)) ([c574494](c574494))

### Performance Improvements

* use `LEFT JOIN` instead of `NOT EXISTS` (backport [#36221](#36221)) ([#36384](#36384)) ([cdc86bd](cdc86bd))
    @frappe-bot
    frappe-bot committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    0281afc View commit details
    Browse the repository at this point in the history