[15.0][MIG+REF] sale_commission: Refactorization to split and extract the base #387

pedrobaeza · 2022-11-21T13:23:55Z

Restarting from the excellent work done by Quartile, adding these extra things:

Squash of the administrative commits.
Make specific top-level menu and permissions for commissions.
Don't depend on account for base module.
Reorganize elements.
Change some parts of the code to fit better ORM tools.
Adjust permissions in children modules.

…e_commission rev 7)

…ion rev 15)

* PEP 8 fixes * Replace depreciated osv for orm and other depreciation fixes * Code fix and optimization * Add context

* migrate models security and i18n * add demo data and minor fixes * add sale agent and commission views * add stock dependency add views and product/stock overrides * fixed related fields * minor fixes: names and labels * change 'onchange' attribute in view to api.onchange' * improve comments about migration * add invoice view * add wizards * use api.onchange * add store attribute on res.partner.agent * set default currency * change state field to readonly * migrate stock picking and settlements views * fix invoice view * fix invoice wizard * change osv.except_osv to openerp.exceptions * add missed report * fix taxes in action_invoice_create

* Take default commission when manual adding agents + error on settled filter * Many2one pointer of comission section * Fix translation problem + add commission total on sales orders * Cancel settlement when the associated invoice is cancel and go back to invoiced when re-validated

…users w/o sale rights

On generate agent invoice you can only select journal of type "sale". This can cause the numbers of sales invoices not correlated. IMHO, agent invoices must be of type purchase and this solves it, allowing to select journals of type purchase.

… state of the invoice

…elect if commission is calculated from subtotal or from margin * added python tests

Tests create invoices in a month previous the current date, which makes that they fail on January, as previous fiscal year doesn't exist. This is fixed creating invoices in the current date, and calling the settle wizard with one month more. This won't fail on December, because there's no need of the next fiscal year for this operation

When creating a refund from an invoice, pass correct values (converted as dictionary) for the agents lines, so that the refund keep the same commissions (but reversed) than the original invoice.

…omer. (instead of showing when agent is not an agent)

Without this condition, all partners are suppliers, because the default value for agent_type is agent and the onchange is executed.

* Show wizards results * Fix refunds * Fixes OCA#61 * Fixes OCA#63.

add same method for account invoice

FIX after changing customer on SO with lines, can't save sale order anymore See odoo/odoo#17618 Also add button to recompute agents on SO lines

