[MIG] contract_sale_generation: Migration to 15.0 #847

ntsirintanis · 2022-06-21T14:37:30Z

No description provided.

ntsirintanis · 2022-06-21T14:45:40Z

contract_sale_generation/tests/test_contract_sale.py

+        self.contract_line._onchange_is_auto_renew()
+        contracts = self.contract2
+        for _i in range(10):
+            contracts |= self.contract.copy({"contract_type": "sale"})


Currently tests fail at this one line. Error:

contract/models/contract_line.py", line 452, in _check_recurring_next_date_start_date raise ValidationError( odoo.exceptions.ValidationError: You can't have a date of next invoice anterior to the start of the contract line 'Test Contract Template'
Will need to check this more. @NL66278 @thomaspaulb if you have any ideas, please shoot.

@ntsirintanis I tried to follow what happens, and somehow it's a problem with the order of the evaluation of computations.

The test contract line is set to certain values, among which date_start = 2020-01-01

The contract including this line is copied 10 times

During copying of the contract, recurring_next_date of the lines gets recomputed correctly (2020-01-15)

Something happens and recurring_next_date is now 2020-01-01, which is lower than 2020-01-15 (maybe recomputation, or goes back to cached value)

The computed values are checked and it finds 2020-01-01 < 2020-01-15 and borks out

I find that this stops happening when you access self.contract_line.recurring_next_date (by printing, or just like that) before copying, so between line 98 and 99.

Somehow equivalently, @rousseldenis found in this PR that he had to call _compute_recurring_next_date(), however that specifically does not work for me.

There's another failing test on import odoo.odoo.tests in another module, I don't know how that got through CI, but it's clearly from and should be odoo.tests

@thomaspaulb We need first to fix the tests import errors, then, check which test(s) are failing. @ntsirintanis

rousseldenis · 2022-06-22T06:25:55Z

/ocabot migration contract_sale_generation

rousseldenis · 2022-06-22T06:26:38Z

@ntsirintanis Thanks for this.

Don't forget to make your PR's title a little bit understandable (e.g.: like your last commit)

rousseldenis · 2022-06-22T07:35:01Z

contract_sale_generation/models/contract.py

@@ -123,13 +123,10 @@ def _recurring_create_sale(self, date_ref=False):
        self._compute_recurring_next_date()
        return sale_orders

-    @api.model
-    def _get_recurring_create_func(self, create_type="invoice"):


@ntsirintanis Why removing this ?

Because it was removed from contract module in version 15.0, along with the generation_type field and all related methods.

Mmmh, that's because migration PR for 15 was created before those changes.

I'll do forwardport of changes in contract since. Wait for it

Arf, already done.

Could you review #776 ?

contract_sale_generation/models/abstract_contract.py

Closes OCA#117

