odoo-addon-account-commission 17.0.1.0.0.14__py3-none-any.whl → 17.0.1.0.1.1__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- odoo/addons/account_commission/README.rst +42 -34
- odoo/addons/account_commission/__manifest__.py +2 -1
- odoo/addons/account_commission/i18n/account_commission.pot +8 -0
- odoo/addons/account_commission/i18n/es.po +8 -0
- odoo/addons/account_commission/i18n/hr.po +10 -2
- odoo/addons/account_commission/i18n/it.po +8 -0
- odoo/addons/account_commission/i18n/ja.po +8 -0
- odoo/addons/account_commission/i18n/pt.po +10 -2
- odoo/addons/account_commission/i18n/pt_BR.po +8 -0
- odoo/addons/account_commission/i18n/tr.po +10 -2
- odoo/addons/account_commission/models/commission_settlement.py +36 -0
- odoo/addons/account_commission/readme/CONTRIBUTORS.md +2 -0
- odoo/addons/account_commission/readme/DESCRIPTION.md +3 -0
- odoo/addons/account_commission/static/description/index.html +31 -19
- odoo/addons/account_commission/tests/test_account_commission.py +79 -0
- odoo/addons/account_commission/views/grouped_report_settlement_templates.xml +45 -0
- {odoo_addon_account_commission-17.0.1.0.0.14.dist-info → odoo_addon_account_commission-17.0.1.0.1.1.dist-info}/METADATA +44 -35
- {odoo_addon_account_commission-17.0.1.0.0.14.dist-info → odoo_addon_account_commission-17.0.1.0.1.1.dist-info}/RECORD +20 -19
- {odoo_addon_account_commission-17.0.1.0.0.14.dist-info → odoo_addon_account_commission-17.0.1.0.1.1.dist-info}/WHEEL +1 -1
- {odoo_addon_account_commission-17.0.1.0.0.14.dist-info → odoo_addon_account_commission-17.0.1.0.1.1.dist-info}/top_level.txt +0 -0
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
.. image:: https://odoo-community.org/readme-banner-image
|
|
2
|
+
:target: https://odoo-community.org/get-involved?utm_source=readme
|
|
3
|
+
:alt: Odoo Community Association
|
|
4
|
+
|
|
1
5
|
===================
|
|
2
6
|
Account commissions
|
|
3
7
|
===================
|
|
@@ -7,13 +11,13 @@ Account commissions
|
|
|
7
11
|
!! This file is generated by oca-gen-addon-readme !!
|
|
8
12
|
!! changes will be overwritten. !!
|
|
9
13
|
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
|
10
|
-
!! source digest: sha256:
|
|
14
|
+
!! source digest: sha256:4fa8f154e66e62d73a6e19596f65a5ba3cffc5d7861a8f3f4f3c373e8bea39f6
|
|
11
15
|
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
|
12
16
|
|
|
13
17
|
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
|
|
14
18
|
:target: https://odoo-community.org/page/development-status
|
|
15
19
|
:alt: Beta
|
|
16
|
-
.. |badge2| image:: https://img.shields.io/badge/
|
|
20
|
+
.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
|
|
17
21
|
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
|
|
18
22
|
:alt: License: AGPL-3
|
|
19
23
|
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fcommission-lightgray.png?logo=github
|
|
@@ -36,6 +40,9 @@ agents.
|
|
|
36
40
|
|
|
37
41
|
This module depends on the commission module.
|
|
38
42
|
|
|
43
|
+
Additionally, it extends the grouped settlement report from the
|
|
44
|
+
commission module to include a grouping by invoice
|
|
45
|
+
|
|
39
46
|
**Table of contents**
|
|
40
47
|
|
|
41
48
|
.. contents::
|
|
@@ -49,10 +56,10 @@ For selecting invoice status in commissions:
|
|
|
49
56
|
1. Edit or create a new record to select the invoice status for settling
|
|
50
57
|
the commissions.
|
|
51
58
|
|
|
52
|
-
-
|
|
53
|
-
|
|
54
|
-
-
|
|
55
|
-
|
|
59
|
+
- **Invoice Based**: Commissions are settled when the invoice is
|
|
60
|
+
issued.
|
|
61
|
+
- **Payment Based**: Commissions are settled when the invoice is
|
|
62
|
+
paid.
|
|
56
63
|
|
|
57
64
|
Usage
|
|
58
65
|
=====
|
|
@@ -81,13 +88,12 @@ For invoicing the settlements (only for external agents):
|
|
|
81
88
|
1. Go to *Invoicing > Commissions > Create Commission Invoices*.
|
|
82
89
|
2. On the window that appears, you can select following data:
|
|
83
90
|
|
|
84
|
-
-
|
|
85
|
-
-
|
|
86
|
-
-
|
|
87
|
-
|
|
88
|
-
-
|
|
89
|
-
|
|
90
|
-
settlements.
|
|
91
|
+
- Product. It should be a service product for being coherent.
|
|
92
|
+
- Journal: To be selected between existing purchase journals.
|
|
93
|
+
- Date: If you want to choose a specific invoice date. You can leave
|
|
94
|
+
it blank if you prefer.
|
|
95
|
+
- Settlements: For selecting specific settlements to invoice. You can
|
|
96
|
+
leave it blank as well for invoicing all the pending settlements.
|
|
91
97
|
|
|
92
98
|
If you want to invoice a/some specific settlement/s:
|
|
93
99
|
|
|
@@ -118,34 +124,36 @@ Authors
|
|
|
118
124
|
Contributors
|
|
119
125
|
------------
|
|
120
126
|
|
|
121
|
-
-
|
|
122
|
-
-
|
|
123
|
-
-
|
|
124
|
-
-
|
|
125
|
-
-
|
|
126
|
-
-
|
|
127
|
-
-
|
|
128
|
-
-
|
|
129
|
-
-
|
|
130
|
-
-
|
|
131
|
-
-
|
|
132
|
-
-
|
|
127
|
+
- Pexego.
|
|
128
|
+
- Davide Corio <davide.corio@domsense.com>
|
|
129
|
+
- Joao Alfredo Gama Batista <joao.gama@savoirfairelinux.com>
|
|
130
|
+
- Sandy Carter <sandy.carter@savoirfairelinux.com>
|
|
131
|
+
- Giorgio Borelli <giorgio.borelli@abstract.it>
|
|
132
|
+
- Daniel Campos <danielcampos@avanzosc.es>
|
|
133
|
+
- Oihane Crucelaegui <oihanecruce@gmail.com>
|
|
134
|
+
- Nicola Malcontenti <nicola.malcontenti@agilebg.com>
|
|
135
|
+
- Aitor Bouzas <aitor.bouzas@adaptivecity.com>
|
|
136
|
+
- Alexei Rivera <arivera@archeti.com>
|
|
137
|
+
- Mina Samir <minaw349@outlook.com>
|
|
138
|
+
- `Tecnativa <https://www.tecnativa.com>`__:
|
|
133
139
|
|
|
134
|
-
|
|
135
|
-
|
|
140
|
+
- Pedro M. Baeza
|
|
141
|
+
- Manuel Calero
|
|
136
142
|
|
|
137
|
-
-
|
|
143
|
+
- `Quartile <https://www.quartile.co>`__:
|
|
138
144
|
|
|
139
|
-
|
|
140
|
-
|
|
145
|
+
- Aung Ko Ko Lin
|
|
146
|
+
- Yoshi Tashiro
|
|
141
147
|
|
|
142
|
-
-
|
|
148
|
+
- `Studio73 <https://www.studio73.es>`__:
|
|
143
149
|
|
|
144
|
-
|
|
150
|
+
- Ethan Hildick
|
|
145
151
|
|
|
146
|
-
-
|
|
152
|
+
- `Sygel <https://www.sygel.es>`__:
|
|
147
153
|
|
|
148
|
-
|
|
154
|
+
- Alberto Martínez
|
|
155
|
+
- Valentín Vinagre
|
|
156
|
+
- Ángel Rivas
|
|
149
157
|
|
|
150
158
|
Maintainers
|
|
151
159
|
-----------
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
# Copyright 2014-2022 Tecnativa - Pedro M. Baeza
|
|
4
4
|
{
|
|
5
5
|
"name": "Account commissions",
|
|
6
|
-
"version": "17.0.1.0.
|
|
6
|
+
"version": "17.0.1.0.1",
|
|
7
7
|
"author": "Tecnativa, Odoo Community Association (OCA)",
|
|
8
8
|
"category": "Sales Management",
|
|
9
9
|
"license": "AGPL-3",
|
|
@@ -21,6 +21,7 @@
|
|
|
21
21
|
"views/commission_settlement_views.xml",
|
|
22
22
|
"views/commission_views.xml",
|
|
23
23
|
"views/report_settlement_templates.xml",
|
|
24
|
+
"views/grouped_report_settlement_templates.xml",
|
|
24
25
|
"report/commission_analysis_view.xml",
|
|
25
26
|
"wizards/wizard_invoice.xml",
|
|
26
27
|
],
|
|
@@ -28,6 +28,11 @@ msgstr ""
|
|
|
28
28
|
msgid "<strong>Settlement invoice:</strong>"
|
|
29
29
|
msgstr ""
|
|
30
30
|
|
|
31
|
+
#. module: account_commission
|
|
32
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
33
|
+
msgid "<strong>Total</strong>"
|
|
34
|
+
msgstr ""
|
|
35
|
+
|
|
31
36
|
#. module: account_commission
|
|
32
37
|
#: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__agent_id
|
|
33
38
|
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__agent_id
|
|
@@ -237,6 +242,7 @@ msgstr ""
|
|
|
237
242
|
|
|
238
243
|
#. module: account_commission
|
|
239
244
|
#: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__invoice_id
|
|
245
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
240
246
|
msgid "Invoice"
|
|
241
247
|
msgstr ""
|
|
242
248
|
|
|
@@ -372,6 +378,7 @@ msgstr ""
|
|
|
372
378
|
|
|
373
379
|
#. module: account_commission
|
|
374
380
|
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__partner_id
|
|
381
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
375
382
|
msgid "Partner"
|
|
376
383
|
msgstr ""
|
|
377
384
|
|
|
@@ -496,6 +503,7 @@ msgstr ""
|
|
|
496
503
|
|
|
497
504
|
#. module: account_commission
|
|
498
505
|
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__price_subtotal
|
|
506
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
499
507
|
msgid "Subtotal"
|
|
500
508
|
msgstr ""
|
|
501
509
|
|
|
@@ -31,6 +31,11 @@ msgstr "(mantener vacío para facturar todas las liquidaciones pendientes)"
|
|
|
31
31
|
msgid "<strong>Settlement invoice:</strong>"
|
|
32
32
|
msgstr "<strong>Factura de liquidación:</strong>"
|
|
33
33
|
|
|
34
|
+
#. module: account_commission
|
|
35
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
36
|
+
msgid "<strong>Total</strong>"
|
|
37
|
+
msgstr ""
|
|
38
|
+
|
|
34
39
|
#. module: account_commission
|
|
35
40
|
#: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__agent_id
|
|
36
41
|
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__agent_id
|
|
@@ -240,6 +245,7 @@ msgstr "ID (identificación)"
|
|
|
240
245
|
|
|
241
246
|
#. module: account_commission
|
|
242
247
|
#: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__invoice_id
|
|
248
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
243
249
|
msgid "Invoice"
|
|
244
250
|
msgstr "Factura"
|
|
245
251
|
|
|
@@ -375,6 +381,7 @@ msgstr "Parental"
|
|
|
375
381
|
|
|
376
382
|
#. module: account_commission
|
|
377
383
|
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__partner_id
|
|
384
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
378
385
|
msgid "Partner"
|
|
379
386
|
msgstr "Socio"
|
|
380
387
|
|
|
@@ -503,6 +510,7 @@ msgstr "Estado"
|
|
|
503
510
|
|
|
504
511
|
#. module: account_commission
|
|
505
512
|
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__price_subtotal
|
|
513
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
506
514
|
msgid "Subtotal"
|
|
507
515
|
msgstr "Sub total"
|
|
508
516
|
|
|
@@ -12,8 +12,8 @@ msgstr ""
|
|
|
12
12
|
"MIME-Version: 1.0\n"
|
|
13
13
|
"Content-Type: text/plain; charset=UTF-8\n"
|
|
14
14
|
"Content-Transfer-Encoding: \n"
|
|
15
|
-
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 &&
|
|
16
|
-
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
|
|
15
|
+
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
|
|
16
|
+
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
|
|
17
17
|
|
|
18
18
|
#. module: account_commission
|
|
19
19
|
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__quantity
|
|
@@ -30,6 +30,11 @@ msgstr ""
|
|
|
30
30
|
msgid "<strong>Settlement invoice:</strong>"
|
|
31
31
|
msgstr ""
|
|
32
32
|
|
|
33
|
+
#. module: account_commission
|
|
34
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
35
|
+
msgid "<strong>Total</strong>"
|
|
36
|
+
msgstr ""
|
|
37
|
+
|
|
33
38
|
#. module: account_commission
|
|
34
39
|
#: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__agent_id
|
|
35
40
|
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__agent_id
|
|
@@ -239,6 +244,7 @@ msgstr ""
|
|
|
239
244
|
|
|
240
245
|
#. module: account_commission
|
|
241
246
|
#: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__invoice_id
|
|
247
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
242
248
|
msgid "Invoice"
|
|
243
249
|
msgstr ""
|
|
244
250
|
|
|
@@ -374,6 +380,7 @@ msgstr ""
|
|
|
374
380
|
|
|
375
381
|
#. module: account_commission
|
|
376
382
|
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__partner_id
|
|
383
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
377
384
|
msgid "Partner"
|
|
378
385
|
msgstr ""
|
|
379
386
|
|
|
@@ -498,6 +505,7 @@ msgstr ""
|
|
|
498
505
|
|
|
499
506
|
#. module: account_commission
|
|
500
507
|
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__price_subtotal
|
|
508
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
501
509
|
msgid "Subtotal"
|
|
502
510
|
msgstr ""
|
|
503
511
|
|
|
@@ -31,6 +31,11 @@ msgstr "(lasciare vuoto per fatturare tutte le liquidazioni pendenti)"
|
|
|
31
31
|
msgid "<strong>Settlement invoice:</strong>"
|
|
32
32
|
msgstr "<strong>Fattura provvigione:</strong>"
|
|
33
33
|
|
|
34
|
+
#. module: account_commission
|
|
35
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
36
|
+
msgid "<strong>Total</strong>"
|
|
37
|
+
msgstr ""
|
|
38
|
+
|
|
34
39
|
#. module: account_commission
|
|
35
40
|
#: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__agent_id
|
|
36
41
|
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__agent_id
|
|
@@ -240,6 +245,7 @@ msgstr "ID"
|
|
|
240
245
|
|
|
241
246
|
#. module: account_commission
|
|
242
247
|
#: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__invoice_id
|
|
248
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
243
249
|
msgid "Invoice"
|
|
244
250
|
msgstr "Fattura"
|
|
245
251
|
|
|
@@ -375,6 +381,7 @@ msgstr "Padre"
|
|
|
375
381
|
|
|
376
382
|
#. module: account_commission
|
|
377
383
|
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__partner_id
|
|
384
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
378
385
|
msgid "Partner"
|
|
379
386
|
msgstr "Partner"
|
|
380
387
|
|
|
@@ -504,6 +511,7 @@ msgstr "Stato"
|
|
|
504
511
|
|
|
505
512
|
#. module: account_commission
|
|
506
513
|
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__price_subtotal
|
|
514
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
507
515
|
msgid "Subtotal"
|
|
508
516
|
msgstr "Subtotale"
|
|
509
517
|
|
|
@@ -31,6 +31,11 @@ msgstr "(???????????????????????????????????????????????????????????????????????
|
|
|
31
31
|
msgid "<strong>Settlement invoice:</strong>"
|
|
32
32
|
msgstr ""
|
|
33
33
|
|
|
34
|
+
#. module: account_commission
|
|
35
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
36
|
+
msgid "<strong>Total</strong>"
|
|
37
|
+
msgstr ""
|
|
38
|
+
|
|
34
39
|
#. module: account_commission
|
|
35
40
|
#: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__agent_id
|
|
36
41
|
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__agent_id
|
|
@@ -240,6 +245,7 @@ msgstr "ID"
|
|
|
240
245
|
|
|
241
246
|
#. module: account_commission
|
|
242
247
|
#: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__invoice_id
|
|
248
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
243
249
|
msgid "Invoice"
|
|
244
250
|
msgstr "?????????"
|
|
245
251
|
|
|
@@ -375,6 +381,7 @@ msgstr "???"
|
|
|
375
381
|
|
|
376
382
|
#. module: account_commission
|
|
377
383
|
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__partner_id
|
|
384
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
378
385
|
msgid "Partner"
|
|
379
386
|
msgstr "?????????"
|
|
380
387
|
|
|
@@ -499,6 +506,7 @@ msgstr "???????????????"
|
|
|
499
506
|
|
|
500
507
|
#. module: account_commission
|
|
501
508
|
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__price_subtotal
|
|
509
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
502
510
|
msgid "Subtotal"
|
|
503
511
|
msgstr "??????"
|
|
504
512
|
|
|
@@ -31,6 +31,11 @@ msgstr "(manter vazio para faturação de todos os acordos pendentes)"
|
|
|
31
31
|
msgid "<strong>Settlement invoice:</strong>"
|
|
32
32
|
msgstr "<strong>Fatura de Liquidação:</strong>"
|
|
33
33
|
|
|
34
|
+
#. module: account_commission
|
|
35
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
36
|
+
msgid "<strong>Total</strong>"
|
|
37
|
+
msgstr ""
|
|
38
|
+
|
|
34
39
|
#. module: account_commission
|
|
35
40
|
#: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__agent_id
|
|
36
41
|
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__agent_id
|
|
@@ -240,6 +245,7 @@ msgstr "ID"
|
|
|
240
245
|
|
|
241
246
|
#. module: account_commission
|
|
242
247
|
#: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__invoice_id
|
|
248
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
243
249
|
msgid "Invoice"
|
|
244
250
|
msgstr "Fatura"
|
|
245
251
|
|
|
@@ -375,6 +381,7 @@ msgstr "Ascendente"
|
|
|
375
381
|
|
|
376
382
|
#. module: account_commission
|
|
377
383
|
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__partner_id
|
|
384
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
378
385
|
msgid "Partner"
|
|
379
386
|
msgstr "Parceiro"
|
|
380
387
|
|
|
@@ -504,6 +511,7 @@ msgstr "Situação"
|
|
|
504
511
|
|
|
505
512
|
#. module: account_commission
|
|
506
513
|
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__price_subtotal
|
|
514
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
507
515
|
msgid "Subtotal"
|
|
508
516
|
msgstr "Subtotal"
|
|
509
517
|
|
|
@@ -513,8 +521,8 @@ msgid ""
|
|
|
513
521
|
"The source of the settlement, e.g. 'Sales invoice', 'Sales order', 'Purchase "
|
|
514
522
|
"order'..."
|
|
515
523
|
msgstr ""
|
|
516
|
-
"A origem da liquidação, por exemplo, «Fatura de venda», «Ordem de venda»,
|
|
517
|
-
"Ordem de compra»..."
|
|
524
|
+
"A origem da liquidação, por exemplo, «Fatura de venda», «Ordem de venda», "
|
|
525
|
+
"«Ordem de compra»..."
|
|
518
526
|
|
|
519
527
|
#. module: account_commission
|
|
520
528
|
#: model_terms:ir.ui.view,arch_db:account_commission.view_invoice_commission_analysis_search
|
|
@@ -32,6 +32,11 @@ msgstr "(manter em branco para faturar todas as liquida????es pendentes)"
|
|
|
32
32
|
msgid "<strong>Settlement invoice:</strong>"
|
|
33
33
|
msgstr "<strong>Fatura de Liquida????o:</strong>"
|
|
34
34
|
|
|
35
|
+
#. module: account_commission
|
|
36
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
37
|
+
msgid "<strong>Total</strong>"
|
|
38
|
+
msgstr ""
|
|
39
|
+
|
|
35
40
|
#. module: account_commission
|
|
36
41
|
#: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__agent_id
|
|
37
42
|
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__agent_id
|
|
@@ -241,6 +246,7 @@ msgstr "ID"
|
|
|
241
246
|
|
|
242
247
|
#. module: account_commission
|
|
243
248
|
#: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__invoice_id
|
|
249
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
244
250
|
msgid "Invoice"
|
|
245
251
|
msgstr "Fatura"
|
|
246
252
|
|
|
@@ -376,6 +382,7 @@ msgstr "Pai"
|
|
|
376
382
|
|
|
377
383
|
#. module: account_commission
|
|
378
384
|
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__partner_id
|
|
385
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
379
386
|
msgid "Partner"
|
|
380
387
|
msgstr "Parceiro"
|
|
381
388
|
|
|
@@ -505,6 +512,7 @@ msgstr "Situa????o"
|
|
|
505
512
|
|
|
506
513
|
#. module: account_commission
|
|
507
514
|
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__price_subtotal
|
|
515
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
508
516
|
msgid "Subtotal"
|
|
509
517
|
msgstr "Subtotal"
|
|
510
518
|
|
|
@@ -31,6 +31,11 @@ msgstr "(bekleyen tüm ödemeleri faturalandırmak için boş tutun)"
|
|
|
31
31
|
msgid "<strong>Settlement invoice:</strong>"
|
|
32
32
|
msgstr "<strong>Anlaşma faturası:</strong>"
|
|
33
33
|
|
|
34
|
+
#. module: account_commission
|
|
35
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
36
|
+
msgid "<strong>Total</strong>"
|
|
37
|
+
msgstr ""
|
|
38
|
+
|
|
34
39
|
#. module: account_commission
|
|
35
40
|
#: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__agent_id
|
|
36
41
|
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__agent_id
|
|
@@ -240,6 +245,7 @@ msgstr "Kimlik"
|
|
|
240
245
|
|
|
241
246
|
#. module: account_commission
|
|
242
247
|
#: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__invoice_id
|
|
248
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
243
249
|
msgid "Invoice"
|
|
244
250
|
msgstr "Fatura"
|
|
245
251
|
|
|
@@ -375,6 +381,7 @@ msgstr "Üst"
|
|
|
375
381
|
|
|
376
382
|
#. module: account_commission
|
|
377
383
|
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__partner_id
|
|
384
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
378
385
|
msgid "Partner"
|
|
379
386
|
msgstr "Ortak"
|
|
380
387
|
|
|
@@ -502,14 +509,15 @@ msgstr "Durum"
|
|
|
502
509
|
|
|
503
510
|
#. module: account_commission
|
|
504
511
|
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__price_subtotal
|
|
512
|
+
#: model_terms:ir.ui.view,arch_db:account_commission.grouped_report_settlement_document
|
|
505
513
|
msgid "Subtotal"
|
|
506
514
|
msgstr "Aratoplam"
|
|
507
515
|
|
|
508
516
|
#. module: account_commission
|
|
509
517
|
#: model:ir.model.fields,help:account_commission.field_commission_settlement__settlement_type
|
|
510
518
|
msgid ""
|
|
511
|
-
"The source of the settlement, e.g. 'Sales invoice', 'Sales order', 'Purchase"
|
|
512
|
-
"
|
|
519
|
+
"The source of the settlement, e.g. 'Sales invoice', 'Sales order', 'Purchase "
|
|
520
|
+
"order'..."
|
|
513
521
|
msgstr ""
|
|
514
522
|
"Anlaşmanın kaynağı, ör. 'Satış faturası', 'Satış siparişi', 'Alış "
|
|
515
523
|
"siparişi'..."
|
|
@@ -159,6 +159,42 @@ class CommissionSettlement(models.Model):
|
|
|
159
159
|
self.write({"state": "invoiced"})
|
|
160
160
|
return invoices
|
|
161
161
|
|
|
162
|
+
def grouped_report_lines(self):
|
|
163
|
+
self.ensure_one()
|
|
164
|
+
if self.settlement_type == "sale_invoice":
|
|
165
|
+
grouped_res = {}
|
|
166
|
+
for line in self.line_ids:
|
|
167
|
+
origin = (
|
|
168
|
+
line.invoice_line_id.move_id if line.invoice_line_id else "Manual"
|
|
169
|
+
)
|
|
170
|
+
move = line.invoice_line_id.move_id
|
|
171
|
+
sign = -1 if move and "refund" in move.move_type else 1
|
|
172
|
+
group = grouped_res.setdefault(
|
|
173
|
+
(line.date, origin),
|
|
174
|
+
{"commission": 0.0, "base_commission": 0.0},
|
|
175
|
+
)
|
|
176
|
+
if move:
|
|
177
|
+
group["base_commission"] += (
|
|
178
|
+
sign * line.invoice_line_id.price_subtotal
|
|
179
|
+
)
|
|
180
|
+
group["commission"] += line.settled_amount
|
|
181
|
+
res = []
|
|
182
|
+
for (date, origin), values in grouped_res.items():
|
|
183
|
+
res.append(
|
|
184
|
+
{
|
|
185
|
+
"date": date,
|
|
186
|
+
"settled_amount": values["commission"],
|
|
187
|
+
"base_commission": values["base_commission"],
|
|
188
|
+
"invoice": origin if isinstance(origin, str) else origin.name,
|
|
189
|
+
"partner": ""
|
|
190
|
+
if isinstance(origin, str)
|
|
191
|
+
else origin.partner_id.display_name,
|
|
192
|
+
}
|
|
193
|
+
)
|
|
194
|
+
else:
|
|
195
|
+
res = super().grouped_report_lines()
|
|
196
|
+
return res
|
|
197
|
+
|
|
162
198
|
|
|
163
199
|
class SettlementLine(models.Model):
|
|
164
200
|
_inherit = "commission.settlement.line"
|
|
@@ -3,15 +3,16 @@
|
|
|
3
3
|
<head>
|
|
4
4
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
|
5
5
|
<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
|
|
6
|
-
<title>
|
|
6
|
+
<title>README.rst</title>
|
|
7
7
|
<style type="text/css">
|
|
8
8
|
|
|
9
9
|
/*
|
|
10
10
|
:Author: David Goodger (goodger@python.org)
|
|
11
|
-
:Id: $Id: html4css1.css
|
|
11
|
+
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
|
|
12
12
|
:Copyright: This stylesheet has been placed in the public domain.
|
|
13
13
|
|
|
14
14
|
Default cascading style sheet for the HTML output of Docutils.
|
|
15
|
+
Despite the name, some widely supported CSS2 features are used.
|
|
15
16
|
|
|
16
17
|
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
|
|
17
18
|
customize this style sheet.
|
|
@@ -274,7 +275,7 @@ pre.literal-block, pre.doctest-block, pre.math, pre.code {
|
|
|
274
275
|
margin-left: 2em ;
|
|
275
276
|
margin-right: 2em }
|
|
276
277
|
|
|
277
|
-
pre.code .ln { color:
|
|
278
|
+
pre.code .ln { color: gray; } /* line numbers */
|
|
278
279
|
pre.code, code { background-color: #eeeeee }
|
|
279
280
|
pre.code .comment, code .comment { color: #5C6576 }
|
|
280
281
|
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
|
|
@@ -300,7 +301,7 @@ span.option {
|
|
|
300
301
|
span.pre {
|
|
301
302
|
white-space: pre }
|
|
302
303
|
|
|
303
|
-
span.problematic {
|
|
304
|
+
span.problematic, pre.problematic {
|
|
304
305
|
color: red }
|
|
305
306
|
|
|
306
307
|
span.section-subtitle {
|
|
@@ -359,21 +360,28 @@ ul.auto-toc {
|
|
|
359
360
|
</style>
|
|
360
361
|
</head>
|
|
361
362
|
<body>
|
|
362
|
-
<div class="document"
|
|
363
|
-
<h1 class="title">Account commissions</h1>
|
|
363
|
+
<div class="document">
|
|
364
364
|
|
|
365
|
+
|
|
366
|
+
<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
|
|
367
|
+
<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
|
|
368
|
+
</a>
|
|
369
|
+
<div class="section" id="account-commissions">
|
|
370
|
+
<h1>Account commissions</h1>
|
|
365
371
|
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
|
366
372
|
!! This file is generated by oca-gen-addon-readme !!
|
|
367
373
|
!! changes will be overwritten. !!
|
|
368
374
|
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
|
369
|
-
!! source digest: sha256:
|
|
375
|
+
!! source digest: sha256:4fa8f154e66e62d73a6e19596f65a5ba3cffc5d7861a8f3f4f3c373e8bea39f6
|
|
370
376
|
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
|
|
371
|
-
<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/
|
|
377
|
+
<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/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/commission/tree/17.0/account_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-17-0/commission-17-0-account_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=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
|
|
372
378
|
<p>This module adds the function to calculate commissions in invoices
|
|
373
379
|
(account moves).</p>
|
|
374
380
|
<p>It also allows to create vendor bills from settlements for external
|
|
375
381
|
agents.</p>
|
|
376
382
|
<p>This module depends on the commission module.</p>
|
|
383
|
+
<p>Additionally, it extends the grouped settlement report from the
|
|
384
|
+
commission module to include a grouping by invoice</p>
|
|
377
385
|
<p><strong>Table of contents</strong></p>
|
|
378
386
|
<div class="contents local topic" id="contents">
|
|
379
387
|
<ul class="simple">
|
|
@@ -389,7 +397,7 @@ agents.</p>
|
|
|
389
397
|
</ul>
|
|
390
398
|
</div>
|
|
391
399
|
<div class="section" id="configuration">
|
|
392
|
-
<
|
|
400
|
+
<h2><a class="toc-backref" href="#toc-entry-1">Configuration</a></h2>
|
|
393
401
|
<p>For selecting invoice status in commissions:</p>
|
|
394
402
|
<ol class="arabic simple">
|
|
395
403
|
<li>Edit or create a new record to select the invoice status for settling
|
|
@@ -403,7 +411,7 @@ paid.</li>
|
|
|
403
411
|
</ol>
|
|
404
412
|
</div>
|
|
405
413
|
<div class="section" id="usage">
|
|
406
|
-
<
|
|
414
|
+
<h2><a class="toc-backref" href="#toc-entry-2">Usage</a></h2>
|
|
407
415
|
<p>For adding commissions on invoices:</p>
|
|
408
416
|
<ol class="arabic simple">
|
|
409
417
|
<li>Go to <em>Invoicing > Customers > Invoices</em>.</li>
|
|
@@ -431,9 +439,8 @@ partner on the invoice having already inserted lines.</li>
|
|
|
431
439
|
<li>Journal: To be selected between existing purchase journals.</li>
|
|
432
440
|
<li>Date: If you want to choose a specific invoice date. You can leave
|
|
433
441
|
it blank if you prefer.</li>
|
|
434
|
-
<li>Settlements: For selecting specific settlements to invoice. You
|
|
435
|
-
|
|
436
|
-
settlements.</li>
|
|
442
|
+
<li>Settlements: For selecting specific settlements to invoice. You can
|
|
443
|
+
leave it blank as well for invoicing all the pending settlements.</li>
|
|
437
444
|
</ul>
|
|
438
445
|
</li>
|
|
439
446
|
</ol>
|
|
@@ -447,7 +454,7 @@ invoice” button.</li>
|
|
|
447
454
|
</ol>
|
|
448
455
|
</div>
|
|
449
456
|
<div class="section" id="bug-tracker">
|
|
450
|
-
<
|
|
457
|
+
<h2><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h2>
|
|
451
458
|
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/commission/issues">GitHub Issues</a>.
|
|
452
459
|
In case of trouble, please check there if your issue has already been reported.
|
|
453
460
|
If you spotted it first, help us to smash it by providing a detailed and welcomed
|
|
@@ -455,15 +462,15 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
|
|
|
455
462
|
<p>Do not contact contributors directly about support or help with technical issues.</p>
|
|
456
463
|
</div>
|
|
457
464
|
<div class="section" id="credits">
|
|
458
|
-
<
|
|
465
|
+
<h2><a class="toc-backref" href="#toc-entry-4">Credits</a></h2>
|
|
459
466
|
<div class="section" id="authors">
|
|
460
|
-
<
|
|
467
|
+
<h3><a class="toc-backref" href="#toc-entry-5">Authors</a></h3>
|
|
461
468
|
<ul class="simple">
|
|
462
469
|
<li>Tecnativa</li>
|
|
463
470
|
</ul>
|
|
464
471
|
</div>
|
|
465
472
|
<div class="section" id="contributors">
|
|
466
|
-
<
|
|
473
|
+
<h3><a class="toc-backref" href="#toc-entry-6">Contributors</a></h3>
|
|
467
474
|
<ul class="simple">
|
|
468
475
|
<li>Pexego.</li>
|
|
469
476
|
<li>Davide Corio <<a class="reference external" href="mailto:davide.corio@domsense.com">davide.corio@domsense.com</a>></li>
|
|
@@ -492,14 +499,18 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
|
|
|
492
499
|
</li>
|
|
493
500
|
<li><a class="reference external" href="https://www.sygel.es">Sygel</a>:<ul>
|
|
494
501
|
<li>Alberto Martínez</li>
|
|
502
|
+
<li>Valentín Vinagre</li>
|
|
503
|
+
<li>Ángel Rivas</li>
|
|
495
504
|
</ul>
|
|
496
505
|
</li>
|
|
497
506
|
</ul>
|
|
498
507
|
</div>
|
|
499
508
|
<div class="section" id="maintainers">
|
|
500
|
-
<
|
|
509
|
+
<h3><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h3>
|
|
501
510
|
<p>This module is maintained by the OCA.</p>
|
|
502
|
-
<a class="reference external image-reference" href="https://odoo-community.org"
|
|
511
|
+
<a class="reference external image-reference" href="https://odoo-community.org">
|
|
512
|
+
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
|
|
513
|
+
</a>
|
|
503
514
|
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
|
|
504
515
|
mission is to support the collaborative development of Odoo features and
|
|
505
516
|
promote its widespread use.</p>
|
|
@@ -510,5 +521,6 @@ promote its widespread use.</p>
|
|
|
510
521
|
</div>
|
|
511
522
|
</div>
|
|
512
523
|
</div>
|
|
524
|
+
</div>
|
|
513
525
|
</body>
|
|
514
526
|
</html>
|
|
@@ -532,3 +532,82 @@ class TestAccountCommission(TestCommissionBase):
|
|
|
532
532
|
]
|
|
533
533
|
)
|
|
534
534
|
self.assertEqual(2, len(settlements))
|
|
535
|
+
|
|
536
|
+
def test_grouped_report_lines_sale_invoice(self):
|
|
537
|
+
"""Test grouped report lines for settlements coming from sale invoices."""
|
|
538
|
+
invoice = self.env["account.move"].create(
|
|
539
|
+
{
|
|
540
|
+
"move_type": "out_invoice",
|
|
541
|
+
"partner_id": self.partner.id,
|
|
542
|
+
"invoice_date": fields.Date.today(),
|
|
543
|
+
"invoice_line_ids": [
|
|
544
|
+
(0, 0, {"name": "Line 1", "price_unit": 100.0, "quantity": 1.0}),
|
|
545
|
+
(0, 0, {"name": "Line 2", "price_unit": 50.0, "quantity": 1.0}),
|
|
546
|
+
],
|
|
547
|
+
}
|
|
548
|
+
)
|
|
549
|
+
agent_line1 = self.env["account.invoice.line.agent"].create(
|
|
550
|
+
{
|
|
551
|
+
"object_id": invoice.invoice_line_ids[0].id,
|
|
552
|
+
"commission_id": self.commission_net_paid.id,
|
|
553
|
+
"amount": 20.0,
|
|
554
|
+
"agent_id": self.agent_monthly.id,
|
|
555
|
+
"invoice_date": fields.Date.today(),
|
|
556
|
+
"company_id": self.company.id,
|
|
557
|
+
}
|
|
558
|
+
)
|
|
559
|
+
agent_line2 = self.env["account.invoice.line.agent"].create(
|
|
560
|
+
{
|
|
561
|
+
"object_id": invoice.invoice_line_ids[1].id,
|
|
562
|
+
"commission_id": self.commission_net_paid.id,
|
|
563
|
+
"amount": 10.0,
|
|
564
|
+
"agent_id": self.agent_monthly.id,
|
|
565
|
+
"invoice_date": fields.Date.today(),
|
|
566
|
+
"company_id": self.company.id,
|
|
567
|
+
}
|
|
568
|
+
)
|
|
569
|
+
settlement = self.settle_model.create(
|
|
570
|
+
{
|
|
571
|
+
"agent_id": self.agent_monthly.id,
|
|
572
|
+
"date_from": fields.Date.today(),
|
|
573
|
+
"date_to": fields.Date.today(),
|
|
574
|
+
"settlement_type": "sale_invoice",
|
|
575
|
+
"company_id": self.company.id,
|
|
576
|
+
"line_ids": [
|
|
577
|
+
(
|
|
578
|
+
0,
|
|
579
|
+
0,
|
|
580
|
+
{
|
|
581
|
+
"date": fields.Date.today(),
|
|
582
|
+
"agent_id": self.agent_monthly.id,
|
|
583
|
+
"commission_id": self.commission_net_paid.id,
|
|
584
|
+
"settled_amount": 20.0,
|
|
585
|
+
"invoice_agent_line_id": agent_line1.id,
|
|
586
|
+
"currency_id": self.company.currency_id.id,
|
|
587
|
+
},
|
|
588
|
+
),
|
|
589
|
+
(
|
|
590
|
+
0,
|
|
591
|
+
0,
|
|
592
|
+
{
|
|
593
|
+
"date": fields.Date.today(),
|
|
594
|
+
"agent_id": self.agent_monthly.id,
|
|
595
|
+
"commission_id": self.commission_net_paid.id,
|
|
596
|
+
"settled_amount": 10.0,
|
|
597
|
+
"invoice_agent_line_id": agent_line2.id,
|
|
598
|
+
"currency_id": self.company.currency_id.id,
|
|
599
|
+
},
|
|
600
|
+
),
|
|
601
|
+
],
|
|
602
|
+
}
|
|
603
|
+
)
|
|
604
|
+
grouped_lines = settlement.grouped_report_lines()
|
|
605
|
+
self.assertEqual(
|
|
606
|
+
len(grouped_lines), 1, "Lines from same invoice should be grouped together"
|
|
607
|
+
)
|
|
608
|
+
|
|
609
|
+
gl = grouped_lines[0]
|
|
610
|
+
self.assertEqual(
|
|
611
|
+
gl["settled_amount"], 30.0, "Grouped settled amount should be summed"
|
|
612
|
+
)
|
|
613
|
+
self.assertEqual(gl["invoice"], invoice.name)
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="utf-8" ?>
|
|
2
|
+
<odoo>
|
|
3
|
+
<template
|
|
4
|
+
id="grouped_report_settlement_document"
|
|
5
|
+
inherit_id="commission.grouped_report_settlement_document"
|
|
6
|
+
>
|
|
7
|
+
<xpath expr="//th[@name='th_commission']" position="attributes">
|
|
8
|
+
<attribute name="t-if">o.settlement_type != 'sale_invoice'</attribute>
|
|
9
|
+
</xpath>
|
|
10
|
+
<xpath expr="//td[@name='td_commission']" position="attributes">
|
|
11
|
+
<attribute name="t-if">o.settlement_type != 'sale_invoice'</attribute>
|
|
12
|
+
</xpath>
|
|
13
|
+
<xpath expr="//th[@name='th_date']" position="after">
|
|
14
|
+
<t t-if="o.settlement_type == 'sale_invoice'">
|
|
15
|
+
<th class="text-start">Invoice</th>
|
|
16
|
+
<th class="text-start">Partner</th>
|
|
17
|
+
<th class="text-start">Subtotal</th>
|
|
18
|
+
</t>
|
|
19
|
+
</xpath>
|
|
20
|
+
<xpath expr="//td[@name='td_date']" position="after">
|
|
21
|
+
<t t-if="o.settlement_type == 'sale_invoice'">
|
|
22
|
+
<td><span t-out="l.get('invoice')" /></td>
|
|
23
|
+
<td><span t-out="l.get('partner')" /></td>
|
|
24
|
+
<td><span t-out="round(l.get('base_commission', 0.0), 2)" /></td>
|
|
25
|
+
</t>
|
|
26
|
+
</xpath>
|
|
27
|
+
<xpath expr="//tr[td[@name='td_total']]" position="after">
|
|
28
|
+
<tr t-if="o.settlement_type == 'sale_invoice'">
|
|
29
|
+
<td />
|
|
30
|
+
<td />
|
|
31
|
+
<td />
|
|
32
|
+
<td class="text-end"><strong>Total</strong></td>
|
|
33
|
+
<td class="text-end">
|
|
34
|
+
<span
|
|
35
|
+
t-field="o.total"
|
|
36
|
+
t-options="{'widget': 'monetary', 'display_currency': o.currency_id}"
|
|
37
|
+
/>
|
|
38
|
+
</td>
|
|
39
|
+
</tr>
|
|
40
|
+
</xpath>
|
|
41
|
+
<xpath expr="//tr[td[@name='td_total']]" position="attributes">
|
|
42
|
+
<attribute name="t-if">o.settlement_type != 'sale_invoice'</attribute>
|
|
43
|
+
</xpath>
|
|
44
|
+
</template>
|
|
45
|
+
</odoo>
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: odoo-addon-account_commission
|
|
3
|
-
Version: 17.0.1.0.
|
|
3
|
+
Version: 17.0.1.0.1.1
|
|
4
4
|
Requires-Python: >=3.10
|
|
5
5
|
Requires-Dist: odoo-addon-commission>=17.0dev,<17.1dev
|
|
6
6
|
Requires-Dist: odoo>=17.0a,<17.1dev
|
|
@@ -13,6 +13,11 @@ Classifier: Programming Language :: Python
|
|
|
13
13
|
Classifier: Framework :: Odoo
|
|
14
14
|
Classifier: Framework :: Odoo :: 17.0
|
|
15
15
|
Classifier: License :: OSI Approved :: GNU Affero General Public License v3
|
|
16
|
+
Description-Content-Type: text/x-rst
|
|
17
|
+
|
|
18
|
+
.. image:: https://odoo-community.org/readme-banner-image
|
|
19
|
+
:target: https://odoo-community.org/get-involved?utm_source=readme
|
|
20
|
+
:alt: Odoo Community Association
|
|
16
21
|
|
|
17
22
|
===================
|
|
18
23
|
Account commissions
|
|
@@ -23,13 +28,13 @@ Account commissions
|
|
|
23
28
|
!! This file is generated by oca-gen-addon-readme !!
|
|
24
29
|
!! changes will be overwritten. !!
|
|
25
30
|
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
|
26
|
-
!! source digest: sha256:
|
|
31
|
+
!! source digest: sha256:4fa8f154e66e62d73a6e19596f65a5ba3cffc5d7861a8f3f4f3c373e8bea39f6
|
|
27
32
|
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
|
28
33
|
|
|
29
34
|
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
|
|
30
35
|
:target: https://odoo-community.org/page/development-status
|
|
31
36
|
:alt: Beta
|
|
32
|
-
.. |badge2| image:: https://img.shields.io/badge/
|
|
37
|
+
.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
|
|
33
38
|
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
|
|
34
39
|
:alt: License: AGPL-3
|
|
35
40
|
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fcommission-lightgray.png?logo=github
|
|
@@ -52,6 +57,9 @@ agents.
|
|
|
52
57
|
|
|
53
58
|
This module depends on the commission module.
|
|
54
59
|
|
|
60
|
+
Additionally, it extends the grouped settlement report from the
|
|
61
|
+
commission module to include a grouping by invoice
|
|
62
|
+
|
|
55
63
|
**Table of contents**
|
|
56
64
|
|
|
57
65
|
.. contents::
|
|
@@ -65,10 +73,10 @@ For selecting invoice status in commissions:
|
|
|
65
73
|
1. Edit or create a new record to select the invoice status for settling
|
|
66
74
|
the commissions.
|
|
67
75
|
|
|
68
|
-
-
|
|
69
|
-
|
|
70
|
-
-
|
|
71
|
-
|
|
76
|
+
- **Invoice Based**: Commissions are settled when the invoice is
|
|
77
|
+
issued.
|
|
78
|
+
- **Payment Based**: Commissions are settled when the invoice is
|
|
79
|
+
paid.
|
|
72
80
|
|
|
73
81
|
Usage
|
|
74
82
|
=====
|
|
@@ -97,13 +105,12 @@ For invoicing the settlements (only for external agents):
|
|
|
97
105
|
1. Go to *Invoicing > Commissions > Create Commission Invoices*.
|
|
98
106
|
2. On the window that appears, you can select following data:
|
|
99
107
|
|
|
100
|
-
-
|
|
101
|
-
-
|
|
102
|
-
-
|
|
103
|
-
|
|
104
|
-
-
|
|
105
|
-
|
|
106
|
-
settlements.
|
|
108
|
+
- Product. It should be a service product for being coherent.
|
|
109
|
+
- Journal: To be selected between existing purchase journals.
|
|
110
|
+
- Date: If you want to choose a specific invoice date. You can leave
|
|
111
|
+
it blank if you prefer.
|
|
112
|
+
- Settlements: For selecting specific settlements to invoice. You can
|
|
113
|
+
leave it blank as well for invoicing all the pending settlements.
|
|
107
114
|
|
|
108
115
|
If you want to invoice a/some specific settlement/s:
|
|
109
116
|
|
|
@@ -134,34 +141,36 @@ Authors
|
|
|
134
141
|
Contributors
|
|
135
142
|
------------
|
|
136
143
|
|
|
137
|
-
-
|
|
138
|
-
-
|
|
139
|
-
-
|
|
140
|
-
-
|
|
141
|
-
-
|
|
142
|
-
-
|
|
143
|
-
-
|
|
144
|
-
-
|
|
145
|
-
-
|
|
146
|
-
-
|
|
147
|
-
-
|
|
148
|
-
-
|
|
144
|
+
- Pexego.
|
|
145
|
+
- Davide Corio <davide.corio@domsense.com>
|
|
146
|
+
- Joao Alfredo Gama Batista <joao.gama@savoirfairelinux.com>
|
|
147
|
+
- Sandy Carter <sandy.carter@savoirfairelinux.com>
|
|
148
|
+
- Giorgio Borelli <giorgio.borelli@abstract.it>
|
|
149
|
+
- Daniel Campos <danielcampos@avanzosc.es>
|
|
150
|
+
- Oihane Crucelaegui <oihanecruce@gmail.com>
|
|
151
|
+
- Nicola Malcontenti <nicola.malcontenti@agilebg.com>
|
|
152
|
+
- Aitor Bouzas <aitor.bouzas@adaptivecity.com>
|
|
153
|
+
- Alexei Rivera <arivera@archeti.com>
|
|
154
|
+
- Mina Samir <minaw349@outlook.com>
|
|
155
|
+
- `Tecnativa <https://www.tecnativa.com>`__:
|
|
149
156
|
|
|
150
|
-
|
|
151
|
-
|
|
157
|
+
- Pedro M. Baeza
|
|
158
|
+
- Manuel Calero
|
|
152
159
|
|
|
153
|
-
-
|
|
160
|
+
- `Quartile <https://www.quartile.co>`__:
|
|
154
161
|
|
|
155
|
-
|
|
156
|
-
|
|
162
|
+
- Aung Ko Ko Lin
|
|
163
|
+
- Yoshi Tashiro
|
|
157
164
|
|
|
158
|
-
-
|
|
165
|
+
- `Studio73 <https://www.studio73.es>`__:
|
|
159
166
|
|
|
160
|
-
|
|
167
|
+
- Ethan Hildick
|
|
161
168
|
|
|
162
|
-
-
|
|
169
|
+
- `Sygel <https://www.sygel.es>`__:
|
|
163
170
|
|
|
164
|
-
|
|
171
|
+
- Alberto Martínez
|
|
172
|
+
- Valentín Vinagre
|
|
173
|
+
- Ángel Rivas
|
|
165
174
|
|
|
166
175
|
Maintainers
|
|
167
176
|
-----------
|
|
@@ -1,22 +1,22 @@
|
|
|
1
|
-
odoo/addons/account_commission/README.rst,sha256=
|
|
1
|
+
odoo/addons/account_commission/README.rst,sha256=3tkR_niMjExO3lCXVZKRLc5zXyqfPG9NvEgPfwXRHxk,6395
|
|
2
2
|
odoo/addons/account_commission/__init__.py,sha256=8JG3SPnwMlgXTppOwkp3YTgDDQGo7U7veMEMpG1bL_c,64
|
|
3
|
-
odoo/addons/account_commission/__manifest__.py,sha256=
|
|
3
|
+
odoo/addons/account_commission/__manifest__.py,sha256=ZnNrBffjEr42KqphOVszS8vCKDm_utnwqOhSkXbSLXQ,950
|
|
4
4
|
odoo/addons/account_commission/data/menuitem_data.xml,sha256=OX8KpilSn3zWf9cMNiJLDO7aV_vtaH6GTIyMZWDxYqM,361
|
|
5
|
-
odoo/addons/account_commission/i18n/account_commission.pot,sha256=
|
|
6
|
-
odoo/addons/account_commission/i18n/es.po,sha256=
|
|
7
|
-
odoo/addons/account_commission/i18n/hr.po,sha256=
|
|
8
|
-
odoo/addons/account_commission/i18n/it.po,sha256=
|
|
9
|
-
odoo/addons/account_commission/i18n/ja.po,sha256=
|
|
10
|
-
odoo/addons/account_commission/i18n/pt.po,sha256=
|
|
11
|
-
odoo/addons/account_commission/i18n/pt_BR.po,sha256=
|
|
12
|
-
odoo/addons/account_commission/i18n/tr.po,sha256=
|
|
5
|
+
odoo/addons/account_commission/i18n/account_commission.pot,sha256=wxWrcERsjBLilm6msSmDfEaH5ziuGcd76_Qf0WbbHPc,21739
|
|
6
|
+
odoo/addons/account_commission/i18n/es.po,sha256=Fw0sn-SfMIGp3_b4hNP9UHvphX9qoZzdtcNZfg2FeRc,24740
|
|
7
|
+
odoo/addons/account_commission/i18n/hr.po,sha256=Z6SXfEQcMfcsQdAnkHPqqh-eJmdoOpdt-JLYdyyjLcQ,21886
|
|
8
|
+
odoo/addons/account_commission/i18n/it.po,sha256=trcBFuMCk1o28oKgjFZNXIVvU50r3Gwmv9Sj7rwdS5I,24468
|
|
9
|
+
odoo/addons/account_commission/i18n/ja.po,sha256=TASYZsbLIYwEJSrUXOxEpLZmEM3SNyorkrZAS2kK6Po,24427
|
|
10
|
+
odoo/addons/account_commission/i18n/pt.po,sha256=hTKeiaJ8VF6XDkEmPUBdeKFFMWArIc2fFe89XVjYAjc,24547
|
|
11
|
+
odoo/addons/account_commission/i18n/pt_BR.po,sha256=R01UoIe36qO8OVnV5pDXpy0AKwNPOWxthjn6jXM9nbE,24595
|
|
12
|
+
odoo/addons/account_commission/i18n/tr.po,sha256=fJmDmZVoOO0zw64BsPUQ0Tr74OX7Zg3QLJ1khUheAYI,23992
|
|
13
13
|
odoo/addons/account_commission/models/__init__.py,sha256=NAnZVtdmEwISK51Ipnoin5jHE3_bVPLsNghvuFcM3NI,88
|
|
14
14
|
odoo/addons/account_commission/models/account_move.py,sha256=UdmtkvAPhZ3nIZ25_yT25ZKgtDjXZZE-hYgR2DmJDGo,8149
|
|
15
15
|
odoo/addons/account_commission/models/commission.py,sha256=AIEMAKgRh8JegGp1aMKOpUzsIKzy9PEUl3O63ixX04A,562
|
|
16
|
-
odoo/addons/account_commission/models/commission_settlement.py,sha256=
|
|
16
|
+
odoo/addons/account_commission/models/commission_settlement.py,sha256=Yi6MIU3U6TnPKa79FwVvDpaJTei7aFlT-vsdfCt_B_Y,8653
|
|
17
17
|
odoo/addons/account_commission/readme/CONFIGURE.md,sha256=MUcXiUiHnGvFvOCDa60sU1dITWJhaIWKPTLi1yPutnU,305
|
|
18
|
-
odoo/addons/account_commission/readme/CONTRIBUTORS.md,sha256=
|
|
19
|
-
odoo/addons/account_commission/readme/DESCRIPTION.md,sha256=
|
|
18
|
+
odoo/addons/account_commission/readme/CONTRIBUTORS.md,sha256=UQLLrKLbKr-Zg47R7hdOj8qieTHjJ3mneQu2UpGEgZ0,822
|
|
19
|
+
odoo/addons/account_commission/readme/DESCRIPTION.md,sha256=CIp_hApsflP2_cYaV4yUUmk7tL3e4Fgx3gkl7dj1Ofg,324
|
|
20
20
|
odoo/addons/account_commission/readme/USAGE.md,sha256=LIukUx_HC-yK265RMUQ6UeMnRHlbZEA9EAy91VYQatE,1842
|
|
21
21
|
odoo/addons/account_commission/report/__init__.py,sha256=w7t-EO6EMoLF3jDCOZz5mMxeLWYADB6TeEI2GWbzy5M,34
|
|
22
22
|
odoo/addons/account_commission/report/commission_analysis.py,sha256=3GtN00qKdAZppDxy3spyuWQOCarwhaR8C4Nyj3vwqWE,3915
|
|
@@ -25,18 +25,19 @@ odoo/addons/account_commission/security/account_commission_security.xml,sha256=B
|
|
|
25
25
|
odoo/addons/account_commission/security/ir.model.access.csv,sha256=c0k8cFhVg1A4XCaUQ-mzJdLIotKKt1ltIYznK8ELhYE,883
|
|
26
26
|
odoo/addons/account_commission/static/description/icon.png,sha256=ydxSIUuHSeE4CfMVsEzLjKKVdX4RicuPj8VGM2rBpBg,8219
|
|
27
27
|
odoo/addons/account_commission/static/description/icon.svg,sha256=96b_cQ-F1XuDU6S5mDi9ioe0d22Vwn30uBDQ_3ZSi5w,17220
|
|
28
|
-
odoo/addons/account_commission/static/description/index.html,sha256=
|
|
28
|
+
odoo/addons/account_commission/static/description/index.html,sha256=JziKZNckzkL8bw-dMEMIEeXzm1OAQXJCqIovlH0oSMM,17612
|
|
29
29
|
odoo/addons/account_commission/tests/__init__.py,sha256=bxd564RH-TWEpEJWbbc558dPFEJZCsH9JM8JF3-PMUM,38
|
|
30
|
-
odoo/addons/account_commission/tests/test_account_commission.py,sha256=
|
|
30
|
+
odoo/addons/account_commission/tests/test_account_commission.py,sha256=2RSn3DQn8w7ui26TMqQ_OuULqQqrb8KyqZhN69Fdaec,25277
|
|
31
31
|
odoo/addons/account_commission/views/account_move_views.xml,sha256=_jmqUxHPBaOP-qiXeOIlCgDdHJQQ4M35Pcu9Cp9BV88,6037
|
|
32
32
|
odoo/addons/account_commission/views/commission_settlement_views.xml,sha256=Cl5K36FcVp89yxcsgQbyz7ii1vPUp-pnEmI261VHBYo,3411
|
|
33
33
|
odoo/addons/account_commission/views/commission_views.xml,sha256=jSGTFW7V1R1eEFXmNzLvWcjTvq0rnOT4xcTXG9G8Esk,596
|
|
34
|
+
odoo/addons/account_commission/views/grouped_report_settlement_templates.xml,sha256=FyZKDcEiPdf5u4dnTMMGz9QHYhm6hIdXfxbSAqbdAD4,1932
|
|
34
35
|
odoo/addons/account_commission/views/report_settlement_templates.xml,sha256=GVds0qOR-Xi0w50HmYoCvNumEvw9UIUYbFBgMajLzdE,1274
|
|
35
36
|
odoo/addons/account_commission/wizards/__init__.py,sha256=ddwjnl0fpZTw56iNQmRcDJ0Q1RfptMC23XtvW93Ofec,66
|
|
36
37
|
odoo/addons/account_commission/wizards/commission_make_settle.py,sha256=k7yztap0JSa5q-QH71GXd0WFaUG639ETaAKrqdH8UE0,1717
|
|
37
38
|
odoo/addons/account_commission/wizards/wizard_invoice.py,sha256=SumDW3606uLS4d6L2rKjQbwdvfmIYovKark-EUMTve0,3162
|
|
38
39
|
odoo/addons/account_commission/wizards/wizard_invoice.xml,sha256=oqh9hQ4_R3O_SnMEiosYuQ32CkAFRMl2qTjD83EcaJg,2207
|
|
39
|
-
odoo_addon_account_commission-17.0.1.0.
|
|
40
|
-
odoo_addon_account_commission-17.0.1.0.
|
|
41
|
-
odoo_addon_account_commission-17.0.1.0.
|
|
42
|
-
odoo_addon_account_commission-17.0.1.0.
|
|
40
|
+
odoo_addon_account_commission-17.0.1.0.1.1.dist-info/METADATA,sha256=wO8pjd2Lm-NPXrFMBCspfxYgxtj_kTxCCSDEIv8yTpw,6998
|
|
41
|
+
odoo_addon_account_commission-17.0.1.0.1.1.dist-info/WHEEL,sha256=ZhOvUsYhy81Dx67gN3TV0RchQWBIIzutDZaJODDg2Vo,81
|
|
42
|
+
odoo_addon_account_commission-17.0.1.0.1.1.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
|
|
43
|
+
odoo_addon_account_commission-17.0.1.0.1.1.dist-info/RECORD,,
|