[16.0] [MIG] product_contract #959

Rad0van · 2023-06-08T17:03:06Z

Fairly standard, had only to update one compute method name.

rousseldenis · 2023-06-09T07:16:10Z

/ocabot migration product_contract

rousseldenis

Code review

product_contract/models/contract_line.py

product_contract/models/product_template.py

product_contract/models/sale_order.py

product_contract/models/sale_order_line.py

Rad0van · 2023-06-09T09:16:10Z

@rousseldenis there is a typo in sale_order.py:

    @api.constrains("state")
    def _check_contact_is_not_terminated(self):

It should have been _check_contRact_is_not_terminated Should that be fixed? If so, should it be fixed in migration or in separate PR?

Rad0van · 2023-08-27T11:26:45Z

product_contract/models/sale_order_line.py

+        )
+        return date_end
+
+    @api.depends("product_id")


@rousseldenis, @sbejaoui, @pedrobaeza, @sbidoul maybe you could help me here please. I am trying to use this module in e-shop. However when I purchase the product, Contract is created but all the relevant fields are empty. What I found out is that this method _compute_auto_renew is not called in such scenario. I'm scratching my head on why is it never called and how to solve this in some good and elegant way. Any help / advice is really appreciated.

Hi @Rad0van ,
I think the issue is that all the fields computed by this method have a default value.
What happens at record creation is that get assigned their default value so they don't need to be computed;
The computation method triggers-in, correctly, next time the observed field (product_id) changes.

This issue doesn't happen when a user manually creates a Sale Order because the computation method is immediately triggered when product_id changes (as the computation method is also part of the onchange workflow).

Besides causing this issue, a default value on a computed field doesn't make much sense in my opinion. I suggest you remove all defaults from field definition and maybe add them in the computation method itself.

Hi @espo-tony ,

not really sure I follow what you suggest here because the issue is as you point out that when Sale Order is created directly, the computation method is not called. I have created a hacky solution by creating glue module between product_contract and website_sale where I basically reproduce the whole _compute_auto_renew method except for setting the quantity. It goes like this:

class SaleOrder(models.Model): _inherit = "sale.order" def _cart_update_order_line(self, product_id, quantity, order_line, **kwargs): """ This ensures that when contract product is put into basket in e-commerce all necessary values are set """ order_line = super()._cart_update_order_line( product_id, quantity, order_line, **kwargs ) """ This is (apart from commented out line) 1:1 copy of _compute_auto_renew method from product_contract module to ensure we get the defaults configured """ if order_line.product_id.is_contract: # order_line.product_uom_qty = order_line.product_id.default_qty order_line.recurring_rule_type = order_line.product_id.recurring_rule_type order_line.recurring_invoicing_type = ( order_line.product_id.recurring_invoicing_type ) order_line.date_start = order_line.date_start or fields.Date.today() order_line.date_end = order_line._get_date_end() order_line.is_auto_renew = order_line.product_id.is_auto_renew if order_line.is_auto_renew: order_line.auto_renew_interval = ( order_line.product_id.auto_renew_interval ) order_line.auto_renew_rule_type = ( order_line.product_id.auto_renew_rule_type ) return order_line

Hi @Rad0van
When a Sale Order is created directly, the computation method is not called because of the default values. If you remove them, the computation method will be called even when a Sale Order is created directly. I tested this solution locally and it worked for me.

Hi @Rad0van When a Sale Order is created directly, the computation method is not called because of the default values. If you remove them, the computation method will be called even when a Sale Order is created directly. I tested this solution locally and it worked for me.

Oh I see now! But that is quite a big change which I think should be approved by more senior people.
Also I would be interested to get to know the inner mechanics of this. I.e. why the @api.depends is called when the default values are not present? It only depends on product_id Does anyone know the explanation?

The module is taken from PR: OCA/contract#959 (comment) - commit: df3e3f380ba3fa4d64f8884a754036eafdf616ab + I fixed a bug by removing default values to computed fields on SO Line;

Abranes

Change this attrs to invisible to fix the view problems

Image from runboat

product_contract/views/sale_order.xml

* Add contract functionality to `product.templates` * Add logic to create contracts from `sale.order` that contains contract products.

