odoo-addon-account-reconcile-oca 18.0.1.0.3.2__py3-none-any.whl → 18.0.1.0.4__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.
Files changed (11) hide show
  1. odoo/addons/account_reconcile_oca/README.rst +1 -1
  2. odoo/addons/account_reconcile_oca/__manifest__.py +1 -1
  3. odoo/addons/account_reconcile_oca/i18n/account_reconcile_oca.pot +5 -0
  4. odoo/addons/account_reconcile_oca/models/account_account_reconcile.py +14 -5
  5. odoo/addons/account_reconcile_oca/static/description/index.html +1 -1
  6. odoo/addons/account_reconcile_oca/static/src/js/reconcile_form/reconcile_form_controller.esm.js +22 -6
  7. odoo/addons/account_reconcile_oca/static/src/js/widgets/reconcile_data_widget.esm.js +5 -1
  8. {odoo_addon_account_reconcile_oca-18.0.1.0.3.2.dist-info → odoo_addon_account_reconcile_oca-18.0.1.0.4.dist-info}/METADATA +2 -2
  9. {odoo_addon_account_reconcile_oca-18.0.1.0.3.2.dist-info → odoo_addon_account_reconcile_oca-18.0.1.0.4.dist-info}/RECORD +11 -11
  10. {odoo_addon_account_reconcile_oca-18.0.1.0.3.2.dist-info → odoo_addon_account_reconcile_oca-18.0.1.0.4.dist-info}/WHEEL +0 -0
  11. {odoo_addon_account_reconcile_oca-18.0.1.0.3.2.dist-info → odoo_addon_account_reconcile_oca-18.0.1.0.4.dist-info}/top_level.txt +0 -0
odoo/addons/account_reconcile_oca/README.rst CHANGED
@@ -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:d184238b47f394e8fd55c8b2027bd745084402306edce638a5e983497e12573a
10
+ !! source digest: sha256:bbf3b42f13adcce35bb386b02b3e3177c25ac196fc89a72333651f6596ae6fc0
11
11
  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
12
12
 
13
13
  .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
odoo/addons/account_reconcile_oca/__manifest__.py CHANGED
@@ -5,7 +5,7 @@
5
5
  "name": "Account Reconcile Oca",
6
6
  "summary": """
7
7
  Reconcile addons for Odoo CE accounting""",
8
- "version": "18.0.1.0.3",
8
+ "version": "18.0.1.0.4",
9
9
  "license": "AGPL-3",
10
10
  "author": "CreuBlanca,Dixmit,Odoo Community Association (OCA)",
11
11
  "maintainers": ["etobella"],
odoo/addons/account_reconcile_oca/i18n/account_reconcile_oca.pot CHANGED
@@ -39,6 +39,11 @@ msgstr ""
39
39
  msgid "Account Reconcile Abstract"
40
40
  msgstr ""
41
41
 
42
+ #. module: account_reconcile_oca
43
+ #: model:ir.model.fields,field_description:account_reconcile_oca.field_account_account_reconcile__active
44
+ msgid "Active"
45
+ msgstr ""
46
+
42
47
  #. module: account_reconcile_oca
43
48
  #: model:ir.model.fields,field_description:account_reconcile_oca.field_account_account_reconcile__add_account_move_line_id
44
49
  #: model:ir.model.fields,field_description:account_reconcile_oca.field_account_bank_statement_line__add_account_move_line_id
odoo/addons/account_reconcile_oca/models/account_account_reconcile.py CHANGED
@@ -21,6 +21,7 @@ class AccountAccountReconcile(models.Model):
21
21
  account_id = fields.Many2one("account.account", readonly=True)
22
22
  name = fields.Char(readonly=True)
23
23
  is_reconciled = fields.Boolean(readonly=True)
24
+ active = fields.Boolean(default=True)
24
25
 
25
26
  @property
26
27
  def _table_query(self):
@@ -54,7 +55,19 @@ class AccountAccountReconcile(models.Model):
54
55
  FALSE as is_reconciled,
55
56
  aml.currency_id as currency_id,
56
57
  am.company_id,
57
- null as foreign_currency_id
58
+ null as foreign_currency_id,
59
+ (
60
+ SUM(
61
+ CASE WHEN aml.amount_residual > 0
62
+ THEN aml.amount_residual
63
+ ELSE 0 END
64
+ ) > 0
65
+ AND SUM(
66
+ CASE WHEN aml.amount_residual < 0
67
+ THEN -aml.amount_residual
68
+ ELSE 0 END
69
+ ) > 0
70
+ ) as active
58
71
  """
59
72
 
60
73
  def _from(self):
@@ -69,7 +82,6 @@ class AccountAccountReconcile(models.Model):
69
82
  return """
