Browse Source

[UPDT] Ageing report issue

pull/175/head
Ajmal Cybro 4 years ago
parent
commit
4bbd5ecc98
  1. 2
      dynamic_accounts_report/__manifest__.py
  2. 5
      dynamic_accounts_report/doc/RELEASE_NOTES.md
  3. 10
      dynamic_accounts_report/report/ageing.xml
  4. 20
      dynamic_accounts_report/static/src/js/ageing.js
  5. 926
      dynamic_accounts_report/static/src/xml/ageing.xml
  6. 22
      dynamic_accounts_report/wizard/ageing.py

2
dynamic_accounts_report/__manifest__.py

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

5
dynamic_accounts_report/doc/RELEASE_NOTES.md

@ -10,5 +10,10 @@
#### UPDT
- Updated Style and Currency Format
#### 27.05.2021
#### Version 14.0.1.2.1
#### UPDT
- Ageing Report.

10
dynamic_accounts_report/report/ageing.xml

@ -53,11 +53,11 @@
<th>JRNL</th>
<th>Account</th>
<th>Not Due</th>
<th>0 - 20</th>
<th>20 - 40</th>
<th>40 - 60</th>
<th>60 - 80</th>
<th>80 +</th>
<th>0 - 30</th>
<th>30 - 60</th>
<th>60 - 90</th>
<th>90 - 120</th>
<th>120 +</th>
<th> Total</th>
<th groups="base.group_multi_currency">Currency</th>
</tr>

20
dynamic_accounts_report/static/src/js/ageing.js

