[UPDT] Style and Currency symbol fix

dynamic_accounts_report/__manifest__.py

@@ -22,7 +22,7 @@
 
 {
     'name': 'Dynamic Financial Reports',
-    'version': '14.0.1.0.0',
+    'version': '14.0.1.1.1',
     'category': 'Accounting',
     'summary': """Dynamic Financial Reports with drill 
                 down and filters– Community Edition""",

dynamic_accounts_report/doc/RELEASE_NOTES.md

@@ -5,7 +5,10 @@
 #### ADD
 - Initial commit for Odoo 14 dynamic financial reports
 
-
+#### 21.05.2021
+#### Version 14.0.1.1.1
+#### UPDT
+- Updated Style and Currency Format
 
 
 

dynamic_accounts_report/report/ageing.py

@@ -12,6 +12,7 @@ class PartnerAgeing(models.AbstractModel):
                 data.update(
                     {'account_data': data.get('report_data')['report_lines'][0],
                      'Filters': data.get('report_data')['filters'],
+                     'company': self.env.company,
 
                      })
 

dynamic_accounts_report/report/ageing.xml

@@ -7,7 +7,7 @@
             <t t-call="web.internal_layout">
                 <div class="page">
                     <div class="oe_structure"/>
-                    <h3 style="text-align:centre;left:50%;"><span t-esc="res_company.name"/>: Partner Ageing
+                    <h3 style="text-align:centre;left:50%;"><span t-esc="Filters.get('company_name')"/>: Partner Ageing
                     </h3>
                     <strong> As On Date:</strong>
                     <t t-esc="Filters['date_from']"/>

dynamic_accounts_report/report/cash_flow_report.py

@@ -8,9 +8,9 @@ class GeneralLedger(models.AbstractModel):
     def _get_report_values(self, docids, data=None):
 
         if self.env.context.get('trial_pdf_report'):
-
             if data.get('report_data'):
                 data.update({'account_data': data.get('report_data')['report_lines'],
                              'Filters': data.get('report_data')['filters'],
+                             'company': self.env.company,
                              })
         return data

dynamic_accounts_report/report/cash_flow_report.xml

@@ -18,20 +18,22 @@
                     <h4 style="padding-left:10px !important">Cash Flow statements</h4>
                     <div style="width:90%;margin:1px auto;font-size:12px" class="row mt32 mb32">
 
-                                <div class="col-4">
-                                <t t-if="Filters.get('target_moves')">
-                                    <p>
-                                    <strong>Target Moves:</strong>
 
-                                 <span t-esc="Filters['target_moves']"/>
-                                        <br/>
+                                <div class="col-3">
+                                    <strong>Target move:</strong>
+                                        <li>
+                                            <t t-esc="Filters['target_move']"/>
+                                        </li>
+                                </div>
+
+                                <div class="col-3">
                                     <t t-if="Filters.get('levels')">
                                         <strong>Level :</strong>
-                                <span t-esc="Filters['levels']"/>
+                                        <li>
+                                            <t t-esc="Filters['levels']"/>
+                                         </li>
                                     </t>
 
-                            </p>
-                                </t>
                                 </div>
 
                         <div class="col-4">

dynamic_accounts_report/report/daybook.py

@@ -12,5 +12,6 @@ class DayBook(models.AbstractModel):
             if data.get('report_data'):
                 data.update({'account_data': data.get('report_data')['report_lines'],
                              'Filters': data.get('report_data')['filters'],
+                             'company': self.env.company,
                              })
         return data

dynamic_accounts_report/report/daybook.xml

@@ -7,7 +7,7 @@
             <t t-call="web.internal_layout">
                 <div class="page">
                     <div class="oe_structure"/>
-                    <h3 style="text-align:centre;left:50%;"><span t-esc="res_company.name"/>: Day Book
+                    <h3 style="text-align:centre;left:50%;"><span t-esc="Filters.get('company_name')"/>: Day Book
                     </h3>
 
                     <span t-if="Filters.get('date_from')">

dynamic_accounts_report/report/financial_report_template.xml

@@ -7,7 +7,7 @@
                 <t t-set="data_report_header_spacing" t-value="9"/>
                 <t t-set="data_report_dpi" t-value="110"/>
                 <div class="page">
-                    <h3><span t-esc="res_company.name"/>: <span t-esc="report_name"/>
+                    <h3><span t-esc="Filters.get('company_name')"/>: <span t-esc="report_name"/>
                     </h3>
 
                     <div>
@@ -71,12 +71,7 @@
                                 <div class="col-3">
                                     <strong>Target move:</strong>
                                         <li>
-                                            <t t-if="Filters['target_move'] == 'all'">
-                                                <span>All</span>
-                                            </t>
-                                            <t t-if="Filters['target_move'] == 'posted'">
-                                                <span>Posted</span>
-                                            </t>
+                                            <t t-esc="Filters['target_move']"/>
                                         </li>
                                 </div>
                             </div>
@@ -113,15 +108,15 @@
                                                     </td>
                                                     <td class="text-right">
                                                         <span t-esc="line['debit']"
-                                                              t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/>
+                                                              t-options="{'widget': 'monetary', 'display_currency': env.company.currency_id}"/>
                                                     </td>
                                                     <td class="text-right">
                                                         <span t-esc="line['credit']"
-                                                              t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/>
+                                                              t-options="{'widget': 'monetary', 'display_currency': env.company.currency_id}"/>
                                                     </td>
                                                     <td class="text-right">
                                                         <span t-esc="line['balance']"
-                                                              t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"/>
+                                                              t-options="{'widget': 'monetary', 'display_currency': env.company.currency_id}"/>
                                                     </td>
                                                 </tr>
                                             </t>

dynamic_accounts_report/report/financial_reports.py

@@ -15,5 +15,6 @@ class InsReportBalanceSheet(models.AbstractModel):
                     'report_lines': data.get('report_data')['bs_lines'],
                     'report_name': data.get('report_name'),
                     'title': data.get('report_data')['name'],
+                    'company': self.env.company,
                 })
         return data

