From 3f6c70c519eb70f25ddb79e54a1670103a6538bf Mon Sep 17 00:00:00 2001 From: Jordi Ballester Date: Wed, 29 Mar 2017 13:54:25 +0200 Subject: [PATCH 01/15] account_payment_partner_reconcile --- account_partner_reconcile/README.rst | 52 ++++++++++++++++++ account_partner_reconcile/__init__.py | 2 + account_partner_reconcile/__openerp__.py | 21 +++++++ account_partner_reconcile/models/__init__.py | 2 + .../models/res_partner.py | 26 +++++++++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../views/res_partner_view.xml | 20 +++++++ 7 files changed, 123 insertions(+) create mode 100644 account_partner_reconcile/README.rst create mode 100644 account_partner_reconcile/__init__.py create mode 100644 account_partner_reconcile/__openerp__.py create mode 100644 account_partner_reconcile/models/__init__.py create mode 100644 account_partner_reconcile/models/res_partner.py create mode 100644 account_partner_reconcile/static/description/icon.png create mode 100644 account_partner_reconcile/views/res_partner_view.xml diff --git a/account_partner_reconcile/README.rst b/account_partner_reconcile/README.rst new file mode 100644 index 00000000..b0a8842c --- /dev/null +++ b/account_partner_reconcile/README.rst @@ -0,0 +1,52 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +========================= +Account Partner Reconcile +========================= + +This module adds a button "Match Payments" in the customer & suppliers form +view to allow to start the matching of invoices & payments for that partner. + +Configuration +============= + +The button is visible only to users that belong to the accounting groups +"Accountant" or "Adviser". + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/96/9.0 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smashing it by providing a detailed and welcomed feedback. + + +Credits +======= + +Contributors +------------ + +* Jordi Ballester + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/account_partner_reconcile/__init__.py b/account_partner_reconcile/__init__.py new file mode 100644 index 00000000..a0fdc10f --- /dev/null +++ b/account_partner_reconcile/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from . import models diff --git a/account_partner_reconcile/__openerp__.py b/account_partner_reconcile/__openerp__.py new file mode 100644 index 00000000..7517dd13 --- /dev/null +++ b/account_partner_reconcile/__openerp__.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# © 2017 Eficent Business and IT Consulting Services S.L. +# (http://www.eficent.com) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +{ + 'name': "Account Partner Reconcile", + 'version': '9.0.1.0.0', + 'category': 'Accounting', + 'author': 'Eficent,' + 'Odoo Community Association (OCA), ', + 'website': 'https://github.com/OCA/account-payment', + 'license': 'AGPL-3', + "depends": [ + 'account', + ], + "data": [ + 'views/res_partner_view.xml', + ], + "installable": True +} diff --git a/account_partner_reconcile/models/__init__.py b/account_partner_reconcile/models/__init__.py new file mode 100644 index 00000000..0fbdfcf8 --- /dev/null +++ b/account_partner_reconcile/models/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from . import res_partner diff --git a/account_partner_reconcile/models/res_partner.py b/account_partner_reconcile/models/res_partner.py new file mode 100644 index 00000000..b6c413b4 --- /dev/null +++ b/account_partner_reconcile/models/res_partner.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# © 2017 Eficent Business and IT Consulting Services S.L. +# (http://www.eficent.com) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from openerp import models, api + + +class ResPartner(models.Model): + _inherit = 'res.partner' + + @api.multi + def action_open_reconcile(self): + # Open reconciliation view for customers + accounts = self.env['account.account'] + accounts += (self.property_account_receivable_id + + self.property_account_payable_id) + + action_context = {'show_mode_selector': True, + 'partner_ids': [self.id, ], + 'account_ids': accounts.ids} + return { + 'type': 'ir.actions.client', + 'tag': 'manual_reconciliation_view', + 'context': action_context, + } diff --git a/account_partner_reconcile/static/description/icon.png b/account_partner_reconcile/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z z?n?eq1XP>p-IM$Z^C;2L3itnbJZAip*Zo0aw2bs8@(s^~*8T9go!%dHcAz2lM;`yp zD=7&xjFV$S&5uDaiScyD?B-i1ze`+CoRtz`Wn+Zl&#s4&}MO{@N!ufrzjG$B79)Y2d3tBk&)TxUTw@QS0TEL_?njX|@vq?Uz(nBFK5Pq7*xj#u*R&i|?7+6# z+|r_n#SW&LXhtheZdah{ZVoqwyT{D>MC3nkFF#N)xLi{p7J1jXlmVeb;cP5?e(=f# zuT7fvjSbjS781v?7{)-X3*?>tq?)Yd)~|1{BDS(pqC zC}~H#WXlkUW*H5CDOo<)#x7%RY)A;ShGhI5s*#cRDA8YgqG(HeKDx+#(ZQ?386dv! zlXCO)w91~Vw4AmOcATuV653fa9R$fyK8ul%rG z-wfS zihugoZyr38Im?Zuh6@RcF~t1anQu7>#lPpb#}4cOA!EM11`%f*07RqOVkmX{p~KJ9 z^zP;K#|)$`^Rb{rnHGH{~>1(fawV0*Z#)}M`m8-?ZJV<+e}s9wE# z)l&az?w^5{)`S(%MRzxdNqrs1n*-=jS^_jqE*5XDrA0+VE`5^*p3CuM<&dZEeCjoz zR;uu_H9ZPZV|fQq`Cyw4nscrVwi!fE6ciMmX$!_hN7uF;jjKG)d2@aC4ropY)8etW=xJvni)8eHi`H$%#zn^WJ5NLc-rqk|u&&4Z6fD_m&JfSI1Bvb?b<*n&sfl0^t z=HnmRl`XrFvMKB%9}>PaA`m-fK6a0(8=qPkWS5bb4=v?XcWi&hRY?O5HdulRi4?fN zlsJ*N-0Qw+Yic@s0(2uy%F@ib;GjXt01Fmx5XbRo6+n|pP(&nodMoap^z{~q ziEeaUT@Mxe3vJSfI6?uLND(CNr=#^W<1b}jzW58bIfyWTDle$mmS(|x-0|2UlX+9k zQ^EX7Nw}?EzVoBfT(-LT|=9N@^hcn-_p&sqG z&*oVs2JSU+N4ZD`FhCAWaS;>|wH2G*Id|?pa#@>tyxX`+4HyIArWDvVrX)2WAOQff z0qyHu&-S@i^MS-+j--!pr4fPBj~_8({~e1bfcl0wI1kaoN>mJL6KUPQm5N7lB(ui1 zE-o%kq)&djzWJ}ob<-GfDlkB;F31j-VHKvQUGQ3sp`CwyGJk_i!y^sD0fqC@$9|jO zOqN!r!8-p==F@ZVP=U$qSpY(gQ0)59P1&t@y?5rvg<}E+GB}26NYPp4f2YFQrQtot5mn3wu_qprZ=>Ig-$ zbW26Ws~IgY>}^5w`vTB(G`PTZaDiGBo5o(tp)qli|NeV( z@H_=R8V39rt5J5YB2Ky?4eJJ#b`_iBe2ot~6%7mLt5t8Vwi^Jy7|jWXqa3amOIoRb zOr}WVFP--DsS`1WpN%~)t3R!arKF^Q$e12KEqU36AWwnCBICpH4XCsfnyrHr>$I$4 z!DpKX$OKLWarN7nv@!uIA+~RNO)l$$w}p(;b>mx8pwYvu;dD_unryX_NhT8*Tj>BTrTTL&!?O+%Rv;b?B??gSzdp?6Uug9{ zd@V08Z$BdI?fpoCS$)t4mg4rT8Q_I}h`0d-vYZ^|dOB*Q^S|xqTV*vIg?@fVFSmMpaw0qtTRbx} z({Pg?#{2`sc9)M5N$*N|4;^t$+QP?#mov zGVC@I*lBVrOU-%2y!7%)fAKjpEFsgQc4{amtiHb95KQEwvf<(3T<9-Zm$xIew#P22 zc2Ix|App^>v6(3L_MCU0d3W##AB0M~3D00EWoKZqsJYT(#@w$Y_H7G22M~ApVFTRHMI_3be)Lkn#0F*V8Pq zc}`Cjy$bE;FJ6H7p=0y#R>`}-m4(0F>%@P|?7fx{=R^uFdISRnZ2W_xQhD{YuR3t< z{6yxu=4~JkeA;|(J6_nv#>Nvs&FuLA&PW^he@t(UwFFE8)|a!R{`E`K`i^ZnyE4$k z;(749Ix|oi$c3QbEJ3b~D_kQsPz~fIUKym($a_7dJ?o+40*OLl^{=&oq$<#Q(yyrp z{J-FAniyAw9tPbe&IhQ|a`DqFTVQGQ&Gq3!C2==4x{6EJwiPZ8zub-iXoUtkJiG{} zPaR&}_fn8_z~(=;5lD-aPWD3z8PZS@AaUiomF!G8I}Mf>e~0g#BelA-5#`cj;O5>N Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/account_partner_reconcile/views/res_partner_view.xml b/account_partner_reconcile/views/res_partner_view.xml new file mode 100644 index 00000000..93e8722a --- /dev/null +++ b/account_partner_reconcile/views/res_partner_view.xml @@ -0,0 +1,20 @@ + + + + + res.partner.view.buttons + res.partner + + + + +
+ +
+ + + + From 26b89a83af58c1aa1cfc4cbff5015cbd11cefb9f Mon Sep 17 00:00:00 2001 From: mreficent Date: Fri, 16 Jun 2017 18:01:21 +0200 Subject: [PATCH 02/15] [MIG] account_partner_reconcile: Migration to 10.0 --- account_partner_reconcile/README.rst | 2 +- .../{__openerp__.py => __manifest__.py} | 2 +- .../models/res_partner.py | 2 +- account_partner_reconcile/tests/__init__.py | 6 +++ .../tests/test_account_partner_reconcile.py | 38 +++++++++++++++++++ .../views/res_partner_view.xml | 34 ++++++++--------- 6 files changed, 64 insertions(+), 20 deletions(-) rename account_partner_reconcile/{__openerp__.py => __manifest__.py} (94%) create mode 100644 account_partner_reconcile/tests/__init__.py create mode 100644 account_partner_reconcile/tests/test_account_partner_reconcile.py diff --git a/account_partner_reconcile/README.rst b/account_partner_reconcile/README.rst index b0a8842c..c073f784 100644 --- a/account_partner_reconcile/README.rst +++ b/account_partner_reconcile/README.rst @@ -17,7 +17,7 @@ The button is visible only to users that belong to the accounting groups .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/96/9.0 + :target: https://runbot.odoo-community.org/runbot/96/10.0 Bug Tracker =========== diff --git a/account_partner_reconcile/__openerp__.py b/account_partner_reconcile/__manifest__.py similarity index 94% rename from account_partner_reconcile/__openerp__.py rename to account_partner_reconcile/__manifest__.py index 7517dd13..b542616b 100644 --- a/account_partner_reconcile/__openerp__.py +++ b/account_partner_reconcile/__manifest__.py @@ -5,7 +5,7 @@ { 'name': "Account Partner Reconcile", - 'version': '9.0.1.0.0', + 'version': '10.0.1.0.0', 'category': 'Accounting', 'author': 'Eficent,' 'Odoo Community Association (OCA), ', diff --git a/account_partner_reconcile/models/res_partner.py b/account_partner_reconcile/models/res_partner.py index b6c413b4..b279dfc2 100644 --- a/account_partner_reconcile/models/res_partner.py +++ b/account_partner_reconcile/models/res_partner.py @@ -3,7 +3,7 @@ # (http://www.eficent.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). -from openerp import models, api +from odoo import api, models class ResPartner(models.Model): diff --git a/account_partner_reconcile/tests/__init__.py b/account_partner_reconcile/tests/__init__.py new file mode 100644 index 00000000..16bbafad --- /dev/null +++ b/account_partner_reconcile/tests/__init__.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# (http://www.eficent.com) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from . import test_account_partner_reconcile diff --git a/account_partner_reconcile/tests/test_account_partner_reconcile.py b/account_partner_reconcile/tests/test_account_partner_reconcile.py new file mode 100644 index 00000000..7b1378df --- /dev/null +++ b/account_partner_reconcile/tests/test_account_partner_reconcile.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# (http://www.eficent.com) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo.tests.common import TransactionCase + + +class TestAccountPartnerReconcile(TransactionCase): + """ + Tests for Account Partner Reconcile. + """ + def setUp(self): + super(TestAccountPartnerReconcile, self).setUp() + + self.partner1 = self.env.ref('base.res_partner_1') + + def test_account_partner_reconcile(self): + + res = self.partner1.action_open_reconcile() + self.assertDictContainsSubset( + { + 'type': 'ir.actions.client', + 'tag': 'manual_reconciliation_view', + }, + res, + 'There was an error and the manual_reconciliation_view ' + 'couldn\'t be opened.' + ) + self.assertDictContainsSubset( + { + 'partner_ids': self.partner1.ids, + 'show_mode_selector': True, + }, + res['context'], + 'There was an error and the manual_reconciliation_view ' + 'couldn\'t be opened.' + ) diff --git a/account_partner_reconcile/views/res_partner_view.xml b/account_partner_reconcile/views/res_partner_view.xml index 93e8722a..865db48d 100644 --- a/account_partner_reconcile/views/res_partner_view.xml +++ b/account_partner_reconcile/views/res_partner_view.xml @@ -1,20 +1,20 @@ - + - - res.partner.view.buttons - res.partner - - - - -
- -
- - + + res.partner.view.buttons + res.partner + + + + +
+ +
+ + - + From bbd1e8162b5e52a059a19020e645a35ad7ced6eb Mon Sep 17 00:00:00 2001 From: Jaume Planas Date: Fri, 6 Apr 2018 16:22:47 +0200 Subject: [PATCH 03/15] [MIG] account_partner_reconcile: Migration to 11.0 --- account_partner_reconcile/README.rst | 3 +- account_partner_reconcile/__init__.py | 1 - account_partner_reconcile/__manifest__.py | 3 +- account_partner_reconcile/models/__init__.py | 1 - .../models/res_partner.py | 1 - account_partner_reconcile/tests/__init__.py | 1 - .../tests/test_account_partner_reconcile.py | 36 +++++++++---------- 7 files changed, 21 insertions(+), 25 deletions(-) diff --git a/account_partner_reconcile/README.rst b/account_partner_reconcile/README.rst index c073f784..6c22a930 100644 --- a/account_partner_reconcile/README.rst +++ b/account_partner_reconcile/README.rst @@ -17,7 +17,7 @@ The button is visible only to users that belong to the accounting groups .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/96/10.0 + :target: https://runbot.odoo-community.org/runbot/96/11.0 Bug Tracker =========== @@ -35,6 +35,7 @@ Contributors ------------ * Jordi Ballester +* Jaume Planas Maintainer ---------- diff --git a/account_partner_reconcile/__init__.py b/account_partner_reconcile/__init__.py index a0fdc10f..0650744f 100644 --- a/account_partner_reconcile/__init__.py +++ b/account_partner_reconcile/__init__.py @@ -1,2 +1 @@ -# -*- coding: utf-8 -*- from . import models diff --git a/account_partner_reconcile/__manifest__.py b/account_partner_reconcile/__manifest__.py index b542616b..d9d60297 100644 --- a/account_partner_reconcile/__manifest__.py +++ b/account_partner_reconcile/__manifest__.py @@ -1,11 +1,10 @@ -# -*- coding: utf-8 -*- # © 2017 Eficent Business and IT Consulting Services S.L. # (http://www.eficent.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). { 'name': "Account Partner Reconcile", - 'version': '10.0.1.0.0', + 'version': '11.0.1.0.0', 'category': 'Accounting', 'author': 'Eficent,' 'Odoo Community Association (OCA), ', diff --git a/account_partner_reconcile/models/__init__.py b/account_partner_reconcile/models/__init__.py index 0fbdfcf8..91fed54d 100644 --- a/account_partner_reconcile/models/__init__.py +++ b/account_partner_reconcile/models/__init__.py @@ -1,2 +1 @@ -# -*- coding: utf-8 -*- from . import res_partner diff --git a/account_partner_reconcile/models/res_partner.py b/account_partner_reconcile/models/res_partner.py index b279dfc2..1b299e97 100644 --- a/account_partner_reconcile/models/res_partner.py +++ b/account_partner_reconcile/models/res_partner.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © 2017 Eficent Business and IT Consulting Services S.L. # (http://www.eficent.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). diff --git a/account_partner_reconcile/tests/__init__.py b/account_partner_reconcile/tests/__init__.py index 16bbafad..2d8892c4 100644 --- a/account_partner_reconcile/tests/__init__.py +++ b/account_partner_reconcile/tests/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2017 Eficent Business and IT Consulting Services S.L. # (http://www.eficent.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). diff --git a/account_partner_reconcile/tests/test_account_partner_reconcile.py b/account_partner_reconcile/tests/test_account_partner_reconcile.py index 7b1378df..a84230dc 100644 --- a/account_partner_reconcile/tests/test_account_partner_reconcile.py +++ b/account_partner_reconcile/tests/test_account_partner_reconcile.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2017 Eficent Business and IT Consulting Services S.L. # (http://www.eficent.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). @@ -10,29 +9,30 @@ class TestAccountPartnerReconcile(TransactionCase): """ Tests for Account Partner Reconcile. """ + def setUp(self): super(TestAccountPartnerReconcile, self).setUp() self.partner1 = self.env.ref('base.res_partner_1') def test_account_partner_reconcile(self): - res = self.partner1.action_open_reconcile() - self.assertDictContainsSubset( - { - 'type': 'ir.actions.client', - 'tag': 'manual_reconciliation_view', - }, - res, + + # assertDictContainsSubset is deprecated in Python <3.2 + expect = { + 'type': 'ir.actions.client', + 'tag': 'manual_reconciliation_view', + } + self.assertDictEqual( + expect, {k: v for k, v in res.items() if k in expect}, 'There was an error and the manual_reconciliation_view ' - 'couldn\'t be opened.' - ) - self.assertDictContainsSubset( - { - 'partner_ids': self.partner1.ids, - 'show_mode_selector': True, - }, - res['context'], + 'couldn\'t be opened.') + + expect = { + 'partner_ids': self.partner1.ids, + 'show_mode_selector': True, + } + self.assertDictEqual( + expect, {k: v for k, v in res['context'].items() if k in expect}, 'There was an error and the manual_reconciliation_view ' - 'couldn\'t be opened.' - ) + 'couldn\'t be opened.') From 6d98b5aad142ca1d3a95ea07cf00ba3dd7ac73fe Mon Sep 17 00:00:00 2001 From: Jordi Ballester Alomar Date: Thu, 10 May 2018 19:43:20 +0200 Subject: [PATCH 04/15] account_partner_reconcile: change user group --- account_partner_reconcile/views/res_partner_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_partner_reconcile/views/res_partner_view.xml b/account_partner_reconcile/views/res_partner_view.xml index 865db48d..060b70c3 100644 --- a/account_partner_reconcile/views/res_partner_view.xml +++ b/account_partner_reconcile/views/res_partner_view.xml @@ -6,7 +6,7 @@ res.partner - +

