[14.0][ADD] account_wallet - NOBUMP #9

legalsylvain · 2022-08-01T15:26:45Z

Finish #2

Clean and refactor

some clean. remove commented code : 9582751, remove "cagnotte" word : 8100b55 remove openupgradelib dependency : 6f6392d
rename file that contains view to fit OCA convention. 6de4402 10acc32
remove duplicated views for account.move and account.move.line c94432c b49885a
refactor test functions to factorize code. 2887ce5
rename no_anonymous field into automatic_nominative_creation because the description is better, to have the possibility to introduce a new field only_nominative and to prevent double negation : 0d0e392 (openupgrade script included).

UX Improvment

add domain on product field of account.wallet.type 73f2bb4

Bugfixes

in initial version, wallet balance are computed on draft, posted and cancel account move lines. With that patch, only 'posted' move lines impact balance. 6b8c6d7
allow to select wallet on payment refund f009d90

Add Feature

add field only_nominative on account.wallet.type to prevent wallet without partner defined. e8c4fa3
allow to select wallet on the wizard account.payment.register 223e7ef
make credit note wallet feature working in a multi company and or multi wallet type context c23d67b

This PR contains migration scripts. please call ocabot merge with nobump option

As sequence should be set instead of fixed name, don't create move with a name

… merged

…rect ir.rules

Only limit cases where partner_id AND account_id are filled in

refs #56188

change button_box

the existing mechanism did not work 2 new methods implemented/overriden

rousseldenis

@legalsylvain Thanks for this.

@xavier-bouquiaux @Cedric-Pigeon I made comments that could break our tests but IMHO, @legalsylvain work is great.

rousseldenis · 2022-08-02T12:41:20Z

account_wallet/tests/common.py

        cls.partner = cls.env.ref("base.res_partner_2")

-    def _provision_wallet(self, amount, wallet=None):


@legalsylvain I'm not in favor of this in this version as other tests depends on.

rousseldenis · 2022-08-02T12:41:56Z

account_wallet/tests/data/account_wallet_data.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
    <data>
-        <record id="wallet" model="account.account">
+        <record id="wallet_account" model="account.account">


Please don't change this neither.

rousseldenis · 2022-08-02T12:42:51Z

account_wallet/tests/common.py

@@ -23,43 +23,87 @@ class WalletCommon(common.SavepointCase):
    def setUpClass(cls):
        super(WalletCommon, cls).setUpClass()
        load_file(cls.cr, "account_wallet", "tests/data/", "account_wallet_data.xml")
-        cls.wallet_obj = cls.env["account.wallet"]


This change is not necessary (in this version)

legalsylvain · 2022-08-02T13:12:25Z

Hi. @rousseldenis. Thanks for your partial review.
This PR is still work in progress. I still have to fix the main issue regarding the generation of wallet only move are posted, but also other points, like the possibility to select a wallet during payment, that's not possible for the time being.

I'll ping you when it's ready to review. I hope at the end of this week.

Regarding refactor, This PR includes breaking changes regarding your previous PR(s). Some adaptation should be done but I prefer to refactor correctly the module before the introduction into the OCA because the refactor introduce some simplification.
for exemple, 2887ce5 the test refactor.

git log --shortstat
 3 files changed, 107 insertions(+), 199 deletions(-)

Also, it is fixing some things. for exemple, regarding the xml_id, "wallet", the name is wrong, because it's not a account.wallet, but an account.account.

As said before, if you have time, I'm available to talk with you regarding the refactors.

kind regards.

…account_move_line_ids) are in the state 'posted'

legalsylvain · 2022-08-02T13:47:05Z

6b8c6d7 should fix the major problem of bad balance computation on draft / canceled move lines mentionned here #2 (comment)

provide also simplification.

4 files changed, 46 insertions(+), 65 deletions(-)

…_nominative_creation' for better comprehension

…lines (account_move_line_ids) are in the state 'posted'

