diff --git a/commission/README.rst b/commission/README.rst index 031cec49a..f8356c60e 100644 --- a/commission/README.rst +++ b/commission/README.rst @@ -17,13 +17,13 @@ Commissions :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/17.0/commission + :target: https://github.com/OCA/commission/tree/18.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-17-0/commission-17-0-commission + :target: https://translation.odoo-community.org/projects/commission-18-0/commission-18-0-commission :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png - :target: https://runboat.odoo-community.org/builds?repo=OCA/commission&target_branch=17.0 + :target: https://runboat.odoo-community.org/builds?repo=OCA/commission&target_branch=18.0 :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -31,9 +31,9 @@ Commissions This module provides the base functions for commission operations to enable the following: -- Define agents with their commissions -- Assign agents to partners -- Create settlements to summarize commissions for certain periods +- Define agents with their commissions +- Assign agents to partners +- Create settlements to summarize commissions for certain periods You can define which base amount is going to be taken into account: net amount (based on margin) or gross amount (line subtotal amount). @@ -53,19 +53,19 @@ For adding commissions: 3. Select a name for distinguishing that type. 4. 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". + - **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". 5. Select the base amount for computing the percentage: - - **Sale/Invoice Amount**: percentage is computed from the amount - put on sales order/invoice. - - **Margin (Amount - Cost)**: percentage is computed from the profit - only, taken the cost from the product. + - **Sale/Invoice Amount**: percentage is computed from the amount put + on sales order/invoice. + - **Margin (Amount - Cost)**: percentage is computed from the profit + only, taken the cost from the product. For adding new agents: @@ -80,12 +80,12 @@ For adding new agents: 4. 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 "Bi-weekly", - "Monthly", "Quaterly", "Semi-annual" or "Annual". + - 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 "Bi-weekly", "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. @@ -117,9 +117,9 @@ For settling the commissions to agents: Known issues / Roadmap ====================== -- Make it totally multi-company aware. -- Set agent popup window with a kanban view with richer information and - mobile friendly. +- Make it totally multi-company aware. +- Set agent popup window with a kanban view with richer information and + mobile friendly. Bug Tracker =========== @@ -127,7 +127,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us to smash it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -142,29 +142,29 @@ Authors Contributors ------------ -- Pexego. -- Davide Corio -- Joao Alfredo Gama Batista -- Sandy Carter -- Giorgio Borelli -- Daniel Campos -- Oihane Crucelaegui -- Nicola Malcontenti -- Aitor Bouzas -- Alexei Rivera -- `Tecnativa `__: +- Pexego. +- Davide Corio +- Joao Alfredo Gama Batista +- Sandy Carter +- Giorgio Borelli +- Daniel Campos +- Oihane Crucelaegui +- Nicola Malcontenti +- Aitor Bouzas +- Alexei Rivera +- `Tecnativa `__: - - Pedro M. Baeza - - Manuel Calero + - Pedro M. Baeza + - Manuel Calero -- `Quartile `__: +- `Quartile `__: - - Aung Ko Ko Lin - - Yoshi Tashiro + - Aung Ko Ko Lin + - Yoshi Tashiro -- `Studio73 `__: +- `Studio73 `__: - - Ethan Hildick + - Ethan Hildick Maintainers ----------- @@ -187,6 +187,6 @@ Current `maintainer `__: |maintainer-pedrobaeza| -This module is part of the `OCA/commission `_ project on GitHub. +This module is part of the `OCA/commission `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/commission/__manifest__.py b/commission/__manifest__.py index d04d6ab0e..887048ff6 100644 --- a/commission/__manifest__.py +++ b/commission/__manifest__.py @@ -3,7 +3,7 @@ # Copyright 2014-2022 Tecnativa - Pedro M. Baeza { "name": "Commissions", - "version": "17.0.1.1.0", + "version": "18.0.1.1.0", "author": "Tecnativa, Odoo Community Association (OCA)", "category": "Invoicing", "license": "AGPL-3", diff --git a/commission/reports/commission_settlement_report.xml b/commission/reports/commission_settlement_report.xml index b0be5e747..e71c43ddc 100644 --- a/commission/reports/commission_settlement_report.xml +++ b/commission/reports/commission_settlement_report.xml @@ -1,6 +1,6 @@ - + Settlement report commission.settlement qweb-pdf diff --git a/commission/reports/report_settlement_templates.xml b/commission/reports/report_settlement_templates.xml index e45ea4e05..d23d9f3cc 100644 --- a/commission/reports/report_settlement_templates.xml +++ b/commission/reports/report_settlement_templates.xml @@ -81,5 +81,4 @@ - diff --git a/commission/security/commission_security.xml b/commission/security/commission_security.xml index 314b992a3..020b4057c 100644 --- a/commission/security/commission_security.xml +++ b/commission/security/commission_security.xml @@ -2,7 +2,7 @@ - + Commissions Allows to handle commission related stuff. diff --git a/commission/static/description/index.html b/commission/static/description/index.html index 3a06ff2a2..ff0cf6231 100644 --- a/commission/static/description/index.html +++ b/commission/static/description/index.html @@ -8,10 +8,11 @@ /* :Author: David Goodger (goodger@python.org) -:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ +:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $ :Copyright: This stylesheet has been placed in the public domain. Default cascading style sheet for the HTML output of Docutils. +Despite the name, some widely supported CSS2 features are used. See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to customize this style sheet. @@ -274,7 +275,7 @@ margin-left: 2em ; margin-right: 2em } -pre.code .ln { color: grey; } /* line numbers */ +pre.code .ln { color: gray; } /* line numbers */ pre.code, code { background-color: #eeeeee } pre.code .comment, code .comment { color: #5C6576 } pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } @@ -300,7 +301,7 @@ span.pre { white-space: pre } -span.problematic { +span.problematic, pre.problematic { color: red } span.section-subtitle { @@ -368,7 +369,7 @@

