ingadhoc/account-financial-tools#533
Created by fw-bot-adhoc
Merged
at de1e8599519bdad459973eab839768e8df365a73
- label
- adhoc-dev:17.0-16.0-t-39452-rov-a3Kl-fw
- head
- d4ac9908557fbeb25f7aefde40c920575a2c368c
- target
- 17.0
- merged
- hace 3 meses by rov-adhoc
- forward-port of
- ingadhoc/account-financial-tools#527 DETACHED (conflicts: ('cfcb3389e98cba1baea4bfce475bdc26adb891b7', 'Auto-merging account_interests/models/res_company_interest.py\nCONFLICT (content): Merge conflict in account_interests/models/res_company_interest.py\n', "14:49:05.292994 git.c:444 trace: built-in: git cherry-pick cfcb3389e98cba1baea4bfce475bdc26adb891b7\nerror: could not apply cfcb3389... [IMP] account_interest: Add try and catch in order to be aware of the companies where the cron fail\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", ['cfcb3389e98cba1baea4bfce475bdc26adb891b7']) ('cfcb3389e98cba1baea4bfce475bdc26adb891b7', 'Auto-merging account_interests/models/res_company_interest.py\nCONFLICT (content): Merge conflict in account_interests/models/res_company_interest.py\n', "14:49:05.292994 git.c:444 trace: built-in: git cherry-pick cfcb3389e98cba1baea4bfce475bdc26adb891b7\nerror: could not apply cfcb3389... [IMP] account_interest: Add try and catch in order to be aware of the companies where the cron fail\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", ['cfcb3389e98cba1baea4bfce475bdc26adb891b7']))
[FW][IMP] account_interest: Add try and catch in order to be aware of the…
… companies where the cron fail
Forward-Port-Of: ingadhoc/account-financial-tools#527