Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: ask for asset related accounts only when needed #36960

Merged
merged 3 commits into from
Sep 5, 2023
Merged

fix: ask for asset related accounts only when needed #36960

merged 3 commits into from
Sep 5, 2023

Conversation

anandbaburajan
Copy link
Contributor

Users were being asked to set the Expenses Included In Asset Valuation and Asset Received But Not Billed accounts while creating purchase invoices for assets even though they were not really required. Now they'll be asked to set those accounts only when needed. Fixes #36941.

@codecov
Copy link

codecov bot commented Sep 5, 2023

Codecov Report

Merging #36960 (4348380) into develop (d2f03c8) will decrease coverage by 0.01%.
Report is 3 commits behind head on develop.
The diff coverage is 69.56%.

@@             Coverage Diff             @@
##           develop   #36960      +/-   ##
===========================================
- Coverage    65.55%   65.55%   -0.01%     
===========================================
  Files          796      796              
  Lines        62719    62727       +8     
===========================================
+ Hits         41115    41120       +5     
- Misses       21604    21607       +3     
Files Changed Coverage
...ounts/doctype/purchase_invoice/purchase_invoice.py 69.56%

@anandbaburajan anandbaburajan merged commit 174f95d into frappe:develop Sep 5, 2023
13 of 14 checks passed
mergify bot pushed a commit that referenced this pull request Sep 5, 2023
* fix: only ask for asset_received_but_not_billed account when needed

* chore: remove unnecessary if condition

* fix: only ask for expenses_included_in_asset_valuation account when needed

(cherry picked from commit 174f95d)
mergify bot pushed a commit that referenced this pull request Sep 5, 2023
* fix: only ask for asset_received_but_not_billed account when needed

* chore: remove unnecessary if condition

* fix: only ask for expenses_included_in_asset_valuation account when needed

(cherry picked from commit 174f95d)
anandbaburajan added a commit that referenced this pull request Sep 5, 2023
#36971)

fix: ask for asset related accounts only when needed (#36960)

* fix: only ask for asset_received_but_not_billed account when needed

* chore: remove unnecessary if condition

* fix: only ask for expenses_included_in_asset_valuation account when needed

(cherry picked from commit 174f95d)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
anandbaburajan added a commit that referenced this pull request Sep 5, 2023
#36972)

fix: ask for asset related accounts only when needed (#36960)

* fix: only ask for asset_received_but_not_billed account when needed

* chore: remove unnecessary if condition

* fix: only ask for expenses_included_in_asset_valuation account when needed

(cherry picked from commit 174f95d)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request Sep 6, 2023
# [14.38.0](v14.37.1...v14.38.0) (2023-09-06)

### Bug Fixes

* account payable currency and value ([#36859](#36859)) ([98c2640](98c2640))
* added ignore_user_permissions to parent field of tree doctypes ([451cc7b](451cc7b))
* added validation for unique serial numbers in pos invoice ([#36302](#36302)) ([1192736](1192736))
* allow payment_account of loan repayment to be edited ([#36948](#36948)) ([09e2f24](09e2f24))
* ask for asset related accounts only when needed (backport [#36960](#36960)) ([#36971](#36971)) ([58163d5](58163d5))
* calcuate received/paid amount on rate change in PE ([0a63266](0a63266))
* deduplicate gain/loss JE creation for journals as payment ([9168b3b](9168b3b))
* difference amount in UI should not be calculated ([9bc2b41](9bc2b41))
* fetch discount amount for gle in base currency ([a8b5880](a8b5880))
* ignore mandatory fields while saving WO (backport [#36954](#36954)) ([#36970](#36970)) ([c125dea](c125dea))
* index error on Receivable report based on payment terms ([#36963](#36963)) ([e3d64fc](e3d64fc))
* invalid gain/loss JE created on base currency Expense Claim ([068f1b5](068f1b5))
* only show "Unreconcile" if reconciled ([61752ac](61752ac))
* prorate factor for subscription plan ([#36953](#36953)) ([fc79af5](fc79af5))
* reduce threshold for bg job fn ([5a226a8](5a226a8))
* remove withholding category from common fields ([18f8f7f](18f8f7f))
* Set the default filter in All Trends Report ([132957f](132957f))
* Set the default filter in All Trends Report ([420536c](420536c))
* when create doc from item dashboard default uom (buying or selling) is not correctly selected (backport [#36892](#36892)) ([#36928](#36928)) ([5c8bee0](5c8bee0))

### Features

* **RFQ:** optionally send document print ([#36363](#36363)) ([345c608](345c608))
frappe-pr-bot pushed a commit that referenced this pull request Sep 6, 2023
## [13.52.13](v13.52.12...v13.52.13) (2023-09-06)

### Bug Fixes

* ask for asset related accounts only when needed (backport [#36960](#36960)) ([#36972](#36972)) ([3a71fa9](3a71fa9))
* update repay_from_salary, payment_account and payroll_payable_account fields ([#36949](#36949)) ([6f40d0c](6f40d0c))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 3, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport version-13-hotfix backport version-14-hotfix backport to version 14 needs-tests This PR needs automated unit-tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"Expenses Included In Asset Valuation" should not be mandated for purchase invoices
1 participant