Bug Tracker

-

Bugs are tracked on GitHub Issues. +

Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -feedback.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -428,7 +428,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

-

This module is part of the OCA/account-payment project on GitHub.

+

This module is part of the OCA/account-reconcile project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

From 40c393508d936158678607491007f57f75a4d526 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Thu, 11 Apr 2019 07:59:26 +0000 Subject: [PATCH 08/15] [UPD] Update account_partner_reconcile.pot --- account_partner_reconcile/i18n/account_partner_reconcile.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/account_partner_reconcile/i18n/account_partner_reconcile.pot b/account_partner_reconcile/i18n/account_partner_reconcile.pot index e441b34e..2dee18d0 100644 --- a/account_partner_reconcile/i18n/account_partner_reconcile.pot +++ b/account_partner_reconcile/i18n/account_partner_reconcile.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: <>\n" "Language-Team: \n" @@ -19,7 +19,7 @@ msgid "Contact" msgstr "" #. module: account_partner_reconcile -#: model:ir.ui.view,arch_db:account_partner_reconcile.res_partner_view_buttons +#: model_terms:ir.ui.view,arch_db:account_partner_reconcile.res_partner_view_buttons msgid "Match payments" msgstr "" From b2acea463ed3be7b211218cbd523b3d888b0c030 Mon Sep 17 00:00:00 2001 From: Jordi Ballester Alomar Date: Mon, 4 Feb 2019 19:30:45 +0100 Subject: [PATCH 09/15] [IMP] account_partner_reconcile: splits the button 'Match payments' Splits the button 'Match payments' to 'Match Receivables' and 'Match Payables', as the previous button was just now working. --- account_partner_reconcile/__manifest__.py | 2 +- account_partner_reconcile/models/res_partner.py | 10 ++++++---- account_partner_reconcile/views/res_partner_view.xml | 8 +++++++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/account_partner_reconcile/__manifest__.py b/account_partner_reconcile/__manifest__.py index 784bc40d..4b9eff2d 100644 --- a/account_partner_reconcile/__manifest__.py +++ b/account_partner_reconcile/__manifest__.py @@ -4,7 +4,7 @@ { 'name': "Account Partner Reconcile", - 'version': '12.0.1.0.0', + 'version': '12.0.1.0.1', 'category': 'Accounting', 'author': 'Eficent,' 'Odoo Community Association (OCA), ', diff --git a/account_partner_reconcile/models/res_partner.py b/account_partner_reconcile/models/res_partner.py index afbbcbc4..0b7e2014 100644 --- a/account_partner_reconcile/models/res_partner.py +++ b/account_partner_reconcile/models/res_partner.py @@ -10,13 +10,15 @@ class ResPartner(models.Model): @api.multi def action_open_reconcile(self): - # Open reconciliation view for customers - accounts = self.env['account.account'] - accounts += (self.property_account_receivable_id + - self.property_account_payable_id) + # Open reconciliation view for customers and suppliers + reconcile_mode = self.env.context.get('reconcile_mode', False) + accounts = self.property_account_payable_id + if reconcile_mode == 'customers': + accounts = self.property_account_receivable_id action_context = {'show_mode_selector': True, 'partner_ids': [self.id, ], + 'mode': reconcile_mode, 'account_ids': accounts.ids} return { 'type': 'ir.actions.client', diff --git a/account_partner_reconcile/views/res_partner_view.xml b/account_partner_reconcile/views/res_partner_view.xml index 52a2f257..2e7280b5 100644 --- a/account_partner_reconcile/views/res_partner_view.xml +++ b/account_partner_reconcile/views/res_partner_view.xml @@ -13,7 +13,13 @@
+
From d895d28dc325499db2254d71295eed69f5d1ecfc Mon Sep 17 00:00:00 2001 From: oca-travis Date: Wed, 29 May 2019 16:09:28 +0000 Subject: [PATCH 10/15] [UPD] Update account_partner_reconcile.pot --- .../i18n/account_partner_reconcile.pot | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/account_partner_reconcile/i18n/account_partner_reconcile.pot b/account_partner_reconcile/i18n/account_partner_reconcile.pot index 2dee18d0..d6311069 100644 --- a/account_partner_reconcile/i18n/account_partner_reconcile.pot +++ b/account_partner_reconcile/i18n/account_partner_reconcile.pot @@ -20,6 +20,11 @@ msgstr "" #. module: account_partner_reconcile #: model_terms:ir.ui.view,arch_db:account_partner_reconcile.res_partner_view_buttons -msgid "Match payments" +msgid "Match Payables" +msgstr "" + +#. module: account_partner_reconcile +#: model_terms:ir.ui.view,arch_db:account_partner_reconcile.res_partner_view_buttons +msgid "Match Receivables" msgstr "" From 94a5c94b954998391f88602cab8375e00e4a26e6 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 29 Jul 2019 02:39:37 +0000 Subject: [PATCH 11/15] [UPD] README.rst --- account_partner_reconcile/static/description/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_partner_reconcile/static/description/index.html b/account_partner_reconcile/static/description/index.html index f82e5bed..79eaf928 100644 --- a/account_partner_reconcile/static/description/index.html +++ b/account_partner_reconcile/static/description/index.html @@ -3,7 +3,7 @@ - + Account Partner Reconcile