dynamic_accounts_report/report/general_ledger.py

@@ -15,5 +15,6 @@ class GeneralLedger(models.AbstractModel):
                              'debit_total': data.get('report_data')['debit_total'],
                              'credit_total': data.get('report_data')['credit_total'],
                              'title': data.get('report_data')['name'],
+                             'company': self.env.company,
                              })
         return data

dynamic_accounts_report/report/general_ledger.xml

@@ -1,7 +1,5 @@
 <odoo>
 
-
-
     <template id="dynamic_accounts_report.general_ledger">
         <t t-call="web.html_container">
             <t t-set="data_report_margin_top" t-value="12"/>
@@ -10,7 +8,7 @@
             <t t-call="web.internal_layout">
                 <div class="page">
                     <div class="oe_structure"/>
-                    <h3 style="text-align:centre;left:50%;"><span t-esc="res_company.name"/>: <t t-esc="title"/>
+                    <h3 style="text-align:centre;left:50%;"><span t-esc="Filters.get('company_name')"/>: <t t-esc="title"/>
                     </h3>
 
                     <span t-if="Filters.get('date_from')">
@@ -27,9 +25,10 @@
 
 
                     <div>
-                        <div style="text-align:centre;left:50%;" class="row">
+                        <div style="width:100%;">
+                            <div style="text-align:centre;" class="row">
 
-                                <div class="col-3" style="">
+                                <div class="col-2">
                                     <strong>Journals:</strong>
                                     <t t-foreach="Filters['journals']" t-as="ps">
                                         <li>
@@ -38,6 +37,33 @@
                                     </t>
                                 </div>
 
+                                <div class="col-2">
+                                        <strong>Accounts:</strong>
+                                        <t t-foreach="Filters['accounts']" t-as="ps">
+                                            <li>
+                                                <t t-esc="ps"/>
+                                            </li>
+                                        </t>
+                                </div>
+
+                                <div class="col-2">
+                                    <strong>Analytic:</strong>
+                                    <t t-foreach="Filters['analytics']" t-as="ps">
+                                        <li>
+                                            <t t-esc="ps"/>
+                                        </li>
+                                    </t>
+                                </div>
+
+                                 <div class="col-2">
+                                        <strong>Analytic Tag:</strong>
+                                        <t t-foreach="Filters['analytic_tags']" t-as="ps">
+                                            <li>
+                                                <t t-esc="ps"/>
+                                            </li>
+                                        </t>
+                                </div>
+
                                 <div class="col-3">
                                     <strong>Target move:</strong>
                                         <li>
@@ -45,12 +71,13 @@
                                         </li>
                                 </div>
                             </div>
+                        </div>
 
 
                         <br></br>
                     <table class="table table-sm table-reports">
                         <thead>
-                            <tr class="text-center">
+                            <tr class="text-right">
                                 <th>Date</th>
                                 <th>JRNL</th>
                                 <th>Partner</th>

dynamic_accounts_report/report/partner_ledger.py

@@ -11,5 +11,6 @@ class PartnerLedgerReport(models.AbstractModel):
             if data.get('report_data'):
                 data.update({'account_data': data.get('report_data')['report_lines'],
                              'Filters': data.get('report_data')['filters'],
+                             'company': self.env.company,
                              })
         return data

dynamic_accounts_report/report/partner_ledger.xml

@@ -8,7 +8,7 @@
             <t t-call="web.internal_layout">
                 <div class="page">
                     <div class="oe_structure"/>
