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

[14.0][IMP] shopfloor_reception improve confirmation #717

Merged

Conversation

TDu
Copy link
Member

@TDu TDu commented Aug 10, 2023

No description provided.

@OCA-git-bot
Copy link
Contributor

Hi @JuMiSanAr, @mmequignon,
some modules you are maintaining are being modified, check this out!

@@ -240,6 +240,7 @@ export const reception_states = function () {
picking_id: this.state.data.picking.id,
selected_line_id: this.line_being_handled.id,
location_name: location.text,
// FIXME if it is always set to true, it is not really used ?
Copy link
Contributor

Choose a reason for hiding this comment

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

don't we fix it here?

Copy link
Member Author

Choose a reason for hiding this comment

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

Actually not. This is not the same endpoint that is called. So this one has not been changed.
Because the frontend always return true, I did not see the point of updating it, maybe the question is should it be removed ?

@@ -1406,7 +1406,7 @@ def set_quantity(self):
},
"quantity": {"type": "float"},
"barcode": {"type": "string"},
"confirmation": {"type": "boolean"},
"confirmation": {"type": "string"},
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this should be now nullable

Suggested change
"confirmation": {"type": "string"},
"confirmation": {"type": "string", "required": False, "nullable": True},

Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

I think so, yes.

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't think this was required, but did the change anyway.

@TDu TDu force-pushed the 14-shopfloor-reception-improve-confirmation branch from 3e8a284 to 34cc1c0 Compare August 30, 2023 09:32
@jbaudoux
Copy link
Contributor

@mt-software-de Can you provide a second approval on this one?

Copy link
Contributor

@mt-software-de mt-software-de left a comment

Choose a reason for hiding this comment

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

LGTM

@jbaudoux
Copy link
Contributor

/ocabot merge minor

@OCA-git-bot
Copy link
Contributor

What a great day to merge this nice PR. Let's do it!
Prepared branch 14.0-ocabot-merge-pr-717-by-jbaudoux-bump-minor, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Nov 21, 2023
Signed-off-by jbaudoux
@OCA-git-bot
Copy link
Contributor

@jbaudoux your merge command was aborted due to failed check(s), which you can inspect on this commit of 14.0-ocabot-merge-pr-717-by-jbaudoux-bump-minor.

After fixing the problem, you can re-issue a merge command. Please refrain from merging manually as it will most probably make the target branch red.

@jbaudoux
Copy link
Contributor

@TDu can you rebase?

@TDu TDu force-pushed the 14-shopfloor-reception-improve-confirmation branch from 34cc1c0 to c2cec2d Compare November 22, 2023 07:46
@TDu
Copy link
Member Author

TDu commented Nov 22, 2023

@TDu can you rebase?

@jbaudoux Done

@jbaudoux
Copy link
Contributor

@TDu Can you check failing test? Could not be related to this PR

@mmequignon
Copy link
Member

@TDu Can you check failing test? Could not be related to this PR

https://github.com/OCA/wms/actions/runs/6954309475/job/18920884227?pr=717#step:8:3980

 2023-11-22 07:58:46,334 532 INFO odoo odoo.addons.shopfloor_reception_packaging_dimension.tests.test_set_package_dimension: ====================================================================== 
2023-11-22 07:58:46,334 532 ERROR odoo odoo.addons.shopfloor_reception_packaging_dimension.tests.test_set_package_dimension: FAIL: TestSetPackDimension.test_set_multiple_packaging_dimension
Traceback (most recent call last):
  File "/__w/wms/wms/shopfloor_reception_packaging_dimension/tests/test_set_package_dimension.py", line 159, in test_set_multiple_packaging_dimension
    self.product_c_packaging_2
  File "/__w/wms/wms/shopfloor_base/tests/common.py", line 204, in assert_response
    "\n\nExpected:\n%s" % (pformat(response), pformat(expected)),
AssertionError: {'data': {'set_quantity': {'selected_move_l[1094 chars]d.'}} != {'message': {'message_type': 'success', 'bo[1095 chars]se}}}
- {'data': {'set_quantity': {'confirmation_required': None,
?                                                     ^^^

+ {'data': {'set_quantity': {'confirmation_required': False,
?                                                     ^^^^

@TDu
Copy link
Member Author

TDu commented Nov 22, 2023

@jbaudoux Test fixed

@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). 🤖

@jbaudoux
Copy link
Contributor

/ocabot merge minor

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 14.0-ocabot-merge-pr-717-by-jbaudoux-bump-minor, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 61afa0a into OCA:14.0 Nov 22, 2023
7 checks passed
@OCA-git-bot
Copy link
Contributor

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

6 participants