Commissions

!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! source digest: sha256:0f54149f86b86660382708274a8cb05ec4cabea68b0ede1531e0147bb309d5ab !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/commission Translate me on Weblate Try me on Runboat

+

Beta License: AGPL-3 OCA/commission Translate me on Weblate Try me on Runboat

This module provides the base functions for commission operations to enable the following:

  • Select the base amount for computing the percentage:
      -
    • Sale/Invoice Amount: percentage is computed from the amount -put on sales order/invoice.
      • +
    • Sale/Invoice Amount: percentage is computed from the amount put +on sales order/invoice.
    • Margin (Amount - Cost): percentage is computed from the profit only, taken the cost from the product.
    @@ -430,12 +431,12 @@

    Configuration

  • 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 +
    • 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 “Bi-weekly”, -“Monthly”, “Quaterly”, “Semi-annual” or “Annual”.
      • +
    • The settlement period, where you can select “Bi-weekly”, “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.

    @@ -479,7 +480,7 @@

    Bug Tracker

    Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us to smash it by providing a detailed and welcomed -feedback.

    +feedback.

    Do not contact contributors directly about support or help with technical issues.

    @@ -522,13 +523,15 @@

    Contributors

    Maintainers

    This module is maintained by the OCA.

    -Odoo Community Association + +Odoo Community Association +

    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.

    Current maintainer:

    pedrobaeza

    -

    This module is part of the OCA/commission project on GitHub.

    +

    This module is part of the OCA/commission project on GitHub.

    You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

    diff --git a/commission/wizards/commission_make_settle_views.xml b/commission/wizards/commission_make_settle_views.xml index 25cd05d7c..f697aa7c1 100644 --- a/commission/wizards/commission_make_settle_views.xml +++ b/commission/wizards/commission_make_settle_views.xml @@ -33,18 +33,18 @@