[12.0][stock_available_mrp] Migration + make compatible with other stock_available_immediately #644

florian-dacosta · 2019-07-06T15:52:46Z

Hi, This PR has 2 commits.
First one is standard migration, second one try to solve a problem I have detected.

If I understand well, the purpose code in product_template.py that I removed (https://github.com/OCA/stock-logistics-warehouse/blob/11.0/stock_available_mrp/models/product_template.py#L14), was to be sure, in case a template with variants, that the immediately usable qty of our bom is the sum of all real planned qties of the variable (by default, virtual qty) + the potential quantity, which is the highest potential of its variants.

Indeed, we see in method _compute_available_quantities_dict of stock_available module : https://github.com/OCA/stock-logistics-warehouse/blob/12.0/stock_available/models/product_template.py#L29
that the computed immediately_usable_qty of our template is the sum of all quantities of the variants, but, the quantities of the variant, already include the potential quantity !
See : https://github.com/OCA/stock-logistics-warehouse/blob/11.0/stock_available_mrp/models/product_product.py#L122

So, without this code (https://github.com/OCA/stock-logistics-warehouse/blob/11.0/stock_available_mrp/models/product_template.py#L14) we add in template qty_immediately_usable the potential qty of all variants even though we want only to count the highest potential qty of the variant...

Anyway, the problem is that it makes it incompatible with others modules like stock_available_immediately. (and maybe others).
Indeed, stock_available_immediately remove the incoming quantity from the virtual quantity.
But the patch I removed (stock_available_immediately) go from virtual quantity once more...

That's what I have tried to correct in my second commit. For this I need to modify the logic in stock_available.
(+ make impossible to have a negative potential quantity, because I guess it makes no sense...but this have nothing to do with the problem described!)

It seems to work fine and the test passes without any problem.
But any opinion is welcome. @lmignon @Cedric-Pigeon @rafaelbn @tschanzt @simahawk @grindtildeath

rousseldenis · 2019-07-06T21:35:37Z

@Cedric-Pigeon

sergio-teruel · 2019-07-09T09:14:55Z

stock_available_mrp/models/product_product.py

+                )
+
+            res[product.id]['potential_qty'] = potential_qty
+            res[product.id]['immediately_usable_qty'] += potential_qty


I not sure of this...

I have a bom for a glass cookcing table

Also, I create a work order like this

As yo can see...
inmediately_usable_qty is 1 because is virtual_available and you increase all potential_qty so inmediately_usable_qty is 6.. Is correct?

hello @sergio-teruel
Yes it is the behavior of the module, I did not change this.
The potential quantity is added to the immediately_usable_qty and it is intended.

rousseldenis · 2019-07-24T10:29:24Z

@florian-dacosta I think you should take a look at what @Cedric-Pigeon has done in v10 : https://github.com/OCA/stock-logistics-warehouse/blob/10.0/stock_available/models/product_template.py

Done from PRs:
#474
#305

rafaelbn · 2019-07-24T19:45:09Z

Please @florian-dacosta take a quick read also in #611 Thank you for this great contribution! 😄

florian-dacosta · 2019-07-25T08:06:30Z

@rousseldenis
It was not done in version 11? I'll take a look to include it in this PR then.

@rafaelbn Thanks for the pointer.
I won't include this here since it depends on a patch on Odoo...
But when it will be merged, if it is, we could be a improvment PR

florian-dacosta · 2019-07-25T17:09:16Z

@rousseldenis Actually, both PR you pointed concern more the stock_available module, which has already been migrated to 12, and wich seems to contains all modifications.
But it does not concern this module (stock_available_mrp).
Unless I am missing something...
So nothing to do I guess.

pedrobaeza · 2019-08-17T12:26:52Z

stock_available_mrp/models/product_product.py

+    bom_id = fields.Many2one(
+        'mrp.bom',
+        compute='_compute_bom_id',
+        string='Bill of Materials'


Change this string due to:

2019-08-16 15:08:49,323 175 WARNING openerp_test odoo.addons.base.models.ir_model: Two fields (bom_ids, bom_id) of product.product() have the same label: Bill of Materials.

oca-clabot · 2019-08-22T08:04:47Z

Hey @florian-dacosta, thank you for your Pull Request.

It looks like some users haven't signed our Contributor License Agreement, yet.
You can read and sign our full Contributor License Agreement here: http://odoo-community.org/page/cla
Here is a list of the users:

Lionel Sausin ls@numerigraphe.com (no github login found)
Cyril Gaudin cyril.gaudin@camptocamp.com (no github login found)
Laetitia Gangloff laetitia.gangloff@acsone.eu (no github login found)

Appreciation of efforts,
OCA CLAbot

pedrobaeza · 2019-08-31T02:00:20Z

/ocabot merge

OCA-git-bot · 2019-08-31T02:00:53Z

What a great day to merge this nice PR. Let's do it!
Rebased to 12.0-ocabot-merge-pr-644-by-pedrobaeza-bump-no, awaiting test results.

OCA-git-bot · 2019-08-31T05:50:09Z

@pedrobaeza The merge process could not be finalized, because command oca-gen-addon-readme --org-name OCA --repo-name stock-logistics-warehouse --branch 12.0 --addons-dir . --commit failed with output:

./stock_available_mrp/README.rst:81: (SEVERE/4) Title level inconsistent:

Authors
~~~~~~~
Traceback (most recent call last):
  File "/ocamt/lib/python3.6/site-packages/docutils/parsers/rst/states.py", line 349, in check_subsection
    level = title_styles.index(style) + 1
ValueError: '~' is not in list

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "/usr/local/bin/oca-gen-addon-readme", line 11, in <module>
    load_entry_point('oca-maintainers-tools', 'console_scripts', 'oca-gen-addon-readme')()
  File "/ocamt/lib/python3.6/site-packages/click/core.py", line 764, in __call__
    return self.main(*args, **kwargs)
  File "/ocamt/lib/python3.6/site-packages/click/core.py", line 717, in main
    rv = self.invoke(ctx)
  File "/ocamt/lib/python3.6/site-packages/click/core.py", line 956, in invoke
    return ctx.invoke(self.callback, **ctx.params)
  File "/ocamt/lib/python3.6/site-packages/click/core.py", line 555, in invoke
    return callback(*args, **kwargs)
  File "/ocamt/src/oca-maintainers-tools/tools/gen_addon_readme.py", line 310, in gen_addon_readme
    check_rst(readme_filename)
  File "/ocamt/src/oca-maintainers-tools/tools/gen_addon_readme.py", line 241, in check_rst
    settings_overrides=RST2HTML_SETTINGS,
  File "/ocamt/lib/python3.6/site-packages/docutils/core.py", line 380, in publish_file
    enable_exit_status=enable_exit_status)
  File "/ocamt/lib/python3.6/site-packages/docutils/core.py", line 664, in publish_programmatically
    output = pub.publish(enable_exit_status=enable_exit_status)
  File "/ocamt/lib/python3.6/site-packages/docutils/core.py", line 217, in publish
    self.settings)
  File "/ocamt/lib/python3.6/site-packages/docutils/readers/__init__.py", line 71, in read
    self.parse()
  File "/ocamt/lib/python3.6/site-packages/docutils/readers/__init__.py", line 77, in parse
    self.parser.parse(self.input, document)
  File "/ocamt/lib/python3.6/site-packages/docutils/parsers/rst/__init__.py", line 191, in parse
    self.statemachine.run(inputlines, document, inliner=self.inliner)
  File "/ocamt/lib/python3.6/site-packages/docutils/parsers/rst/states.py", line 171, in run
    input_source=document['source'])
  File "/ocamt/lib/python3.6/site-packages/docutils/statemachine.py", line 239, in run
    context, state, transitions)
  File "/ocamt/lib/python3.6/site-packages/docutils/statemachine.py", line 460, in check_line
    return method(match, context, next_state)
  File "/ocamt/lib/python3.6/site-packages/docutils/parsers/rst/states.py", line 3007, in text
    self.section(title.lstrip(), source, style, lineno + 1, messages)
  File "/ocamt/lib/python3.6/site-packages/docutils/parsers/rst/states.py", line 327, in section
    self.new_subsection(title, lineno, messages)
  File "/ocamt/lib/python3.6/site-packages/docutils/parsers/rst/states.py", line 395, in new_subsection
    node=section_node, match_titles=True)
  File "/ocamt/lib/python3.6/site-packages/docutils/parsers/rst/states.py", line 282, in nested_parse
    node=node, match_titles=match_titles)
  File "/ocamt/lib/python3.6/site-packages/docutils/parsers/rst/states.py", line 196, in run
    results = StateMachineWS.run(self, input_lines, input_offset)
  File "/ocamt/lib/python3.6/site-packages/docutils/statemachine.py", line 239, in run
    context, state, transitions)
  File "/ocamt/lib/python3.6/site-packages/docutils/statemachine.py", line 460, in check_line
    return method(match, context, next_state)
  File "/ocamt/lib/python3.6/site-packages/docutils/parsers/rst/states.py", line 2771, in underline
    self.section(title, source, style, lineno - 1, messages)
  File "/ocamt/lib/python3.6/site-packages/docutils/parsers/rst/states.py", line 327, in section
    self.new_subsection(title, lineno, messages)
  File "/ocamt/lib/python3.6/site-packages/docutils/parsers/rst/states.py", line 395, in new_subsection
    node=section_node, match_titles=True)
  File "/ocamt/lib/python3.6/site-packages/docutils/parsers/rst/states.py", line 282, in nested_parse
    node=node, match_titles=match_titles)
  File "/ocamt/lib/python3.6/site-packages/docutils/parsers/rst/states.py", line 196, in run
    results = StateMachineWS.run(self, input_lines, input_offset)
  File "/ocamt/lib/python3.6/site-packages/docutils/statemachine.py", line 239, in run
    context, state, transitions)
  File "/ocamt/lib/python3.6/site-packages/docutils/statemachine.py", line 460, in check_line
    return method(match, context, next_state)
  File "/ocamt/lib/python3.6/site-packages/docutils/parsers/rst/states.py", line 2771, in underline
    self.section(title, source, style, lineno - 1, messages)
  File "/ocamt/lib/python3.6/site-packages/docutils/parsers/rst/states.py", line 326, in section
    if self.check_subsection(source, style, lineno):
  File "/ocamt/lib/python3.6/site-packages/docutils/parsers/rst/states.py", line 355, in check_subsection
    self.parent += self.title_inconsistent(source, lineno)
  File "/ocamt/lib/python3.6/site-packages/docutils/parsers/rst/states.py", line 373, in title_inconsistent
    line=lineno)
  File "/ocamt/lib/python3.6/site-packages/docutils/utils/__init__.py", line 237, in severe
    return self.system_message(self.SEVERE_LEVEL, *args, **kwargs)
  File "/ocamt/lib/python3.6/site-packages/docutils/utils/__init__.py", line 195, in system_message
    raise SystemMessage(msg, level)
