odoo-addon-account-reconcile-oca 17.0.1.5.3__py3-none-any.whl → 17.0.1.5.5__py3-none-any.whl

odoo/addons/account_reconcile_oca/models/account_reconcile_abstract.py

@@ -33,24 +33,46 @@ class AccountReconcileAbstract(models.AbstractModel):
         related="company_id.currency_id", string="Company Currency"
     )
 
+    def _get_reconcile_currency(self):
+        return self.currency_id or self.company_id._currency_id
+
     def _get_reconcile_line(
-        self, line, kind, is_counterpart=False, max_amount=False, from_unreconcile=False
+        self,
+        line,
+        kind,
+        is_counterpart=False,
+        max_amount=False,
+        from_unreconcile=False,
+        move=False,
     ):
         date = self.date if "date" in self._fields else line.date
         original_amount = amount = net_amount = line.debit - line.credit
+        line_currency = line.currency_id
         if is_counterpart:
             currency_amount = -line.amount_residual_currency or line.amount_residual
             amount = -line.amount_residual
-            currency = line.currency_id or self.company_id.currency_id
+            currency = line.currency_id or line.company_id.currency_id
             original_amount = net_amount = -line.amount_residual
             if max_amount:
-                currency_max_amount = self.company_id.currency_id._convert(
-                    max_amount, currency, self.company_id, date
-                )
+                dest_currency = self._get_reconcile_currency()
+                if currency == dest_currency:
+                    real_currency_amount = currency_amount
+                elif self.company_id.currency_id == dest_currency:
+                    real_currency_amount = amount
+                else:
+                    real_currency_amount = self.company_id.currency_id._convert(
+                        amount,
+                        dest_currency,
+                        self.company_id,
+                        date,
+                    )
                 if (
-                    -currency_amount > currency_max_amount > 0
-                    or -currency_amount < currency_max_amount < 0
+                    -real_currency_amount > max_amount > 0
+                    or -real_currency_amount < max_amount < 0
                 ):
+                    currency_max_amount = self._get_reconcile_currency()._convert(
+                        max_amount, currency, self.company_id, date
+                    )
                     amount = currency_max_amount
                     net_amount = -max_amount
                     currency_amount = -amount
@@ -61,8 +83,11 @@ class AccountReconcileAbstract(models.AbstractModel):
                         date,
                     )
         else:
