From c2b684654ba503d972ca79d68f9b6c86a41aa636 Mon Sep 17 00:00:00 2001 From: "Lucas Perais (lpe)" Date: Fri, 24 Aug 2018 17:17:15 +0200 Subject: [PATCH 1/3] [FIX] account: unreconcile payment from invoice with exchange difference backport 1dbc65567604d85ce4cd5c663e8d9cdfd71316a4 Company in USD Invoice in EUR with rate A Register a payment in EUR with rate B Unreconcile them. Before this commit, there was an error because we tried to reconcile the exchange items with its reversal while the formers were already reconciled with the invoice After this commit, there is no error OPW 1864091 closes #26583 --- addons/account/models/account_move.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py index 0271807a235..a47de2d96e3 100644 --- a/addons/account/models/account_move.py +++ b/addons/account/models/account_move.py @@ -214,7 +214,7 @@ class AccountMove(models.Model): # Do not forward port in >= saas-14 def _reconcile_reversed_pair(self, move, reversed_move): - amls_to_reconcile = move.line_ids + reversed_move.line_ids + amls_to_reconcile = (move.line_ids + reversed_move.line_ids).filtered(lambda l: not l.reconciled) accounts_reconcilable = amls_to_reconcile.mapped('account_id').filtered(lambda a: a.reconcile) for account in accounts_reconcilable: amls_for_account = amls_to_reconcile.filtered(lambda l: l.account_id.id == account.id) From 08d539099538ff3ab2af92e8e2abc1b11b58ef88 Mon Sep 17 00:00:00 2001 From: Abdur-Rahmaan Janhangeer Date: Mon, 27 Aug 2018 20:22:18 +0400 Subject: [PATCH 2/3] [CLA] signature for Abdur-RahmaanJ Closes #26617 --- doc/cla/individual/abdur-rahmaanJ.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/cla/individual/abdur-rahmaanJ.md diff --git a/doc/cla/individual/abdur-rahmaanJ.md b/doc/cla/individual/abdur-rahmaanJ.md new file mode 100644 index 00000000000..257221f1a91 --- /dev/null +++ b/doc/cla/individual/abdur-rahmaanJ.md @@ -0,0 +1,11 @@ +Mauritius, 2018-08-27 + +I hereby agree to the terms of the Odoo Individual Contributor License +Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this +declaration. + +Signed, + +Abdur-Rahmaan Janhangeer cryptolabour@gmail.com https://github.com/Abdur-RahmaanJ From 5f25b902e5988373228bf91cbe517814d0ea6c39 Mon Sep 17 00:00:00 2001 From: Abdur-Rahmaan Janhangeer Date: Mon, 27 Aug 2018 08:54:23 +0400 Subject: [PATCH 3/3] [FIX] doc: update obsolete openobject link The library https://github.com/syleam/openobject-library is obsolete and advises to use OdooRPC instead. Closes #26596 --- doc/howtos/backend.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/howtos/backend.rst b/doc/howtos/backend.rst index a72d78788d6..65339fcbbc8 100644 --- a/doc/howtos/backend.rst +++ b/doc/howtos/backend.rst @@ -1850,7 +1850,7 @@ Examples can be easily adapted from XML-RPC to JSON-RPC. systems without *explicitly* going through XML-RPC or JSON-RPC, such as: * https://github.com/akretion/ooor - * https://github.com/syleam/openobject-library + * https://github.com/OCA/odoorpc * https://github.com/nicolas-van/openerp-client-lib * https://pypi.python.org/pypi/oersted/ * https://github.com/abhishek-jaiswal/php-openerp-lib