@ -72,6 +72,12 @@ odoo.define('dynamic_accounts_report.ageing', function (require) {
self.$el.find('.category').select2({
placeholder: ' Partner Category...',
});
self.$el.find('.target_move').select2({
placeholder: ' Target Move...',
});
self.$el.find('.result_selection').select2({
placeholder: ' Account Type...',
});
}
var child=[];
@ -337,10 +343,12 @@ odoo.define('dynamic_accounts_report.ageing', function (require) {
if ($(".target_move").length) {
var post_res = document.getElementById("post_res")
filter_data_selected.target_move = $(".target_move")[0].value
post_res.value = $(".target_move")[0].value
filter_data_selected.target_move = $(".target_move")[1].value
console.log($(".target_move"))
post_res.value = $(".target_move")[1].value
post_res.innerHTML=post_res.value;
if ($(".target_move")[0].value == "") {
if ($(".target_move")[1].value == "") {
post_res.innerHTML="posted";
}
@ -348,10 +356,10 @@ odoo.define('dynamic_accounts_report.ageing', function (require) {
if ($(".result_selection").length) {
var account_res = document.getElementById("account_res")
filter_data_selected.result_selection = $(".result_selection")[0].value
account_res.value = $(".result_selection")[0].value
filter_data_selected.result_selection = $(".result_selection")[1].value
account_res.value = $(".result_selection")[1].value
account_res.innerHTML=account_res.value;
if ($(".result_selection")[0].value == "") {
if ($(".result_selection")[1].value == "") {
account_res.innerHTML="customer";
}

926
dynamic_accounts_report/static/src/xml/ageing.xml

@ -1,9 +1,8 @@
<templates>
<t t-name="AgeingTemp">
<div class="">
<div class="">
<h1 style="padding:10px">
<h1 style="padding:10px">
Partner Ageing
</h1>
@ -12,119 +11,191 @@
<div>
<div class="filter_view_tb"></div>
</div>
<br></br>
<div>
<br></br>
<div>
<div class="table_view_tb" style="right:20px;"></div>
</div>
</div>
</t>
<t t-name="Ageingtable">
<div>
</div>
</t>
<t t-name="Ageingtable">
<div>
<div class="table_main_view">
<table cellspacing="0" width="100%">
<thead>
<tr>
<th colspan="6">Partner</th>
<th class="mon_fld">Not Due</th>
<th class="mon_fld">0-20</th>
<th class="mon_fld">20-40</th>
<th class="mon_fld">40-60</th>
<th class="mon_fld">60-80</th>
<th class="mon_fld">80+</th>
<th class="mon_fld">Total</th>
<th class="mon_fld">Not Due</th>
<th class="mon_fld">0-30</th>
<th class="mon_fld">30-60</th>
<th class="mon_fld">60-90</th>
<th class="mon_fld">90-120</th>
<th class="mon_fld">120+</th>
<th class="mon_fld">Total</th>
</tr>
</thead>
<tbody style="width:100%;">
</tbody>
<tbody>
<t t-set="none_value" t-value="_"/>
<t t-foreach="report_lines[0]" t-as="account">
<tbody>
<t t-set="none_value" t-value="_"/>
<t t-foreach="report_lines[0]" t-as="account">
<t t-set="common_id" t-value="0"/>
<t t-set="common_id" t-value="0"/>
<tr style="border: 1.5px solid black;" class="gl-line"
<tr style="border: 1.5px solid black;" class="gl-line"
data-toggle="collapse"
t-att-data-account-id="account['partner_id']"
t-attf-data-target=".a{{account['partner_id']}}">
<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['name']"/>
</span>
<t t-if="currency[1] == 'before'">
<td style="text-align:right;">
<t t-esc="currency[0]"/>
<t t-raw="account['direction']"/>
</td>
<td style="text-align:right;">
<t t-esc="currency[0]"/>
<t t-raw="account['4']"/>
</td>
<td style="text-align:right;">
<t t-esc="currency[0]"/>
<t t-raw="account['3']"/>
</td>
<td style="text-align:right;">
<t t-esc="currency[0]"/>
<t t-raw="account['2']"/>
</td>
<td style="text-align:right;">
<t t-esc="currency[0]"/>
<t t-raw="account['1']"/>
</td>
<td style="text-align:right;">
<t t-esc="currency[0]"/>
<t t-raw="account['0']"/>
</td>
<td style="text-align:right;">
<t t-esc="currency[0]"/>
<t t-raw="account['total']"/>
</td>
</t>
<t t-else="">
<td style="text-align:right;">
<t t-raw="account['direction']"/><t t-esc="currency[0]"/>
</td>
<td style="text-align:right;">
<t t-raw="account['4']"/><t t-esc="currency[0]"/>
</td>
<td style="text-align:right;">
<t t-raw="account['3']"/><t t-esc="currency[0]"/>
</td>
<td style="text-align:right;">
<t t-raw="account['2']"/><t t-esc="currency[0]"/>
</td>
<td style="text-align:right;">
<t t-raw="account['1']"/><t t-esc="currency[0]"/>
</td>
<td style="text-align:right;">
<t t-raw="account['0']"/><t t-esc="currency[0]"/>
</td>
<td style="text-align:right;">
<t t-raw="account['total']"/><t t-esc="currency[0]"/>
</td>
</t>
<!--
< </div>-->
</td>
<tr t-attf-class="collapse a{{account['partner_id']}}">
<td colspan="14">
<ul>
</ul>
</td>
</tr>
</tr>
</t>
</tbody>
<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['name']"/>
</span>
<t t-if="currency[1] == 'before'">
<td style="text-align:right;">
<t t-if="account['direction'] == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="currency[0]"/>
<t t-esc="Math.round(account['direction'] * Math.pow(10, 2)) / Math.pow(10, 2)"/>
</t>
</td>
<td style="text-align:right;">
<t t-if="account['4'] == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="currency[0]"/>
<t t-esc="Math.round(account['4'] * Math.pow(10, 2)) / Math.pow(10, 2)"/>
</t>
</td>
<td style="text-align:right;">
<t t-if="account['3'] == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="currency[0]"/>
<t t-esc="Math.round(account['3'] * Math.pow(10, 2)) / Math.pow(10, 2)"/>
</t>
</td>
<td style="text-align:right;">
<t t-if="account['2'] == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="currency[0]"/>
<t t-esc="Math.round(account['2'] * Math.pow(10, 2)) / Math.pow(10, 2)"/>
</t>
</td>
<td style="text-align:right;">
<t t-if="account['1'] == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="currency[0]"/>
<t t-esc="Math.round(account['1'] * Math.pow(10, 2)) / Math.pow(10, 2)"/>
</t>
</td>
<td style="text-align:right;">
<t t-if="account['0'] == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="currency[0]"/>
<t t-esc="Math.round(account['0'] * Math.pow(10, 2)) / Math.pow(10, 2)"/>
</t>
</td>
<td style="text-align:right;">
<t t-if="account['total'] == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="currency[0]"/>
<t t-esc="Math.round(account['total'] * Math.pow(10, 2)) / Math.pow(10, 2)"/>
</t>
</td>
</t>
<t t-else="">
<td style="text-align:right;">
<t t-if="account['direction'] == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="Math.round(account['direction'] * Math.pow(10, 2)) / Math.pow(10, 2)"/>
<t t-esc="currency[0]"/>
</t>
</td>
<td style="text-align:right;">
<t t-if="account['4'] == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="Math.round(account['4'] * Math.pow(10, 2)) / Math.pow(10, 2)"/>
<t t-esc="currency[0]"/>
</t>
</td>
<td style="text-align:right;">
<t t-if="account['3'] == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="Math.round(account['3'] * Math.pow(10, 2)) / Math.pow(10, 2)"/>
<t t-esc="currency[0]"/>
</t>
</td>
<td style="text-align:right;">
<t t-if="account['2'] == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="Math.round(account['2'] * Math.pow(10, 2)) / Math.pow(10, 2)"/>
<t t-esc="currency[0]"/>
</t>
</td>
<td style="text-align:right;">
<t t-if="account['1'] == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="Math.round(account['1'] * Math.pow(10, 2)) / Math.pow(10, 2)"/>
<t t-esc="currency[0]"/>
</t>
</td>
<td style="text-align:right;">
<t t-if="account['0'] == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="Math.round(account['0'] * Math.pow(10, 2)) / Math.pow(10, 2)"/>
<t t-esc="currency[0]"/>
</t>
</td>
<td style="text-align:right;">
<t t-if="account['total'] == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="Math.round(account['total'] * Math.pow(10, 2)) / Math.pow(10, 2)"/>
<t t-esc="currency[0]"/>
</t>
</td>
</t>
</td>
<tr t-attf-class="collapse a{{account['partner_id']}}">
<td colspan="14">
<ul>
</ul>
</td>
</tr>
</tr>
</t>
</tbody>
</table>
</div>
@ -132,52 +203,56 @@
</t>
<t t-name="AgeingFilterView">
<div class="" style="position: relative;">
<div class="sub_container_left">
<div class="report_print">
<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>
<div class="sub_container_right" style="width:50%;height:3%;right:0px;top:0px;position: absolute;">
<div class="" style="right:80x;">
<br></br>
<div class="row" style="right:80px;top:0px;position: absolute;width:50;">
<div class="time_range" style="">
<a type="button" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<span class="fa fa-calendar" title="Dates" role="img" aria-label="Dates"></span>
As On Date
</a>
<div class="dropdown-menu" role="menu">
<div class="" >
<label class="" for="date_from">As On Date :</label>
<div class="">
<div class="" aria-atomic="true" id="" >
<input type="date" id="date_from"></input>
</div>
</div>
</div>
</div>
</div>
<div class="search-Result-Selection" style="">
<a type="button" class="dropdown-toggle" data-toggle="dropdown">
<span class="fa fa-book"></span>
Account Type:
</a>
<select id="selection" class="dropdown-menu result_selection" name="states[]" >
<div role="separator" class="dropdown-divider"></div>
<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>
<div class="partner_filter">
<div class="" style="position: relative;">
<div class="sub_container_left">
<div class="report_print">
<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>
<div class="sub_container_right" style="width:50%;height:3%;right:0px;top:0px;position: absolute;">
<div class="" style="right:80x;">
<br></br>
<div class="row" style="right:100px;top:0px;position: absolute;width:50;">
<div class="time_range" style="">
<a type="button" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<span class="fa fa-calendar" title="Dates" role="img" aria-label="Dates"></span>
As On Date
</a>
<div class="dropdown-menu" role="menu">
<div class="">
<label class="" for="date_from">As On Date :</label>
<div class="">
<div class="" aria-atomic="true" id="">
<input type="date" id="date_from"></input>
</div>
</div>
</div>
</div>
</div>
<div class="search-Result-Selection" style="">
<a type="button" class="dropdown-toggle" data-toggle="dropdown">
<span class="fa fa-book"></span>
Account Type:
</a>
<select id="selection" class="dropdown-menu result_selection" name="states[]">
<div role="separator" class="dropdown-divider"></div>
<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>
<div class="partner_filter">
<a type="button" class="dropdown-toggle" data-toggle="dropdown">
<span class="fa fa-users"></span>
Partners:
@ -191,285 +266,288 @@ Account Type:
</select>
<span id="partner_res"></span>
</div>
<div class="category_filter">
<a type="button" class="dropdown-toggle"
data-toggle="dropdown">
<span class="fa fa-filter"></span>
Partner tag:
</a>
<select class="dropdown-menu category"
name="states[]" multiple="multiple">
<t t-foreach="filter_data.category_list"
t-as="category">
<option t-attf-value="{{category[0]}}">
<t t-esc="category[1]"/>
</option>
</t>
</select>
<span id="category_res"></span>
</div>
<div class="search-Target-move" style="">
<a type="button" class="dropdown-toggle" data-toggle="dropdown">
<span class="fa fa-filter"></span>
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>
</select>
<span id="post_res"></span>
</div>
</div>
</div>
<div style="">
<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>
</div>
</t>
<t t-name="SubSectional">
<div class="gl-table-div">
<table class="table table-sm o_main_table"
<div class="category_filter">
<a type="button" class="dropdown-toggle"
data-toggle="dropdown">
<span class="fa fa-filter"></span>
Partner tag:
</a>
<select class="dropdown-menu category"
name="states[]" multiple="multiple">
<t t-foreach="filter_data.category_list"
t-as="category">
<option t-attf-value="{{category[0]}}">
<t t-esc="category[1]"/>
</option>
</t>
</select>
<span id="category_res"></span>
</div>
<div class="search-Target-move" style="">
<a type="button" class="dropdown-toggle" data-toggle="dropdown">
<span class="fa fa-filter"></span>
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>
</select>
<span id="post_res"></span>
</div>
</div>
</div>
<div style="">
<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>
</div>
</t>
<t t-name="SubSectional">
<div class="gl-table-div">
<table class="table table-sm o_main_table"
style="border: 0px solid black;display compact;">
<thead>
<tr style="">
<th>Entry Label</th>
<th>DueDate</th>
<th>JRNL</th>
<th>Account</th>
<th >Not Due</th>
<th >0-20</th>
<th >21-40</th>
<th >41-60</th>
<th >61-80</th>
<th >80+</th>
</tr>
</thead>
<tbody>
<t t-foreach="account_data" t-as="account_line">
<tr>
<td>
<t t-if="account_line.mov_id">
<div class="dropdown dropdown-toggle">
<a data-toggle="dropdown" href="#">
<span class="caret"></span>
<span>
<t t-esc="account_line.move"/>
</span>
</a>
<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu">
<li>
<a class="view-account-move" tabindex="-1" href="#"
t-att-data-move-id="account_line.mov_id">
View Source move
</a>
</li>
</ul>
</div>
</t>
</td>
<td>
<t t-esc="account_line.date"/>
</td>
<td>
<t t-esc="account_line.jrnl"/>
</td>
<td>
<span>
<t t-esc="account_line.acc_code"/>
-
<t t-esc="account_line.acc_name"/>
</span>
</td>
<t t-if="account_line.currency== 'before'">
<td>
<t t-if="account_line.period6">
<t t-if="account_line.amount== 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="account_line.symbol"/>
<t t-esc="Math.round(account_line.amount * Math.pow(10, 2)) / Math.pow(10, 2)"/>
</t>
</t>
<t t-else="">
<span>-</span>
</t>
</td>
<td>
<t t-if="account_line.period5">
<t t-if="account_line.amount== 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="account_line.symbol"/>
<t t-esc="Math.round(account_line.amount * Math.pow(10, 2)) / Math.pow(10, 2)"/>
</t>
</t>
<t t-else="">
<span>-</span>
</t>
</td>
<td>
<t t-if="account_line.period4">
<t t-if="account_line.amount== 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="account_line.symbol"/>
<t t-esc="Math.round(account_line.amount * Math.pow(10, 2)) / Math.pow(10, 2)"/>
</t>
</t>
<t t-else="">
<span>-</span>
</t>
</td>
<td>
<t t-if="account_line.period3">
<t t-if="account_line.amount== 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="account_line.symbol"/>
<t t-esc="Math.round(account_line.amount * Math.pow(10, 2)) / Math.pow(10, 2)"/>
</t>
</t>
<t t-else="">
<span>-</span>
</t>
</td>
<td>
<t t-if="account_line.period2">
<t t-if="account_line.amount== 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="account_line.symbol"/>
<t t-esc="Math.round(account_line.amount * Math.pow(10, 2)) / Math.pow(10, 2)"/>
</t>
</t>
<t t-else="">
<span>-</span>
</t>
</td>
<td>
<t t-if="account_line.period1">
<t t-if="account_line.amount== 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="account_line.symbol"/>
<t t-esc="Math.round(account_line.amount * Math.pow(10, 2)) / Math.pow(10, 2)"/>
</t>
</t>
<t t-else="">
<span>-</span>
</t>
</td>
</t>
<t t-else="">
<td>
<t t-if="account_line.period6">
<t t-if="account_line.amount == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="Math.round(account_line.amount * Math.pow(10, 2)) / Math.pow(10, 2)"/>
<t t-esc="account_line.symbol"/>
</t>
</t>
</td>
<td>
<t t-if="account_line.period5">
<t t-if="account_line.amount == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="Math.round(account_line.amount * Math.pow(10, 2)) / Math.pow(10, 2)"/>
<t t-esc="account_line.symbol"/>
</t>
</t>
</td>
<td>
<t t-if="account_line.period4">
<t t-if="account_line.amount == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="Math.round(account_line.amount * Math.pow(10, 2)) / Math.pow(10, 2)"/>
<t t-esc="account_line.symbol"/>
</t>
</t>
</td>
<td>
<t t-if="account_line.period3">
<t t-if="account_line.amount == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="Math.round(account_line.amount * Math.pow(10, 2)) / Math.pow(10, 2)"/>
<t t-esc="account_line.symbol"/>
</t>
</t>
</td>
<td>
<t t-if="account_line.period2">
<t t-if="account_line.amount == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="Math.round(account_line.amount * Math.pow(10, 2)) / Math.pow(10, 2)"/>
<t t-esc="account_line.symbol"/>
</t>
</t>
</td>
<td>
<t t-if="account_line.period1">
<t t-if="account_line.amount == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="Math.round(account_line.amount * Math.pow(10, 2)) / Math.pow(10, 2)"/>
<t t-esc="account_line.symbol"/>
</t>
</t>
</td>
</t>
</tr>
</t>
</tbody>
</table>
</div>
</t>
<thead>
<tr style="">
<th>Entry Label</th>
<th>DueDate</th>
<th>JRNL</th>
<th>Account</th>
<th>Not Due</th>
<th>0-30</th>
<th>30-60</th>
<th>60-90</th>
<th>90-120</th>
<th>120+</th>
</tr>
</thead>
<tbody>
<t t-foreach="account_data" t-as="account_line">
<tr>
<td>
<t t-if="account_line.mov_id">
<div class="dropdown dropdown-toggle">
<a data-toggle="dropdown" href="#">
<span class="caret"></span>
<span>
<t t-esc="account_line.move"/>
</span>
</a>
<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu">
<li>
<a class="view-account-move" tabindex="-1" href="#"
t-att-data-move-id="account_line.mov_id">
View Source move
</a>
</li>
</ul>
</div>
</t>
</td>
<td>
<t t-esc="account_line.date"/>
</td>
<td>
<t t-esc="account_line.jrnl"/>
</td>
<td>
<span>
<t t-esc="account_line.acc_code"/>
-
<t t-esc="account_line.acc_name"/>
</span>
</td>
<t t-if="account_line.currency== 'before'">
<td>
<t t-if="account_line.period6">
<t t-if="account_line.amount== 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="account_line.symbol"/>
<t t-esc="Math.round(account_line.amount * Math.pow(10, 2)) / Math.pow(10, 2)"/>
</t>
</t>
<t t-else="">
<span>-</span>
</t>
</td>
<td>
<t t-if="account_line.period5">
<t t-if="account_line.amount== 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="account_line.symbol"/>
<t t-esc="Math.round(account_line.amount * Math.pow(10, 2)) / Math.pow(10, 2)"/>
</t>
</t>
<t t-else="">
<span>-</span>
</t>
</td>
<td>
<t t-if="account_line.period4">
<t t-if="account_line.amount== 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="account_line.symbol"/>
<t t-esc="Math.round(account_line.amount * Math.pow(10, 2)) / Math.pow(10, 2)"/>
</t>
</t>
<t t-else="">
<span>-</span>
</t>
</td>
<td>
<t t-if="account_line.period3">
<t t-if="account_line.amount== 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="account_line.symbol"/>
<t t-esc="Math.round(account_line.amount * Math.pow(10, 2)) / Math.pow(10, 2)"/>
</t>
</t>
<t t-else="">
<span>-</span>
</t>
</td>
<td>
<t t-if="account_line.period2">
<t t-if="account_line.amount== 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="account_line.symbol"/>
<t t-esc="Math.round(account_line.amount * Math.pow(10, 2)) / Math.pow(10, 2)"/>
</t>
</t>
<t t-else="">
<span>-</span>
</t>
</td>
<td>
<t t-if="account_line.period1">
<t t-if="account_line.amount== 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="account_line.symbol"/>
<t t-esc="Math.round(account_line.amount * Math.pow(10, 2)) / Math.pow(10, 2)"/>
</t>
</t>
<t t-else="">
<span>-</span>
</t>
</td>
</t>
<t t-else="">
<td>
<t t-if="account_line.period6">
<t t-if="account_line.amount == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="Math.round(account_line.amount * Math.pow(10, 2)) / Math.pow(10, 2)"/>
<t t-esc="account_line.symbol"/>
</t>
</t>
</td>
<td>
<t t-if="account_line.period5">
<t t-if="account_line.amount == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="Math.round(account_line.amount * Math.pow(10, 2)) / Math.pow(10, 2)"/>
<t t-esc="account_line.symbol"/>
</t>
</t>
</td>
<td>
<t t-if="account_line.period4">
<t t-if="account_line.amount == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="Math.round(account_line.amount * Math.pow(10, 2)) / Math.pow(10, 2)"/>
<t t-esc="account_line.symbol"/>
</t>
</t>
</td>
<td>
<t t-if="account_line.period3">
<t t-if="account_line.amount == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="Math.round(account_line.amount * Math.pow(10, 2)) / Math.pow(10, 2)"/>
<t t-esc="account_line.symbol"/>
</t>
</t>
</td>
<td>
<t t-if="account_line.period2">
<t t-if="account_line.amount == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="Math.round(account_line.amount * Math.pow(10, 2)) / Math.pow(10, 2)"/>
<t t-esc="account_line.symbol"/>
</t>
</t>
</td>
<td>
<t t-if="account_line.period1">
<t t-if="account_line.amount == 0">
<span>-</span>
</t>
<t t-else="">
<t t-esc="Math.round(account_line.amount * Math.pow(10, 2)) / Math.pow(10, 2)"/>
<t t-esc="account_line.symbol"/>
</t>
</t>
</td>
</t>
</tr>
</t>
</tbody>
</table>
</div>
</t>
</templates>

22
dynamic_accounts_report/wizard/ageing.py

@ -19,7 +19,7 @@ class AgeingView(models.TransientModel):
_name = 'account.partner.ageing'
period_length = fields.Integer(string='Period Length (days)',
required=True, default=20)
required=True, default=30)
date_from = fields.Date(default=lambda *a: time.strftime('%Y-%m-%d'))
result_selection = fields.Selection([('customer', 'Receivable Accounts'),
('supplier', 'Payable Accounts'),
@ -599,11 +599,11 @@ class AgeingView(models.TransientModel):
sheet.merge_range('A7:C7', 'Partner', heading)
sheet.write('D7', 'Total', heading)
sheet.write('E7', 'Not Due', heading)
sheet.write('F7', '0-20', heading)
sheet.write('G7', '20-40', heading)
sheet.write('H7', '40-60', heading)
sheet.write('I7', '60-80', heading)
sheet.write('J7', '80+', heading)
sheet.write('F7', '0-30', heading)
sheet.write('G7', '30-60', heading)
sheet.write('H7', '60-90', heading)
sheet.write('I7', '90-120', heading)
sheet.write('J7', '120+', heading)
lst = []
for rec in report_data_main[0]:
@ -637,11 +637,11 @@ class AgeingView(models.TransientModel):
sheet.write(row, col + 2, 'Journal', sub_heading)
sheet.write(row, col + 3, 'Account', sub_heading)
sheet.write(row, col + 4, 'Not Due', sub_heading)
sheet.write(row, col + 5, '0 - 20', sub_heading)
sheet.write(row, col + 6, '21 - 40', sub_heading)
sheet.write(row, col + 7, '41 - 60', sub_heading)
sheet.write(row, col + 8, '61 - 80', sub_heading)
sheet.write(row, col + 9, '81 - 100', sub_heading)
sheet.write(row, col + 5, '0 - 30', sub_heading)
sheet.write(row, col + 6, '30 - 60', sub_heading)
sheet.write(row, col + 7, '60 - 90', sub_heading)
sheet.write(row, col + 8, '90 - 120', sub_heading)
sheet.write(row, col + 9, '120 +', sub_heading)
for line_data in rec_data['child_lines']:
row += 1

Loading…
Cancel
Save