docutils.utils.SystemMessage: ./stock_available_mrp/README.rst:81: (SEVERE/4) Title level inconsistent:

Authors
~~~~~~~

@gdgellatly

Compute potential quantities for both product templates and variants. To keep the code simple, only the biggest potential of any single variant is accounted for in the template's potential. Take all levels of phantom BoM into account, respects validity dates etc. thanks to the use of the standard method _bom_explode, as suggested by @gdgellatly in OCA#5 (comment) Improve tests, rewritten in python. Adhere to new file/manifest/README conventions. Simplify copyright headers

sudo is not required since mrp.bom are readable to groups with access to the qty_x fields on a product. Moreover using sudo to retrive the bom will ignore the company_id defined on the bom

Record rules used to not be checked on stock quants, but now they are since Odoo's commit 2fd14db (odoo/odoo@2fd14db). In our test we changed the company of the products and BoMs but we neglected that the stock was not attached to the right company, and that made the test fail. To fix that, make the test inventory for the right company. Since there is a little inconsistency in the demo data with a negative quantity of an unrelated product, use the `partial` filter for the inventories instead of the `none` filter, so that no wrong inventory lines are added automatically.

…ch field use to compute potential

…ew + small improvements

* mrp_bom.name has been deleted. * mrp_bom_line.type moved to mrp_bom.type. * Fix missing group_mrp_user issue. * Change versions