-                    <h3 style="text-align:centre;left:50%;"><span t-esc="res_company.name"/>: Partner Ledger
+                    <h3 style="text-align:centre;left:50%;"><span t-esc="Filters.get('company_name')"/>: Partner Ledger
                     </h3>
 
                     <span t-if="Filters.get('date_from')">

dynamic_accounts_report/report/trial_balance.py

@@ -13,5 +13,6 @@ class TrialBalance(models.AbstractModel):
                              'Filters': data.get('report_data')['filters'],
                              'debit_total': data.get('report_data')['debit_total'],
                              'credit_total': data.get('report_data')['credit_total'],
+                             'company': self.env.company,
                              })
         return data

dynamic_accounts_report/report/trial_balance.xml

@@ -7,7 +7,7 @@
             <t t-call="web.internal_layout">
                 <div class="page">
                     <div class="oe_structure"/>
-                    <h3 style="text-align:centre;left:50%;"><span t-esc="res_company.name"/>: Trial Balance
+                    <h3 style="text-align:centre;left:50%;"><span t-esc="Filters.get('company_name')"/>: Trial Balance
                     </h3>
 
                     <span t-if="Filters.get('date_from')">

dynamic_accounts_report/security/ir.model.access.csv

@@ -1,8 +1,8 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_account_general_ledger,access.account.general.ledger,model_account_general_ledger,base.group_user,1,1,1,1
-access_account_trial_balance,access.account.trial.balance,model_account_trial_balance,base.group_user,1,1,1,1
-access_account_cash_flow,access.account.cash.flow,model_account_cash_flow,base.group_user,1,1,1,1
-access_dynamic_balance_sheet_report,access.dynamic.balance.sheet.report,model_dynamic_balance_sheet_report,base.group_user,1,1,1,1
-access_account_partner_ledger,access.account.partner.ledger,model_account_partner_ledger,base.group_user,1,1,1,1
-access_account_partner_ageing,account_partner_ageing.account_partner_ageing,model_account_partner_ageing,base.group_user,1,1,1,1
-access_account_day_book,account_day_book.account_day_book,model_account_day_book,base.group_user,1,1,1,1
+access_account_general_ledger,access.account.general.ledger,model_account_general_ledger,account.group_account_user,1,1,1,1
+access_account_trial_balance,access.account.trial.balance,model_account_trial_balance,account.group_account_user,1,1,1,1
+access_account_cash_flow,access.account.cash.flow,model_account_cash_flow,account.group_account_user,1,1,1,1
+access_dynamic_balance_sheet_report,access.dynamic.balance.sheet.report,model_dynamic_balance_sheet_report,account.group_account_user,1,1,1,1
+access_account_partner_ledger,access.account.partner.ledger,model_account_partner_ledger,account.group_account_user,1,1,1,1
+access_account_partner_ageing,account_partner_ageing.account_partner_ageing,model_account_partner_ageing,account.group_account_user,1,1,1,1
+access_account_day_book,account_day_book.account_day_book,model_account_day_book,account.group_account_user,1,1,1,1

dynamic_accounts_report/static/src/js/ageing.js

