Skip to content

Conversation

@matiasperalta1
Copy link
Contributor

No description provided.

pedrobaeza and others added 30 commits December 6, 2023 15:35
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
oca-ci and others added 5 commits December 6, 2023 15:35
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: sale-workflow-16.0/sale-workflow-16.0-sale_order_type
Translate-URL: https://translation.odoo-community.org/projects/sale-workflow-16-0/sale-workflow-16-0-sale_order_type/
Currently translated at 55.8% (24 of 43 strings)

Translation: sale-workflow-16.0/sale-workflow-16.0-sale_order_type
Translate-URL: https://translation.odoo-community.org/projects/sale-workflow-16-0/sale-workflow-16-0-sale_order_type/it/
@nicolascol
Copy link

Functional LGTM

Copy link
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.

The CI has failed, check test

compute="_compute_sale_type_id",
store=True,
readonly=True,
readonly="state not in ['draft']",
Copy link
Contributor

@celm1990 celm1990 Dec 13, 2023

Choose a reason for hiding this comment

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

These attributes should now be in XML instead of .py files and must be evaluated as Booleans. Please refer to the logs of the test for more information.

precompute=True,
store=True,
readonly=False,
readonly="state in ['draft']",
Copy link
Contributor

Choose a reason for hiding this comment

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

same here

@lef-adhoc lef-adhoc force-pushed the 17.0-mig-sale_order_type branch 4 times, most recently from b6d54b6 to 0c3744d Compare December 20, 2023 14:56
@lef-adhoc lef-adhoc force-pushed the 17.0-mig-sale_order_type branch from 0c3744d to 15ac103 Compare December 26, 2023 19:01
@lef-adhoc
Copy link
Contributor

@celm1990 It's ready

Copy link
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

@lef-adhoc lef-adhoc force-pushed the 17.0-mig-sale_order_type branch from 15ac103 to a82faee Compare December 27, 2023 16:44
Copy link
Member

@pedrobaeza pedrobaeza left a comment

Choose a reason for hiding this comment

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

/ocabot merge nobump

@pedrobaeza
Copy link
Member

/ocabot migration sale_order_type

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 17.0-ocabot-merge-pr-2836-by-pedrobaeza-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot added this to the 17.0 milestone Dec 30, 2023
@OCA-git-bot OCA-git-bot merged commit 17af53e into OCA:17.0 Dec 30, 2023
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at f986599. 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.