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

[15.0][MIG] sale_order_type #1886

Merged
merged 93 commits into from
Feb 3, 2022
Merged

Conversation

juanpgarza
Copy link
Contributor

Standard migration

pedrobaeza and others added 30 commits January 22, 2022 20:01
FIX case of tests

DEL refund journal field on sale order type, now same invoice journal should be used for refunds

FIX case of test

FIX sale order test
Conflicts:
	sale_order_type/models/sale_order.py
	sale_order_type/models/stock_picking.py
	sale_order_type/tests/test_sale_order_type.py

ADD Payment Term, Pricelist and Incoterm to sale order type

Conflicts:
	sale_order_type/models/sale_order.py
	sale_order_type/tests/test_sale_order_type.py
	sale_order_type/views/sale_order_type_view.xml

ADD sale type for invoices

Conflicts:
	sale_order_type/README.rst
	sale_order_type/models/account_invoice.py
	sale_order_type/tests/test_sale_order_type.py

IMP description
ADD multicompany rule for sale.order.type and company in sale.order.type (OCA#292)

[IMP] sale_order_type: multicompany handle
Conflicts:
	sale_order_type/models/sale_order_type.py
[UPD] Update sale_order_type.pot
The other one is a fake one that is dangling
@rousseldenis
Copy link
Sponsor Contributor

/ocabot migration sale_order_type

Copy link
Sponsor Contributor

@celm1990 celm1990 left a comment

Choose a reason for hiding this comment

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

Please remove migration script

Copy link
Sponsor Contributor

@celm1990 celm1990 left a comment

Choose a reason for hiding this comment

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

LGTM.

Pls squash your commits

@pedrobaeza
Copy link
Member

There are several PRs that have been merged meanwhile: #1884 and #1894

Can you please cherry-pick them?

hildickethan and others added 2 commits January 31, 2022 19:40
@juanpgarza
Copy link
Contributor Author

There are several PRs that have been merged meanwhile: #1884 and #1894

Can you please cherry-pick them?

Done. Thanks!

@pedrobaeza
Copy link
Member

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 15.0-ocabot-merge-pr-1886-by-pedrobaeza-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit a5eb54d into OCA:15.0 Feb 3, 2022
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at d175475. 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.