as May would have June as period start: ((5 - 1) // 3 + 1) * 3 instead, the new formula: >>> for m in range(1, 13): ... print (m - 1) // 3 * 3 + 1 ... 1 1 1 4 4 4 7 7 7 10 10 10 See hurrinico#2 and odoo/odoo#17618 This extends the workaround, fixing "Record not found" after changing invoice date, for example

…stalled

yostashiro · 2022-12-01T09:47:47Z

@pedrobaeza We would like to expedite this migration due to our project situation. If you are too busy to update this PR soon, we will try following up with another PR, adding a commit on top of yours. Would you like us to do so? In that case, can you please comment on each suggested point with your opinion/judgment so that your ideas will be reflected in our update.

pedrobaeza · 2022-12-01T14:44:16Z

Sorry, and thanks for the quality feedback. I'm on it.

pedrobaeza · 2022-12-01T15:54:17Z

I think "Agents" instead of "Commissions" makes more sense

Not on the main menu, as that one contains all the commission related things, including the agents.

pedrobaeza · 2022-12-01T15:55:56Z

In my opinion, I think enterprise users may confuse a little bit for home app screen UX. Two apps related with accounting will be displayed in home screen. But just a minor thing.

@AungKoKoLin1997 fixed using this trick: https://github.com/OCA/commission/pull/387/files#diff-0be2abbed382f1580ef0a0f9ee00f07e299ef4d714aeecad3d64b1db2ebefab9R8

pedrobaeza · 2022-12-01T16:23:31Z

Everything sorted out or commented. Please tell me if anything more is found.

yostashiro

@pedrobaeza Thank you very much for your fast follow-up. I did some functional tests and there are a few more points to take care of.

account_commission/models/commission.py

account_commission/views/commission_views.xml

account_commission/wizards/wizard_invoice.xml

account_commission/readme/USAGE.rst

account_commission/views/commission_settlement_views.xml

account_commission/models/account_move.py

- Make specific top-level menu and permissions for commissions. - Don't depend on account. - Reorganize elements. - Change some parts of the code to fit better ORM tools. - Adjust permissions in children modules. - Add <sheet> to some form views to get modern view.

This way, we can restrict which commissions we can select or be automatically populate in the different documents.

pedrobaeza · 2022-12-05T08:41:54Z

Changes pushed.

yostashiro

Code review. 👍 Thank you very much!

yostashiro · 2022-12-05T10:34:42Z

account_commission/models/account_move.py

+        if any(self.mapped("invoice_line_ids.any_settled")):
+            raise exceptions.ValidationError(
+                _("You can't cancel an invoice with settled lines"),
+            )


I was thinking that this check should stay in button_draft() to ensure the consistency. I think doing this check in cancel step is a remnant of 12.0 in which cancel was the step to take to revert the posted invoice, which has changed in 13.0. IMO, it should be done in button_draft() now, but it's OK if it's handled in another PR also.

Yes, that's was my initial thought, but in fact being a draft means the same as other areas: a draft invoice in sales means that the order is not invoiceable while not cancelled, so this one is a good balance being able to re-invoice the settlement clicking the button.

OCA-git-bot · 2022-12-05T13:04:14Z

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

pedrobaeza · 2022-12-05T13:04:37Z

Let's go with this! I will add later the migration scripts for transforming 14.0 datamodel to this one:

/ocabot merge major

OCA-git-bot · 2022-12-05T13:05:00Z

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 15.0-ocabot-merge-pr-387-by-pedrobaeza-bump-major, awaiting test results.

OCA-git-bot · 2022-12-05T13:12:43Z

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

mgielissen · 2022-12-05T13:52:05Z

No migrations script?

pedrobaeza · 2022-12-05T15:13:50Z

There are 2 options:

You do them and contribute it.
Wait until I do it, but not now: [15.0][MIG+REF] sale_commission: Refactorization to split and extract the base #387 (comment). They are not needed for vanilla 15.0 DBs, so not a requirement for merging.

hildickethan · 2022-12-26T10:04:13Z

@pedrobaeza From what I see in the migration commit, the migration script would be primarily renaming models and fields. I suppose the biggest part is how to handle the module splitting.
Should an Odoo with 14.0 sale_commission that migrates to 15.0 have account_commission auto-installed too? Since it's part of the module they had, if they don't use that part then it can be uninstalled later. I didn't see that it depends on it, I suppose that's not a problem then

I'm looking to migrate this to 16.0, but I don't really have a good test subject to help with this migration script right now, do you have anything planned for it?

Edit: Now that the PR is done and I mentioned you again, probably better to reply there #394

pedrobaeza · 2022-12-27T07:43:43Z

Yes, basically is to rename some tables, models, columns and fields, and set some values. I will do this on February.

martiita and others added 30 commits November 19, 2022 08:52

sale_commissions: added module migrated to 6.1. (../../7.0-pexego_sal…

5add607

…e_commission rev 7)

sale_commission. Ported to version 7.0 (../../7.0-pexego_sale_commiss…

39b0d47

…ion rev 15)

[FIX+IMP] sale_commission: 4 things

c23abc5

* PEP 8 fixes * Replace depreciated osv for orm and other depreciation fixes * Code fix and optimization * Add context

onchange_partner_id() got an unexpected keyword argument 'context'

49537ad

#1180743 + missing context

87c3076

Removed wrong bracket from L197 of the settled.py

0a4d1a6

Launchpad automatic translations update.

da9748e

Improve partnert view

752fd35

adapt QA files to 8.0

50adf51

<hr_commission><sale_commission><stock_commission>.

2af53a9

sale.commission.settlement access error opening res.partner form for …

1f0ff4a

…users w/o sale rights

"sale" journal type on making agent invoice

bdea22c

On generate agent invoice you can only select journal of type "sale". This can cause the numbers of sales invoices not correlated. IMHO, agent invoices must be of type purchase and this solves it, allowing to select journals of type purchase.

Created new field to specify the commission creation according to the…

d7a8f33

… state of the invoice

sale_commission: base amount for computation selectable You can now s…

d83eceb

…elect if commission is calculated from subtotal or from margin * added python tests

Fix singleton error

344e87c

sale_commission: Refunds from invoices. Fixes OCA#51

0095e09

When creating a refund from an invoice, pass correct values (converted as dictionary) for the agents lines, so that the refund keep the same commissions (but reversed) than the original invoice.

Change visibility of agents field to only show when partner is a cust…

d319a47

…omer. (instead of showing when agent is not an agent)

sale_commission: Don't put supplier flag if not agent

e98b59f

Without this condition, all partners are suppliers, because the default value for agent_type is agent and the onchange is executed.

[IMP+FIX] sale_commission: 4 things:

1b5c4fb

* Show wizards results * Fix refunds * Fixes OCA#61 * Fixes OCA#63.

add method to prepare agents

17c3faa

add same method for account invoice

sale_commission: : Migrated to 10.0

510e0ed

FIX after changing customer on SO with lines, can't save sale order anymore See odoo/odoo#17618 Also add button to recompute agents on SO lines

Tradução pt_BR

0fc773e

[MIG] sale_commission: Migrationt to 11.0

6023fb4

[FIX] sale_commission: installation fails if en_US language is not in…

054a0d1

…stalled

OCA Transbot updated translations from Transifex

3570fea

small fix

a52fcdc

pedrobaeza force-pushed the 15.0-mig-sale_commission branch from 001dbf7 to 433a3a2 Compare December 1, 2022 15:52

pedrobaeza force-pushed the 15.0-mig-sale_commission branch from 433a3a2 to 3d71603 Compare December 1, 2022 16:23

pedrobaeza force-pushed the 15.0-mig-sale_commission branch from 3d71603 to d171b6b Compare December 1, 2022 16:29

yostashiro reviewed Dec 4, 2022

View reviewed changes

pedrobaeza added 2 commits December 5, 2022 09:41

[IMP] commission*: Add settlement_type to commissions

359c1c1

This way, we can restrict which commissions we can select or be automatically populate in the different documents.

pedrobaeza force-pushed the 15.0-mig-sale_commission branch from d171b6b to 359c1c1 Compare December 5, 2022 08:41

yostashiro approved these changes Dec 5, 2022

View reviewed changes

OCA-git-bot added approved ready to merge labels Dec 5, 2022

OCA-git-bot added the bot is merging ⏳ label Dec 5, 2022

OCA-git-bot merged commit 7e975f6 into OCA:15.0 Dec 5, 2022

OCA-git-bot added merged 🎉 and removed bot is merging ⏳ labels Dec 5, 2022

pedrobaeza deleted the 15.0-mig-sale_commission branch December 5, 2022 15:12

SirAionTech mentioned this pull request Dec 5, 2024

[16.0][MIG]l10n_it_riba_sale_commission: migration to v16 OCA/l10n-italy#4403

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[15.0][MIG+REF] sale_commission: Refactorization to split and extract the base #387

[15.0][MIG+REF] sale_commission: Refactorization to split and extract the base #387

pedrobaeza commented Nov 21, 2022

yostashiro commented Dec 1, 2022

pedrobaeza commented Dec 1, 2022

pedrobaeza commented Dec 1, 2022

pedrobaeza commented Dec 1, 2022

pedrobaeza commented Dec 1, 2022

yostashiro left a comment

pedrobaeza commented Dec 5, 2022

yostashiro left a comment

yostashiro Dec 5, 2022

pedrobaeza Dec 5, 2022

OCA-git-bot commented Dec 5, 2022

pedrobaeza commented Dec 5, 2022

OCA-git-bot commented Dec 5, 2022

OCA-git-bot commented Dec 5, 2022

mgielissen commented Dec 5, 2022

pedrobaeza commented Dec 5, 2022

hildickethan commented Dec 26, 2022 •

edited

Loading

pedrobaeza commented Dec 27, 2022

[15.0][MIG+REF] sale_commission: Refactorization to split and extract the base #387

[15.0][MIG+REF] sale_commission: Refactorization to split and extract the base #387

Conversation

pedrobaeza commented Nov 21, 2022

yostashiro commented Dec 1, 2022

pedrobaeza commented Dec 1, 2022

pedrobaeza commented Dec 1, 2022

pedrobaeza commented Dec 1, 2022

pedrobaeza commented Dec 1, 2022

yostashiro left a comment

Choose a reason for hiding this comment

pedrobaeza commented Dec 5, 2022

yostashiro left a comment

Choose a reason for hiding this comment

yostashiro Dec 5, 2022

Choose a reason for hiding this comment

pedrobaeza Dec 5, 2022

Choose a reason for hiding this comment

OCA-git-bot commented Dec 5, 2022

pedrobaeza commented Dec 5, 2022

OCA-git-bot commented Dec 5, 2022

OCA-git-bot commented Dec 5, 2022

mgielissen commented Dec 5, 2022

pedrobaeza commented Dec 5, 2022

hildickethan commented Dec 26, 2022 • edited Loading

pedrobaeza commented Dec 27, 2022

hildickethan commented Dec 26, 2022 •

edited

Loading