ingadhoc/account-financial-tools#588
Created by fw-bot-adhoc
Merged
at 4cb3b5f9cb0233ac22e5183928cd455f3c5ec87e
- label
- adhoc-dev:17.0-16.0-h-83182-rov-oYX3-fw
- head
- 21c6dd48ef6860805159323b6b58046dc90071ef
- target
- 17.0
- merged
- hace 5 días by rov-adhoc
- forward-port of
- ingadhoc/account-financial-tools#587 DETACHED (conflicts: ('424cf314f6e8cfb8551c1e0ec0b2dcf9991e77bc', 'Auto-merging account_interests/models/res_company_interest.py\nCONFLICT (content): Merge conflict in account_interests/models/res_company_interest.py\n', "20:34:37.777092 git.c:444 trace: built-in: git cherry-pick 424cf314f6e8cfb8551c1e0ec0b2dcf9991e77bc\nerror: could not apply 424cf314... [FIX] account_interest : Fix when searching the journal and having more than one receivable_account_ids\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n----------\nstatus:\n", ['424cf314f6e8cfb8551c1e0ec0b2dcf9991e77bc']) ('424cf314f6e8cfb8551c1e0ec0b2dcf9991e77bc', 'Auto-merging account_interests/models/res_company_interest.py\nCONFLICT (content): Merge conflict in account_interests/models/res_company_interest.py\n', "20:34:37.777092 git.c:444 trace: built-in: git cherry-pick 424cf314f6e8cfb8551c1e0ec0b2dcf9991e77bc\nerror: could not apply 424cf314... [FIX] account_interest : Fix when searching the journal and having more than one receivable_account_ids\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n----------\nstatus:\n", ['424cf314f6e8cfb8551c1e0ec0b2dcf9991e77bc']))
[FW][FIX] account_interest : Fix when searching the journal and having more than one receivable_account_ids
Forward-Port-Of: ingadhoc/account-financial-tools#587