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

fix: Item-wise Sales and Purchase register with no item codes #41373 (backport #41424) (backport #41829) #41832

Merged
merged 7 commits into from
Jun 10, 2024
Merged

fix: Item-wise Sales and Purchase register with no item codes #41373 (backport #41424) (backport #41829) #41832

merged 7 commits into from
Jun 10, 2024

Commits on Jun 10, 2024

  1. fix: fixing Item-wise sales register 

    (cherry picked from commit c90185f)
(cherry picked from commit 5d97c7c)
    @mergify
    Poorvi authored and mergify[bot] committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    3823e0e View commit details
    Browse the repository at this point in the history

  2. fix: Item-wise Sales and Purchase register with no item codes #41373 

    (cherry picked from commit 1b45ecf)

# Conflicts:
#	erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
#	erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
(cherry picked from commit bc24e75)
    @Poorvi-R-Bhat @mergify
    Poorvi-R-Bhat authored and mergify[bot] committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    91de469 View commit details
    Browse the repository at this point in the history

  3. fix: fixing Item-wise sales register and purchase register #41373 

    (cherry picked from commit 76073ae)

# Conflicts:
#	erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
(cherry picked from commit ee47440)
    @Poorvi-R-Bhat @mergify
    Poorvi-R-Bhat authored and mergify[bot] committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    fd73a8a View commit details
    Browse the repository at this point in the history

  4. fix: fixing Item-wise sales register #41373 

    (cherry picked from commit eafa88b)

# Conflicts:
#	erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
(cherry picked from commit ab90b81)
    @Poorvi-R-Bhat @mergify
    Poorvi-R-Bhat authored and mergify[bot] committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    e8286d7 View commit details
    Browse the repository at this point in the history

  5. chore: update condition queries in qb 

    (cherry picked from commit d2af36e)

# Conflicts:
#	erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
#	erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
(cherry picked from commit e94e152)
    @deepeshgarg007 @mergify
    deepeshgarg007 authored and mergify[bot] committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    bdf198c View commit details
    Browse the repository at this point in the history

  6. fix: Add additional condition application 

    (cherry picked from commit 8ec364d)

# Conflicts:
#	erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
(cherry picked from commit e79e9e9)
    @deepeshgarg007 @mergify
    deepeshgarg007 authored and mergify[bot] committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    810378c View commit details
    Browse the repository at this point in the history

  7. chore: resolve conflicts 

    (cherry picked from commit e9b7d00)
    @deepeshgarg007 @mergify
    deepeshgarg007 authored and mergify[bot] committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    47b3e96 View commit details
    Browse the repository at this point in the history