* 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

- On Sale Order confirmation, a contract is created for each contract template used on sale order lines - A not finished contract can be mentioned on sale order line - A sale order line linked to a contract will update it and don't create a new one if it had the same template

recurring_next_date should be computed by contract line to get default value

- Sale order line for contract product pass to nothing to invoice on order confirmation - Contract Invoices are linked to sale order line

…emplate

…ith Recurring

Rad0van · 2024-02-10T20:26:50Z

@remi-filament seems @Abranes is right. In the commit #1019 the analytic_account_id was indeed removed...

remi-filament · 2024-02-11T14:46:25Z

@remi-filament seems @Abranes is right. In the commit #1019 the analytic_account_id was indeed removed...

Ah yes, my bad I checked contract code on your branch and not on upstream when your branch is outdated for that topic...
It makes sense that it is removed, there is still a group_id on contract but it does not seem to be used anywhere so better to not use analytic account anymore.

You should then rebase this PR on OCA v16 branch and squash your 3 last commits in one before this PR can be merged.

jaenbox · 2024-02-19T15:15:51Z

product_contract/models/sale_order.py

+                contract = contract_model.create(
+                    rec._prepare_contract_value(contract_template)
+                )
+                contracts.append(contract)


When performing a create(), the created object 'contract.contract(xxx,)' is returned. When appending to the list named 'contracts', you should indicate performing a contract.id to create a list of contract identifiers. If this is not done, when performing a contract_model.browse(contracts), it returns contract.contract(contract.contract(xxx,),), which is incorrect. From what I see, it should return contract.contract(xxx,).

@Rad0van can you answer this comment?

aliciagaarzo

LGTM!

aliciagaarzo

Review to cover all tests. Regards.

flalexg · 2024-03-11T09:11:31Z

product_contract/models/sale_order.py

+            "payment_term_id": self.payment_term_id.id,
+            "fiscal_position_id": self.fiscal_position_id.id,
+            "invoice_partner_id": self.partner_invoice_id.id,
+            "line_recurrence": self.partner_invoice_id.id,


Why the line_recurrence is the self.partner_invoice_id?

Why the line_recurrence is the self.partner_invoice_id?

Funny, it's the same as in original module:

contract/product_contract/models/sale_order.py

Lines 76 to 79 in aca1183

"payment_term_id": self.payment_term_id.id,

"fiscal_position_id": self.fiscal_position_id.id,

"invoice_partner_id": self.partner_invoice_id.id,

"line_recurrence": self.partner_invoice_id.id,

But probably needs fixing as well.

flalexg · 2024-03-11T09:13:25Z

product_contract/models/sale_order.py

+            line_to_update_contract = rec.order_line.filtered(
+                lambda r: r.contract_id
+                and r.product_id.is_contract
+                and r


You should check that r exists at the beggining of the function, no? Otherwise, when performing r.contract_id it will fail.

You should check that r exists at the beggining of the function, no? Otherwise, when performing r.contract_id it will fail.

It's just formatting that's misleading you. Check the following line ;-)

flalexg · 2024-03-11T09:16:19Z

product_contract/models/sale_order.py

+            "line_recurrence": self.partner_invoice_id.id,
+        }
+
+    def action_create_contract(self):


If I change the product_uom_qty before creating the contract, when creating the contract the quantity is doesn't match.

mrcast

Functional test ok!

jaenbox · 2024-05-08T13:51:23Z

Hello @Rad0van, I just wanted to ask if you were planning to continue with the PR. I see that you have some unanswered comments, and I was wondering if I can proceed with the PR of the product_contract module. If it's not a problem!

Rad0van · 2024-05-08T14:01:50Z

Hello @Rad0van, I just wanted to ask if you were planning to continue with the PR. I see that you have some unanswered comments, and I was wondering if I can proceed with the PR of the product_contract module. If it's not a problem!

Was quite busy but planning to finish this one soon.

pedrobaeza · 2024-06-04T09:04:23Z

@rousseldenis can you update your review?

Rad0van · 2024-06-21T12:44:43Z

I have carried over changes done in #1083 so now these are 1:1 but also fix a typo in constrain method name.

