forked from OCA/commission
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #310 from OCA/12.0
Syncing from upstream OCA/commission (12.0)
- Loading branch information
Showing
16 changed files
with
242 additions
and
202 deletions.
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
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 |
|---|---|---|
| @@ -1,20 +1,20 @@ | ||
| <?xml version="1.0" encoding="utf-8" ?> | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | ||
| <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> | ||
| <head> | ||
| <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> | ||
| <meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" /> | ||
| <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" /> | ||
| <title>Commissions in contract invoices</title> | ||
| <style type="text/css"> | ||
|
|
||
| /* | ||
| :Author: David Goodger ([email protected]) | ||
| :Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $ | ||
| :Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ | ||
| :Copyright: This stylesheet has been placed in the public domain. | ||
|
|
||
| Default cascading style sheet for the HTML output of Docutils. | ||
|
|
||
| See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to | ||
| See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to | ||
| customize this style sheet. | ||
| */ | ||
|
|
||
|
|
@@ -366,60 +366,62 @@ <h1 class="title">Commissions in contract invoices</h1> | |
| <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
| !! This file is generated by oca-gen-addon-readme !! | ||
| !! changes will be overwritten. !! | ||
| !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
| !! source digest: sha256:58cf63385a9110dd0ea6de469011b47c7c9c92a4a93b635bf1cb93c7ecc1f0dc | ||
| !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> | ||
| <p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/commission/tree/12.0/contract_commission"><img alt="OCA/commission" src="https://img.shields.io/badge/github-OCA%2Fcommission-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/commission-12-0/commission-12-0-contract_commission"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/165/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p> | ||
| <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/commission/tree/12.0/contract_commission"><img alt="OCA/commission" src="https://img.shields.io/badge/github-OCA%2Fcommission-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/commission-12-0/commission-12-0-contract_commission"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/commission&target_branch=12.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p> | ||
| <p>This module allows to get default commissions for partner in the recurring | ||
| invoices generated from contracts.</p> | ||
| <p><strong>Table of contents</strong></p> | ||
| <div class="contents local topic" id="contents"> | ||
| <ul class="simple"> | ||
| <li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li> | ||
| <li><a class="reference internal" href="#usage" id="id2">Usage</a></li> | ||
| <li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li> | ||
| <li><a class="reference internal" href="#credits" id="id4">Credits</a><ul> | ||
| <li><a class="reference internal" href="#authors" id="id5">Authors</a></li> | ||
| <li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li> | ||
| <li><a class="reference internal" href="#maintainers" id="id7">Maintainers</a></li> | ||
| <li><a class="reference internal" href="#configuration" id="toc-entry-1">Configuration</a></li> | ||
| <li><a class="reference internal" href="#usage" id="toc-entry-2">Usage</a></li> | ||
| <li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li> | ||
| <li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul> | ||
| <li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li> | ||
| <li><a class="reference internal" href="#contributors" id="toc-entry-6">Contributors</a></li> | ||
| <li><a class="reference internal" href="#maintainers" id="toc-entry-7">Maintainers</a></li> | ||
| </ul> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| <div class="section" id="configuration"> | ||
| <h1><a class="toc-backref" href="#id1">Configuration</a></h1> | ||
| <h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1> | ||
| <p>This module is auto-installed when you have <em>contract</em> and <em>sale_commission</em> | ||
| modules installed.</p> | ||
| </div> | ||
| <div class="section" id="usage"> | ||
| <h1><a class="toc-backref" href="#id2">Usage</a></h1> | ||
| <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1> | ||
| <p>When invoicing contracts, the agents assigned to the partner of the contract | ||
| will now be assigned to the generated invoices.</p> | ||
| </div> | ||
| <div class="section" id="bug-tracker"> | ||
| <h1><a class="toc-backref" href="#id3">Bug Tracker</a></h1> | ||
| <h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1> | ||
| <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/commission/issues">GitHub Issues</a>. | ||
| 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 | ||
| If you spotted it first, help us to smash it by providing a detailed and welcomed | ||
| <a class="reference external" href="https://github.com/OCA/commission/issues/new?body=module:%20contract_commission%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p> | ||
| <p>Do not contact contributors directly about support or help with technical issues.</p> | ||
| </div> | ||
| <div class="section" id="credits"> | ||
| <h1><a class="toc-backref" href="#id4">Credits</a></h1> | ||
| <h1><a class="toc-backref" href="#toc-entry-4">Credits</a></h1> | ||
| <div class="section" id="authors"> | ||
| <h2><a class="toc-backref" href="#id5">Authors</a></h2> | ||
| <h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2> | ||
| <ul class="simple"> | ||
| <li>Tecnativa</li> | ||
| </ul> | ||
| </div> | ||
| <div class="section" id="contributors"> | ||
| <h2><a class="toc-backref" href="#id6">Contributors</a></h2> | ||
| <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2> | ||
| <ul class="simple"> | ||
| <li>Pedro M. Baeza <<a class="reference external" href="mailto:pedro.baeza@tecnativa.com">pedro.baeza@tecnativa.com</a>></li> | ||
| <li>Vicent Cubells <<a class="reference external" href="mailto:vicent.cubells@tecnativa.com">vicent.cubells@tecnativa.com</a>></li> | ||
| <li>Marcel Savegnago <<a class="reference external" href="mailto:marcel.savegnago@escodoo.com.br">marcel.savegnago@escodoo.com.br</a>></li> | ||
| </ul> | ||
| </div> | ||
| <div class="section" id="maintainers"> | ||
| <h2><a class="toc-backref" href="#id7">Maintainers</a></h2> | ||
| <h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2> | ||
| <p>This module is maintained by the OCA.</p> | ||
| <a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a> | ||
| <p>OCA, or the Odoo Community Association, is a nonprofit organization whose | ||
|
|
||
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
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 |
|---|---|---|
| @@ -1,20 +1,20 @@ | ||
| <?xml version="1.0" encoding="utf-8" ?> | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | ||
| <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> | ||
| <head> | ||
| <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> | ||
| <meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" /> | ||
| <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" /> | ||
| <title>HR commissions</title> | ||
| <style type="text/css"> | ||
|
|
||
| /* | ||
| :Author: David Goodger ([email protected]) | ||
| :Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $ | ||
| :Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ | ||
| :Copyright: This stylesheet has been placed in the public domain. | ||
|
|
||
| Default cascading style sheet for the HTML output of Docutils. | ||
|
|
||
| See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to | ||
| See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to | ||
| customize this style sheet. | ||
| */ | ||
|
|
||
|
|
@@ -366,48 +366,50 @@ <h1 class="title">HR commissions</h1> | |
| <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
| !! This file is generated by oca-gen-addon-readme !! | ||
| !! changes will be overwritten. !! | ||
| !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
| !! source digest: sha256:125570d2dbfe36562f9f3da061b519b02fa849bf85091fc4dd42af153c280b7d | ||
| !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> | ||
| <p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/commission/tree/12.0/hr_commission"><img alt="OCA/commission" src="https://img.shields.io/badge/github-OCA%2Fcommission-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/commission-12-0/commission-12-0-hr_commission"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/165/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p> | ||
| <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/commission/tree/12.0/hr_commission"><img alt="OCA/commission" src="https://img.shields.io/badge/github-OCA%2Fcommission-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/commission-12-0/commission-12-0-hr_commission"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/commission&target_branch=12.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p> | ||
| <p>This module links sale_commission with hr module. For now, it only adds another | ||
| type of agent whose commissions are not invoiced in the corresponding wizard.</p> | ||
| <p><strong>Table of contents</strong></p> | ||
| <div class="contents local topic" id="contents"> | ||
| <ul class="simple"> | ||
| <li><a class="reference internal" href="#known-issues-roadmap" id="id1">Known issues / Roadmap</a></li> | ||
| <li><a class="reference internal" href="#bug-tracker" id="id2">Bug Tracker</a></li> | ||
| <li><a class="reference internal" href="#credits" id="id3">Credits</a><ul> | ||
| <li><a class="reference internal" href="#authors" id="id4">Authors</a></li> | ||
| <li><a class="reference internal" href="#contributors" id="id5">Contributors</a></li> | ||
| <li><a class="reference internal" href="#maintainers" id="id6">Maintainers</a></li> | ||
| <li><a class="reference internal" href="#known-issues-roadmap" id="toc-entry-1">Known issues / Roadmap</a></li> | ||
| <li><a class="reference internal" href="#bug-tracker" id="toc-entry-2">Bug Tracker</a></li> | ||
| <li><a class="reference internal" href="#credits" id="toc-entry-3">Credits</a><ul> | ||
| <li><a class="reference internal" href="#authors" id="toc-entry-4">Authors</a></li> | ||
| <li><a class="reference internal" href="#contributors" id="toc-entry-5">Contributors</a></li> | ||
| <li><a class="reference internal" href="#maintainers" id="toc-entry-6">Maintainers</a></li> | ||
| </ul> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| <div class="section" id="known-issues-roadmap"> | ||
| <h1><a class="toc-backref" href="#id1">Known issues / Roadmap</a></h1> | ||
| <h1><a class="toc-backref" href="#toc-entry-1">Known issues / Roadmap</a></h1> | ||
| <ul class="simple"> | ||
| <li>Add demo data.</li> | ||
| <li>Link settlements with wages.</li> | ||
| </ul> | ||
| </div> | ||
| <div class="section" id="bug-tracker"> | ||
| <h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1> | ||
| <h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1> | ||
| <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/commission/issues">GitHub Issues</a>. | ||
| 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 | ||
| If you spotted it first, help us to smash it by providing a detailed and welcomed | ||
| <a class="reference external" href="https://github.com/OCA/commission/issues/new?body=module:%20hr_commission%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p> | ||
| <p>Do not contact contributors directly about support or help with technical issues.</p> | ||
| </div> | ||
| <div class="section" id="credits"> | ||
| <h1><a class="toc-backref" href="#id3">Credits</a></h1> | ||
| <h1><a class="toc-backref" href="#toc-entry-3">Credits</a></h1> | ||
| <div class="section" id="authors"> | ||
| <h2><a class="toc-backref" href="#id4">Authors</a></h2> | ||
| <h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2> | ||
| <ul class="simple"> | ||
| <li>Tecnativa</li> | ||
| </ul> | ||
| </div> | ||
| <div class="section" id="contributors"> | ||
| <h2><a class="toc-backref" href="#id5">Contributors</a></h2> | ||
| <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2> | ||
| <ul class="simple"> | ||
| <li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a><ul> | ||
| <li>Pedro M. Baeza</li> | ||
|
|
@@ -417,7 +419,7 @@ <h2><a class="toc-backref" href="#id5">Contributors</a></h2> | |
| </ul> | ||
| </div> | ||
| <div class="section" id="maintainers"> | ||
| <h2><a class="toc-backref" href="#id6">Maintainers</a></h2> | ||
| <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2> | ||
| <p>This module is maintained by the OCA.</p> | ||
| <a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a> | ||
| <p>OCA, or the Odoo Community Association, is a nonprofit organization whose | ||
|
|
||
Oops, something went wrong.