odoo-addon-account-reconcile-oca 17.0.1.5.7__py3-none-any.whl → 18.0.1.0.0.7__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- odoo/addons/account_reconcile_oca/README.rst +6 -6
- odoo/addons/account_reconcile_oca/__manifest__.py +1 -1
- odoo/addons/account_reconcile_oca/demo/demo.xml +0 -1
- odoo/addons/account_reconcile_oca/i18n/account_reconcile_oca.pot +6 -26
- odoo/addons/account_reconcile_oca/models/account_account_reconcile.py +6 -8
- odoo/addons/account_reconcile_oca/models/account_bank_statement_line.py +22 -16
- odoo/addons/account_reconcile_oca/models/account_reconcile_abstract.py +1 -1
- odoo/addons/account_reconcile_oca/static/description/index.html +4 -4
- odoo/addons/account_reconcile_oca/static/src/js/reconcile/reconcile_controller.esm.js +2 -3
- odoo/addons/account_reconcile_oca/static/src/js/reconcile/reconcile_kanban_record.esm.js +0 -2
- odoo/addons/account_reconcile_oca/static/src/js/reconcile/reconcile_renderer.esm.js +0 -2
- odoo/addons/account_reconcile_oca/static/src/js/reconcile/reconcile_view.esm.js +0 -2
- odoo/addons/account_reconcile_oca/static/src/js/reconcile_form/reconcile_form_controller.esm.js +1 -3
- odoo/addons/account_reconcile_oca/static/src/js/reconcile_form/reconcile_form_notebook.esm.js +0 -1
- odoo/addons/account_reconcile_oca/static/src/js/reconcile_form/reconcile_form_renderer.esm.js +0 -2
- odoo/addons/account_reconcile_oca/static/src/js/reconcile_form/reconcile_form_view.esm.js +0 -2
- odoo/addons/account_reconcile_oca/static/src/js/reconcile_manual/reconcile_manual_controller.esm.js +2 -2
- odoo/addons/account_reconcile_oca/static/src/js/reconcile_manual/reconcile_manual_view.esm.js +0 -2
- odoo/addons/account_reconcile_oca/static/src/js/reconcile_move_line/reconcile_move_line_controller.esm.js +0 -2
- odoo/addons/account_reconcile_oca/static/src/js/reconcile_move_line/reconcile_move_line_renderer.esm.js +0 -2
- odoo/addons/account_reconcile_oca/static/src/js/reconcile_move_line/reconcile_move_line_view.esm.js +0 -2
- odoo/addons/account_reconcile_oca/static/src/js/widgets/reconcile_chatter_field.esm.js +2 -4
- odoo/addons/account_reconcile_oca/static/src/js/widgets/reconcile_data_widget.esm.js +2 -1
- odoo/addons/account_reconcile_oca/static/src/js/widgets/reconcile_move_line_widget.esm.js +0 -2
- odoo/addons/account_reconcile_oca/static/src/js/widgets/selection_badge_uncheck.esm.js +0 -1
- odoo/addons/account_reconcile_oca/static/src/xml/reconcile.xml +3 -3
- odoo/addons/account_reconcile_oca/tests/test_account_reconcile.py +32 -55
- odoo/addons/account_reconcile_oca/tests/test_bank_account_reconcile.py +31 -28
- odoo/addons/account_reconcile_oca/views/account_account.xml +3 -5
- odoo/addons/account_reconcile_oca/views/account_account_reconcile.xml +13 -20
- odoo/addons/account_reconcile_oca/views/account_bank_statement.xml +0 -2
- odoo/addons/account_reconcile_oca/views/account_bank_statement_line.xml +66 -71
- odoo/addons/account_reconcile_oca/views/account_journal.xml +8 -12
- odoo/addons/account_reconcile_oca/views/account_move.xml +0 -4
- odoo/addons/account_reconcile_oca/views/account_move_line.xml +23 -24
- odoo/addons/account_reconcile_oca/views/res_config_settings.xml +0 -4
- {odoo_addon_account_reconcile_oca-17.0.1.5.7.dist-info → odoo_addon_account_reconcile_oca-18.0.1.0.0.7.dist-info}/METADATA +11 -11
- {odoo_addon_account_reconcile_oca-17.0.1.5.7.dist-info → odoo_addon_account_reconcile_oca-18.0.1.0.0.7.dist-info}/RECORD +40 -40
- {odoo_addon_account_reconcile_oca-17.0.1.5.7.dist-info → odoo_addon_account_reconcile_oca-18.0.1.0.0.7.dist-info}/WHEEL +0 -0
- {odoo_addon_account_reconcile_oca-17.0.1.5.7.dist-info → odoo_addon_account_reconcile_oca-18.0.1.0.0.7.dist-info}/top_level.txt +0 -0
@@ -7,7 +7,7 @@ Account Reconcile Oca
|
|
7
7
|
!! This file is generated by oca-gen-addon-readme !!
|
8
8
|
!! changes will be overwritten. !!
|
9
9
|
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
10
|
-
!! source digest: sha256:
|
10
|
+
!! source digest: sha256:724ba0bf29e558813ec81c62b41fb300550d68da0570edf8e00e438ffc0ee5c9
|
11
11
|
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
12
12
|
|
13
13
|
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
|
@@ -17,13 +17,13 @@ Account Reconcile Oca
|
|
17
17
|
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
|
18
18
|
:alt: License: AGPL-3
|
19
19
|
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--reconcile-lightgray.png?logo=github
|
20
|
-
:target: https://github.com/OCA/account-reconcile/tree/
|
20
|
+
:target: https://github.com/OCA/account-reconcile/tree/18.0/account_reconcile_oca
|
21
21
|
:alt: OCA/account-reconcile
|
22
22
|
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
|
23
|
-
:target: https://translation.odoo-community.org/projects/account-reconcile-
|
23
|
+
:target: https://translation.odoo-community.org/projects/account-reconcile-18-0/account-reconcile-18-0-account_reconcile_oca
|
24
24
|
:alt: Translate me on Weblate
|
25
25
|
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
|
26
|
-
:target: https://runboat.odoo-community.org/builds?repo=OCA/account-reconcile&target_branch=
|
26
|
+
:target: https://runboat.odoo-community.org/builds?repo=OCA/account-reconcile&target_branch=18.0
|
27
27
|
:alt: Try me on Runboat
|
28
28
|
|
29
29
|
|badge1| |badge2| |badge3| |badge4| |badge5|
|
@@ -65,7 +65,7 @@ Bug Tracker
|
|
65
65
|
Bugs are tracked on `GitHub Issues <https://github.com/OCA/account-reconcile/issues>`_.
|
66
66
|
In case of trouble, please check there if your issue has already been reported.
|
67
67
|
If you spotted it first, help us to smash it by providing a detailed and welcomed
|
68
|
-
`feedback <https://github.com/OCA/account-reconcile/issues/new?body=module:%20account_reconcile_oca%0Aversion:%
|
68
|
+
`feedback <https://github.com/OCA/account-reconcile/issues/new?body=module:%20account_reconcile_oca%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
|
69
69
|
|
70
70
|
Do not contact contributors directly about support or help with technical issues.
|
71
71
|
|
@@ -104,6 +104,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
|
|
104
104
|
|
105
105
|
|maintainer-etobella|
|
106
106
|
|
107
|
-
This module is part of the `OCA/account-reconcile <https://github.com/OCA/account-reconcile/tree/
|
107
|
+
This module is part of the `OCA/account-reconcile <https://github.com/OCA/account-reconcile/tree/18.0/account_reconcile_oca>`_ project on GitHub.
|
108
108
|
|
109
109
|
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
|
@@ -5,7 +5,7 @@
|
|
5
5
|
"name": "Account Reconcile Oca",
|
6
6
|
"summary": """
|
7
7
|
Reconcile addons for Odoo CE accounting""",
|
8
|
-
"version": "
|
8
|
+
"version": "18.0.1.0.0",
|
9
9
|
"license": "AGPL-3",
|
10
10
|
"author": "CreuBlanca,Dixmit,Odoo Community Association (OCA)",
|
11
11
|
"maintainers": ["etobella"],
|
@@ -4,7 +4,7 @@
|
|
4
4
|
#
|
5
5
|
msgid ""
|
6
6
|
msgstr ""
|
7
|
-
"Project-Id-Version: Odoo Server
|
7
|
+
"Project-Id-Version: Odoo Server 18.0\n"
|
8
8
|
"Report-Msgid-Bugs-To: \n"
|
9
9
|
"Last-Translator: \n"
|
10
10
|
"Language-Team: \n"
|
@@ -26,7 +26,6 @@ msgstr ""
|
|
26
26
|
#: code:addons/account_reconcile_oca/static/src/xml/reconcile.xml:0
|
27
27
|
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_account_reconcile__account_id
|
28
28
|
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.bank_statement_line_form_reconcile_view
|
29
|
-
#, python-format
|
30
29
|
msgid "Account"
|
31
30
|
msgstr ""
|
32
31
|
|
@@ -55,7 +54,6 @@ msgstr ""
|
|
55
54
|
#. module: account_reconcile_oca
|
56
55
|
#. odoo-javascript
|
57
56
|
#: code:addons/account_reconcile_oca/static/src/xml/reconcile.xml:0
|
58
|
-
#, python-format
|
59
57
|
msgid "Add all"
|
60
58
|
msgstr ""
|
61
59
|
|
@@ -87,7 +85,6 @@ msgstr ""
|
|
87
85
|
#. module: account_reconcile_oca
|
88
86
|
#. odoo-javascript
|
89
87
|
#: code:addons/account_reconcile_oca/static/src/xml/reconcile.xml:0
|
90
|
-
#, python-format
|
91
88
|
msgid "Amount in currency"
|
92
89
|
msgstr ""
|
93
90
|
|
@@ -172,11 +169,6 @@ msgstr ""
|
|
172
169
|
msgid "Company Currency"
|
173
170
|
msgstr ""
|
174
171
|
|
175
|
-
#. module: account_reconcile_oca
|
176
|
-
#: model:ir.model.fields,help:account_reconcile_oca.field_account_bank_statement_line__company_id
|
177
|
-
msgid "Company related to this journal"
|
178
|
-
msgstr ""
|
179
|
-
|
180
172
|
#. module: account_reconcile_oca
|
181
173
|
#: model:ir.model,name:account_reconcile_oca.model_res_config_settings
|
182
174
|
msgid "Config Settings"
|
@@ -185,7 +177,6 @@ msgstr ""
|
|
185
177
|
#. module: account_reconcile_oca
|
186
178
|
#. odoo-javascript
|
187
179
|
#: code:addons/account_reconcile_oca/static/src/xml/reconcile.xml:0
|
188
|
-
#, python-format
|
189
180
|
msgid "Create"
|
190
181
|
msgstr ""
|
191
182
|
|
@@ -202,7 +193,6 @@ msgstr ""
|
|
202
193
|
#. module: account_reconcile_oca
|
203
194
|
#. odoo-javascript
|
204
195
|
#: code:addons/account_reconcile_oca/static/src/xml/reconcile.xml:0
|
205
|
-
#, python-format
|
206
196
|
msgid "Credit"
|
207
197
|
msgstr ""
|
208
198
|
|
@@ -220,7 +210,6 @@ msgstr ""
|
|
220
210
|
#. module: account_reconcile_oca
|
221
211
|
#. odoo-javascript
|
222
212
|
#: code:addons/account_reconcile_oca/static/src/xml/reconcile.xml:0
|
223
|
-
#, python-format
|
224
213
|
msgid "Date"
|
225
214
|
msgstr ""
|
226
215
|
|
@@ -232,7 +221,6 @@ msgstr ""
|
|
232
221
|
#. module: account_reconcile_oca
|
233
222
|
#. odoo-javascript
|
234
223
|
#: code:addons/account_reconcile_oca/static/src/xml/reconcile.xml:0
|
235
|
-
#, python-format
|
236
224
|
msgid "Debit"
|
237
225
|
msgstr ""
|
238
226
|
|
@@ -272,7 +260,6 @@ msgstr ""
|
|
272
260
|
#. module: account_reconcile_oca
|
273
261
|
#. odoo-javascript
|
274
262
|
#: code:addons/account_reconcile_oca/static/src/xml/reconcile.xml:0
|
275
|
-
#, python-format
|
276
263
|
msgid "Global Balance"
|
277
264
|
msgstr ""
|
278
265
|
|
@@ -326,7 +313,6 @@ msgstr ""
|
|
326
313
|
#. module: account_reconcile_oca
|
327
314
|
#. odoo-javascript
|
328
315
|
#: code:addons/account_reconcile_oca/static/src/xml/reconcile.xml:0
|
329
|
-
#, python-format
|
330
316
|
msgid "Label"
|
331
317
|
msgstr ""
|
332
318
|
|
@@ -450,15 +436,9 @@ msgstr ""
|
|
450
436
|
msgid "Name"
|
451
437
|
msgstr ""
|
452
438
|
|
453
|
-
#. module: account_reconcile_oca
|
454
|
-
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.bank_statement_line_form_reconcile_view
|
455
|
-
msgid "Narration"
|
456
|
-
msgstr ""
|
457
|
-
|
458
439
|
#. module: account_reconcile_oca
|
459
440
|
#. odoo-python
|
460
441
|
#: code:addons/account_reconcile_oca/models/account_bank_statement_line.py:0
|
461
|
-
#, python-format
|
462
442
|
msgid "No supense lines are allowed when reconciling"
|
463
443
|
msgstr ""
|
464
444
|
|
@@ -474,12 +454,16 @@ msgstr ""
|
|
474
454
|
msgid "Nothing to reconcile"
|
475
455
|
msgstr ""
|
476
456
|
|
457
|
+
#. module: account_reconcile_oca
|
458
|
+
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.bank_statement_line_form_reconcile_view
|
459
|
+
msgid "Other Info"
|
460
|
+
msgstr ""
|
461
|
+
|
477
462
|
#. module: account_reconcile_oca
|
478
463
|
#. odoo-javascript
|
479
464
|
#: code:addons/account_reconcile_oca/static/src/xml/reconcile.xml:0
|
480
465
|
#: model:ir.model.fields,field_description:account_reconcile_oca.field_account_account_reconcile__partner_id
|
481
466
|
#: model_terms:ir.ui.view,arch_db:account_reconcile_oca.bank_statement_line_form_reconcile_view
|
482
|
-
#, python-format
|
483
467
|
msgid "Partner"
|
484
468
|
msgstr ""
|
485
469
|
|
@@ -568,7 +552,6 @@ msgstr ""
|
|
568
552
|
#. module: account_reconcile_oca
|
569
553
|
#. odoo-python
|
570
554
|
#: code:addons/account_reconcile_oca/models/account_bank_statement_line.py:0
|
571
|
-
#, python-format
|
572
555
|
msgid "Reversal of: %s"
|
573
556
|
msgstr ""
|
574
557
|
|
@@ -631,7 +614,6 @@ msgstr ""
|
|
631
614
|
#. module: account_reconcile_oca
|
632
615
|
#. odoo-python
|
633
616
|
#: code:addons/account_reconcile_oca/models/account_bank_statement_line.py:0
|
634
|
-
#, python-format
|
635
617
|
msgid "Undefined"
|
636
618
|
msgstr ""
|
637
619
|
|
@@ -668,14 +650,12 @@ msgstr ""
|
|
668
650
|
#. module: account_reconcile_oca
|
669
651
|
#. odoo-python
|
670
652
|
#: code:addons/account_reconcile_oca/models/account_journal.py:0
|
671
|
-
#, python-format
|
672
653
|
msgid "Well done! Everything has been reconciled"
|
673
654
|
msgstr ""
|
674
655
|
|
675
656
|
#. module: account_reconcile_oca
|
676
657
|
#. odoo-python
|
677
658
|
#: code:addons/account_reconcile_oca/models/account_move_line.py:0
|
678
|
-
#, python-format
|
679
659
|
msgid "You can only reconcile journal items belonging to the same account."
|
680
660
|
msgstr ""
|
681
661
|
|
@@ -24,13 +24,11 @@ class AccountAccountReconcile(models.Model):
|
|
24
24
|
|
25
25
|
@property
|
26
26
|
def _table_query(self):
|
27
|
-
|
28
|
-
self._select()
|
29
|
-
self.
|
30
|
-
self._where(),
|
31
|
-
self._groupby(),
|
32
|
-
self._having(),
|
27
|
+
query = (
|
28
|
+
f"{self._select()} {self._from()} {self._where()} "
|
29
|
+
f"{self._groupby()} {self._having()}"
|
33
30
|
)
|
31
|
+
return query
|
34
32
|
|
35
33
|
def _select(self):
|
36
34
|
account_account_name_field = (
|
@@ -55,7 +53,7 @@ class AccountAccountReconcile(models.Model):
|
|
55
53
|
a.id as account_id,
|
56
54
|
FALSE as is_reconciled,
|
57
55
|
aml.currency_id as currency_id,
|
58
|
-
|
56
|
+
am.company_id,
|
59
57
|
null as foreign_currency_id
|
60
58
|
"""
|
61
59
|
|
@@ -84,7 +82,7 @@ class AccountAccountReconcile(models.Model):
|
|
84
82
|
ELSE NULL
|
85
83
|
END,
|
86
84
|
aml.currency_id,
|
87
|
-
|
85
|
+
am.company_id
|
88
86
|
"""
|
89
87
|
|
90
88
|
def _having(self):
|
@@ -9,7 +9,9 @@ from dateutil.relativedelta import relativedelta
|
|
9
9
|
from odoo import Command, _, api, fields, models, tools
|
10
10
|
from odoo.exceptions import UserError
|
11
11
|
from odoo.fields import first
|
12
|
-
from odoo.tools import float_compare, float_is_zero
|
12
|
+
from odoo.tools import LazyTranslate, float_compare, float_is_zero
|
13
|
+
|
14
|
+
_lt = LazyTranslate(__name__, default_lang="en_US")
|
13
15
|
|
14
16
|
|
15
17
|
class AccountBankStatementLine(models.Model):
|
@@ -22,7 +24,6 @@ class AccountBankStatementLine(models.Model):
|
|
22
24
|
._fields["reconcile_mode"]
|
23
25
|
.selection
|
24
26
|
)
|
25
|
-
company_id = fields.Many2one(related="journal_id.company_id")
|
26
27
|
reconcile_data = fields.Serialized()
|
27
28
|
manual_line_id = fields.Many2one(
|
28
29
|
"account.move.line",
|
@@ -290,7 +291,7 @@ class AccountBankStatementLine(models.Model):
|
|
290
291
|
can_reconcile = True
|
291
292
|
account = self.partner_id.property_account_payable_id
|
292
293
|
suspense_line = {
|
293
|
-
"reference": "reconcile_auxiliary
|
294
|
+
"reference": f"reconcile_auxiliary;{reconcile_auxiliary_id}",
|
294
295
|
"id": False,
|
295
296
|
"account_id": [account.id, account.display_name],
|
296
297
|
"partner_id": self.partner_id
|
@@ -456,7 +457,7 @@ class AccountBankStatementLine(models.Model):
|
|
456
457
|
"account_id": (
|
457
458
|
[self.manual_account_id.id, self.manual_account_id.display_name]
|
458
459
|
if self.manual_account_id
|
459
|
-
else [False,
|
460
|
+
else [False, _lt("Undefined")]
|
460
461
|
),
|
461
462
|
"amount": self.manual_amount,
|
462
463
|
"credit": -self.manual_amount if self.manual_amount < 0 else 0.0,
|
@@ -587,7 +588,7 @@ class AccountBankStatementLine(models.Model):
|
|
587
588
|
)
|
588
589
|
new_line.update(
|
589
590
|
{
|
590
|
-
"reference": "reconcile_auxiliary
|
591
|
+
"reference": f"reconcile_auxiliary;{reconcile_auxiliary_id}",
|
591
592
|
"id": False,
|
592
593
|
"amount": amount,
|
593
594
|
"debit": amount if amount > 0 else 0,
|
@@ -768,7 +769,7 @@ class AccountBankStatementLine(models.Model):
|
|
768
769
|
def reconcile_bank_line(self):
|
769
770
|
self.ensure_one()
|
770
771
|
self.reconcile_mode = self.journal_id.reconcile_mode
|
771
|
-
result = getattr(self, "_reconcile_bank_line_
|
772
|
+
result = getattr(self, f"_reconcile_bank_line_{self.reconcile_mode}")(
|
772
773
|
self._prepare_reconcile_line_data(self.reconcile_data_info["data"])
|
773
774
|
)
|
774
775
|
self.reconcile_data = False
|
@@ -776,7 +777,9 @@ class AccountBankStatementLine(models.Model):
|
|
776
777
|
|
777
778
|
def _reconcile_bank_line_edit(self, data):
|
778
779
|
_liquidity_lines, suspense_lines, other_lines = self._seek_for_lines()
|
779
|
-
lines_to_remove = [
|
780
|
+
lines_to_remove = [
|
781
|
+
Command.delete(line.id) for line in suspense_lines + other_lines
|
782
|
+
]
|
780
783
|
|
781
784
|
# Cleanup previous lines.
|
782
785
|
move = self.move_id
|
@@ -787,6 +790,7 @@ class AccountBankStatementLine(models.Model):
|
|
787
790
|
skip_account_move_synchronization=True,
|
788
791
|
force_delete=True,
|
789
792
|
skip_invoice_sync=True,
|
793
|
+
skip_readonly_check=True,
|
790
794
|
).write(
|
791
795
|
{
|
792
796
|
"line_ids": lines_to_remove,
|
@@ -908,7 +912,7 @@ class AccountBankStatementLine(models.Model):
|
|
908
912
|
default_values_list = [
|
909
913
|
{
|
910
914
|
"date": move.date,
|
911
|
-
"ref":
|
915
|
+
"ref": _lt("Reversal of: %s", move.name),
|
912
916
|
}
|
913
917
|
for move in to_reverse
|
914
918
|
]
|
@@ -986,9 +990,9 @@ class AccountBankStatementLine(models.Model):
|
|
986
990
|
)
|
987
991
|
if not data.get("can_reconcile"):
|
988
992
|
continue
|
989
|
-
getattr(
|
990
|
-
|
991
|
-
)
|
993
|
+
getattr(record, f"_reconcile_bank_line_{record.journal_id.reconcile_mode}")(
|
994
|
+
self._prepare_reconcile_line_data(data["data"])
|
995
|
+
)
|
992
996
|
return result
|
993
997
|
|
994
998
|
def _synchronize_to_moves(self, changed_fields):
|
@@ -1030,7 +1034,9 @@ class AccountBankStatementLine(models.Model):
|
|
1030
1034
|
st_line_vals = {"line_ids": line_ids_commands}
|
1031
1035
|
if st_line.move_id.partner_id != st_line.partner_id:
|
1032
1036
|
st_line_vals["partner_id"] = st_line.partner_id.id
|
1033
|
-
st_line.move_id.write(
|
1037
|
+
st_line.move_id.with_context(skip_readonly_check=True).write(
|
1038
|
+
st_line_vals
|
1039
|
+
)
|
1034
1040
|
else:
|
1035
1041
|
super()._synchronize_to_moves(changed_fields=changed_fields)
|
1036
1042
|
|
@@ -1103,7 +1109,7 @@ class AccountBankStatementLine(models.Model):
|
|
1103
1109
|
new_data += lines
|
1104
1110
|
new_data.append(
|
1105
1111
|
{
|
1106
|
-
"reference": "reconcile_auxiliary
|
1112
|
+
"reference": f"reconcile_auxiliary;{reconcile_auxiliary_id}",
|
1107
1113
|
"id": False,
|
1108
1114
|
"account_id": line["account_id"],
|
1109
1115
|
"partner_id": line.get("partner_id"),
|
@@ -1130,13 +1136,13 @@ class AccountBankStatementLine(models.Model):
|
|
1130
1136
|
|
1131
1137
|
def action_to_check(self):
|
1132
1138
|
self.ensure_one()
|
1133
|
-
self.move_id.
|
1139
|
+
self.move_id.write({"checked": False})
|
1134
1140
|
if self.can_reconcile and self.journal_id.reconcile_mode == "edit":
|
1135
1141
|
self.reconcile_bank_line()
|
1136
1142
|
|
1137
1143
|
def action_checked(self):
|
1138
1144
|
self.ensure_one()
|
1139
|
-
self.move_id.
|
1145
|
+
self.move_id.write({"checked": True})
|
1140
1146
|
|
1141
1147
|
def _get_reconcile_line(
|
1142
1148
|
self,
|
@@ -1222,7 +1228,7 @@ class AccountBankStatementLine(models.Model):
|
|
1222
1228
|
data = {
|
1223
1229
|
"is_exchange_counterpart": True,
|
1224
1230
|
"original_exchange_line_id": line.id,
|
1225
|
-
"reference": "reconcile_auxiliary
|
1231
|
+
"reference": f"reconcile_auxiliary;{reconcile_auxiliary_id}",
|
1226
1232
|
"id": False,
|
1227
1233
|
"account_id": (account.id, account.display_name),
|
1228
1234
|
"partner_id": False,
|
@@ -88,7 +88,7 @@ class AccountReconcileAbstract(models.AbstractModel):
|
|
88
88
|
vals = {
|
89
89
|
"move_id": move and line.move_id.id,
|
90
90
|
"move": move and line.move_id.name,
|
91
|
-
"reference": "account.move.line
|
91
|
+
"reference": f"account.move.line;{line.id}",
|
92
92
|
"id": line.id,
|
93
93
|
"account_id": [line.account_id.id, line.account_id.display_name],
|
94
94
|
"partner_id": [line.partner_id.id, line.partner_id.display_name]
|
@@ -367,9 +367,9 @@ ul.auto-toc {
|
|
367
367
|
!! This file is generated by oca-gen-addon-readme !!
|
368
368
|
!! changes will be overwritten. !!
|
369
369
|
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
370
|
-
!! source digest: sha256:
|
370
|
+
!! source digest: sha256:724ba0bf29e558813ec81c62b41fb300550d68da0570edf8e00e438ffc0ee5c9
|
371
371
|
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
|
372
|
-
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/account-reconcile/tree/
|
372
|
+
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/account-reconcile/tree/18.0/account_reconcile_oca"><img alt="OCA/account-reconcile" src="https://img.shields.io/badge/github-OCA%2Faccount--reconcile-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/account-reconcile-18-0/account-reconcile-18-0-account_reconcile_oca"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/account-reconcile&target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
|
373
373
|
<p>This addon allows to reconcile bank statements and account marked as
|
374
374
|
reconcile.</p>
|
375
375
|
<p><strong>Table of contents</strong></p>
|
@@ -416,7 +416,7 @@ You can access the same widget from accounts and Partners.</p>
|
|
416
416
|
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/account-reconcile/issues">GitHub Issues</a>.
|
417
417
|
In case of trouble, please check there if your issue has already been reported.
|
418
418
|
If you spotted it first, help us to smash it by providing a detailed and welcomed
|
419
|
-
<a class="reference external" href="https://github.com/OCA/account-reconcile/issues/new?body=module:%20account_reconcile_oca%0Aversion:%
|
419
|
+
<a class="reference external" href="https://github.com/OCA/account-reconcile/issues/new?body=module:%20account_reconcile_oca%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
|
420
420
|
<p>Do not contact contributors directly about support or help with technical issues.</p>
|
421
421
|
</div>
|
422
422
|
<div class="section" id="credits">
|
@@ -445,7 +445,7 @@ mission is to support the collaborative development of Odoo features and
|
|
445
445
|
promote its widespread use.</p>
|
446
446
|
<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
|
447
447
|
<p><a class="reference external image-reference" href="https://github.com/etobella"><img alt="etobella" src="https://github.com/etobella.png?size=40px" /></a></p>
|
448
|
-
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/account-reconcile/tree/
|
448
|
+
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/account-reconcile/tree/18.0/account_reconcile_oca">OCA/account-reconcile</a> project on GitHub.</p>
|
449
449
|
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
|
450
450
|
</div>
|
451
451
|
</div>
|
@@ -1,9 +1,9 @@
|
|
1
|
-
/** @odoo-module */
|
2
1
|
const {onMounted, onWillStart, useState, useSubEnv} = owl;
|
3
2
|
import {useBus, useService} from "@web/core/utils/hooks";
|
4
3
|
import {KanbanController} from "@web/views/kanban/kanban_controller";
|
5
4
|
import {View} from "@web/views/view";
|
6
5
|
import {formatMonetary} from "@web/views/fields/formatters";
|
6
|
+
import {router} from "@web/core/browser/router";
|
7
7
|
|
8
8
|
export class ReconcileController extends KanbanController {
|
9
9
|
async setup() {
|
@@ -20,7 +20,6 @@ export class ReconcileController extends KanbanController {
|
|
20
20
|
this.effect = useService("effect");
|
21
21
|
this.orm = useService("orm");
|
22
22
|
this.action = useService("action");
|
23
|
-
this.router = useService("router");
|
24
23
|
this.activeActions = this.props.archInfo.activeActions;
|
25
24
|
useBus(this.model.bus, "update", () => {
|
26
25
|
this.selectRecord();
|
@@ -134,7 +133,7 @@ export class ReconcileController extends KanbanController {
|
|
134
133
|
this.selectRecord(record);
|
135
134
|
}
|
136
135
|
updateURL(resId) {
|
137
|
-
|
136
|
+
router.pushState({id: resId});
|
138
137
|
}
|
139
138
|
}
|
140
139
|
|
odoo/addons/account_reconcile_oca/static/src/js/reconcile_form/reconcile_form_controller.esm.js
CHANGED
@@ -1,5 +1,3 @@
|
|
1
|
-
/** @odoo-module */
|
2
|
-
|
3
1
|
import {FormController} from "@web/views/form/form_controller";
|
4
2
|
import {useService} from "@web/core/utils/hooks";
|
5
3
|
import {useViewButtons} from "@web/views/view_button/view_button_hook";
|
@@ -11,7 +9,7 @@ export class ReconcileFormController extends FormController {
|
|
11
9
|
this.env.exposeController(this);
|
12
10
|
this.orm = useService("orm");
|
13
11
|
const rootRef = useRef("root");
|
14
|
-
useViewButtons(
|
12
|
+
useViewButtons(rootRef, {
|
15
13
|
reload: this.reloadFormController.bind(this),
|
16
14
|
beforeExecuteAction: this.beforeExecuteActionButton.bind(this),
|
17
15
|
afterExecuteAction: this.afterExecuteActionButton.bind(this),
|
odoo/addons/account_reconcile_oca/static/src/js/reconcile_manual/reconcile_manual_controller.esm.js
CHANGED
@@ -1,5 +1,3 @@
|
|
1
|
-
/** @odoo-module */
|
2
|
-
|
3
1
|
import {FormController} from "@web/views/form/form_controller";
|
4
2
|
import {useViewButtons} from "@web/views/view_button/view_button_hook";
|
5
3
|
const {useRef} = owl;
|
@@ -22,6 +20,8 @@ export class ReconcileManualController extends FormController {
|
|
22
20
|
try {
|
23
21
|
await this.model.root.load();
|
24
22
|
} catch (error) {
|
23
|
+
// eslint-disable-next-line no-undef
|
24
|
+
console.error("Error reloading form controller:", error);
|
25
25
|
// This should happen when we reconcile a line (no more possible data...)
|
26
26
|
if (this.env.parentController) {
|
27
27
|
await this.env.parentController.model.root.load();
|
@@ -1,8 +1,6 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
// import {ChatterContainer} from "@mail/components/chatter_container/chatter_container";
|
1
|
+
// Import {ChatterContainer} from "@mail/components/chatter_container/chatter_container";
|
4
2
|
// import {Chatter} from "@mail/core/web/chatter";
|
5
|
-
import {Chatter} from "@mail/
|
3
|
+
import {Chatter} from "@mail/chatter/web_portal/chatter";
|
6
4
|
|
7
5
|
import {registry} from "@web/core/registry";
|
8
6
|
import {standardFieldProps} from "@web/views/fields/standard_field_props";
|
@@ -1,4 +1,4 @@
|
|
1
|
-
|
1
|
+
/* global CustomEvent */
|
2
2
|
import {formatDate, parseDate} from "@web/core/l10n/dates";
|
3
3
|
import {formatMonetary} from "@web/views/fields/formatters";
|
4
4
|
import {registry} from "@web/core/registry";
|
@@ -76,6 +76,7 @@ export class AccountReconcileDataWidget extends Component {
|
|
76
76
|
async openMove(ev, moveId) {
|
77
77
|
ev.preventDefault();
|
78
78
|
ev.stopPropagation();
|
79
|
+
// eslint-disable-next-line no-undef
|
79
80
|
console.log(moveId);
|
80
81
|
const action = await this.orm.call("account.move", "get_formview_action", [
|
81
82
|
[moveId],
|
@@ -71,8 +71,8 @@
|
|
71
71
|
</xpath>
|
72
72
|
<xpath expr="//Layout" position="inside">
|
73
73
|
<div class="o_account_reconcile_oca_info">
|
74
|
-
|
75
|
-
|
74
|
+
<t t-if="state.selectedRecordId">
|
75
|
+
<View t-props="viewReconcileInfo" t-key="state.selectedRecordId" />
|
76
76
|
</t>
|
77
77
|
</div>
|
78
78
|
</xpath>
|
@@ -81,7 +81,7 @@
|
|
81
81
|
<button
|
82
82
|
t-on-click="onClickNewButton"
|
83
83
|
class="btn btn-primary"
|
84
|
-
t-if="activeActions.create"
|
84
|
+
t-if="props.archInfo.activeActions.create"
|
85
85
|
>Create</button>
|
86
86
|
</t>
|
87
87
|
<t t-name="account_reconcile_oca.ReconcileMatchWidget">
|