sbidoul · 2024-07-01T15:11:14Z

product_contract/views/product_template.xml

+            <xpath expr="//div[@name='options']" position="inside">
+                <div attrs="{'invisible': [('type', '!=', 'service')],}">
+                    <field name="is_contract" />
+                    <label for="is_contract" />
+                </div>
+            </xpath>


Suggested change

<xpath expr="//div[@name='options']" position="inside">

<div attrs="{'invisible': [('type', '!=', 'service')],}">

<field name="is_contract" />

<label for="is_contract" />

</div>

</xpath>

<div name="options" position="inside">

<span class="d-inline-block" attrs="{'invisible': [('type', '!=', 'service')]}">

<field name="is_contract"/>

<label for="is_contract"/>

</span>

</div>

This looks better

But this can be done in another PR.

rousseldenis

Code review. Changes seems legit

rousseldenis · 2024-07-02T06:40:53Z

product_contract/models/sale_order.py

-                        ).format(order_line.product_id.name, rec.company_id.name)
+                            "template for '%(product_name)s' product "
+                            "in '%(company_name)s' company."
+                        )


Prefer using translation method attributes.

_("You must specify (...) %(product_name)s (...)", product_name=(...), company_name=(...))

sbidoul

As this is PR is identical to the v17 branch, I think the rest can be done in followup PRs.

rousseldenis

We can move forward and do improvements in further PR's

rousseldenis · 2024-07-02T08:04:01Z

/ocabot merge nobump

OCA-git-bot · 2024-07-02T08:53:28Z

What a great day to merge this nice PR. Let's do it!
Prepared branch 16.0-ocabot-merge-pr-959-by-rousseldenis-bump-nobump, awaiting test results.

OCA-git-bot · 2024-07-02T09:07:29Z

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

Rad0van force-pushed the 16.0-mig-product_contract branch from 84dcd76 to 54fad5f Compare June 8, 2023 17:26

OCA-git-bot added this to the 16.0 milestone Jun 9, 2023

OCA-git-bot mentioned this pull request Jun 9, 2023

Migration to version 16.0 #880

Open

14 tasks

rousseldenis added needs review migration labels Jun 9, 2023

rousseldenis requested changes Jun 9, 2023

View reviewed changes

Rad0van requested a review from rousseldenis June 9, 2023 10:21

Rad0van mentioned this pull request Jul 24, 2023

Q: How to use contract modules for managing subscriptions? #977

Closed

Rad0van commented Aug 27, 2023

View reviewed changes

Abranes suggested changes Sep 22, 2023

View reviewed changes

mileo mentioned this pull request Oct 13, 2023

[16.0][MIG] product_contract #1006

Closed

Ted Salmon and others added 16 commits November 9, 2023 15:05

[ADD] product_contract: Create module

7bbfbe1

* Add contract functionality to `product.templates` * Add logic to create contracts from `sale.order` that contains contract products.

[FIX] product_contract: Fix mock usage in tests

a1aef2a

[MIG] - Product Contract Migration to 12.0

1bb25a2

[IMP] - Product with is_contract can be only of type service

981fc8e

[IMP] - Change dependencies to contract_sale

cf9131a

[IMP] - Add recurrence fields to product template and sale order line

8b52763

[IMP] - Link contract line to sale order line

9d64e6f

[FIX] - Remove recurring_next_date from sale order line

06ec626

recurring_next_date should be computed by contract line to get default value

[IMP] - Contract product are ignored on invoicing process

5d626d6

- Sale order line for contract product pass to nothing to invoice on order confirmation - Contract Invoices are linked to sale order line

[FIX] - Default value for date_start applied on product change

3679d75

[ADD] - Add readme directory

513d754

[IMP] - Onchange contract product on contract contract and contract t…

6762d12

…emplate

[FIX] - Change website to OCA repository url and prefix module name w…

534f6a3

…ith Recurring

[FIX] - Compute recurring_next_date before create contract line

1875a60

jaenbox reviewed Feb 19, 2024

View reviewed changes

aliciagaarzo approved these changes Mar 4, 2024

View reviewed changes

aliciagaarzo reviewed Mar 4, 2024

View reviewed changes