…recordset + Condition never statisfied

…of immediately usable qty

…ilable_immediately

pedrobaeza · 2019-08-31T07:33:51Z

/ocabot merge

OCA-git-bot · 2019-08-31T07:34:04Z

On my way to merge this fine PR!
Rebased to 12.0-ocabot-merge-pr-644-by-pedrobaeza-bump-no, awaiting test results.

Signed-off-by pedrobaeza

OCA-git-bot · 2019-08-31T09:00:58Z

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

PS: Don't worry if GitHub says there are unmerged commits: it is due to a rebase before merge. All commits of this PR have been merged into 12.0.

Signed-off-by pedrobaeza

florian-dacosta force-pushed the 12-mig-stock_available_mrp branch from 5f7d4c8 to ace3a3e Compare July 6, 2019 15:57

rousseldenis added this to the 12.0 milestone Jul 6, 2019

rousseldenis added the needs review label Jul 6, 2019

sergio-teruel reviewed Jul 9, 2019

View reviewed changes

OCA-git-bot mentioned this pull request Jul 24, 2019

Migration to version 12.0 #487

Closed

54 tasks

rafaelbn approved these changes Aug 16, 2019

View reviewed changes

pedrobaeza reviewed Aug 17, 2019

View reviewed changes

sbidoul and others added 14 commits August 31, 2019 09:23

