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

[13.0][MIG] account_invoice_fixed_discount #650

Merged
merged 19 commits into from Jan 15, 2020
Merged

[13.0][MIG] account_invoice_fixed_discount #650

merged 19 commits into from Jan 15, 2020

Conversation

kongrattapong
Copy link
Contributor

@kongrattapong kongrattapong commented Dec 17, 2019 •
edited

Ready to review

LoisRForgeFlow and others added 17 commits December 17, 2019 13:11
@LoisRForgeFlow @kongrattapong
[9.0][ADD] account_invoice_fixed_discount
ab86bdf
@LoisRForgeFlow @kongrattapong
[10.0][MIG] account_invoice_fixed_discount
297f9ca
@oca-travis @kongrattapong
[UPD] Update account_invoice_fixed_discount.pot
09367c9
@MiquelRForgeFlow @kongrattapong
[MIG] account_invoice_fixed_discount: Migration to 11.0
6c17baf
@OCA-git-bot @kongrattapong
[UPD] README.rst
7b4eb6c
@oca-travis @kongrattapong
[UPD] Update account_invoice_fixed_discount.pot
dd7503a
@HviorForgeFlow @kongrattapong
[MIG] account_invoice_fixed_discount: Migration to 12.0
86a0e58
@OCA-git-bot @kongrattapong
[UPD] README.rst
9a8ed6c
@oca-travis @kongrattapong
[UPD] Update account_invoice_fixed_discount.pot
125f451
@MiquelRForgeFlow @kongrattapong
[FIX] account_invoice_fixed_discount: templated correctly
eca3642
@oca-travis @kongrattapong
[UPD] Update account_invoice_fixed_discount.pot
52c5319
@marylla @kongrattapong
Added translation using Weblate (German)
feab593
@marylla @kongrattapong
Translated using Weblate (German)
f534ccc 
Currently translated at 100.0% (6 of 6 strings)

Translation: account-invoicing-12.0/account-invoicing-12.0-account_invoice_fixed_discount
Translate-URL: https://translation.odoo-community.org/projects/account-invoicing-12-0/account-invoicing-12-0-account_invoice_fixed_discount/de/
@OCA-git-bot @kongrattapong
[UPD] README.rst
4b8270a
@JordiBForgeFlow @kongrattapong
fix invoice report
cdf80a1
@OCA-git-bot @kongrattapong
account_invoice_fixed_discount 12.0.1.0.1
0c66f2c
@kongrattapong
[IMP] account_invoice_fixed_discount: black, isort
4013bd3
This was referenced Dec 17, 2019
Closed
Open
@pedrobaeza pedrobaeza added this to the 13.0 milestone Dec 17, 2019
@kongrattapong kongrattapong force-pushed the 13.0-mig-account_invoice_fixed_discount branch 6 times, most recently from c5d9096 to 1efdfed Compare December 26, 2019 10:19
@AdriaGForgeFlow
Copy link
Contributor

AdriaGForgeFlow commented Jan 9, 2020 •
edited

Is this still WIP? @kongrattapong

@kongrattapong
Copy link
Contributor Author

Is this still WIP? @kongrattapong

@AdriaGForgeFlow I forgot this PR sorry, I will make this pr greenify.

@kongrattapong kongrattapong changed the title [13.0][MIG][WIP] account invoice fixed discount [13.0][MIG] account invoice fixed discount Jan 10, 2020
@kongrattapong kongrattapong force-pushed the 13.0-mig-account_invoice_fixed_discount branch from 1efdfed to 72fe814 Compare January 10, 2020 03:35
@kongrattapong kongrattapong force-pushed the 13.0-mig-account_invoice_fixed_discount branch 8 times, most recently from 410a8f4 to f3f20b5 Compare January 10, 2020 09:03
@kongrattapong kongrattapong force-pushed the 13.0-mig-account_invoice_fixed_discount branch from f3f20b5 to 7aefe8c Compare January 10, 2020 09:36
AdriaGForgeFlow
AdriaGForgeFlow suggested changes Jan 10, 2020
View reviewed changes
Copy link
Contributor

@AdriaGForgeFlow AdriaGForgeFlow left a comment •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested locally. When you add a fixed discount the tax amount is not correctly updated:

image

Tax amount equals $48 = 15% of $320 but it should be $45 = 15% of $300 right?

@kongrattapong kongrattapong force-pushed the 13.0-mig-account_invoice_fixed_discount branch from e671312 to ca27064 Compare January 13, 2020 02:57
@kongrattapong
Copy link
Contributor Author

Tested locally. When you add a fixed discount the tax amount is not correctly updated:

image

Tax amount equals $48 = 15% of $320 but it should be $45 = 15% of $300 right?

Thank you for review, Fixed it

Selection_039

@kongrattapong kongrattapong force-pushed the 13.0-mig-account_invoice_fixed_discount branch 2 times, most recently from 90151bb to 2e8cdd2 Compare January 13, 2020 03:23
AdriaGForgeFlow
AdriaGForgeFlow suggested changes Jan 13, 2020
View reviewed changes
Copy link
Contributor

@AdriaGForgeFlow AdriaGForgeFlow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After the changes I got this error every time I try to add or edit a line.

image

Find below a comment where the error occurs:

account_invoice_fixed_discount/models/account_move.py Outdated Show resolved Hide resolved
@kongrattapong kongrattapong force-pushed the 13.0-mig-account_invoice_fixed_discount branch from 2e8cdd2 to 9b317ec Compare January 13, 2020 09:06
AdriaGForgeFlow
AdriaGForgeFlow approved these changes Jan 13, 2020
View reviewed changes
Copy link
Contributor

@AdriaGForgeFlow AdriaGForgeFlow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Functional review 👍

@kongrattapong kongrattapong changed the title [13.0][MIG] account invoice fixed discount [13.0][MIG] account_invoice_fixed_discount Jan 13, 2020
AaronHForgeFlow
AaronHForgeFlow approved these changes Jan 15, 2020
View reviewed changes
Copy link
Contributor

@AaronHForgeFlow AaronHForgeFlow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested on local LGTM 👍

@OCA-git-bot
Copy link
Contributor

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

@AaronHForgeFlow
Copy link
Contributor

/ocabot merge

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 13.0-ocabot-merge-pr-650-by-AaronHForgeFlow-bump-no, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Jan 15, 2020
@OCA-git-bot
Merge PR #650 into 13.0
384b331 
Signed-off-by AaronHForgeFlow
@OCA-git-bot OCA-git-bot merged commit 9b317ec into OCA:13.0 Jan 15, 2020
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at ef8de37. Thanks a lot for contributing to OCA. ❤️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AaronHForgeFlow AaronHForgeFlow AaronHForgeFlow approved these changes

@AdriaGForgeFlow AdriaGForgeFlow AdriaGForgeFlow approved these changes

Assignees
No one assigned
Labels
approved merged 🎉 ready to merge
Projects
None yet
Milestone
13.0
Development

Successfully merging this pull request may close these issues.

None yet