From 31e25671ef5df7475d5f1038be604ffa80c1faae Mon Sep 17 00:00:00 2001
From: Ajmalcybrosys <ajmal@cybrosys.in>
Date: Thu, 14 Nov 2019 19:08:38 +0530
Subject: [PATCH] [FIX] Bug Fixed 'base_accounting_kit'

---
 base_accounting_kit/__manifest__.py                    |  2 +-
 base_accounting_kit/doc/RELEASE_NOTES.md               |  7 ++++++-
 base_accounting_kit/report/account_bank_book_view.xml  |  2 +-
 base_accounting_kit/report/account_cash_book_view.xml  |  2 +-
 base_accounting_kit/report/account_day_book_view.xml   |  2 +-
 base_accounting_kit/report/general_ledger_report.xml   | 10 ++++++----
 .../account_asset.less => scss/account_asset.scss}     |  0
 base_accounting_kit/views/account_asset_templates.xml  |  2 +-
 8 files changed, 17 insertions(+), 10 deletions(-)
 rename base_accounting_kit/static/src/{less/account_asset.less => scss/account_asset.scss} (100%)

diff --git a/base_accounting_kit/__manifest__.py b/base_accounting_kit/__manifest__.py
index 7c39a46ca..a8c311af1 100644
--- a/base_accounting_kit/__manifest__.py
+++ b/base_accounting_kit/__manifest__.py
@@ -22,7 +22,7 @@
 
 {
     'name': 'Odoo 13 Full Accounting Kit',
-    'version': '13.0.1.3.1',
+    'version': '13.0.1.4.1',
     'category': 'Accounting',
     'summary':  """ This Module will bring back the accounting features such  
                     Asset Management, Budget Management,  Accounting Reports, 
diff --git a/base_accounting_kit/doc/RELEASE_NOTES.md b/base_accounting_kit/doc/RELEASE_NOTES.md
index 6cfb28361..b3b9c5f7b 100644
--- a/base_accounting_kit/doc/RELEASE_NOTES.md
+++ b/base_accounting_kit/doc/RELEASE_NOTES.md
@@ -18,4 +18,9 @@
 #### 31.10.2019
 #### Version 13.0.1.3.1
 #### FIX
-- Bug Fixed 'Recurring paymenst'
+- Bug Fixed 'Recurring payment'
+
+#### 12.11.2019
+#### Version 13.0.1.4.1
+#### FIX
+- Bug Fixed 'asset and report'
diff --git a/base_accounting_kit/report/account_bank_book_view.xml b/base_accounting_kit/report/account_bank_book_view.xml
index 425dfb12f..c8b74ed02 100644
--- a/base_accounting_kit/report/account_bank_book_view.xml
+++ b/base_accounting_kit/report/account_bank_book_view.xml
@@ -118,7 +118,7 @@
                                         <span t-esc="line['balance']"
                                               t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/>
                                     </td>
-                                    <td class="text-right" groups="base.group_multi_currency">
+                                    <td t-if="line['amount_currency']" class="text-right" groups="base.group_multi_currency">
                                         <span t-esc="line['amount_currency'] if line['amount_currency'] > 0.00 else ''"/>
                                         <span t-esc="line['currency_code'] if line['amount_currency'] > 0.00 else ''"/>
                                     </td>
diff --git a/base_accounting_kit/report/account_cash_book_view.xml b/base_accounting_kit/report/account_cash_book_view.xml
index 7a6af7ac1..0a0d2c4bb 100644
--- a/base_accounting_kit/report/account_cash_book_view.xml
+++ b/base_accounting_kit/report/account_cash_book_view.xml
@@ -93,7 +93,7 @@
                                 <td class="text-right">
                                     <span t-esc="line['balance']" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/>
                                 </td>
-                                <td class="text-right" groups="base.group_multi_currency">
+                                <td t-if="line['amount_currency']" class="text-right" groups="base.group_multi_currency">
                                     <span t-esc="line['amount_currency'] if line['amount_currency'] > 0.00 else ''"/>
                                     <span t-esc="line['currency_code'] if line['amount_currency'] > 0.00 else ''"/>
                                 </td>
diff --git a/base_accounting_kit/report/account_day_book_view.xml b/base_accounting_kit/report/account_day_book_view.xml
index 82f1ebb7a..fcf22d4ba 100644
--- a/base_accounting_kit/report/account_day_book_view.xml
+++ b/base_accounting_kit/report/account_day_book_view.xml
@@ -99,7 +99,7 @@
                                         <span t-esc="line['balance']"
                                               t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/>
                                     </td>
-                                    <td class="text-right" groups="base.group_multi_currency">
+                                    <td t-if="line['amount_currency']" class="text-right" groups="base.group_multi_currency">
                                         <span t-esc="line['amount_currency'] if line['amount_currency'] > 0.00 else ''"/>
                                         <span t-esc="line['currency_code'] if line['amount_currency'] > 0.00 else ''"/>
                                     </td>
diff --git a/base_accounting_kit/report/general_ledger_report.xml b/base_accounting_kit/report/general_ledger_report.xml
index c027e5ef7..2dea42772 100644
--- a/base_accounting_kit/report/general_ledger_report.xml
+++ b/base_accounting_kit/report/general_ledger_report.xml
@@ -90,10 +90,12 @@
                                     <td class="text-right">
                                         <span t-esc="line['balance']" t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/>
                                     </td>
-                                    <td class="text-right" groups="base.group_multi_currency">
-                                        <span t-esc="line['amount_currency'] if line['amount_currency'] > 0.00 else ''"/>
-                                        <span t-esc="line['currency_code'] if line['amount_currency'] > 0.00 else ''"/>
-                                    </td>
+                                    <t t-if="line['amount_currency']">
+                                        <td class="text-right" groups="base.group_multi_currency">
+                                            <span t-esc="line['amount_currency'] if line['amount_currency'] > 0.00 else ''"/>
+                                            <span t-esc="line['currency_code'] if line['amount_currency'] > 0.00 else ''"/>
+                                        </td>
+                                    </t>
                                 </tr>
                             </t>
                         </tbody>
diff --git a/base_accounting_kit/static/src/less/account_asset.less b/base_accounting_kit/static/src/scss/account_asset.scss
similarity index 100%
rename from base_accounting_kit/static/src/less/account_asset.less
rename to base_accounting_kit/static/src/scss/account_asset.scss
diff --git a/base_accounting_kit/views/account_asset_templates.xml b/base_accounting_kit/views/account_asset_templates.xml
index df9b56962..fc4660c14 100644
--- a/base_accounting_kit/views/account_asset_templates.xml
+++ b/base_accounting_kit/views/account_asset_templates.xml
@@ -2,7 +2,7 @@
 <odoo>
     <template id="assets_backend" name="account assets" inherit_id="web.assets_backend">
         <xpath expr="." position="inside">
-            <link rel="stylesheet" href="/base_accounting_kit/static/src/less/account_asset.less"/>
+            <link rel="stylesheet" href="/base_accounting_kit/static/src/scss/account_asset.scss"/>
             <script type="text/javascript" src="/base_accounting_kit/static/src/js/account_asset.js"/>
         </xpath>
     </template>