-            currency_amount = line.amount_currency
+            currency_amount = self.amount_currency or self.amount
+            line_currency = self._get_reconcile_currency()
         vals = {
+            "move_id": move and line.move_id.id,
+            "move": move and line.move_id.name,
             "reference": "account.move.line;%s" % line.id,
             "id": line.id,
             "account_id": [line.account_id.id, line.account_id.display_name],
@@ -76,7 +101,7 @@ class AccountReconcileAbstract(models.AbstractModel):
             "amount": amount,
             "net_amount": amount - net_amount,
             "currency_id": self.company_id.currency_id.id,
-            "line_currency_id": line.currency_id.id,
+            "line_currency_id": line_currency.id,
             "currency_amount": currency_amount,
             "analytic_distribution": line.analytic_distribution,
             "kind": kind,
@@ -84,11 +109,11 @@ class AccountReconcileAbstract(models.AbstractModel):
         if from_unreconcile:
             vals.update(
                 {
-                    "id": False,
-                    "counterpart_line_ids": (
-                        line.matched_debit_ids.mapped("debit_move_id")
-                        | line.matched_credit_ids.mapped("credit_move_id")
-                    ).ids,
+                    "credit": vals["debit"] and from_unreconcile["debit"],
+                    "debit": vals["credit"] and from_unreconcile["credit"],
+                    "amount": from_unreconcile["amount"],
+                    "net_amount": from_unreconcile["amount"],
+                    "currency_amount": from_unreconcile["currency_amount"],
                 }
             )
         if not float_is_zero(
@@ -99,3 +124,6 @@ class AccountReconcileAbstract(models.AbstractModel):
         if is_counterpart:
             vals["counterpart_line_ids"] = line.ids
         return [vals]
+
+    def add_multiple_lines(self, domain):
+        self.ensure_one()

odoo/addons/account_reconcile_oca/static/description/index.html

@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:25a85af43d834abf67306c2d7fa108d6ecc44f76300ab92e54cc982f8cfe9334
+!! source digest: sha256:cf0d778067ac722c5a6d7f65f8fa4b0766076829ba9c9c147cc3718782cc85b0
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/17.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-17-0/account-reconcile-17-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=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This addon allows to reconcile bank statements and account marked as

odoo/addons/account_reconcile_oca/static/src/js/reconcile_move_line/reconcile_move_line_controller.esm.js

@@ -8,6 +8,15 @@ export class ReconcileMoveLineController extends ListController {
         data[this.props.parentField] = [record.resId, record.display_name];
         this.props.parentRecord.update(data);
     }
+    async clickAddAll() {
+        await this.props.parentRecord.save();
+        await this.orm.call(this.props.parentRecord.resModel, "add_multiple_lines", [
+            this.props.parentRecord.resIds,
+            this.model.root.domain,
+        ]);
+        await this.props.parentRecord.load();
+        this.props.parentRecord.model.notify();
+    }
 }
 
 ReconcileMoveLineController.template = `account_reconcile_oca.ReconcileMoveLineController`;

odoo/addons/account_reconcile_oca/static/src/js/reconcile_move_line/reconcile_move_line_view.esm.js

@@ -10,6 +10,7 @@ export const ReconcileMoveLineView = {
     ...listView,
     Controller: ReconcileMoveLineController,
     Renderer: ReconcileMoveLineRenderer,
+    buttonTemplate: "reconcile_move_line.ListView.Buttons",
 };
 
 registry.category("views").add("reconcile_move_line", ReconcileMoveLineView);

odoo/addons/account_reconcile_oca/static/src/js/widgets/reconcile_data_widget.esm.js

@@ -2,12 +2,15 @@
 import {formatDate, parseDate} from "@web/core/l10n/dates";
 import {formatMonetary} from "@web/views/fields/formatters";
 import {registry} from "@web/core/registry";
+import {useService} from "@web/core/utils/hooks";
 
 const {Component} = owl;
 
 export class AccountReconcileDataWidget extends Component {
     setup() {
         super.setup(...arguments);
+        this.orm = useService("orm");
+        this.action = useService("action");
         this.foreignCurrency =
             this.props &&
             this.props.record &&
@@ -70,6 +73,15 @@ export class AccountReconcileDataWidget extends Component {
         });
         this.env.bus.trigger("RECONCILE_PAGE_NAVIGATE", triggerEv);
     }
+    async openMove(ev, moveId) {
+        ev.preventDefault();
+        ev.stopPropagation();
+        console.log(moveId);
+        const action = await this.orm.call("account.move", "get_formview_action", [
+            [moveId],
+        ]);
+        this.action.doAction(action);
+    }
 }
 AccountReconcileDataWidget.template = "account_reconcile_oca.ReconcileDataWidget";
 

odoo/addons/account_reconcile_oca/static/src/js/widgets/reconcile_move_line_widget.esm.js

@@ -31,7 +31,7 @@ export class AccountReconcileMatchWidget extends Component {
                 controlPanel: {
                     // Hiding the control panel buttons
                     "top-left": false,
-                    "bottom-left": false,
+                    "bottom-left": true,
                     layoutActions: false,
                 },
             },
@@ -49,6 +49,7 @@ export class AccountReconcileMatchWidget extends Component {
             searchViewId: false,
             parentRecord: this.props.record,
             parentField: this.props.name,
+            showButtons: false,
         };
     }
 }

odoo/addons/account_reconcile_oca/static/src/xml/reconcile.xml

@@ -114,7 +114,18 @@
                         t-on-click="(ev) => this.selectReconcileLine(ev, reconcile_line)"
                         t-att-class="'o_reconcile_widget_line ' + reconcile_line.kind + (props.record.data.manual_reference == reconcile_line.reference ? ' selected ' :  ' ')"
                     >
-                        <td t-esc="reconcile_line.account_id[1]" />
+                        <td>
+                            <div t-esc="reconcile_line.account_id[1]" />
+                            <div t-if="reconcile_line.move_id">
+                                <a
+                                    t-att-href="'/web#id=' + reconcile_line.move_id + '&amp;view_type=form&amp;model=account.move'"
+                                    class="o_form_uri"
+                                    t-on-click="(ev) => this.openMove(ev, reconcile_line.move_id)"
+                                >
+                                    <small t-esc="reconcile_line.move" />
+                                </a>
+                            </div>
+                        </td>
                         <td>
                             <span
                                 t-esc="reconcile_line.partner_id[1]"
@@ -189,4 +200,7 @@
             <attribute name="parentField">props.parentField</attribute>
         </xpath>
     </t>
+    <t t-name="reconcile_move_line.ListView.Buttons">
+        <button class="btn btn-primary" t-on-click="clickAddAll">Add all</button>
+    </t>
 </templates>