From 50ef29e405b8c76f25c4b77dcfa93def2122faf1 Mon Sep 17 00:00:00 2001
From: Iryna Vyshnevska <i.vyshnevska@mobilunity.com>
Date: Thu, 27 Dec 2018 17:14:28 +0200
Subject: [PATCH] [IMP] Link reconcile model instead just name

---
 .../report/general_ledger.py                       |  6 +++---
 .../report/general_ledger_xlsx.py                  |  5 ++++-
 .../report/templates/general_ledger.xml            | 14 +++++++-------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/account_financial_report_qweb/report/general_ledger.py b/account_financial_report_qweb/report/general_ledger.py
index bb8768e3..4a6b6606 100644
--- a/account_financial_report_qweb/report/general_ledger.py
+++ b/account_financial_report_qweb/report/general_ledger.py
@@ -186,6 +186,7 @@ class GeneralLedgerReportMoveLine(models.TransientModel):
 
     # Data fields, used to keep link with real object
     move_line_id = fields.Many2one('account.move.line')
+    matched_ml_id = fields.Many2one("account.full.reconcile")
 
     # Data fields, used for report display
     date = fields.Date()
@@ -197,7 +198,6 @@ class GeneralLedgerReportMoveLine(models.TransientModel):
     label = fields.Char()
     cost_center = fields.Char()
     tags = fields.Char()
-    matching_number = fields.Char()
     debit = fields.Float(digits=(16, 2))
     credit = fields.Float(digits=(16, 2))
     cumul_balance = fields.Float(digits=(16, 2))
@@ -1067,6 +1067,7 @@ INSERT INTO
     create_uid,
     create_date,
     move_line_id,
+    matched_ml_id,
     date,
     entry,
     journal,
@@ -1075,7 +1076,6 @@ INSERT INTO
     partner,
     label,
     cost_center,
-    matching_number,
     debit,
     credit,
     cumul_balance,
@@ -1096,6 +1096,7 @@ SELECT
     %s AS create_uid,
     NOW() AS create_date,
     ml.id AS move_line_id,
+    fr.id AS matched_ml_id,
     ml.date,
     m.name AS entry,
     j.code AS journal,
@@ -1139,7 +1140,6 @@ SELECT
         query_inject_move_line += """
     CONCAT_WS(' - ', NULLIF(ml.ref, ''), NULLIF(ml.name, '')) AS label,
     aa.name AS cost_center,
-    fr.name AS matching_number,
     ml.debit,
     ml.credit,
         """
diff --git a/account_financial_report_qweb/report/general_ledger_xlsx.py b/account_financial_report_qweb/report/general_ledger_xlsx.py
index d7698f71..c1810359 100644
--- a/account_financial_report_qweb/report/general_ledger_xlsx.py
+++ b/account_financial_report_qweb/report/general_ledger_xlsx.py
@@ -37,7 +37,10 @@ class GeneralLedgerXslx(abstract_report_xlsx.AbstractReportXslx):
             8: {'header': _('Tags'),
                 'field': 'tags',
                 'width': 10},
-            9: {'header': _('Rec.'), 'field': 'matching_number', 'width': 5},
+            9: {'header': _('Rec.'),
+                'field': 'matched_ml_id',
+                'type': 'many2one',
+                'width': 5},
             10: {'header': _('Debit'),
                  'field': 'debit',
                  'field_initial_balance': 'initial_debit',
diff --git a/account_financial_report_qweb/report/templates/general_ledger.xml b/account_financial_report_qweb/report/templates/general_ledger.xml
index 6745a691..a8e5ecdf 100644
--- a/account_financial_report_qweb/report/templates/general_ledger.xml
+++ b/account_financial_report_qweb/report/templates/general_ledger.xml
@@ -336,8 +336,8 @@
                             <a t-att-data-active-id="line.move_line_id.move_id.id"
                                t-att-data-res-model="res_model"
                                class="o_account_financial_reports_web_action underline-on-hover"
-                               style="color: black; cursor: pointer;">
-                                <t t-raw="line.entry"/></a>
+                               t-att-style="style">
+                                <t t-att-style="style" t-raw="line.entry"/></a>
                         </span>
                     </div>
                     <!--## journal-->
@@ -403,12 +403,12 @@
                     </t>
                     <!--## matching_number-->
                     <div class="act_as_cell">
-                        <t t-set="res_model" t-value="'account_full_reconcile'"/>
-                        <span t-if="line.matching_number">
-                            <a t-att-data-active-id="line.move_line_id.full_reconcile_id.id"
+                        <t t-set="res_model" t-value="'account.full.reconcile'"/>
+                        <span t-if="line.matched_ml_id">
+                            <a t-att-data-active-id="line.matched_ml_id.id"
                                t-att-data-res-model="res_model"
-                               class="o_account_financial_reports_web_action underline-on-hover"
-                               style="color: black; cursor: pointer;"><t t-raw="line.matching_number"/></a>
+                               class="o_account_financial_reports_web_action underline-on-hover">
+                                <t  t-att-style="style" t-raw="line.matched_ml_id.name"/></a>
                         </span>
                     </div>
                     <!--## debit-->