70
83
  WHERE a.reconcile
71
84
  AND am.state = 'posted'
72
- AND aml.amount_residual != 0
73
85
  """
74
86
 
75
87
  def _groupby(self):
@@ -87,9 +99,6 @@ class AccountAccountReconcile(models.Model):
87
99
 
88
100
  def _having(self):
89
101
  return """
90
- HAVING
91
- SUM(aml.debit) > 0
92
- AND SUM(aml.credit) > 0
93
102
  """
94
103
 
95
104
  def _compute_reconcile_data_info(self):
odoo/addons/account_reconcile_oca/static/description/index.html CHANGED
@@ -367,7 +367,7 @@ 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:d184238b47f394e8fd55c8b2027bd745084402306edce638a5e983497e12573a
370
+ !! source digest: sha256:bbf3b42f13adcce35bb386b02b3e3177c25ac196fc89a72333651f6596ae6fc0
371
371
  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
372
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&amp;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
odoo/addons/account_reconcile_oca/static/src/js/reconcile_form/reconcile_form_controller.esm.js CHANGED
@@ -1,6 +1,7 @@
1
1
  import {FormController} from "@web/views/form/form_controller";
2
2
  import {useService} from "@web/core/utils/hooks";
3
3
  import {useViewButtons} from "@web/views/view_button/view_button_hook";
4
+ import {FetchRecordError} from "@web/model/relational_model/errors";
4
5
  const {useRef} = owl;
5
6
 
6
7
  export class ReconcileFormController extends FormController {
@@ -20,24 +21,39 @@ export class ReconcileFormController extends FormController {
20
21
  }
21
22
  async reloadFormController() {
22
23
  var is_reconciled = this.model.root.data.is_reconciled;
23
- await this.model.root.load();
24
- if (this.env.parentController) {
24
+ var forceRefresh = false;
25
+ const journalId = this.model.root.data.journal_id;
26
+ try {
27
+ await this.model.root.load();
28
+ } catch (e) {
29
+ // If the record is not found, we need to reload the parent controller
30
+ if (e instanceof FetchRecordError) {
31
+ forceRefresh = true;
32
+ } else {
33
+ throw e;
34
+ }
35
+ }
36
+ if (
37
+ this.env.parentController &&
38
+ (forceRefresh || (!is_reconciled && this.model.root.data.is_reconciled))
39
+ ) {
25
40
  // We will update the parent controller every time we reload the form.
26
41
  await this.env.parentController.model.root.load();
27
42
  await this.env.parentController.render(true);
28
- if (!is_reconciled && this.model.root.data.is_reconciled) {
43
+ if (journalId) {
29
44
  // This only happens when we press the reconcile button for showing rainbow man
45
+ // Should not affect if we are in the reconcile view
30
46
  const message = await this.orm.call(
31
47
  "account.journal",
32
48
  "get_rainbowman_message",
33
- [[this.model.root.data.journal_id[0]]]
49
+ [[journalId[0]]]
34
50
  );
35
51
  if (message) {
36
52
  this.env.parentController.setRainbowMan(message);
37
53
  }
38
- // Refreshing
39
- this.env.parentController.selectRecord();
40
54
  }
55
+ // Refreshing
56
+ this.env.parentController.selectRecord();
41
57
  }
42
58
  }
43
59
  }
odoo/addons/account_reconcile_oca/static/src/js/widgets/reconcile_data_widget.esm.js CHANGED
@@ -3,10 +3,15 @@ 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";
5
5
  import {useService} from "@web/core/utils/hooks";
6
+ import {standardFieldProps} from "@web/views/fields/standard_field_props";
6
7
 
7
8
  const {Component} = owl;
8
9
 
9
10
  export class AccountReconcileDataWidget extends Component {
11
+ static props = {
12
+ ...standardFieldProps,
13
+ };
14
+ static template = "account_reconcile_oca.ReconcileDataWidget";
10
15
  setup() {
11
16
  super.setup(...arguments);
12
17
  this.orm = useService("orm");
@@ -84,7 +89,6 @@ export class AccountReconcileDataWidget extends Component {
84
89
  this.action.doAction(action);
85
90
  }
86
91
  }
87
- AccountReconcileDataWidget.template = "account_reconcile_oca.ReconcileDataWidget";
88
92
 
89
93
  export const AccountReconcileDataWidgetField = {
90
94
  component: AccountReconcileDataWidget,
{odoo_addon_account_reconcile_oca-18.0.1.0.3.2.dist-info → odoo_addon_account_reconcile_oca-18.0.1.0.4.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: odoo-addon-account_reconcile_oca
3
- Version: 18.0.1.0.3.2
3
+ Version: 18.0.1.0.4
4
4
  Requires-Python: >=3.10
5
5
  Requires-Dist: odoo-addon-account_reconcile_model_oca==18.0.*
6
6
  Requires-Dist: odoo-addon-account_statement_base==18.0.*
@@ -24,7 +24,7 @@ Account Reconcile Oca
24
24
  !! This file is generated by oca-gen-addon-readme !!
25
25
  !! changes will be overwritten. !!
26
26
  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
27
- !! source digest: sha256:d184238b47f394e8fd55c8b2027bd745084402306edce638a5e983497e12573a
27
+ !! source digest: sha256:bbf3b42f13adcce35bb386b02b3e3177c25ac196fc89a72333651f6596ae6fc0
28
28
  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
29
29
 
30
30
  .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
{odoo_addon_account_reconcile_oca-18.0.1.0.3.2.dist-info → odoo_addon_account_reconcile_oca-18.0.1.0.4.dist-info}/RECORD RENAMED
@@ -1,9 +1,9 @@
1
- odoo/addons/account_reconcile_oca/README.rst,sha256=_QR0ytRMnEx7tOJMX48oNFYMXEP4_vbR2ArApoMktJc,3703
1
+ odoo/addons/account_reconcile_oca/README.rst,sha256=4WM1CsSVP8HlgFofvFZmdY42-d5xaDssRXfqnWa58Es,3703
2
2
  odoo/addons/account_reconcile_oca/__init__.py,sha256=vqRYeBgCVZMpZhYvILSxVsNLC9V7zDnvxMnKU8RQP94,55
3
- odoo/addons/account_reconcile_oca/__manifest__.py,sha256=zxURziZ67BqTbPWpTt4ZS4SjjXfvQaX9gSlLmJ9z0fE,1788
3
+ odoo/addons/account_reconcile_oca/__manifest__.py,sha256=EJDebye7XzZOWcx669-9JLROrAMRucWHE24v22LDsho,1788
4
4
  odoo/addons/account_reconcile_oca/hooks.py,sha256=SfJ-GlIGYL1kf8xhQs5qDqwNnE8S9Gs-5dP3vOD-IMM,182
5
5
  odoo/addons/account_reconcile_oca/demo/demo.xml,sha256=UKHgUXdDr54NsxdYk5czOdD-kmJas-8zlq5D7VQtIh4,203
6
- odoo/addons/account_reconcile_oca/i18n/account_reconcile_oca.pot,sha256=5gK02FBQjnhlqJdk3LOxlr9YCBFDG9W9Rbee0WYw-IM,25428
6
+ odoo/addons/account_reconcile_oca/i18n/account_reconcile_oca.pot,sha256=7E0r7rTg0-V3WUD39GZWUt-bNj__DbE0z_w6iHkepa8,25592
7
7
  odoo/addons/account_reconcile_oca/i18n/ca.po,sha256=aLKybPofjsXOs3bR6uHYEgiycA45l0-I86csQkzjH_U,27914
8
8
  odoo/addons/account_reconcile_oca/i18n/es.po,sha256=kmNZdQsnSQRgILsasQ-xwDD-UIYfkql_v_AFdVI9tMY,28785
9
9
  odoo/addons/account_reconcile_oca/i18n/fr.po,sha256=IUc0Hutd1ETLCfMiroZ2YG0eMA32-Y3caz1Eo-YtbIQ,28561
@@ -17,7 +17,7 @@ odoo/addons/account_reconcile_oca/i18n/tr.po,sha256=I12rf_Ii4DG88OYINIK0DORqwbVo
17
17
  odoo/addons/account_reconcile_oca/i18n/zh.po,sha256=OrZGNmHphcAPo9Sptef1lKJKZbMC8dIuWMqnLYc1uHA,25929
18
18
  odoo/addons/account_reconcile_oca/i18n/zh_CN.po,sha256=E90cE9nDSkUWaP3Ngvj3NG0xTAfcguywhgxlNKmeLZ4,27668
19
19
  odoo/addons/account_reconcile_oca/models/__init__.py,sha256=28wbZjUZa30uHQY10BMJtKQ_BqJgwLQMQvB9uv0H_fY,282
20
- odoo/addons/account_reconcile_oca/models/account_account_reconcile.py,sha256=-M3lrYywAASLysnha1GEXXYkINWARXO3VIEyiRg4yL0,7088
20
+ odoo/addons/account_reconcile_oca/models/account_account_reconcile.py,sha256=ngJzOnYFdsTrK51r8Gz7aTLqVSHQcPnTZVAw0slah3Y,7429
21
21
  odoo/addons/account_reconcile_oca/models/account_bank_statement.py,sha256=CFqlLLtmTqmt5yH3v_pkUfkZezSb1nEhBTu2J5gCjxM,1034
22
22
  odoo/addons/account_reconcile_oca/models/account_bank_statement_line.py,sha256=cunPYEzrHSDtFjKH-_4wyuLt8_jmETt3BJrWsKVv1_A,53081
23
23
  odoo/addons/account_reconcile_oca/models/account_journal.py,sha256=PXXoGnByO7ve9_G09tnn95HKJoLvXM1pDxHDdd7bpU4,1359
@@ -31,12 +31,12 @@ odoo/addons/account_reconcile_oca/readme/ROADMAP.md,sha256=fxR8QnC8BkHyODdPScpgJ
31
31
  odoo/addons/account_reconcile_oca/readme/USAGE.md,sha256=yNLGo35X7TW2TLyJqHU-gdQiXazW8Iu59rI0dpa4WjM,365
32
32
  odoo/addons/account_reconcile_oca/security/ir.model.access.csv,sha256=XfN2EKOoChlEDonVd5DtodVAQyRbShiJ8nrXx6EwNmM,339
33
33
  odoo/addons/account_reconcile_oca/static/description/icon.png,sha256=6xBPJauaFOF0KDHfHgQopSc28kKvxMaeoQFQWZtfZDo,9455
34
- odoo/addons/account_reconcile_oca/static/description/index.html,sha256=Rib7-YMuFT7ID70sSUAoMeyUzNlFGBSVFIES00Kb1Rs,13790
34
+ odoo/addons/account_reconcile_oca/static/description/index.html,sha256=YEm3sXSsdk_mCnbc0zt3QD-A7AQLiojs24mFllxyptA,13790
35
35
  odoo/addons/account_reconcile_oca/static/src/js/reconcile/reconcile_controller.esm.js,sha256=Zyk9E7M_dpuqXyB8-TQhRFPGozQA9dCyEsht4_UJWbM,4871
36
36
  odoo/addons/account_reconcile_oca/static/src/js/reconcile/reconcile_kanban_record.esm.js,sha256=8kQb0XINafwaiW3jaogkqIijYChliJHXPj0Kr6Sp6Vk,446
37
37
  odoo/addons/account_reconcile_oca/static/src/js/reconcile/reconcile_renderer.esm.js,sha256=SjwJu1wXFRJ_-fIOFqG0DO0KfkErSTVoW1uFHzsKoP0,2096
38
38
  odoo/addons/account_reconcile_oca/static/src/js/reconcile/reconcile_view.esm.js,sha256=lON7Z1F9I1V9GADvPxRqAbSeGvvGCVHK9A8oXzcFBmQ,514
39
- odoo/addons/account_reconcile_oca/static/src/js/reconcile_form/reconcile_form_controller.esm.js,sha256=qebq6IIOPVcBMuFvcK0L3Vm2pkLfxLlpi1lujRJg5Cc,1779
39
+ odoo/addons/account_reconcile_oca/static/src/js/reconcile_form/reconcile_form_controller.esm.js,sha256=TZ8BaCBiyLBNkfkeq0T1KDtOX2tHBGNZx6sx5mIjPvQ,2326
40
40
  odoo/addons/account_reconcile_oca/static/src/js/reconcile_form/reconcile_form_notebook.esm.js,sha256=La2TfmXUid6xCLdU7XeDPAFxS-iPUhfxCU_zZ-NyJ4U,954
41
41
  odoo/addons/account_reconcile_oca/static/src/js/reconcile_form/reconcile_form_renderer.esm.js,sha256=NOXw7s1wQNFjyZelgJli082Fp9J5XSViT6ldOHGKR1A,311
42
42
  odoo/addons/account_reconcile_oca/static/src/js/reconcile_form/reconcile_form_view.esm.js,sha256=mlkV1uxrus6sL73-B3zu08Mn9YXUtR2fmkY9BlAMS5I,449
@@ -44,7 +44,7 @@ odoo/addons/account_reconcile_oca/static/src/js/reconcile_move_line/reconcile_mo
44
44
  odoo/addons/account_reconcile_oca/static/src/js/reconcile_move_line/reconcile_move_line_renderer.esm.js,sha256=vlDk5Cgjqe1Y-eItfxZfhAKgIi8wNJkNZOH-29mPwxY,584
45
45
  odoo/addons/account_reconcile_oca/static/src/js/reconcile_move_line/reconcile_move_line_view.esm.js,sha256=xWcxhNVvUTABPr5GhwAb4ZfPoFfnhD2JtxjZU_LopHI,549
46
46
  odoo/addons/account_reconcile_oca/static/src/js/widgets/reconcile_chatter_field.esm.js,sha256=xx5E0kEwFAucyYy5KLD3qvrNhVpCOrwHXc0L9OlnfSs,890
47
- odoo/addons/account_reconcile_oca/static/src/js/widgets/reconcile_data_widget.esm.js,sha256=KYB7QGmREMwHkA06vus8sdctRZo-MHRZ0LRr90OY7DQ,3384
47
+ odoo/addons/account_reconcile_oca/static/src/js/widgets/reconcile_data_widget.esm.js,sha256=-s2Prv11nwsNWDbK1G5Lkk25ujB6bOWCGuThxSnR_a8,3502
48
48
  odoo/addons/account_reconcile_oca/static/src/js/widgets/reconcile_move_line_widget.esm.js,sha256=eVAzcBgU5UKXihPXPuxu0xAO_LOZ6-4kgClF4p8FoNY,3781
49
49
  odoo/addons/account_reconcile_oca/static/src/js/widgets/selection_badge_uncheck.esm.js,sha256=v6QRhT3j-6AOXnoEwKWpZjBqykF_LUnSJU3zITXDrdc,815
50
50
  odoo/addons/account_reconcile_oca/static/src/scss/reconcile.scss,sha256=b6clO2yWT91dEdTE3RcdORFE6dNqqzsXz3S0Rc5afZU,2318
@@ -60,7 +60,7 @@ odoo/addons/account_reconcile_oca/views/account_journal.xml,sha256=kO9TjjowUBV-4
60
60
  odoo/addons/account_reconcile_oca/views/account_move.xml,sha256=DmtEGKT5R8QwI_xEAZH1l8tC6pe-GlIQtb4tikHK3z0,971
61
61
  odoo/addons/account_reconcile_oca/views/account_move_line.xml,sha256=a1AqrG0ppplhiAWXabwjbLrvFCatBHys2xNoHxtTgCE,5324
62
62
  odoo/addons/account_reconcile_oca/views/res_config_settings.xml,sha256=uO3fyDQanxF_UfJ2ggc4H9t6gO2cKGMh08IOQemoudc,803
63
- odoo_addon_account_reconcile_oca-18.0.1.0.3.2.dist-info/METADATA,sha256=G1Ew4sJkq0vfr5B76xlW3itfh4Iik4rtHpKoDtcA1mM,4362
64
- odoo_addon_account_reconcile_oca-18.0.1.0.3.2.dist-info/WHEEL,sha256=9fEMia4zL7ZuZbnCOrcYogUhmn4XFIVaJ8G4YGI31xc,81
65
- odoo_addon_account_reconcile_oca-18.0.1.0.3.2.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
66
- odoo_addon_account_reconcile_oca-18.0.1.0.3.2.dist-info/RECORD,,
63
+ odoo_addon_account_reconcile_oca-18.0.1.0.4.dist-info/METADATA,sha256=CAXcTCFkie06ZrC0AgTQ10N6uQofxisKnRW_jTRPV1I,4360
64
+ odoo_addon_account_reconcile_oca-18.0.1.0.4.dist-info/WHEEL,sha256=9fEMia4zL7ZuZbnCOrcYogUhmn4XFIVaJ8G4YGI31xc,81
65
+ odoo_addon_account_reconcile_oca-18.0.1.0.4.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
66
+ odoo_addon_account_reconcile_oca-18.0.1.0.4.dist-info/RECORD,,