…nt wallet without partner defined

…any and or multi wallet type context

legalsylvain · 2022-08-05T11:23:16Z

Hi @rousseldenis : correction and improvement work almost finished.

Could you review ?

I have a question left, regarding the moves generated by the credit note wizard. I don't understand why the move lands in the sale journal, and not in a miscellaneous journal. Advantage to not use sale journal :

possibility to not set a partner. (for the time being, it's not possible). however, it's a valid use case for example, if a company want to edit anonymous wallets for a tombola.
avoid to write this "hack" https://github.com/acsone/wallet/blob/account-wallet/account_wallet/wizards/wizard_account_move_credit_notes_wallet.py#L79
if user want to make this account move without the wizard, he will not have the possibility to use the sale journal. So the wizard method is not consistent with the manual method.

rousseldenis · 2022-08-16T06:55:27Z

@xavier-bouquiaux Could you review ?

xavier-bouquiaux · 2022-10-10T08:42:16Z

do not take my approval into account -> still reviewing
i'll be back ASAP

xavier-bouquiaux

First round of review

xavier-bouquiaux · 2022-10-10T08:48:10Z

account_wallet/readme/CONTRIBUTORS.rst

+* Laetitia Gangloff <[email protected]>
+* Cedric Pigeon <[email protected]>
+* Denis Roussel <[email protected]>
+* Xavier Bouquiaux <[email protected]>


@legalsylvain
add yourself here at the very least

xavier-bouquiaux · 2022-10-10T09:03:33Z

account_wallet/models/account_wallet.py


    @api.depends(lambda self: self._get_compute_balance_fields())
    def _compute_balance(self):
        for wallet in self:
            balance = 0
-            for move_line in wallet.account_move_line_ids:
+            for move_line in wallet.account_move_line_ids.filtered(


This one is a HUGE change
i'll have to test

xavier-bouquiaux · 2022-10-10T09:10:59Z

account_wallet/models/account_move.py

@@ -15,3 +15,7 @@ class AccountMove(models.Model):
        help="Use this field to give coupon to a customer",
        states={"draft": [("readonly", False)]},
    )
+
+    def action_post(self):
+        self.mapped("line_ids").create_or_set_wallet()


This one is linked to the other but it's also a MAJOR change

xavier-bouquiaux · 2022-10-10T09:22:11Z

account_wallet/wizards/account_payment_register.xml

+        <field name="inherit_id" ref="account.view_account_payment_register_form" />
+        <field name="arch" type="xml">
+            <field name="journal_id" position="after">
+                <field name="account_wallet_id" />


shouldn't you put some kind of domain ?

Well, I was thinking that depending on accounting choice, it was possible to make many different accounts.

you can add a domain, if you want. (but in the python part don't you think ?)

xavier-bouquiaux · 2022-10-10T09:29:33Z

account_wallet/models/account_payment.py

-                if vals["debit"] > 0:
+                if self.payment_type == "inbound" and vals["debit"] > 0:
+                    vals.update({"account_wallet_id": self.account_wallet_id.id})
+                if self.payment_type == "outbound" and vals["credit"] > 0:


Question : why the if ?

you're right, fixed !

oca-clabot · 2022-10-10T15:06:20Z

Hey @legalsylvain, thank you for your Pull Request.

It looks like some users haven't signed our Contributor License Agreement, yet.
You can read and sign our full Contributor License Agreement here: https://odoo-community.org/page/cla
Here is a list of the users:

acsone-git-bot [email protected] (no github login found)
oca-ci [email protected] (no github login found)

Appreciation of efforts,
OCA CLAbot

legalsylvain · 2022-10-10T15:07:14Z

answered to all comments. (except your remark regarding the HUGE change).
please ping me if you have other remarks.

xavier-bouquiaux · 2022-10-11T09:21:39Z

account_wallet/migrations/14.0.2.0.0/pre-migration.py

+@openupgrade.migrate()
+def migrate(env, version):
+    if openupgrade.column_exists(env.cr, "account_wallet_type", "no_anonymous"):
+        openupgrade.rename_columns(


TypeError: rename_columns() missing 1 required positional argument: 'column_spec'

should be

Suggested change

openupgrade.rename_columns(

openupgrade.rename_columns(env.cr, ...

github-actions · 2023-02-12T12:25:21Z

There hasn't been any activity on this pull request in the past 4 months, so it has been marked as stale and it will be closed automatically if no further activity occurs in the next 30 days.
If you want this PR to never become stale, please ask a PSC member to apply the "no stale" label.

rousseldenis and others added 30 commits July 18, 2022 09:12

[14.0][IMP] account_cagnotte => account_wallet

d67507b

[14.0][IMP] account_wallet: Add partner relation

bd1950f

[14.0][IMP] account_wallet: Don't create move with a name

464c441

As sequence should be set instead of fixed name, don't create move with a name

[14.0][IMP] account_wallet: Fix tests

26f24a5

[14.0][IMP] account_wallet: Improve form

e4a042b

[14.0][IMP] account_wallet: Add migration scripts

ba37c18

[14.0][IMP] account_wallet: Migrate only if former table exist

17b2ae3

[14.0][IMP] account_wallet: Add remark for future migrations

e51c481

[14.0][IMP] account_wallet: Remove former methods as models have been…

ae817e5

… merged

[14.0][IMP] account_wallet: tests improvements, use create multi, cor…

166131d

…rect ir.rules

[14.0][IMP] account_wallet: Add todo for name_search

cd74ba1

[14.0][IMP] account_wallet: Improve test, set default account

d967906

[14.0][FIX] account_wallet: Prepare good value for move

15707d8

Apply pre-commit

7c75cd2

[14.0][FIX] account_wallet: Demo files will be loaded by code

6be4432

[14.0][FIX] account_wallet*: Rely on openupgradelib

c5271f2

[14.0][IMP] account_wallet*: Remove OCA ref

04270e6

[UPD] README.rst

e921831

account_wallet 14.0.1.0.1

50465ed

[14.0][IMP] account_wallet: Don't retrieve too much exisisting wallets

891a134

Only limit cases where partner_id AND account_id are filled in

account_wallet 14.0.1.0.2

c2fd17b

[14.0][IMP] account_wallet: Remove partner name from wallet display name

16def44

refs #56188

pre-commit: fix manifests website

716a96a

[UPD] Update account_wallet.pot

f55ba3d

[14.0][IMP] account_wallet: Add wallet on payment side

f94cedc

[UPD] Update account_wallet.pot

e01c0cd

[14.0][FIX] account_wallet

a1e0d8b

change button_box

account_wallet 14.0.1.1.0

02ee640

[FIX] account_wallet : move-> account_wallet_type_id

1ae9f16

the existing mechanism did not work 2 new methods implemented/overriden

[ADD] wizard to create a refund as wallet

1e4316c

legalsylvain force-pushed the 14.0-ADD-account_wallet branch from c9aa785 to b49885a Compare August 1, 2022 20:18

legalsylvain added 2 commits August 2, 2022 11:22

[FIX] remove unnecessary dependency to openupgradelib python librairy

6f6392d

[REF] refactor test

2887ce5

rousseldenis requested changes Aug 2, 2022

View reviewed changes

[FIX] wallet balance should be updated only when related move lines (…

6b8c6d7

…account_move_line_ids) are in the state 'posted'

legalsylvain added 3 commits August 2, 2022 16:16

[REF] rename account.wallet.type 'no_anonymous' field into 'automatic…

0d0e392

…_nominative_creation' for better comprehension

fixup! [FIX] wallet balance should be updated only when related move …

1c69e03

…lines (account_move_line_ids) are in the state 'posted'

[IMP] new field only_nominative on account.wallet.type model to preve…

e8c4fa3

…nt wallet without partner defined

legalsylvain force-pushed the 14.0-ADD-account_wallet branch from eca8ccc to 237427b Compare August 5, 2022 08:52

[IMP] allow to select wallet when making payment via the wizard

223e7ef

legalsylvain force-pushed the 14.0-ADD-account_wallet branch from 237427b to 223e7ef Compare August 5, 2022 09:02

[FIX] make payment working with refound

f009d90

legalsylvain changed the title ~~[14.0][ADD] account_wallet~~ [14.0][ADD] account_wallet - NOBUMP Aug 5, 2022

[FIX] make credit_note_product_id configuration working in multi comp…

c23d67b

…any and or multi wallet type context

legalsylvain marked this pull request as ready for review August 5, 2022 11:18

legalsylvain added a commit to legalsylvain/grap-odoo-incubator that referenced this pull request Aug 5, 2022

[BACKPORT] Copy account_wallet from OCA/wallet#9 to current repo

bcc6338

xavier-bouquiaux approved these changes Oct 10, 2022

View reviewed changes

xavier-bouquiaux reviewed Oct 10, 2022

View reviewed changes

legalsylvain added 2 commits October 10, 2022 17:05

[IMP] simplify algorigthm

f5de492

[DOC] add legalsylvain as contributors

d8b866d

xavier-bouquiaux suggested changes Oct 11, 2022

View reviewed changes

github-actions bot added the stale PR/Issue without recent activity, it'll be soon closed automatically. label Feb 12, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[14.0][ADD] account_wallet - NOBUMP #9

[14.0][ADD] account_wallet - NOBUMP #9

legalsylvain commented Aug 1, 2022 •

edited

Loading

rousseldenis left a comment

rousseldenis Aug 2, 2022

rousseldenis Aug 2, 2022

rousseldenis Aug 2, 2022

legalsylvain commented Aug 2, 2022 •

edited

Loading

legalsylvain commented Aug 2, 2022

legalsylvain commented Aug 5, 2022 •

edited

Loading

rousseldenis commented Aug 16, 2022

xavier-bouquiaux commented Oct 10, 2022

xavier-bouquiaux left a comment

xavier-bouquiaux Oct 10, 2022

xavier-bouquiaux Oct 10, 2022

xavier-bouquiaux Oct 10, 2022

xavier-bouquiaux Oct 10, 2022

legalsylvain Oct 10, 2022

xavier-bouquiaux Oct 10, 2022

legalsylvain Oct 10, 2022

oca-clabot commented Oct 10, 2022

legalsylvain commented Oct 10, 2022

xavier-bouquiaux Oct 11, 2022

github-actions bot commented Feb 12, 2023

		cls.partner = cls.env.ref("base.res_partner_2")

		def _provision_wallet(self, amount, wallet=None):

	openupgrade.rename_columns(
	openupgrade.rename_columns(env.cr, ...

[14.0][ADD] account_wallet - NOBUMP #9

Are you sure you want to change the base?

[14.0][ADD] account_wallet - NOBUMP #9

Conversation

legalsylvain commented Aug 1, 2022 • edited Loading

Clean and refactor

UX Improvment

Bugfixes

Add Feature

rousseldenis left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

legalsylvain commented Aug 2, 2022 • edited Loading

legalsylvain commented Aug 2, 2022

legalsylvain commented Aug 5, 2022 • edited Loading

rousseldenis commented Aug 16, 2022

xavier-bouquiaux commented Oct 10, 2022

xavier-bouquiaux left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

oca-clabot commented Oct 10, 2022

legalsylvain commented Oct 10, 2022

Choose a reason for hiding this comment

github-actions bot commented Feb 12, 2023

legalsylvain commented Aug 1, 2022 •

edited

Loading

legalsylvain commented Aug 2, 2022 •

edited

Loading

legalsylvain commented Aug 5, 2022 •

edited

Loading