[MOV] move addons out of __unported__ (they remain not installable)

8ab9b32

[FIX] Browse mrp.bom as current user

9e778c3

sudo is not required since mrp.bom are readable to groups with access to the qty_x fields on a product. Moreover using sudo to retrive the bom will ignore the company_id defined on the bom

OCA Transbot updated translations from Transifex

f28964e

stock_available_mrp: fix BOM qty (multi-units, efficiency)

7eb2499

stock_available / stock_available_mrp : add possibility to choose whi…

f99dc72

…ch field use to compute potential

[FIX+IMP] stock_available_mrp: fix recursive potential_qty in list vi…

ba3d34e

…ew + small improvements

V9 migration modifications.

aa6f648

* mrp_bom.name has been deleted. * mrp_bom_line.type moved to mrp_bom.type. * Fix missing group_mrp_user issue. * Change versions

OCA Transbot updated translations from Transifex

d876bdb

[10.0][MIG] port stock_available_mrp to 10.0

be62bbb

[IMP] stock_available_mrp: readability + change compute bom_id + use …

32e4a04

…recordset + Condition never statisfied

[ADD] include new improvments

b660151

[FIX] stock_available_mrp: remove duplicate button + fix calculation …

8fb3e76

…of immediately usable qty

Timon Tschanz and others added 4 commits August 31, 2019 09:26

[11.0][MIG] port stock_available_mrp to 11.0

5337e7a

Migrate stock_available_mrp to v12

27d80f3

Make stock_available_mrp compatible with other modules like stock_ava…

22d3c6b

…ilable_immediately

[FIX] stock_available_mrp: Fix RST formatting + generate README

1312f68

pedrobaeza force-pushed the 12-mig-stock_available_mrp branch from c242435 to 1312f68 Compare August 31, 2019 07:32

sbidoul mentioned this pull request Aug 31, 2019

Do not log exceptions when failures have been reported to the PR OCA/oca-github-bot#69

Open

OCA-git-bot added a commit that referenced this pull request Aug 31, 2019

Merge PR #644 into 12.0

33e5d79

Signed-off-by pedrobaeza

OCA-git-bot merged commit 1312f68 into OCA:12.0 Aug 31, 2019

OCA-git-bot added the merged 🎉 label Aug 31, 2019

i-vyshnevska pushed a commit to camptocamp/stock-logistics-warehouse that referenced this pull request Apr 13, 2020

Merge PR OCA#644 into 12.0

cc0a2b2

Signed-off-by pedrobaeza

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[12.0][stock_available_mrp] Migration + make compatible with other stock_available_immediately #644

[12.0][stock_available_mrp] Migration + make compatible with other stock_available_immediately #644

florian-dacosta commented Jul 6, 2019

rousseldenis commented Jul 6, 2019

sergio-teruel Jul 9, 2019

florian-dacosta Jul 24, 2019

rousseldenis commented Jul 24, 2019

rafaelbn commented Jul 24, 2019

florian-dacosta commented Jul 25, 2019

florian-dacosta commented Jul 25, 2019

pedrobaeza Aug 17, 2019

florian-dacosta Aug 22, 2019

oca-clabot commented Aug 22, 2019

pedrobaeza commented Aug 31, 2019

OCA-git-bot commented Aug 31, 2019

OCA-git-bot commented Aug 31, 2019

pedrobaeza commented Aug 31, 2019

OCA-git-bot commented Aug 31, 2019

OCA-git-bot commented Aug 31, 2019

[12.0][stock_available_mrp] Migration + make compatible with other stock_available_immediately #644

[12.0][stock_available_mrp] Migration + make compatible with other stock_available_immediately #644

Conversation

florian-dacosta commented Jul 6, 2019

rousseldenis commented Jul 6, 2019

sergio-teruel Jul 9, 2019

Choose a reason for hiding this comment

florian-dacosta Jul 24, 2019

Choose a reason for hiding this comment

rousseldenis commented Jul 24, 2019

rafaelbn commented Jul 24, 2019

florian-dacosta commented Jul 25, 2019

florian-dacosta commented Jul 25, 2019

pedrobaeza Aug 17, 2019

Choose a reason for hiding this comment

florian-dacosta Aug 22, 2019

Choose a reason for hiding this comment

oca-clabot commented Aug 22, 2019

pedrobaeza commented Aug 31, 2019

OCA-git-bot commented Aug 31, 2019

OCA-git-bot commented Aug 31, 2019

pedrobaeza commented Aug 31, 2019

OCA-git-bot commented Aug 31, 2019

OCA-git-bot commented Aug 31, 2019