flalexg suggested changes Mar 11, 2024

View reviewed changes

mrcast approved these changes Apr 17, 2024

View reviewed changes

jaenbox mentioned this pull request May 13, 2024

[17.0][MIG] product_contract #1083

Merged

maisim mentioned this pull request Jun 18, 2024

[16.0][MIG] product contract from 17.0 #1090

Closed

[MIG] product_contract: Migration to 16.0

a41cafe

Rad0van force-pushed the 16.0-mig-product_contract branch from 5b01c29 to a41cafe Compare June 21, 2024 12:50

Rad0van requested review from pedrobaeza, jaenbox, remi-filament and flalexg June 21, 2024 12:53

sbidoul reviewed Jul 1, 2024

View reviewed changes

rousseldenis reviewed Jul 2, 2024

View reviewed changes

sbidoul approved these changes Jul 2, 2024

View reviewed changes

rousseldenis approved these changes Jul 2, 2024

View reviewed changes

OCA-git-bot added the bot is merging ⏳ label Jul 2, 2024

OCA-git-bot merged commit b2198c3 into OCA:16.0 Jul 2, 2024
5 checks passed

OCA-git-bot added merged 🎉 and removed bot is merging ⏳ labels Jul 2, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[16.0] [MIG] product_contract #959

[16.0] [MIG] product_contract #959

Rad0van commented Jun 8, 2023

rousseldenis commented Jun 9, 2023

rousseldenis left a comment

Rad0van commented Jun 9, 2023

Rad0van Aug 27, 2023

espo-tony Aug 28, 2023

Rad0van Aug 28, 2023

espo-tony Aug 28, 2023

Rad0van Aug 28, 2023

Abranes left a comment

Rad0van commented Feb 10, 2024

remi-filament commented Feb 11, 2024

jaenbox Feb 19, 2024

pedrobaeza Mar 11, 2024

aliciagaarzo left a comment

aliciagaarzo left a comment

flalexg Mar 11, 2024

Rad0van Mar 11, 2024

flalexg Mar 11, 2024

Rad0van Jun 21, 2024

flalexg Mar 11, 2024

mrcast left a comment

jaenbox commented May 8, 2024

Rad0van commented May 8, 2024

pedrobaeza commented Jun 4, 2024

Rad0van commented Jun 21, 2024 •

edited

Loading

sbidoul Jul 1, 2024 •

edited

Loading

sbidoul Jul 1, 2024

rousseldenis left a comment

rousseldenis Jul 2, 2024

sbidoul left a comment

rousseldenis left a comment

rousseldenis commented Jul 2, 2024

OCA-git-bot commented Jul 2, 2024

OCA-git-bot commented Jul 2, 2024

	"payment_term_id": self.payment_term_id.id,
	"fiscal_position_id": self.fiscal_position_id.id,
	"invoice_partner_id": self.partner_invoice_id.id,
	"line_recurrence": self.partner_invoice_id.id,

[16.0] [MIG] product_contract #959

[16.0] [MIG] product_contract #959

Conversation

Rad0van commented Jun 8, 2023

rousseldenis commented Jun 9, 2023

rousseldenis left a comment

Choose a reason for hiding this comment

Rad0van commented Jun 9, 2023

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

Abranes left a comment

Choose a reason for hiding this comment

Rad0van commented Feb 10, 2024

remi-filament commented Feb 11, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aliciagaarzo left a comment

Choose a reason for hiding this comment

aliciagaarzo left a 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

Choose a reason for hiding this comment

mrcast left a comment

Choose a reason for hiding this comment

jaenbox commented May 8, 2024

Rad0van commented May 8, 2024

pedrobaeza commented Jun 4, 2024

Rad0van commented Jun 21, 2024 • edited Loading

sbidoul Jul 1, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rousseldenis left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sbidoul left a comment

Choose a reason for hiding this comment

rousseldenis left a comment

Choose a reason for hiding this comment

rousseldenis commented Jul 2, 2024

OCA-git-bot commented Jul 2, 2024

OCA-git-bot commented Jul 2, 2024

Rad0van commented Jun 21, 2024 •

edited

Loading

sbidoul Jul 1, 2024 •

edited

Loading