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(accounts): set non-zero cultivation tax for transaction #613

Merged
merged 9 commits into from
Nov 4, 2020

Conversation

vishdha
Copy link

@vishdha vishdha commented Sep 30, 2020

TASK ID: https://bloomstack.com/desk#Form/Task/TASK-2020-01913
TASK ID: https://bloomstack.com/desk#Form/Task/TASK-2020-01527

fixed show only cultivation tax row which has amount
fixed tax breakup

before:
Peek 2020-10-30 11-50

after:
Peek 2020-10-30 11-45

@coveralls
Copy link

coveralls commented Sep 30, 2020

Pull Request Test Coverage Report for Build 2396

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 0.0%

Totals Coverage Status
Change from base Build 2394: 0.0%
Covered Lines: 0
Relevant Lines: 0

💛 - Coveralls

@vishdha vishdha marked this pull request as ready for review October 5, 2020 06:19
@vishdha vishdha requested a review from hrwX October 6, 2020 14:21
erpnext/public/js/controllers/taxes_and_totals.js Outdated Show resolved Hide resolved
erpnext/public/js/controllers/taxes_and_totals.js Outdated Show resolved Hide resolved
erpnext/public/js/controllers/taxes_and_totals.js Outdated Show resolved Hide resolved
erpnext/public/js/controllers/taxes_and_totals.js Outdated Show resolved Hide resolved
erpnext/public/js/controllers/taxes_and_totals.js Outdated Show resolved Hide resolved
@hrwX
Copy link

hrwX commented Oct 13, 2020

@vishdha There are commits from devarsh in your PR, if they are intentional then cool, else please clean the branch

@vishdha vishdha changed the base branch from staging to develop October 19, 2020 07:56
@vishdha vishdha requested a review from hrwX October 19, 2020 08:23
@neilLasrado
Copy link
Member

neilLasrado commented Oct 29, 2020

@vishdha can you have a look at Himanshu's suggestions.

@neilLasrado neilLasrado merged commit 9f85487 into Bloomstack:develop Nov 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants