Skip to content

Commit 5c68b27

Browse files
Bonneruealexis-via
authored andcommitted
[MIG] donation: Migration to 18.0
1 parent 46152d2 commit 5c68b27

35 files changed

Lines changed: 543 additions & 602 deletions

donation/README.rst

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -49,49 +49,49 @@ Configuration
4949

5050
To configure this module, you need to:
5151

52-
- create donation products
53-
- make sure you have an inbound payment mode for each payment mode
54-
used to receive donations. This payment mode must be configured
55-
with *Link to Bank Account* set to *Fixed* and with the donation
56-
option active.
57-
- if you wish to have a control amount on the donation, add the users
58-
to the group *Donation Check Total*
52+
- create donation products
53+
- make sure you have an inbound payment method for each payment
54+
method used to receive donations. This payment method must be
55+
configured with *Link to Bank Account* set to *Fixed* and with the
56+
donation option active.
57+
- if you wish to have a control amount on the donation, add the
58+
users to the group *Donation Check Total*
5959

6060
If you receive donations via credit transfer, you must also:
6161

62-
- in the configuration page *Invoicing > Configuration > Settings*, in
63-
the *Donations* section, select the product that will be used for
64-
donations by credit transfer.
65-
- on the bank journals corresponding to the bank accounts on which you
66-
receive donations by credit transfer, in the *Payments Configuration*
67-
tab, select the *Donation by credit transfer account*. This account
68-
must allow reconciliation.
69-
- Make sure that the accountant that processes bank statements has
70-
*User* access level or higher on the *Donation* application.
62+
- in the configuration page *Invoicing > Configuration > Settings*, in
63+
the *Donations* section, select the product that will be used for
64+
donations by credit transfer.
65+
- on the bank journals corresponding to the bank accounts on which you
66+
receive donations by credit transfer, in the *Payments Configuration*
67+
tab, select the *Donation by credit transfer account*. This account
68+
must allow reconciliation.
69+
- Make sure that the accountant that processes bank statements has
70+
*User* access level or higher on the *Donation* application.
7171

7272
Usage
7373
=====
7474

7575
This module handles donations by cash, check or by credit transfer:
7676

77-
- for donation by cash or check, you should first create a new donation
78-
and validate it. Then, if you have the module *account_check_deposit*
79-
from the project
80-
`OCA/account-financial-tools <https://github.com/OCA/account-financial-tools>`__,
81-
you can create a check deposit.
82-
- for a donation by credit transfer, the process is different: import
83-
your bank statement file and, while processing it, you will see a
84-
donation button that allow you to create a new donation directly from
85-
the bank statement reconcile interface.
77+
- for donation by cash or check, you should first create a new donation
78+
and validate it. Then, if you have the module *account_check_deposit*
79+
from the project
80+
`OCA/account-financial-tools <https://github.com/OCA/account-financial-tools>`__,
81+
you can create a check deposit.
82+
- for a donation by credit transfer, the process is different: import
83+
your bank statement file and, while processing it, you will see a
84+
donation button that allow you to create a new donation directly from
85+
the bank statement reconcile interface.
8686

8787
When you validate a donation:
8888

89-
- it will create a journal entry that goes directly from the revenue
90-
account to the payment account without going through a receivable
91-
account.
92-
- if the tax receipt option of the donor is configured as *For Each
93-
Donation* and the product of the donation line is eligible to a tax
94-
receipt, it will generate the tax receipt.
89+
- it will create a journal entry that goes directly from the revenue
90+
account to the payment account without going through a receivable
91+
account.
92+
- if the tax receipt option of the donor is configured as *For Each
93+
Donation* and the product of the donation line is eligible to a tax
94+
receipt, it will generate the tax receipt.
9595

9696
To have some statistics about the donations, go to the menu Donation >
9797
Reporting > Donations Analysis.
@@ -118,11 +118,11 @@ Authors
118118
Contributors
119119
------------
120120

121-
- Brother Bernard <informatique - at - barroux.org>
122-
- Brother Irénée (Barroux Abbey)
123-
- Alexis de Lattre <alexis.delattre@akretion.com>
124-
- Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
125-
- Nikul Chaudhary <nikul.chaudhary.serpentcs@gmail.com>
121+
- Brother Bernard <informatique - at - barroux.org>
122+
- Brother Irénée (Barroux Abbey)
123+
- Alexis de Lattre <alexis.delattre@akretion.com>
124+
- Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
125+
- Nikul Chaudhary <nikul.chaudhary.serpentcs@gmail.com>
126126

127127
Maintainers
128128
-----------

donation/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
from . import models
22
from . import report
33
from . import wizard
4-
from .post_install import update_account_payment_mode
4+
from .post_install import update_account_payment_method_line

donation/__manifest__.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@
44

55
{
66
"name": "Donation",
7-
"version": "16.0.2.2.0",
7+
"version": "18.0.1.0.0",
88
"category": "Accounting",
99
"license": "AGPL-3",
1010
"summary": "Manage donations",
1111
"author": "Barroux Abbey, Akretion, Odoo Community Association (OCA)",
1212
"maintainers": ["alexis-via"],
1313
"website": "https://github.com/OCA/donation",
14-
"depends": ["donation_base", "account_payment_mode"],
14+
"depends": [
15+
"donation_base",
16+
],
1517
"data": [
1618
"security/donation_security.xml",
1719
"security/ir.model.access.csv",
@@ -21,7 +23,7 @@
2123
"views/donation.xml",
2224
"wizard/res_config_settings.xml",
2325
"data/donation_sequence.xml",
24-
"views/account_payment_mode.xml",
26+
"views/account_payment_method_line.xml",
2527
"views/donation_campaign.xml",
2628
"views/donation_thanks_template.xml",
2729
"views/res_users.xml",
@@ -30,7 +32,7 @@
3032
"report/donation_thanks_view.xml",
3133
"report/donation_thanks_report.xml",
3234
],
33-
"post_init_hook": "update_account_payment_mode",
35+
"post_init_hook": "update_account_payment_method_line",
3436
"demo": ["demo/donation_demo.xml"],
3537
"installable": True,
3638
}

donation/i18n/de.po

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ msgid "Current Donation Campaign"
336336
msgstr "Aktuelle Spendenkampagne"
337337

338338
#. module: donation
339-
#: model:ir.model.fields,field_description:donation.field_res_users__context_donation_payment_mode_id
339+
#: model:ir.model.fields,field_description:donation.field_res_users__context_donation_payment_method_line_id
340340
msgid "Current Donation Payment Mode"
341341
msgstr ""
342342

@@ -364,13 +364,13 @@ msgstr ""
364364

365365
#. module: donation
366366
#: model:ir.model,name:donation.model_donation_donation
367-
#: model:ir.model.fields,field_description:donation.field_account_payment_mode__donation
367+
#: model:ir.model.fields,field_description:donation.field_account_payment_method_line__donation
368368
#: model:ir.model.fields,field_description:donation.field_donation_line__donation_id
369369
#: model:ir.model.fields,field_description:donation.field_donation_tax_receipt_option_switch__donation_id
370370
#: model:ir.model.fields.selection,name:donation.selection__account_analytic_applicability__business_domain__donation
371371
#: model:ir.module.category,name:donation.module_category_donation
372372
#: model:ir.ui.menu,name:donation.donation_top_menu
373-
#: model_terms:ir.ui.view,arch_db:donation.account_payment_mode_search
373+
#: model_terms:ir.ui.view,arch_db:donation.account_payment_method_line_search
374374
#: model_terms:ir.ui.view,arch_db:donation.res_config_settings_donation
375375
msgid "Donation"
376376
msgstr "Spende"
@@ -438,14 +438,14 @@ msgstr ""
438438

439439
#. module: donation
440440
#. odoo-python
441-
#: code:addons/donation/models/account_payment_mode.py:0
441+
#: code:addons/donation/models/account_payment_method_line.py:0
442442
#, python-format
443443
msgid "Donation payment mode '%s' is not an inbound payment mode."
444444
msgstr ""
445445

446446
#. module: donation
447447
#. odoo-python
448-
#: code:addons/donation/models/account_payment_mode.py:0
448+
#: code:addons/donation/models/account_payment_method_line.py:0
449449
#, python-format
450450
msgid ""
451451
"Donation payment mode '%s' must be configured with 'Link to Bank Account' "
@@ -596,7 +596,7 @@ msgid "If checked, some messages have a delivery error."
596596
msgstr ""
597597

598598
#. module: donation
599-
#: model:ir.model.fields,help:donation.field_account_payment_mode__donation
599+
#: model:ir.model.fields,help:donation.field_account_payment_method_line__donation
600600
msgid "If enabled, this payment mode will be available on donations"
601601
msgstr ""
602602

@@ -834,8 +834,8 @@ msgid "Partner Country"
834834
msgstr "Partner Land"
835835

836836
#. module: donation
837-
#: model:ir.model.fields,field_description:donation.field_donation_donation__payment_mode_id
838-
#: model:ir.model.fields,field_description:donation.field_donation_report__payment_mode_id
837+
#: model:ir.model.fields,field_description:donation.field_donation_donation__payment_method_line_id
838+
#: model:ir.model.fields,field_description:donation.field_donation_report__payment_method_line_id
839839
#: model_terms:ir.ui.view,arch_db:donation.donation_report_search
840840
#: model_terms:ir.ui.view,arch_db:donation.donation_search
841841
msgid "Payment Mode"
@@ -851,9 +851,9 @@ msgid ""
851851
msgstr ""
852852

853853
#. module: donation
854-
#: model:ir.actions.act_window,name:donation.account_payment_mode_donation_action
855-
#: model:ir.model,name:donation.model_account_payment_mode
856-
#: model:ir.ui.menu,name:donation.account_payment_mode_donation_menu
854+
#: model:ir.actions.act_window,name:donation.account_payment_method_line_donation_action
855+
#: model:ir.model,name:donation.model_account_payment_method_line
856+
#: model:ir.ui.menu,name:donation.account_payment_method_line_donation_menu
857857
msgid "Payment Modes"
858858
msgstr ""
859859

donation/i18n/donation.pot

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ msgid "Current Donation Campaign"
329329
msgstr ""
330330

331331
#. module: donation
332-
#: model:ir.model.fields,field_description:donation.field_res_users__context_donation_payment_mode_id
332+
#: model:ir.model.fields,field_description:donation.field_res_users__context_donation_payment_method_line_id
333333
msgid "Current Donation Payment Mode"
334334
msgstr ""
335335

@@ -357,13 +357,13 @@ msgstr ""
357357

358358
#. module: donation
359359
#: model:ir.model,name:donation.model_donation_donation
360-
#: model:ir.model.fields,field_description:donation.field_account_payment_mode__donation
360+
#: model:ir.model.fields,field_description:donation.field_account_payment_method_line__donation
361361
#: model:ir.model.fields,field_description:donation.field_donation_line__donation_id
362362
#: model:ir.model.fields,field_description:donation.field_donation_tax_receipt_option_switch__donation_id
363363
#: model:ir.model.fields.selection,name:donation.selection__account_analytic_applicability__business_domain__donation
364364
#: model:ir.module.category,name:donation.module_category_donation
365365
#: model:ir.ui.menu,name:donation.donation_top_menu
366-
#: model_terms:ir.ui.view,arch_db:donation.account_payment_mode_search
366+
#: model_terms:ir.ui.view,arch_db:donation.account_payment_method_line_search
367367
#: model_terms:ir.ui.view,arch_db:donation.res_config_settings_donation
368368
msgid "Donation"
369369
msgstr ""
@@ -431,14 +431,14 @@ msgstr ""
431431

432432
#. module: donation
433433
#. odoo-python
434-
#: code:addons/donation/models/account_payment_mode.py:0
434+
#: code:addons/donation/models/account_payment_method_line.py:0
435435
#, python-format
436436
msgid "Donation payment mode '%s' is not an inbound payment mode."
437437
msgstr ""
438438

439439
#. module: donation
440440
#. odoo-python
441-
#: code:addons/donation/models/account_payment_mode.py:0
441+
#: code:addons/donation/models/account_payment_method_line.py:0
442442
#, python-format
443443
msgid ""
444444
"Donation payment mode '%s' must be configured with 'Link to Bank Account' "
@@ -589,7 +589,7 @@ msgid "If checked, some messages have a delivery error."
589589
msgstr ""
590590

591591
#. module: donation
592-
#: model:ir.model.fields,help:donation.field_account_payment_mode__donation
592+
#: model:ir.model.fields,help:donation.field_account_payment_method_line__donation
593593
msgid "If enabled, this payment mode will be available on donations"
594594
msgstr ""
595595

@@ -830,8 +830,8 @@ msgid "Partner Country"
830830
msgstr ""
831831

832832
#. module: donation
833-
#: model:ir.model.fields,field_description:donation.field_donation_donation__payment_mode_id
834-
#: model:ir.model.fields,field_description:donation.field_donation_report__payment_mode_id
833+
#: model:ir.model.fields,field_description:donation.field_donation_donation__payment_method_line_id
834+
#: model:ir.model.fields,field_description:donation.field_donation_report__payment_method_line_id
835835
#: model_terms:ir.ui.view,arch_db:donation.donation_report_search
836836
#: model_terms:ir.ui.view,arch_db:donation.donation_search
837837
msgid "Payment Mode"
@@ -847,9 +847,9 @@ msgid ""
847847
msgstr ""
848848

849849
#. module: donation
850-
#: model:ir.actions.act_window,name:donation.account_payment_mode_donation_action
851-
#: model:ir.model,name:donation.model_account_payment_mode
852-
#: model:ir.ui.menu,name:donation.account_payment_mode_donation_menu
850+
#: model:ir.actions.act_window,name:donation.account_payment_method_line_donation_action
851+
#: model:ir.model,name:donation.model_account_payment_method_line
852+
#: model:ir.ui.menu,name:donation.account_payment_method_line_donation_menu
853853
msgid "Payment Modes"
854854
msgstr ""
855855

donation/i18n/es.po

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ msgid "Current Donation Campaign"
344344
msgstr "Campaña actual de donativos"
345345

346346
#. module: donation
347-
#: model:ir.model.fields,field_description:donation.field_res_users__context_donation_payment_mode_id
347+
#: model:ir.model.fields,field_description:donation.field_res_users__context_donation_payment_method_line_id
348348
msgid "Current Donation Payment Mode"
349349
msgstr "Modalidad actual de pago de donativos"
350350

@@ -372,13 +372,13 @@ msgstr "Dominio"
372372

373373
#. module: donation
374374
#: model:ir.model,name:donation.model_donation_donation
375-
#: model:ir.model.fields,field_description:donation.field_account_payment_mode__donation
375+
#: model:ir.model.fields,field_description:donation.field_account_payment_method_line__donation
376376
#: model:ir.model.fields,field_description:donation.field_donation_line__donation_id
377377
#: model:ir.model.fields,field_description:donation.field_donation_tax_receipt_option_switch__donation_id
378378
#: model:ir.model.fields.selection,name:donation.selection__account_analytic_applicability__business_domain__donation
379379
#: model:ir.module.category,name:donation.module_category_donation
380380
#: model:ir.ui.menu,name:donation.donation_top_menu
381-
#: model_terms:ir.ui.view,arch_db:donation.account_payment_mode_search
381+
#: model_terms:ir.ui.view,arch_db:donation.account_payment_method_line_search
382382
#: model_terms:ir.ui.view,arch_db:donation.res_config_settings_donation
383383
msgid "Donation"
384384
msgstr "Donativo"
@@ -449,14 +449,14 @@ msgstr "Donación por transferencia bancaria"
449449

450450
#. module: donation
451451
#. odoo-python
452-
#: code:addons/donation/models/account_payment_mode.py:0
452+
#: code:addons/donation/models/account_payment_method_line.py:0
453453
#, python-format
454454
msgid "Donation payment mode '%s' is not an inbound payment mode."
455455
msgstr "El modo de pago de donaciones '%s' no es un modo de pago entrante."
456456

457457
#. module: donation
458458
#. odoo-python
459-
#: code:addons/donation/models/account_payment_mode.py:0
459+
#: code:addons/donation/models/account_payment_method_line.py:0
460460
#, python-format
461461
msgid ""
462462
"Donation payment mode '%s' must be configured with 'Link to Bank Account' "
@@ -610,7 +610,7 @@ msgid "If checked, some messages have a delivery error."
610610
msgstr "si está marcada, algunos mensajes tienen un error de entrega."
611611

612612
#. module: donation
613-
#: model:ir.model.fields,help:donation.field_account_payment_mode__donation
613+
#: model:ir.model.fields,help:donation.field_account_payment_method_line__donation
614614
msgid "If enabled, this payment mode will be available on donations"
615615
msgstr "Si se activa, este modo de pago estará disponible en las donaciones"
616616

@@ -856,8 +856,8 @@ msgid "Partner Country"
856856
msgstr "País de la empresa"
857857

858858
#. module: donation
859-
#: model:ir.model.fields,field_description:donation.field_donation_donation__payment_mode_id
860-
#: model:ir.model.fields,field_description:donation.field_donation_report__payment_mode_id
859+
#: model:ir.model.fields,field_description:donation.field_donation_donation__payment_method_line_id
860+
#: model:ir.model.fields,field_description:donation.field_donation_report__payment_method_line_id
861861
#: model_terms:ir.ui.view,arch_db:donation.donation_report_search
862862
#: model_terms:ir.ui.view,arch_db:donation.donation_search
863863
msgid "Payment Mode"
@@ -875,9 +875,9 @@ msgstr ""
875875
"totalmente en especie no requieren un modo de pago)."
876876

877877
#. module: donation
878-
#: model:ir.actions.act_window,name:donation.account_payment_mode_donation_action
879-
#: model:ir.model,name:donation.model_account_payment_mode
880-
#: model:ir.ui.menu,name:donation.account_payment_mode_donation_menu
878+
#: model:ir.actions.act_window,name:donation.account_payment_method_line_donation_action
879+
#: model:ir.model,name:donation.model_account_payment_method_line
880+
#: model:ir.ui.menu,name:donation.account_payment_method_line_donation_menu
881881
msgid "Payment Modes"
882882
msgstr "Métodos de pago"
883883

0 commit comments

Comments
 (0)