-
-
Notifications
You must be signed in to change notification settings - Fork 354
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
[15.0][MIG] commission, sale_commission : Migration to 15.0 #372
Closed
Closed
Changes from all commits
Commits
Show all changes
150 commits
Select commit
Hold shift + click to select a range
6d12e2e
sale_commissions: added module migrated to 6.1. (../../7.0-pexego_sal…
martiita d95ea26
sale_commission. Ported to version 7.0 (../../7.0-pexego_sale_commiss…
e8c7ed3
[FIX+IMP] sale_commission: 4 things
0fcf4ee
onchange_partner_id() got an unexpected keyword argument 'context'
7e61e2a
#1180743 + missing context
157de0e
Removed wrong bracket from L197 of the settled.py
tafaRU ebd6ce5
Launchpad automatic translations update.
20f694e
Improve partnert view
mileo d01ff8d
adapt QA files to 8.0
gurneyalex a016151
[MIG] sale_commission: Migration to 8.0
gborelli fcf1f7a
<hr_commission><sale_commission><stock_commission>.
49b6922
[RFR] sale_commission: Total refactorization of the modules
pedrobaeza 60366ca
sale.commission.settlement access error opening res.partner form for …
pablocm-aserti 6813dd2
"sale" journal type on making agent invoice
78c2f78
Created new field to specify the commission creation according to the…
mbcosta ad2ca14
sale_commission: base amount for computation selectable You can now s…
oihane 03ad982
Fix singleton error
47b70e1
sale_commission: Fix tests
pedrobaeza 3b46b0b
sale_commission: Refunds from invoices. Fixes #51
pedrobaeza 272669d
Change visibility of agents field to only show when partner is a cust…
ivantodorovich f1252d5
sale_commission: Don't put supplier flag if not agent
pedrobaeza c7c818c
[IMP+FIX] sale_commission: 4 things:
ivantodorovich 3ad26ad
add method to prepare agents
rgarnau 57db3eb
sale_commission: : Migrated to 10.0
f1a1bd1
FIX sale_commission quaterly settlement
eLBati b730ce4
Tradução pt_BR
hendrixcosta bb41b03
[MIG] sale_commission: Migrationt to 11.0
etobella 1180f19
[FIX] sale_commission: installation fails if en_US language is not in…
oihane 034a585
OCA Transbot updated translations from Transifex
oca-transbot 4f38c14
small fix
rgarnau a8ab2c4
OCA Transbot updated translations from Transifex
oca-transbot 4734492
[IMP] Add hook on make invoice settlement
etobella 6cef8a5
sale_commision: temporary fix until https://github.com/odoo/odoo/issu…
JordiBForgeFlow eaab5f5
OCA Transbot updated translations from Transifex
oca-transbot cde724d
Make Section Model Accessible By Everyone
lk-eska ba30c40
FIX sale_commission the following use case (#170)
eLBati d71aa75
Translated using Weblate (Spanish)
etobella 0d2fa8b
Translated using Weblate (Portuguese (Brazil))
d7efac4
[IMP] sale_commission: Work on integration tests + improve invoice ge…
pedrobaeza c6fd728
[IMP] commission: Add two hooks on make settlements (#176)
etobella 39dbe61
Translated using Weblate (German)
rschnapka 356eb51
FIX taxes in settlement invoice creation
ljimenezsidoo 6c3971c
Translated using Weblate (Italian)
dcorio ef1e541
[FIX]sale_commission: When creating agent from agents fields, on part…
javierjcf 0828107
[IMP] sale_commission: Add hook on the create settlements (#189)
etobella 5cccb3c
[FIX+IMP] sale_commission: Reworked module
pedrobaeza 15aa0c7
[IMP] sale_commission: Adding graph view and settlement report
aitorbouzas 9294f4b
[UPD] Update sale_commission.pot + Update translation files
oca-transbot ebf4008
Translated using Weblate (Spanish)
pedrobaeza d330af6
[MIG] sale_commission: Migration to 12.0
pedrobaeza c0bc956
[FIX] avoid KeyError
dcorio 1adc6c8
[FIX] sale_commission: Strictly check commission type
SimoRubi 89789b7
[REF] sale_commission: Use SavepointCase
pedrobaeza d0fa66b
[IMP] sale_commission: Agent propagation + tests
ernestotejeda f693757
Added translation using Weblate (Portuguese (Portugal))
rdc02271 fd4aa06
Update translation files
oca-travis 2d4022e
[12.0][FIX] sale_commission: show agents field on partner form
rubencr7 dcb9dca
Translated using Weblate (Italian)
eLBati 388b004
Translated using Weblate (Portuguese (Brazil))
marcelsavegnago 2bb84a7
Added translation using Weblate (Portuguese)
pedrocs-exo 0f613d0
[FIX] sale_commission: Add view context by code
pedrobaeza a16acb3
Added translation using Weblate (Chinese (Simplified))
liweijie0812 2d04541
Added translation using Weblate (Dutch)
thomaspot 545e985
[UPD] Update sale_commission.pot + Update translation files
oca-travis 761dc0c
[12.0][IMP] sale_commission: move check of the amount to the end (#204)
etobella 826641d
Translated using Weblate (Italian)
SimoRubi 8419aa3
[IMP] sale_commission: Show signed subtotal
SimoRubi ab6ded1
Translated using Weblate (Portuguese (Brazil))
marcelsavegnago f80f73a
[FIX] sale_commission: No commission should be populated on vendor bills
pedrobaeza a8eb0b6
[IMP] sale_commission: Multi-company record rules
pedrobaeza 29aaa63
[IMP] : black, isort, prettier
1a428f5
[IMP] sale_commission: Migration to 13.0 (partial)
8187afc
[MIG+IMP] sale_commission: Switch to computed writable + finish migra…
pedrobaeza ed284f8
[UPD] Update sale_commission.pot
oca-travis 438cd22
[MIG+FIX] sale_commission: Proper table name
pedrobaeza 9105e48
Update translation files
oca-transbot a7935ed
Added translation using Weblate (Spanish (Argentina))
ibuioli 0b52542
Translated using Weblate (Spanish (Argentina))
ibuioli aba410d
Translated using Weblate (Spanish (Argentina))
ibuioli 14c4c93
[FIX] sale_commission: Settlement report printing
pedrobaeza 7f0f487
[MIG+FIX] sale_commission: Fix migration script
pedrobaeza 01dea73
[FIX] sale_commission: Incorrect compute renaming
pedrobaeza 6abad57
[13.0][FIX] sale_commission: fixing inheritance of view_res_partner_f…
dennybiasiolli 8c8d35f
Update translation files
oca-travis 0e51f33
[13.0][FIX] sale_commission: adding migration after renaming changed …
dennybiasiolli cdbdf00
[IMP] sale_commission: Remove required attribute in settlement field.…
sergio-teruel c89e90d
sale_commission 13.0.1.3.0
OCA-git-bot 7f76c60
[FIX] sale_commission: Fix tests
joao-p-marques fce9560
sale_commission 13.0.1.3.1
OCA-git-bot 7dbd5a1
[IMP] sale_commission: Add optional in commission_status field relate…
victoralmau ac0d24c
sale_commission 13.0.1.4.0
OCA-git-bot 377356f
Translated using Weblate (Spanish)
anasuarez1 e70f7f4
FIX sale_commission: fix wrong constrain logic on settlement lines
SilvioGregorini 5dc7e04
sale_commission 13.0.1.4.1
OCA-git-bot b04d811
[FIX] required only if partner is agent
renatonlima e3c9b23
sale_commission 13.0.1.5.0
OCA-git-bot 6b7f1f7
Core context is not removed from invoice_line_ids
ao-landoo 488fe11
sale_commission 13.0.1.5.1
OCA-git-bot a719260
[IMP] sale_commission: black, isort, prettier
fredzamoabg 91a3baf
[MIG] sale_commission: Migration to 14.0
0031967
[UPD] Update sale_commission.pot
oca-travis 5db3092
[UPD] README.rst
OCA-git-bot be3e9e8
Added translation using Weblate (French)
Yvesldff f7ab3ee
Translated using Weblate (French)
Yvesldff 0b707d4
[14.0][IMP] sale_commission: Only show commission for customers
hildickethan 368dcd8
Translated using Weblate (French)
Yvesldff cc01aff
sale_commission 14.0.1.1.0
OCA-git-bot ebac8bf
FIX sale_commission preventing to cancel invoice with settled commiss…
eLBati 13d7baa
[UPD] Update sale_commission.pot
oca-travis 15fd036
sale_commission 14.0.1.1.1
OCA-git-bot 4b4f36b
Update translation files
oca-transbot 098aab9
[FIX] sale_commission
max3903 6dacfe8
sale_commission 14.0.1.1.2
OCA-git-bot 219ffdc
[FIX] sale_commission
max3903 251f53e
sale_commission 14.0.1.1.3
OCA-git-bot baefdeb
[14.0][FIX] sale_commission: amount compute
Zar21 32b91d1
sale_commission 14.0.1.1.4
OCA-git-bot 9bfb1b9
Translated using Weblate (Italian)
francesco-ooops cfa7b04
Translated using Weblate (Italian)
francesco-ooops 07c0f34
Translated using Weblate (Italian)
primes2h 7bc1ea2
Translated using Weblate (Italian)
primes2h 243ecce
Translated using Weblate (Italian)
primes2h 1a01485
Translated using Weblate (Italian)
primes2h daa103f
Translated using Weblate (Italian)
primes2h cc02a07
Translated using Weblate (Italian)
MarcoCalcagni 9b43920
Translated using Weblate (Italian)
primes2h 14d4553
Translated using Weblate (Italian)
primes2h f1c8c89
[IMP] sale_commission allowing to filter sale orders and invoices by …
antoniospneto 3c34345
[UPD] Update sale_commission.pot
oca-travis 721dbb1
sale_commission 14.0.1.2.0
OCA-git-bot e6f6cce
Update translation files
oca-transbot aa1908a
[FIX] invoice_date
felipemotter 9577679
sale_commission 14.0.1.2.1
OCA-git-bot f0d8c46
[IMP] update dotfiles [ci skip]
OCA-git-bot 6cbb77b
[IMP] sale_commission: Allow to group invoices
etobella 4d9eef6
[IMP] sale_commission: Add a hook
olgamarcocb 1ad9cf7
[FIX] sale_commission: Convert field to write, this way it is checked…
etobella ee4b59c
[FIX] sale_commission: Switch at the end, in order to fix grouped inv…
etobella 73f74bc
[IMP] sale_commission: New bi-weekly settlement period
pedrobaeza 33e2dbc
[IMP] sale_commission: Adapt Forward-port to 14
olgamarcocb 596d63b
[UPD] Update sale_commission.pot
oca-travis d173111
sale_commission 14.0.1.4.0
OCA-git-bot b515524
Update translation files
oca-transbot 45196b9
[FIX] sale_commission: compute amount after changing commission, fixe…
oihane 90ca04f
sale_commission 14.0.1.4.1
OCA-git-bot 9994fe4
[14.0][IMP] sale_commission: show Group Invoices label
ilyasProgrammer dae8125
[14.0][ADD] sale_commission_queued
ilyasProgrammer a443212
sale_commission 14.0.1.5.0
OCA-git-bot 7ea4569
[IMP] sale_commission: black, isort, prettier
AungKoKoLin1997 a4145e6
[MIG] commission and sale_commission: Migration to 15.0
AungKoKoLin1997 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,154 @@ | ||
=========== | ||
Commissions | ||
=========== | ||
|
||
.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
!! This file is generated by oca-gen-addon-readme !! | ||
!! changes will be overwritten. !! | ||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
|
||
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png | ||
:target: https://odoo-community.org/page/development-status | ||
:alt: Beta | ||
.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png | ||
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html | ||
:alt: License: AGPL-3 | ||
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fcommission-lightgray.png?logo=github | ||
:target: https://github.com/OCA/commission/tree/15.0/commission | ||
:alt: OCA/commission | ||
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png | ||
:target: https://translation.odoo-community.org/projects/commission-15-0/commission-15-0-commission | ||
:alt: Translate me on Weblate | ||
.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png | ||
:target: https://runbot.odoo-community.org/runbot/165/15.0 | ||
:alt: Try me on Runbot | ||
|
||
|badge1| |badge2| |badge3| |badge4| |badge5| | ||
|
||
This module allows to define agents with their commissions and assign | ||
them in customers. | ||
|
||
You can define which base amount is going to be taken into account: net amount | ||
(based on margin) or gross amount (line subtotal amount) | ||
|
||
**Table of contents** | ||
|
||
.. contents:: | ||
:local: | ||
|
||
Configuration | ||
============= | ||
|
||
For adding commissions: | ||
|
||
#. Go to *Sales > Commission Management > Commission types*. | ||
#. Edit or create a new record. | ||
#. Select a name for distinguishing that type. | ||
#. Select the percentage type of the commission: | ||
|
||
* **Fixed percentage**: all commissions are computed with a fixed | ||
percentage. You can fill the percentage in the field "Fixed percentage". | ||
* **By sections**: percentage varies depending amount intervals. You can | ||
fill intervals and percentages in the section "Rate definition". | ||
|
||
#. Select the base amount for computing the percentage: | ||
|
||
* **Gross Amount**: percentage is computed from the amount put on | ||
sales order/invoice. | ||
* **Net Amount**: percentage is computed from the profit only, taken the | ||
cost from the product. | ||
|
||
#. Select the invoice status for settling the commissions: | ||
|
||
* **Invoice Based**: Commissions are settled when the invoice is issued. | ||
* **Payment Based**: Commissions are settled when the invoice is paid. | ||
|
||
For adding new agents: | ||
|
||
#. Go to *Sales > Commission Management > Agents*. You can also access from | ||
*Contacts > Contacts* or *Sales > Orders > Customers*. | ||
#. Edit or create a new record. | ||
#. On "Sales & Purchases" page, mark "Agent" check. It should be checked if | ||
you have accessed from first menu option. | ||
#. There's a new page called "Agent information". In it, you can set following | ||
data: | ||
|
||
* The agent type, being in this base module "External agent" the only | ||
existing configuration. It can be extended with `hr_commission` module | ||
for setting an "Employee" agent type. | ||
* The associated commission type. | ||
* The settlement period, where you can select "Monthly", "Quaterly", | ||
"Semi-annual" or "Annual". | ||
|
||
You will also be able to see the settlements that have been made to this | ||
agent from this page. | ||
|
||
Known issues / Roadmap | ||
====================== | ||
|
||
* Make it totally multi-company aware. | ||
* Be multi-currency aware for settlements. | ||
* Allow to calculate and pay in other currency different from company one. | ||
* Set agent popup window with a kanban view with richer information and | ||
mobile friendly. | ||
|
||
Bug Tracker | ||
=========== | ||
|
||
Bugs are tracked on `GitHub Issues <https://github.com/OCA/commission/issues>`_. | ||
In case of trouble, please check there if your issue has already been reported. | ||
If you spotted it first, help us smashing it by providing a detailed and welcomed | ||
`feedback <https://github.com/OCA/commission/issues/new?body=module:%20commission%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_. | ||
|
||
Do not contact contributors directly about support or help with technical issues. | ||
|
||
Credits | ||
======= | ||
|
||
Authors | ||
~~~~~~~ | ||
|
||
* Tecnativa | ||
|
||
Contributors | ||
~~~~~~~~~~~~ | ||
|
||
* Pexego. | ||
* Davide Corio <davide.corio@domsense.com> | ||
* Joao Alfredo Gama Batista <joao.gama@savoirfairelinux.com> | ||
* Sandy Carter <sandy.carter@savoirfairelinux.com> | ||
* Giorgio Borelli <giorgio.borelli@abstract.it> | ||
* Daniel Campos <danielcampos@avanzosc.es> | ||
* Oihane Crucelaegui <oihanecruce@gmail.com> | ||
* Nicola Malcontenti <nicola.malcontenti@agilebg.com> | ||
* Aitor Bouzas <aitor.bouzas@adaptivecity.com> | ||
|
||
* `Tecnativa <https://www.tecnativa.com>`__: | ||
|
||
* Pedro M. Baeza | ||
* Manuel Calero | ||
|
||
Maintainers | ||
~~~~~~~~~~~ | ||
|
||
This module is maintained by the OCA. | ||
|
||
.. image:: https://odoo-community.org/logo.png | ||
:alt: Odoo Community Association | ||
:target: https://odoo-community.org | ||
|
||
OCA, or the Odoo Community Association, is a nonprofit organization whose | ||
mission is to support the collaborative development of Odoo features and | ||
promote its widespread use. | ||
|
||
.. |maintainer-pedrobaeza| image:: https://github.com/pedrobaeza.png?size=40px | ||
:target: https://github.com/pedrobaeza | ||
:alt: pedrobaeza | ||
|
||
Current `maintainer <https://odoo-community.org/page/maintainer-role>`__: | ||
|
||
|maintainer-pedrobaeza| | ||
|
||
This module is part of the `OCA/commission <https://github.com/OCA/commission/tree/15.0/commission>`_ project on GitHub. | ||
|
||
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
from . import models |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
{ | ||
"name": "Commissions", | ||
"version": "15.0.1.0.0", | ||
"author": "Tecnativa," "Odoo Community Association (OCA)", | ||
"category": "Sales Management", | ||
"license": "AGPL-3", | ||
"depends": ["product", "sale_management"], | ||
"website": "https://github.com/OCA/commission", | ||
"maintainers": ["pedrobaeza"], | ||
"data": [ | ||
"security/ir.model.access.csv", | ||
"views/commission_view.xml", | ||
"views/commission_mixin_view.xml", | ||
"views/product_template_view.xml", | ||
"views/res_partner_view.xml", | ||
], | ||
"demo": ["demo/commission_and_agent_demo.xml"], | ||
"installable": True, | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
<?xml version="1.0" ?> | ||
<odoo> | ||
<!-- Create the Commission Types --> | ||
<record id="demo_commission" model="commission"> | ||
<field name="name">10% fixed commission - Invoice Based</field> | ||
<field name="fix_qty">10.0</field> | ||
</record> | ||
<record id="demo_commission_paid" model="commission"> | ||
<field name="name">20% fixed commission - Payment Based</field> | ||
<field name="fix_qty">20.0</field> | ||
<field name="invoice_state">paid</field> | ||
</record> | ||
<!-- Create de Agents --> | ||
<record id="res_partner_pritesh_sale_agent" model="res.partner"> | ||
<field name="name">Pritesh Sales Agent</field> | ||
<field name="city">Ahmedabad</field> | ||
<field name="zip">380007</field> | ||
<field name="country_id" model="res.country" search="[('name','=','India')]" /> | ||
<field name="street">56 Beijing street</field> | ||
<field name="agent" eval="1" /> | ||
<field name="commission_id" ref="demo_commission_paid" /> | ||
</record> | ||
<record id="res_partner_eiffel_sale_agent" model="res.partner"> | ||
<field name="name">Eiffel pvt ltd</field> | ||
<field name="city">Ahmedabad</field> | ||
<field name="zip">380007</field> | ||
<field name="country_id" model="res.country" search="[('name','=','India')]" /> | ||
<field name="street">Wall Street 2</field> | ||
<field name="agent" eval="1" /> | ||
<field name="commission_id" ref="demo_commission" /> | ||
</record> | ||
<record id="res_partner_tiny_sale_agent" model="res.partner"> | ||
<field name="name">Tiny Belgium</field> | ||
<field name="city">Belgium</field> | ||
<field name="zip">2457</field> | ||
<field name="country_id" model="res.country" search="[('name','=','India')]" /> | ||
<field name="street">Belgium Gao</field> | ||
<field name="agent" eval="1" /> | ||
<field name="commission_id" ref="demo_commission" /> | ||
</record> | ||
</odoo> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It shouldn't depend on sale_management. Menu items should be moved under invoicing.