@@ -341,7 +341,7 @@ odoo.define('dynamic_accounts_report.ageing', function (require) {
             post_res.value = $(".target_move")[0].value
                     post_res.innerHTML=post_res.value;
               if ($(".target_move")[0].value == "") {
-              post_res.innerHTML="all";
+              post_res.innerHTML="posted";
 
               }
             }

dynamic_accounts_report/static/src/js/cash_flow.js

@@ -51,7 +51,7 @@ odoo.define('dynamic_cash_flow_statements.cash_flow', function (require) {
             var offset = 0;
             var td = $(event.currentTarget).next('tr').find('td');
             if (td.length == 1) {
-            rpc.query({
+            self._rpc({
                 model: 'account.cash.flow',
                 method: 'view_report',
                 args: [
@@ -255,7 +255,7 @@ odoo.define('dynamic_cash_flow_statements.cash_flow', function (require) {
             post_res.value = $(".target_move")[0].value
                     post_res.innerHTML=post_res.value;
               if ($(".target_move")[0].value == "") {
-              post_res.innerHTML="all";
+              post_res.innerHTML="posted";
 
               }
             }

dynamic_accounts_report/static/src/js/daybook.js

@@ -204,6 +204,8 @@ odoo.define('dynamic_partner_daybook.daybook', function (require) {
                         QWeb.render('SubSectiondb', {
 
                             account_data: data['report_lines'][i]['child_lines'],
+                            currency_symbol : data.currency[0],
+                            currency_position : data.currency[1],
                         }))
 
                     $(event.currentTarget).next('tr').find('td ul li:first a').css({
@@ -332,7 +334,7 @@ odoo.define('dynamic_partner_daybook.daybook', function (require) {
             post_res.value = $(".target_move")[0].value
                     post_res.innerHTML=post_res.value;
               if ($(".target_move")[0].value == "") {
-              post_res.innerHTML="all";
+              post_res.innerHTML="posted";
 
               }
             }

dynamic_accounts_report/static/src/js/financial_reports.js

@@ -311,7 +311,7 @@ odoo.define('dynamic_accounts_report.financial_reports', function (require) {
                 filter_data_selected.date_from = dateString;
             }
             if ($("#date_to").val()) {
-                var dateString = $("#date_from").val();
+                var dateString = $("#date_to").val();
                 filter_data_selected.date_to = dateString;
             }
 
@@ -321,7 +321,7 @@ odoo.define('dynamic_accounts_report.financial_reports', function (require) {
                 post_res.value = $(".target_move")[0].value
                         post_res.innerHTML=post_res.value;
                   if ($(".target_move")[0].value == "") {
-                  post_res.innerHTML="all";
+                  post_res.innerHTML="posted";
 
                   }
             }

dynamic_accounts_report/static/src/js/general_ledger.js

@@ -230,6 +230,9 @@ odoo.define('dynamic_cash_flow_statements.general_ledger', function (require) {
                     $(event.currentTarget).next('tr').find('td ul').after(
                         QWeb.render('SubSection', {
                             account_data: data['report_lines'][i]['move_lines'],
+                            currency_symbol : data.currency[0],
+                            currency_position : data.currency[1],
+
                         }))
                     $(event.currentTarget).next('tr').find('td ul li:first a').css({
                         'background-color': '#00ede8',
@@ -397,7 +400,7 @@ odoo.define('dynamic_cash_flow_statements.general_ledger', function (require) {
             post_res.value = $(".target_move")[0].value
                     post_res.innerHTML=post_res.value;
               if ($(".target_move")[0].value == "") {
-              post_res.innerHTML="all";
+              post_res.innerHTML="posted";
 
               }
             }

dynamic_accounts_report/static/src/js/partner_ledger.js

@@ -186,7 +186,6 @@ odoo.define('dynamic_accounts_report.partner_ledger', function (require) {
                         ],
                     }).then(function(data) {
                     for (var i = 0; i < data['report_lines'].length; i++) {
-                                    console.log(data['report_lines'][i]['move_lines'])
 
                         if (account_id == data['report_lines'][i]['id'] ){
                             $(event.currentTarget).next('tr').find('td .pl-table-div').remove();
@@ -358,7 +357,7 @@ odoo.define('dynamic_accounts_report.partner_ledger', function (require) {
 
             if ($(".reconciled").length){
             var reconciled_res = document.getElementById("reconciled_res")
-            filter_data_selected.reconciled = $(".reconciled")[1].value
+            filter_data_selected.reconciled = $(".reconciled")[0].value
             reconciled_res.value = $(".reconciled")[0].value
             reconciled_res.innerHTML=reconciled_res.value;
             if ($(".reconciled").value==""){

dynamic_accounts_report/static/src/js/trial_balance.js

@@ -219,7 +219,7 @@ odoo.define('dynamic_cash_flow_statements.trial', function (require) {
             post_res.value = $(".target_move")[0].value
                     post_res.innerHTML=post_res.value;
               if ($(".target_move")[0].value == "") {
-              post_res.innerHTML="all";
+              post_res.innerHTML="posted";
 
               }
             }

dynamic_accounts_report/static/src/xml/ageing.xml

@@ -3,8 +3,8 @@
     <t t-name="AgeingTemp">
         <div class="">
             <div class="">
-               <h1>
-                    PARTNER AGEING
+               <h1 style="padding:10px">
+                    Partner Ageing
                 </h1>
 
             </div>
@@ -138,8 +138,8 @@
 		<div class="" style="position: relative;">
 			<div class="sub_container_left">
 				<div class="report_print">
-					<button type="button" class="btn btn-primary" id="pdf" style="height:25px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD;">Print (PDF)</button>
-					<button type="button" class="btn btn-primary" id="xlsx" style="height:25px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD;">Export (XLSX)</button>
+					<button type="button" class="btn btn-primary" id="pdf" style="left:10px; height:30px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">Print (PDF)</button>
+					<button type="button" class="btn btn-primary" id="xlsx" style="left:10px; height:30px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">Export (XLSX)</button>
 				</div>
 			</div>
 			<br></br>
@@ -171,9 +171,9 @@ Account Type:
 						</a>
 						<select id="selection" class="dropdown-menu result_selection" name="states[]" >
 							<div role="separator" class="dropdown-divider"></div>
-								<option value="customer_supplier">Receivable and Payable Accounts</option>
 								<option value="customer">Receivable Accounts </option>
 								<option value="supplier">Payable Accounts</option>
+								<option value="customer_supplier">Receivable and Payable Accounts</option>
 						</select>
 						<span id="account_res"></span>
 					</div>
@@ -218,8 +218,8 @@ Target Move:
 						</a>
 						<select id="entries" class="dropdown-menu target_move" name="states[]" >
 							<div role="separator" class="dropdown-divider"></div>
-								<option value="posted">Posted Entries</option>
-								<option value="all">All Entries </option>
+								<option value="Posted">Posted Entries</option>
+								<option value="All">All Entries </option>
 
 						</select>
 						<span id="post_res"></span>
@@ -228,7 +228,7 @@ Target Move:
 
 				</div>
 				<div style="">
-						<button type="button" id="apply_filter" class="btn btn-primary" style="top:0px;height:25px;right:0px;position: absolute;color:white;background-color: #00A0AD;border-color: #00A0AD;">Apply</button>
+						<button type="button" id="apply_filter" class="btn btn-primary" style="top:0px;height:30px;right:20px;position: absolute;color:white;background-color: #00A0AD;border-color: #00A0AD;">Apply</button>
 
 				</div>
 			</div>

dynamic_accounts_report/static/src/xml/cash_flow_view.xml

@@ -3,8 +3,8 @@
     <t t-name="CFTemp">
         <div class="">
             <div class="">
-               <h1>
-                    CASH FLOW STATEMENTS
+               <h1 style="padding:10px">
+                    Cash Flow Statement
                 </h1>
 
             </div>
@@ -142,8 +142,8 @@
 		<div class="" style="position: relative;">
 			<div class="sub_container_left">
 				<div class="report_print">
-					<button type="button" class="btn btn-primary" id="pdf" style="height:25px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD;">Print (PDF)</button>
-					<button type="button" class="btn btn-primary" id="xlsx" style="height:25px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD;">Export (XLSX)</button>
+					<button type="button" class="btn btn-primary" id="pdf" style="left:10px; height:30px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">Print (PDF)</button>
+					<button type="button" class="btn btn-primary" id="xlsx" style="left:10px; height:30px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">Export (XLSX)</button>
 				</div>
 			</div>
 			<br></br>
@@ -183,8 +183,8 @@ Target Move:
 						</a>
 						<select id="entries" class="dropdown-menu target_move" name="states[]" >
 							<div role="separator" class="dropdown-divider"></div>
-								<option value="all">All Entries </option>
-								<option value="posted">Posted Entries</option>
+								<option value="Posted">Posted Entries</option>
+								<option value="All">All Entries </option>
 						</select>
 						<span id="post_res"></span>
 					</div>
@@ -208,7 +208,7 @@ Level:
 
 				</div>
 				<div style="">
-						<button type="button" id="apply_filter" class="btn btn-primary" style="top:0px;height:25px;right:0px;position: absolute;color:white;background-color: #00A0AD;border-color: #00A0AD;">Apply</button>
+						<button type="button" id="apply_filter" class="btn btn-primary" style="top:0px;height:30px;right:20px;position: absolute;color:white;background-color: #00A0AD;border-color: #00A0AD;">Apply</button>
 
 				</div>
 			</div>

dynamic_accounts_report/static/src/xml/daybook.xml

@@ -1,9 +1,8 @@
-
 <templates>
     <t t-name="DaybookTemp">
         <div class="">
             <div class="">
-               <h1>
+                <h1 style="padding:10px">
                     Day Book
                 </h1>
 
@@ -40,22 +39,62 @@
                                 data-toggle="collapse"
                                 t-att-data-account-id="account['id']"
                                 t-attf-data-target=".a{{account['id']}}">
+                                <t t-if="currency[1] == 'before'">
+
+                                    <td colspan="6" style="border: 0px solid black;">
+                                        <i class="fa fa-caret-down" role="img" aria-label="Unfolded"
+                                           title="Unfolded"></i>
+                                        <span>
+                                            <t t-esc="account['date']"/>
+                                        </span>
+                                        <td class="mon_fld">
+                                            <t t-esc="currency[0]"/>
+
+                                            <t t-raw="account['debit']"/>
+                                        </td>
+                                        <td class="mon_fld">
+                                            <t t-esc="currency[0]"/>
+
+                                            <t t-raw="account['credit']"/>
+                                        </td>
+                                        <td class="mon_fld">
+                                            <t t-esc="currency[0]"/>
+
+                                            <t t-raw="account['balance']"/>
+                                        </td>
+                                        <t t-set="common_id" t-value="'a'+account['id']"/>
+                                    </td>
+                                </t>
+                                <t t-else="">
                                     <td colspan="6" style="border: 0px solid black;">
-								<i class="fa fa-caret-down" role="img" aria-label="Unfolded" title="Unfolded"></i>
+                                        <i class="fa fa-caret-down" role="img" aria-label="Unfolded"
+                                           title="Unfolded"></i>
                                         <span>
                                             <t t-esc="account['date']"/>
                                         </span>
                                         <td class="mon_fld">
-										<t t-raw="account['debit']"/><t t-esc="currency[0]"/>
+
+                                            <t t-raw="account['debit']"/>
+                                            <t t-esc="currency[0]"/>
+
                                         </td>
                                         <td class="mon_fld">
-										<t t-raw="account['credit']"/><t t-esc="currency[0]"/>
+
+                                            <t t-raw="account['credit']"/>
+                                            <t t-esc="currency[0]"/>
+
                                         </td>
                                         <td class="mon_fld">
-										<t t-raw="account['balance']"/><t t-esc="currency[0]"/>
+
+                                            <t t-raw="account['balance']"/>
+                                            <t t-esc="currency[0]"/>
+
                                         </td>
                                         <t t-set="common_id" t-value="'a'+account['id']"/>
                                     </td>
+
+                                </t>
+
                                 <tr t-attf-class="collapse a{{account['id']}}">
                                     <td colspan="10">
                                         <ul>
@@ -71,14 +110,18 @@
     </t>
 
 
-
-
     <t t-name="DayFilterView">
         <div class="" style="position: relative;">
             <div class="sub_container_left">
                 <div class="report_print">
-					<button type="button" class="btn btn-primary" id="pdf" style="height:25px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD;">Print (PDF)</button>
-					<button type="button" class="btn btn-primary" id="xlsx" style="height:25px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD;">Export (XLSX)</button>
+                    <button type="button" class="btn btn-primary" id="pdf"
+                            style="left:10px; height:30px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
+                        Print (PDF)
+                    </button>
+                    <button type="button" class="btn btn-primary" id="xlsx"
+                            style="left:10px; height:30px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
+                        Export (XLSX)
+                    </button>
                 </div>
             </div>
             <br></br>
@@ -118,7 +161,8 @@ Journals:
                             <select class="dropdown-menu  journals" name="states[]" multiple="multiple">
                                 <div role="separator" class="dropdown-divider"></div>
                                 <t t-foreach="filter_data.journals_list" t-as="journal">
-								<option t-attf-value="{{journal[0]}}"><t t-esc="journal[1]"/>
+                                    <option t-attf-value="{{journal[0]}}">
+                                        <t t-esc="journal[1]"/>
                                     </option>
                                 </t>
                             </select>
@@ -147,8 +191,8 @@ Target Move:
                             </a>
                             <select id="entries" class="dropdown-menu target_move" name="states[]">
                                 <div role="separator" class="dropdown-divider"></div>
-								<option value="all">All Entries </option>
-								<option value="posted">Posted Entries</option>
+                                <option value="Posted">Posted Entries</option>
+                                <option value="All">All Entries</option>
                             </select>
                             <span id="post_res"></span>
                         </div>
@@ -156,7 +200,10 @@ Target Move:
 
                 </div>
                 <div style="">
-						<button type="button" id="apply_filter" class="btn btn-primary" style="top:0px;height:25px;right:0px;position: absolute;color:white;background-color: #00A0AD;border-color: #00A0AD;">Apply</button>
+                    <button type="button" id="apply_filter" class="btn btn-primary"
+                            style="top:0px;height:30px;right:20px;position: absolute;color:white;background-color: #00A0AD;border-color: #00A0AD;">
+                        Apply
+                    </button>
 
                 </div>
             </div>
@@ -219,13 +266,13 @@ Target Move:
                             <td t-att-style="style">
                                 <t t-esc="account_line.lname"/>
                             </td>
-								<t t-if="account_line.currency_position == 'before'">
+                            <t t-if="currency_position == 'before'">
                                 <td t-att-style="style" class="text-right">
                                     <t t-if="account_line.debit == 0">
                                         <span>-</span>
                                     </t>
                                     <t t-else="">
-                                        <t t-esc="account_line.currency_code"/>
+                                        <t t-esc="currency_symbol"/>
                                         <t t-esc="Math.round(account_line.debit * Math.pow(10, 2)) / Math.pow(10, 2)"/>
                                     </t>
                                 </td>
@@ -234,7 +281,7 @@ Target Move:
                                         <span>-</span>
                                     </t>
                                     <t t-else="">
-                                        <t t-esc="account_line.currency_code"/>
+                                        <t t-esc="currency_symbol"/>
                                         <t t-esc="Math.round(account_line.credit * Math.pow(10, 2)) / Math.pow(10, 2)"/>
                                     </t>
                                 </td>
@@ -243,7 +290,7 @@ Target Move:
                                         <span>-</span>
                                     </t>
                                     <t t-else="">
-                                        <t t-esc="account_line.currency_code"/>
+                                        <t t-esc="currency_symbol"/>
                                         <t t-esc="Math.round(account_line.balance * Math.pow(10, 2)) / Math.pow(10, 2)"/>
                                     </t>
                                 </td>
@@ -255,7 +302,7 @@ Target Move:
                                     </t>
                                     <t t-else="">
                                         <t t-esc="Math.round(account_line.debit * Math.pow(10, 2)) / Math.pow(10, 2)"/>
-                                        <t t-esc="account_line.currency_code"/>
+                                        <t t-esc="currency_symbol"/>
                                     </t>
                                 </td>
                                 <td t-att-style="style" class="amt">
@@ -264,7 +311,7 @@ Target Move:
                                     </t>
                                     <t t-else="">
                                         <t t-esc="Math.round(account_line.credit * Math.pow(10, 2)) / Math.pow(10, 2)"/>
-                                        <t t-esc="account_line.currency_code"/>
+                                        <t t-esc="currency_symbol"/>
                                     </t>
                                 </td>
                                 <td t-att-style="style" class="amt">
@@ -273,7 +320,7 @@ Target Move:
                                     </t>
                                     <t t-else="">
                                         <t t-esc="Math.round(account_line.balance * Math.pow(10, 2)) / Math.pow(10, 2)"/>
-                                        <t t-esc="account_line.currency_code"/>
+                                        <t t-esc="currency_symbol"/>
                                     </t>
                                 </td>
 

dynamic_accounts_report/static/src/xml/financial_reports_view.xml

@@ -52,7 +52,7 @@
 															<div class="form-group ">
 																<div class="show-gl" aria-atomic="true" id="" data-target-input="">
 																	<li role="presentation">
-																		<a role="menuitem" style="background-color:grey;" t-att-data-account-id="account['id']" class="show-gl" >View General Ledger</a>
+																		<a role="menuitem" style="background-color:aqua; font-weight:bold;" t-att-data-account-id="account['id']" class="show-gl" >View General Ledger</a>
 																	</li>
 																</div>
 															</div>
@@ -243,8 +243,9 @@ Target Move:
 						</a>
 						<select id="entries" class="dropdown-menu target_move" name="states[]" >
 							<div role="separator" class="dropdown-divider"></div>
-								<option value="posted">Posted Entries</option>
-								<option value="all">All Entries </option>
+								<option value="Posted">Posted Entries</option>
+								<option value="All">All Entries</option>
+
 						</select>
 						<span id="post_res"></span>
 					</div>

dynamic_accounts_report/static/src/xml/general_ledger_view.xml

@@ -123,7 +123,7 @@
 
     <t t-name="GLFilterView">
         <div>
-                <h1>
+                <h1 style="padding:10px">
                     <t t-esc="title"/>
                 </h1>
 
@@ -132,11 +132,11 @@
             <div class="sub_container_left">
                 <div class="report_print">
                     <button type="button" class="btn btn-primary" id="pdf"
-                            style="height:25px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD;">
+                            style="left:10px; height:30px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
                         Print (PDF)
                     </button>
                     <button type="button" class="btn btn-primary" id="xlsx"
-                            style="height:25px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD;">
+                            style="left:10px; height:30px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
                         Export (XLSX)
                     </button>
                 </div>
@@ -238,8 +238,8 @@
                             </a>
                             <select id="entries" class="dropdown-menu target_move" name="states[]">
                                 <div role="separator" class="dropdown-divider"></div>
-                                <option value="all">All Entries</option>
-                                <option value="posted">Posted Entries</option>
+                                <option value="Posted">Posted Entries</option>
+                                <option value="All">All Entries</option>
                             </select>
                             <span id="post_res"></span>
                         </div>
@@ -248,7 +248,7 @@
                 </div>
                 <div style="">
                     <button type="button" id="apply_filter" class="btn btn-primary"
-                            style="top:0px;height:25px;right:0px;position: absolute;color:white;background-color: #00A0AD;border-color: #00A0AD;">
+                            style="top:0px;height:30px;right:20px;position: absolute;color:white;background-color: #00A0AD;border-color: #00A0AD;">
                         Apply
                     </button>
 
@@ -277,6 +277,7 @@
                 <tbody>
                     <t t-foreach="account_data" t-as="account_line">
                      <t t-set="style" t-value="''"/>
+                     <t t-set="style_right" t-value="'text-align:right;'"/>
                          <tr>
                             <td>
                                 <t t-if="account_line.ldate">
@@ -311,8 +312,8 @@
                             <td t-att-style="style">
                                 <t t-esc="account_line.lname"/>
                             </td>
-                            <t t-if="account_line.currency_position == 'before'">
-                                <td t-att-style="style" class="amt">
+                            <t t-if="currency_position == 'before'">
+                                <td t-att-style="style_right" class="amt">
                                     <t t-if="account_line.debit == 0">
                                         <span>-</span>
                                     </t>
@@ -321,7 +322,7 @@
                                         <t t-esc="Math.round(account_line.debit * Math.pow(10, 2)) / Math.pow(10, 2)"/>
                                     </t>
                                 </td>
-                                <td t-att-style="style" class="amt">
+                                <td t-att-style="style_right" class="amt">
                                     <t t-if="account_line.credit == 0">
                                         <span>-</span>
                                     </t>
@@ -330,7 +331,7 @@
                                         <t t-esc="Math.round(account_line.credit * Math.pow(10, 2)) / Math.pow(10, 2)"/>
                                     </t>
                                 </td>
-                                <td t-att-style="style" class="amt">
+                                <td t-att-style="style_right" class="amt">
                                     <t t-if="account_line.balance == 0">
                                         <span>-</span>
                                     </t>
@@ -341,7 +342,7 @@
                                 </td>
                             </t>
                             <t t-else="">
-                                <td t-att-style="style" class="amt">
+                                <td t-att-style="style_right" class="amt">
                                     <t t-if="account_line.debit == 0">
                                         <span>-</span>
                                     </t>
@@ -350,7 +351,7 @@
                                         <t t-esc="account_line.currency_code"/>
                                     </t>
                                 </td>
-                                <td t-att-style="style" class="amt">
+                                <td t-att-style="style_right" class="amt">
                                     <t t-if="account_line.credit == 0">
                                         <span>-</span>
                                     </t>
@@ -359,7 +360,7 @@
                                         <t t-esc="account_line.currency_code"/>
                                     </t>
                                 </td>
-                                <td t-att-style="style" class="amt">
+                                <td t-att-style="style_right" class="amt">
                                     <t t-if="account_line.balance == 0">
                                         <span>-</span>
                                     </t>

dynamic_accounts_report/static/src/xml/partner_ledger_view.xml

@@ -2,7 +2,7 @@
     <t t-name="PartnerTemp">
         <div class="">
             <div class="">
-                <h1>
+                <h1 style="padding:10px">
                     Partner Ledger
                 </h1>
             </div>
@@ -95,11 +95,11 @@
             <div class="sub_container_left">
                 <div class="report_print">
                     <button type="button" class="btn btn-primary" id="pdf"
-                            style="height:25px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD;">
+                            style="left:10px; height:30px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
                         Print (PDF)
                     </button>
                     <button type="button" class="btn btn-primary" id="xlsx"
-                            style="height:25px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD;">
+                            style="left:10px; height:30px;position: relative;color:white;background-color: #00A0AD;border-color: #00A0AD; padding:3px;">
                         Export (XLSX)
                     </button>
                 </div>
@@ -147,17 +147,7 @@
                             <span id="partner_res"></span>
 
                         </div>
-                        <div class="reconciliation_sts_filter">
-                            <a type="button" class="dropdown-toggle" data-toggle="dropdown">
-                                <span class="fa fa-book"></span>
-                                Reconciliation Status:
-                            </a>
-                            <select class="dropdown-menu reconciled" name="states[]" multiple="multiple">
-                                <option value="unreconciled">Unreconciled</option>
-                            </select>
-                            <span id="reconciled_res"></span>
 
-                        </div>
                         <div class="acccount_type_filter">
                             <a type="button" class="dropdown-toggle" data-toggle="dropdown">
                                 <span class="fa fa-book"></span>
@@ -229,8 +219,8 @@
                             </a>
                             <select id="entries" class="dropdown-menu target_move" name="states[]">
                                 <div role="separator" class="dropdown-divider"></div>
-                                <option value="posted">Posted Entries</option>
-                                <option value="all">All Entries</option>
+                                <option value="Posted">Posted Entries</option>
+                                <option value="All">All Entries</option>
                             </select>
                             <span id="post_res"></span>
                         </div>
@@ -239,7 +229,7 @@
                 </div>
                 <div style="">
                     <button type="button" id="apply_filter" class="btn btn-primary"
-                            style="top:0px;height:25px;right:0px;position: absolute;color:white;background-color: #00A0AD;border-color: #00A0AD;">
+                            style="top:0px;height:30px;right:20px;position: absolute;color:white;background-color: #00A0AD;border-color: #00A0AD;">
                         Apply
                     </button>
 
@@ -267,7 +257,8 @@
                 <tbody>
                     <t t-foreach="account_data" t-as="account_line">
 
-                        <t t-set="style" t-value="''"/>
+                        <t t-set="style" t-value="'text-align:right;'"/>
+                        <t t-set="styleleft" t-value="'text-align:left;'"/>
                         <tr>
                             <td>
                                 <t t-if="account_line.ldate">
@@ -299,10 +290,10 @@
                                     <t t-esc="account_line.account_name"/>
                                 </span>
                             </td>
-                            <td t-att-style="style">
+                            <td t-att-style="styleleft">
                                 <t t-esc="account_line.move_name"/>
                             </td>
-                            <td t-att-style="style">
+                            <td t-att-style="styleleft">
                                 <t t-esc="account_line.lname"/>
                             </td>
                             <t t-if="account_line.currency_position == 'before'">