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

[17.0][MIG] purchase_order_secondary_unit: Migration to 17.0 #2319

Open
wants to merge 31 commits into
base: 17.0
Choose a base branch
from

Conversation

mmrondon
Copy link

No description provided.

@mmrondon mmrondon force-pushed the 17.0-mig-purchase_order_secondary_unit branch from 66ede93 to ef3d474 Compare July 23, 2024 23:01
@mmrondon
Copy link
Author

mmrondon commented Jul 23, 2024

@mmrondon mmrondon force-pushed the 17.0-mig-purchase_order_secondary_unit branch from 59ff20b to 6af60e8 Compare July 23, 2024 23:54
@mmrondon mmrondon force-pushed the 17.0-mig-purchase_order_secondary_unit branch from 6af60e8 to 6f4471c Compare September 26, 2024 21:46
@mmrondon mmrondon force-pushed the 17.0-mig-purchase_order_secondary_unit branch 3 times, most recently from 463db35 to 45ec32e Compare October 9, 2024 22:26
Copy link
Contributor

@alan196 alan196 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 👍

Copy link
Contributor

@dalonsod dalonsod left a comment

Choose a reason for hiding this comment

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

@mmrondon at last, this addon has been merged for v16 (see #2216) and has some improvements that come from v15 and aren't still available here. Could you take a look?

cc @sergio-teruel

@sergio-teruel
Copy link
Contributor

sergio-teruel commented Nov 14, 2024

Please @mmrondon Can yo sure that all commits from older version are in your PR..?
Thanks

@dalonsod
Copy link
Contributor

Hello @mmrondon will you resume this PR soon? Thanks!

@peluko00
Copy link

Hi @mmrondon, can you squash commits into one please?

pilarvargas-tecnativa and others added 12 commits November 27, 2024 13:35
Fix a bug when calling super's `_compute_product_qty()` was skipping the compute helper from the mixin.

@moduon MT-3483

Co-authored-by: Andrea Cattalani <22261939+anddago78@users.noreply.github.com>
… qty set to 1

Co-authored-by: David Alonso // Solvos <david.alonso@solvos.es>
…secondary uom without product in sale order line

TT51683
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: purchase-workflow-16.0/purchase-workflow-16.0-purchase_order_secondary_unit
Translate-URL: https://translation.odoo-community.org/projects/purchase-workflow-16-0/purchase-workflow-16-0-purchase_order_secondary_unit/
Currently translated at 100.0% (11 of 11 strings)

Translation: purchase-workflow-16.0/purchase-workflow-16.0-purchase_order_secondary_unit
Translate-URL: https://translation.odoo-community.org/projects/purchase-workflow-16-0/purchase-workflow-16-0-purchase_order_secondary_unit/it/
@mmrondon mmrondon force-pushed the 17.0-mig-purchase_order_secondary_unit branch from 45ec32e to b1b632f Compare November 27, 2024 19:52
Copy link
Contributor

@dalonsod dalonsod left a comment

Choose a reason for hiding this comment

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

@mmrondon could take a look at the comments, and the changes you've added in migration commit in general? It seems that you've preserved original migration commit files changes after you've update commit history, and some changes added in recently added commits have been lost.

groups="uom.group_uom"
optional="show"
Copy link
Contributor

Choose a reason for hiding this comment

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

Please don't remove this, as it was added in an recent commit, when updating commit history

groups="uom.group_uom"
optional="show"
Copy link
Contributor

Choose a reason for hiding this comment

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

The same as above

Comment on lines 14 to 30
<field
name="secondary_uom_qty"
class="oe_inline oe_no_button"
groups="uom.group_uom"
readonly="state in ['done', 'cancel']"
/>
<field
name="secondary_uom_id"
class="oe_inline"
domain="['|', ('product_id', '=', product_id),
'&amp;', ('product_tmpl_id.product_variant_ids', 'in', [product_id]),
('product_id', '=', False)]"
options="{'no_create': True}"
groups="uom.group_uom"
readonly="state in ['purchase','done', 'cancel']"
required="secondary_uom_qty != 0.0"
/>
Copy link
Contributor

Choose a reason for hiding this comment

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

It seems that some later changes have been lost in this commit:

  • Move whole code to a <t> node.
  • Improvements in secondary_uom_id domain added by ee8f610

Comment on lines 11 to 15
<field
name="purchase_secondary_uom_id"
options="{'no_create': True}"
groups="uom.group_uom"
/>
Copy link
Contributor

Choose a reason for hiding this comment

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

The same as below with <t> node

[IMP] purchase_order_secondary_unit: pre-commit auto fixes

[IMP] purchase_order_secondary_unit: pre-commit auto fixes

 [DON'T MERGE] test-requirements.txt

[Don't MERGE] Remove dependency

[MIG] purchase_order_secondary_unit: Fix issue on test

[IMP] purchase_order_secondary_unit: pre-commit auto fixes
[IMP] purchase_order_secondary_unit: Restore commit history from version 16.0
@mmrondon mmrondon force-pushed the 17.0-mig-purchase_order_secondary_unit branch from b1b632f to 4dd8a17 Compare November 28, 2024 22:02
@mmrondon
Copy link
Author

hello @dalonsod sorry for that, already modified

Copy link
Contributor

@dalonsod dalonsod left a comment

Choose a reason for hiding this comment

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

There are still some things to be fixed in commit history, please check

@@ -12,6 +12,7 @@
<field
name="purchase_secondary_uom_id"
options="{'no_create': True}"
groups="uom.group_uom"
Copy link
Contributor

Choose a reason for hiding this comment

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

This is redundant, the field is placed into a <t> that have already groups attribute

@@ -15,16 +15,19 @@
<field
name="secondary_uom_qty"
class="oe_inline oe_no_button"
attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"
groups="uom.group_uom"
Copy link
Contributor

Choose a reason for hiding this comment

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

The same as above

options="{'no_create': True}"
attrs="{'readonly': [('state', 'in', ('purchase', 'done', 'cancel'))], 'required': [('secondary_uom_qty', '!=', 0.0)]}"
groups="uom.group_uom"
Copy link
Contributor

Choose a reason for hiding this comment

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

The same as above

/>
<field
name="secondary_uom_id"
class="oe_inline"
domain="product_id and ['|', ('product_id', '=', product_id),
domain="['|', ('product_id', '=', product_id),
Copy link
Contributor

Choose a reason for hiding this comment

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

domain definition is still the old one, changes added by ee8f610 are lost, please check diff at this point.

@dalonsod
Copy link
Contributor

dalonsod commented Dec 9, 2024

Hello @mmrondon would you resume this PR and attend pending comments? Thanks!

@dalonsod
Copy link
Contributor

Superseded by #2492

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.