search

ingadhoc / account-financial-tools

GNU Affero General Public License v3.0
50 stars 102 forks source link

[FW][FIX] account_statement_import_txt_xlsx: Bug when balance is 0 #562

Closed fw-bot-adhoc closed 1 month ago

fw-bot-adhoc commented 1 month ago

Forward-Port-Of: ingadhoc/account-financial-tools#559

roboadhoc commented 1 month ago

Pull request status dashboard.

fw-bot-adhoc commented 1 month ago

@feg-adhoc @rov-adhoc cherrypicking of pull request ingadhoc/account-financial-tools#559 failed.

stdout:

CONFLICT (modify/delete): account_statement_import_txt_xlsx/models/account_statement_import_sheet_parser.py deleted in HEAD and modified in b709e99b ([FIX] account_statement_import_txt_xlsx: Bug when balance is 0). Version b709e99b ([FIX] account_statement_import_txt_xlsx: Bug when balance is 0) of account_statement_import_txt_xlsx/models/account_statement_import_sheet_parser.py left in tree.

stderr:

19:35:46.390605 git.c:444               trace: built-in: git cherry-pick b709e99b570b7b222b2888f44c71da8f53eeb8a2
error: could not apply b709e99b... [FIX] account_statement_import_txt_xlsx: Bug when balance is 0
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port