…ata (OCA#130) * [FIX+IMP] contract: Improve usability and don't fail on wrong data * Cron create invoices masked for avoiding silent errors * New constraints for assuring data consistency * UI helps for entering consistent data * Spanish translation * Remove double company_id field on form * [FIX] contract_sale_generation: Adapt tests to upstream contract

* Change the method called in the view * Complete the create_invoice method * Bump version + authoring * Correct bad call of method Small Documentation * Add super call in python test * FIX bad field names causing bad quantities in sale.order.line

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

ntsirintanis · 2022-06-22T09:59:56Z

contract_sale_generation/tests/test_contract_sale.py

+        # then it maintains it's 'old' value.
+        # TODO: Research that
+        recurring_next_date = self.contract_line.recurring_next_date
+        self.assertGreaterEqual(recurring_next_date, self.contract_line.date_start)


Added these 2 lines in order to make unit tests work, and pre-commit to not complain. Need to see why this is happening though.

rousseldenis · 2022-06-22T11:08:45Z

contract_sale_generation/tests/test_contract_sale.py

@@ -96,6 +96,11 @@ def test_cron_recurring_create_sale(self):
        self.contract_line.recurring_invoicing_type = "post-paid"
        self.contract_line.date_end = "2020-03-15"
        self.contract_line._onchange_is_auto_renew()
+        # If we do not recompute recurring_next_date


Yes, IMHO there are still some cases that should be solved after theses changes : cd086dd

NL66278 · 2022-06-23T08:04:52Z

@ntsirintanis I think if a test is added for a contract with payment terms and a fiscal position, the code will be nearly completely covered and you will get rid of the last two red crosses.

NL66278 · 2022-06-23T08:22:35Z

contract_sale_generation/models/contract_line.py

+        dates = self._get_period_to_invoice(
+            self.last_date_invoiced, self.recurring_next_date
+        )
+        sale_line_vals = self._prepare_sale_line_vals(dates, order_id)


Call keyword parm with keyword: order_id=order_id

Actually order_id is nowhere passed to _prepare_sale_line as far as I can see. So logic and argument can maybe removed from this function and from _prepare_sale_line_vals. Can anyoint point out a use for thus argument?

I think this is intended in order to override and force an existing order

But if you add sale lines to an existing sale order, through a write on that order, order_id will be filled automagically. Or if somehow some code wants to use the prepared values to create the order lines, the order_id can be inserted in that code. On the other hand this is existing code and we should be carefull with changing any method signature. I was just wondering about the usecase...

NL66278 · 2022-06-23T08:32:54Z

contract_sale_generation/tests/common.py

+from odoo.tests import Form
+
+
+def to_date(date):


This one is not uses and can be removed

No, but should be in each test line that uses fields.Date.to_date(

NL66278

👍 LGTM

ntsirintanis · 2022-06-28T08:07:55Z

This PR is as green as it gets. I added some superfluous unit tests to satisfy codecov, but can't do much beyond that. Please review.

NL66278 · 2022-06-28T08:22:15Z

@ntsirintanis I already approved the PR. In the CodeCov there are still three red lines:
https://app.codecov.io/gh/OCA/contract/compare/847/diff
You might get rid of them (if you want) by testing:

That a contract without lines does not generate a sale order;
That if you pass an existing sale order the prepare line vals function, it fills the order_id;
By testing the main cron function.

I do not know how the yellow lines are counted in the percentage. It might be very difficult to get rid of those.

ntsirintanis · 2022-06-28T08:38:15Z

@ntsirintanis I already approved the PR. In the CodeCov there are still three red lines: https://app.codecov.io/gh/OCA/contract/compare/847/diff You might get rid of them (if you want) by testing:
* That a contract without lines does not generate a sale order;

* That if you pass an existing sale order the prepare line vals function, it fills the order_id;

* By testing the main cron function.
I do not know how the yellow lines are counted in the percentage. It might be very difficult to get rid of those.

Agreed. I've been already working on points one and two. Will finish them, push, and hope for absolute greenness.

rousseldenis · 2022-06-28T09:06:13Z

@ntsirintanis Is this ready ?

ntsirintanis · 2022-06-28T09:07:51Z

@ntsirintanis Is this ready ?

yes, finally, we are green!

rousseldenis · 2022-06-28T09:09:12Z

/ocabot merge patch

OCA-git-bot · 2022-06-28T09:09:29Z

This PR looks fantastic, let's merge it!
Prepared branch 15.0-ocabot-merge-pr-847-by-rousseldenis-bump-patch, awaiting test results.

OCA-git-bot · 2022-06-28T09:17:03Z

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

rousseldenis · 2022-06-28T10:57:52Z

@ntsirintanis Could you check at this ? #841

I think this is related to your problem with recurring_next_date value.

ntsirintanis · 2022-06-28T13:56:11Z

@ntsirintanis Could you check at this ? #841

I think this is related to your problem with recurring_next_date value.
thanks @rousseldenis , will check it out

ntsirintanis commented Jun 21, 2022

View reviewed changes

ntsirintanis force-pushed the 15.0-mig-contract_sale_generation branch from e0490fe to 02a5564 Compare June 21, 2022 14:56

OCA-git-bot added this to the 15.0 milestone Jun 22, 2022

OCA-git-bot mentioned this pull request Jun 22, 2022

Migration to version 15.0 #732

Open

18 tasks

ntsirintanis changed the title ~~15.0 mig contract sale generation~~ [MIG] contract_sale_generation: Migration to 15.0 Jun 22, 2022

ntsirintanis force-pushed the 15.0-mig-contract_sale_generation branch from 02a5564 to fc4bf5f Compare June 22, 2022 07:25

rousseldenis reviewed Jun 22, 2022

View reviewed changes

contract_sale_generation/models/abstract_contract.py Outdated Show resolved Hide resolved

ntsirintanis force-pushed the 15.0-mig-contract_sale_generation branch from fc4bf5f to cb75840 Compare June 22, 2022 07:38

angelmoya and others added 19 commits June 22, 2022 11:38

ADD contract_sale_generation module

437a526

[FIX] contract_sale_generation: Isolate sale generation (OCA#118)

e9b1ebc

Closes OCA#117

OCA Transbot updated translations from Transifex

c87c1b4

[FIX] contract_payment_auto: Fix freze wkhtmltopdf freezed

9622642

[FIX] contract_sale_generation: Useless test

952a7af

OCA Transbot updated translations from Transifex

97c6061

OCA Transbot updated translations from Transifex

3c9d7f2

OCA Transbot updated translations from Transifex

40ec715

OCA Transbot updated translations from Transifex

d765c39

OCA Transbot updated translations from Transifex

1adee86

OCA Transbot updated translations from Transifex

5b812db

OCA Transbot updated translations from Transifex

2d770d0

OCA Transbot updated translations from Transifex

1c76116

[UPD] Update contract_sale_generation.pot

9e1c127

[FIX] contract. Optimize insertion of dates in invoice and lines.

437fa66

[UPD] Update contract_sale_generation.pot

fd2411b

Update translation files

4fc0f2b

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

ntsirintanis force-pushed the 15.0-mig-contract_sale_generation branch from cb75840 to 0fb4b16 Compare June 22, 2022 09:58

ntsirintanis commented Jun 22, 2022

View reviewed changes

ntsirintanis force-pushed the 15.0-mig-contract_sale_generation branch from 0fb4b16 to a2d53c1 Compare June 22, 2022 10:16

rousseldenis reviewed Jun 22, 2022

View reviewed changes

NL66278 reviewed Jun 23, 2022

View reviewed changes

ntsirintanis force-pushed the 15.0-mig-contract_sale_generation branch 3 times, most recently from 7da94d7 to c06d773 Compare June 27, 2022 12:36

NL66278 approved these changes Jun 27, 2022

View reviewed changes

ntsirintanis force-pushed the 15.0-mig-contract_sale_generation branch from c06d773 to 5b9bf0f Compare June 27, 2022 13:38

rousseldenis approved these changes Jun 28, 2022

View reviewed changes

OCA-git-bot added the approved label Jun 28, 2022

[MIG] contract_sale_generation: Migration to 15.0

dc07e6d

ntsirintanis force-pushed the 15.0-mig-contract_sale_generation branch from 5b9bf0f to dc07e6d Compare June 28, 2022 08:57

OCA-git-bot added the bot is merging ⏳ label Jun 28, 2022

OCA-git-bot merged commit 61f49e3 into OCA:15.0 Jun 28, 2022

OCA-git-bot added merged 🎉 and removed bot is merging ⏳ labels Jun 28, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[MIG] contract_sale_generation: Migration to 15.0 #847

[MIG] contract_sale_generation: Migration to 15.0 #847

ntsirintanis commented Jun 21, 2022

ntsirintanis Jun 21, 2022

thomaspaulb Jun 21, 2022

thomaspaulb Jun 21, 2022

rousseldenis Jun 22, 2022

rousseldenis commented Jun 22, 2022

rousseldenis commented Jun 22, 2022

rousseldenis Jun 22, 2022

ntsirintanis Jun 22, 2022

rousseldenis Jun 22, 2022

rousseldenis Jun 22, 2022

ntsirintanis Jun 22, 2022

rousseldenis Jun 22, 2022

NL66278 commented Jun 23, 2022

NL66278 Jun 23, 2022

NL66278 Jun 23, 2022

rousseldenis Jun 23, 2022

NL66278 Jun 23, 2022

NL66278 Jun 23, 2022

rousseldenis Jun 23, 2022

NL66278 left a comment

ntsirintanis commented Jun 28, 2022

NL66278 commented Jun 28, 2022 •

edited

Loading

ntsirintanis commented Jun 28, 2022

rousseldenis commented Jun 28, 2022

ntsirintanis commented Jun 28, 2022

rousseldenis commented Jun 28, 2022

OCA-git-bot commented Jun 28, 2022

OCA-git-bot commented Jun 28, 2022

rousseldenis commented Jun 28, 2022

ntsirintanis commented Jun 28, 2022

[MIG] contract_sale_generation: Migration to 15.0 #847

[MIG] contract_sale_generation: Migration to 15.0 #847

Conversation

ntsirintanis commented Jun 21, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rousseldenis commented Jun 22, 2022

rousseldenis commented Jun 22, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NL66278 commented Jun 23, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NL66278 left a comment

Choose a reason for hiding this comment

ntsirintanis commented Jun 28, 2022

NL66278 commented Jun 28, 2022 • edited Loading

ntsirintanis commented Jun 28, 2022

rousseldenis commented Jun 28, 2022

ntsirintanis commented Jun 28, 2022

rousseldenis commented Jun 28, 2022

OCA-git-bot commented Jun 28, 2022

OCA-git-bot commented Jun 28, 2022

rousseldenis commented Jun 28, 2022

ntsirintanis commented Jun 28, 2022

NL66278 commented Jun 28, 2022 •

edited

Loading