Techsystech
/
account-financial-reporting
mirror of https://github.com/OCA/account-financial-reporting.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[FIX] show detail move line on state draft

pull/850/head
Saran440 2022-01-15 16:40:58 +07:00
parent 8d0ddad8cf
commit 22c111057f
3 changed files with 308 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
account_financial_report/readme/CONTRIBUTORS.rst
View File

@ -30,6 +30,7 @@
* Valentin Vinagre * Valentin Vinagre
* Lois Rilo <lois.rilo@forgeflow.com> * Lois Rilo <lois.rilo@forgeflow.com>
* Saran Lim. <saranl@ecosoft.co.th>
Much of the work in this module was done at a sprint in Sorrento, Italy in Much of the work in this module was done at a sprint in Sorrento, Italy in
April 2016. April 2016.

406
account_financial_report/report/templates/trial_balance.xml
View File

@ -297,11 +297,21 @@
<div class="act_as_cell amount"> <div class="act_as_cell amount">
<t t-if="not show_partner_details"> <t t-if="not show_partner_details">
<t t-if="balance['type'] == 'account_type'"> <t t-if="balance['type'] == 'account_type'">
<t <t t-if="only_posted_moves">
t-set="domain" <t
t-value="[('account_id', '=', balance['id']), t-set="domain"
('date', '&lt;', date_from)]" t-value="[('account_id', '=', balance['id']),
/> ('parent_state', '=', 'posted'),
('date', '&lt;', date_from)]"
/>
</t>
<t t-else="">
<t
t-set="domain"
t-value="[('account_id', '=', balance['id']),
('date', '&lt;', date_from)]"
/>
</t>
<span t-att-domain="domain" res-model="account.move.line"> <span t-att-domain="domain" res-model="account.move.line">
<t <t
t-att-style="style" t-att-style="style"
@ -311,11 +321,21 @@
</span> </span>
</t> </t>
<t t-if="balance['type'] == 'group_type'"> <t t-if="balance['type'] == 'group_type'">
<t <t t-if="only_posted_moves">
t-set="domain" <t
t-value="[('account_id', 'in', balance['account_ids']), t-set="domain"
t-value="[('account_id', '=', balance['account_ids']),
('parent_state', '=', 'posted'),
('date', '&lt;', date_from)]" ('date', '&lt;', date_from)]"
/> />
</t>
<t t-else="">
<t
t-set="domain"
t-value="[('account_id', '=', balance['account_ids']),
('date', '&lt;', date_from)]"
/>
</t>
<span t-att-domain="domain" res-model="account.move.line"> <span t-att-domain="domain" res-model="account.move.line">
<t <t
t-att-style="style" t-att-style="style"
@ -326,12 +346,23 @@
</t> </t>
</t> </t>
<t t-if="type == 'partner_type'"> <t t-if="type == 'partner_type'">
<t <t t-if="only_posted_moves">
t-set="domain" <t
t-value="[('account_id', '=', int(account_id)), t-set="domain"
('partner_id', '=', int(partner_id)), t-value="[('account_id', '=', int(account_id)),
('date', '&lt;', date_from)]" ('parent_state', '=', 'posted'),
/> ('partner_id', '=', int(partner_id)),
('date', '&lt;', date_from)]"
/>
</t>
<t t-else="">
<t
t-set="domain"
t-value="[('account_id', '=', int(account_id)),
('partner_id', '=', int(partner_id)),
('date', '&lt;', date_from)]"
/>
</t>
<span t-att-domain="domain" res-model="account.move.line"> <span t-att-domain="domain" res-model="account.move.line">
<t <t
t-att-style="style" t-att-style="style"
@ -345,13 +376,25 @@
<div class="act_as_cell amount"> <div class="act_as_cell amount">
<t t-if="not show_partner_details"> <t t-if="not show_partner_details">
<t t-if="balance['type'] == 'account_type'"> <t t-if="balance['type'] == 'account_type'">
<t <t t-if="only_posted_moves">
t-set="domain" <t
t-value="[('account_id', '=', balance['id']), t-set="domain"
('date', '&gt;=', date_from), t-value="[('account_id', '=', balance['id']),
('date', '&lt;=', date_to), ('parent_state', '=', 'posted'),
('debit', '&lt;&gt;', 0)]" ('date', '&gt;=', date_from),
/> ('date', '&lt;=', date_to),
('debit', '&lt;&gt;', 0)]"
/>
</t>
<t t-else="">
<t
t-set="domain"
t-value="[('account_id', '=', balance['id']),
('date', '&gt;=', date_from),
('date', '&lt;=', date_to),
('debit', '&lt;&gt;', 0)]"
/>
</t>
<span t-att-domain="domain" res-model="account.move.line"> <span t-att-domain="domain" res-model="account.move.line">
<t <t
t-att-style="style" t-att-style="style"
@ -361,13 +404,25 @@
</span> </span>
</t> </t>
<t t-if="balance['type'] == 'group_type'"> <t t-if="balance['type'] == 'group_type'">
<t <t t-if="only_posted_moves">
t-set="domain" <t
t-value="[('account_id', 'in', balance['account_ids']), t-set="domain"
t-value="[('account_id', 'in', balance['account_ids']),
('parent_state', '=', 'posted'),
('date', '&gt;=', date_from), ('date', '&gt;=', date_from),
('date', '&lt;=', date_to), ('date', '&lt;=', date_to),
('debit', '&lt;&gt;', 0)]" ('debit', '&lt;&gt;', 0)]"
/> />
</t>
<t t-else="">
<t
t-set="domain"
t-value="[('account_id', 'in', balance['account_ids']),
('date', '&gt;=', date_from),
('date', '&lt;=', date_to),
('debit', '&lt;&gt;', 0)]"
/>
</t>
<span t-att-domain="domain" res-model="account.move.line"> <span t-att-domain="domain" res-model="account.move.line">
<t <t
t-att-style="style" t-att-style="style"
@ -378,14 +433,27 @@
</t> </t>
</t> </t>
<t t-if="type == 'partner_type'"> <t t-if="type == 'partner_type'">
<t <t t-if="only_posted_moves">
t-set="domain" <t
t-value="[('account_id', '=', int(account_id)), t-set="domain"
('partner_id', '=', int(partner_id)), t-value="[('account_id', '=', int(account_id)),
('date', '&gt;=', date_from), ('partner_id', '=', int(partner_id)),
('date', '&lt;=', date_to), ('parent_state', '=', 'posted'),
('debit', '&lt;&gt;', 0)]" ('date', '&gt;=', date_from),
/> ('date', '&lt;=', date_to),
('debit', '&lt;&gt;', 0)]"
/>
</t>
<t t-else="">
<t
t-set="domain"
t-value="[('account_id', '=', int(account_id)),
('partner_id', '=', int(partner_id)),
('date', '&gt;=', date_from),
('date', '&lt;=', date_to),
('debit', '&lt;&gt;', 0)]"
/>
</t>
<span t-att-domain="domain" res-model="account.move.line"> <span t-att-domain="domain" res-model="account.move.line">
<t <t
t-att-style="style" t-att-style="style"
@ -399,13 +467,25 @@
<div class="act_as_cell amount"> <div class="act_as_cell amount">
<t t-if="not show_partner_details"> <t t-if="not show_partner_details">
<t t-if="balance['type'] == 'account_type'"> <t t-if="balance['type'] == 'account_type'">
<t <t t-if="only_posted_moves">
t-set="domain" <t
t-value="[('account_id', '=', balance['id']), t-set="domain"
('date', '&gt;=', date_from), t-value="[('account_id', '=', balance['id']),
('date', '&lt;=', date_to), ('parent_state', '=', 'posted'),
('credit', '&lt;&gt;', 0)]" ('date', '&gt;=', date_from),
/> ('date', '&lt;=', date_to),
('credit', '&lt;&gt;', 0)]"
/>
</t>
<t t-else="">
<t
t-set="domain"
t-value="[('account_id', '=', balance['id']),
('date', '&gt;=', date_from),
('date', '&lt;=', date_to),
('credit', '&lt;&gt;', 0)]"
/>
</t>
<span t-att-domain="domain" res-model="account.move.line"> <span t-att-domain="domain" res-model="account.move.line">
<t <t
t-att-style="style" t-att-style="style"
@ -415,13 +495,25 @@
</span> </span>
</t> </t>
<t t-if="balance['type'] == 'group_type'"> <t t-if="balance['type'] == 'group_type'">
<t <t t-if="only_posted_moves">
t-set="domain" <t
t-value="[('account_id', 'in', balance['account_ids']), t-set="domain"
t-value="[('account_id', 'in', balance['account_ids']),
('parent_state', '=', 'posted'),
('date', '&gt;=', date_from), ('date', '&gt;=', date_from),
('date', '&lt;=', date_to), ('date', '&lt;=', date_to),
('credit', '&lt;&gt;', 0)]" ('credit', '&lt;&gt;', 0)]"
/> />
</t>
<t t-else="">
<t
t-set="domain"
t-value="[('account_id', 'in', balance['account_ids']),
('date', '&gt;=', date_from),
('date', '&lt;=', date_to),
('credit', '&lt;&gt;', 0)]"
/>
</t>
<span t-att-domain="domain" res-model="account.move.line"> <span t-att-domain="domain" res-model="account.move.line">
<t <t
t-att-style="style" t-att-style="style"
@ -432,14 +524,27 @@
</t> </t>
</t> </t>
<t t-if="type == 'partner_type'"> <t t-if="type == 'partner_type'">
<t <t t-if="only_posted_moves">
t-set="domain" <t
t-value="[('account_id', '=', int(account_id)), t-set="domain"
('partner_id', '=', int(partner_id)), t-value="[('account_id', '=', int(account_id)),
('date', '&gt;=', date_from), ('partner_id', '=', int(partner_id)),
('date', '&lt;=', date_to), ('parent_state', '=', 'posted'),
('credit', '&lt;&gt;', 0)]" ('date', '&gt;=', date_from),
/> ('date', '&lt;=', date_to),
('credit', '&lt;&gt;', 0)]"
/>
</t>
<t t-else="">
<t
t-set="domain"
t-value="[('account_id', '=', int(account_id)),
('partner_id', '=', int(partner_id)),
('date', '&gt;=', date_from),
('date', '&lt;=', date_to),
('credit', '&lt;&gt;', 0)]"
/>
</t>
<span t-att-domain="domain" res-model="account.move.line"> <span t-att-domain="domain" res-model="account.move.line">
<t <t
t-att-style="style" t-att-style="style"
@ -453,13 +558,25 @@
<div class="act_as_cell amount"> <div class="act_as_cell amount">
<t t-if="not show_partner_details"> <t t-if="not show_partner_details">
<t t-if="balance['type'] == 'account_type'"> <t t-if="balance['type'] == 'account_type'">
<t <t t-if="only_posted_moves">
t-set="domain" <t
t-value="[('account_id', '=', balance['id']), t-set="domain"
t-value="[('account_id', '=', balance['id']),
('parent_state', '=', 'posted'),
('date', '&gt;=', date_from), ('date', '&gt;=', date_from),
('date', '&lt;=', date_to), ('date', '&lt;=', date_to),
('balance', '&lt;&gt;', 0)]" ('balance', '&lt;&gt;', 0)]"
/> />
</t>
<t t-else="">
<t
t-set="domain"
t-value="[('account_id', '=', balance['id']),
('date', '&gt;=', date_from),
('date', '&lt;=', date_to),
('balance', '&lt;&gt;', 0)]"
/>
</t>
<span t-att-domain="domain" res-model="account.move.line"> <span t-att-domain="domain" res-model="account.move.line">
<t <t
t-att-style="style" t-att-style="style"
@ -469,12 +586,23 @@
</span> </span>
</t> </t>
<t t-if="balance['type'] == 'group_type'"> <t t-if="balance['type'] == 'group_type'">
<t <t t-if="only_posted_moves">
t-set="domain" <t
t-value="[('account_id', 'in', balance['account_ids']), t-set="domain"
t-value="[('account_id', 'in', balance['account_ids']),
('parent_state', '=', 'posted'),
('date', '&gt;=', date_from), ('date', '&gt;=', date_from),
('date', '&lt;=', date_to)]" ('date', '&lt;=', date_to)]"
/> />
</t>
<t t-else="">
<t
t-set="domain"
t-value="[('account_id', 'in', balance['account_ids']),
('date', '&gt;=', date_from),
('date', '&lt;=', date_to)]"
/>
</t>
<span t-att-domain="domain" res-model="account.move.line"> <span t-att-domain="domain" res-model="account.move.line">
<t <t
t-att-style="style" t-att-style="style"
@ -485,14 +613,27 @@
</t> </t>
</t> </t>
<t t-if="type == 'partner_type'"> <t t-if="type == 'partner_type'">
<t <t t-if="only_posted_moves">
t-set="domain" <t
t-value="[('account_id', '=', int(account_id)), t-set="domain"
('partner_id', '=', int(partner_id)), t-value="[('account_id', '=', int(account_id)),
('date', '&gt;=', date_from), ('parent_state', '=', 'posted'),
('date', '&lt;=', date_to), ('partner_id', '=', int(partner_id)),
('balance', '&lt;&gt;', 0)]" ('date', '&gt;=', date_from),
/> ('date', '&lt;=', date_to),
('balance', '&lt;&gt;', 0)]"
/>
</t>
<t t-else="">
<t
t-set="domain"
t-value="[('account_id', '=', int(account_id)),
('partner_id', '=', int(partner_id)),
('date', '&gt;=', date_from),
('date', '&lt;=', date_to),
('balance', '&lt;&gt;', 0)]"
/>
</t>
<span t-att-domain="domain" res-model="account.move.line"> <span t-att-domain="domain" res-model="account.move.line">
<t <t
t-att-style="style" t-att-style="style"
@ -506,11 +647,21 @@
<div class="act_as_cell amount"> <div class="act_as_cell amount">
<t t-if="not show_partner_details"> <t t-if="not show_partner_details">
<t t-if="balance['type'] == 'account_type'"> <t t-if="balance['type'] == 'account_type'">
<t <t t-if="only_posted_moves">
t-set="domain" <t
t-value="[('account_id', '=', balance['id']), t-set="domain"
('date', '&lt;=', date_to)]" t-value="[('account_id', '=', balance['id']),
/> ('parent_state', '=', 'posted'),
('date', '&lt;=', date_to)]"
/>
</t>
<t t-else="">
<t
t-set="domain"
t-value="[('account_id', '=', balance['id']),
('date', '&lt;=', date_to)]"
/>
</t>
<span t-att-domain="domain" res-model="account.move.line"> <span t-att-domain="domain" res-model="account.move.line">
<t <t
t-att-style="style" t-att-style="style"
@ -520,10 +671,18 @@
</span> </span>
</t> </t>
<t t-if="balance['type'] == 'group_type'"> <t t-if="balance['type'] == 'group_type'">
<t <t t-if="only_posted_moves">
t-set="domain" <t
t-value="[('account_id', 'in', balance['account_ids'])]" t-set="domain"
/> t-value="[('account_id', 'in', balance['account_ids']), ('parent_state', '=', 'posted')]"
/>
</t>
<t t-else="">
<t
t-set="domain"
t-value="[('account_id', 'in', balance['account_ids'])]"
/>
</t>
<span t-att-domain="domain" res-model="account.move.line"> <span t-att-domain="domain" res-model="account.move.line">
<t <t
t-att-style="style" t-att-style="style"
@ -534,12 +693,23 @@
</t> </t>
</t> </t>
<t t-if="type == 'partner_type'"> <t t-if="type == 'partner_type'">
<t <t t-if="only_posted_moves">
t-set="domain" <t
t-value="[('account_id', '=', int(account_id)), t-set="domain"
('partner_id', '=', int(partner_id)), t-value="[('account_id', '=', int(account_id)),
('date', '&lt;=', date_to)]" ('parent_state', '=', 'posted'),
/> ('partner_id', '=', int(partner_id)),
('date', '&lt;=', date_to)]"
/>
</t>
<t t-else="">
<t
t-set="domain"
t-value="[('account_id', '=', int(account_id)),
('partner_id', '=', int(partner_id)),
('date', '&lt;=', date_to)]"
/>
</t>
<span t-att-domain="domain" res-model="account.move.line"> <span t-att-domain="domain" res-model="account.move.line">
<t <t
t-att-style="style" t-att-style="style"
@ -559,10 +729,18 @@
</div> </div>
<!--## Initial balance cur.--> <!--## Initial balance cur.-->
<div class="act_as_cell amount"> <div class="act_as_cell amount">
<t <t t-if="only_posted_moves">
t-set="domain" <t
t-value="[('account_id', '=', balance['id'])]" t-set="domain"
/> t-value="[('account_id', '=', balance['id']), ('parent_state', '=', 'posted')]"
/>
</t>
<t t-else="">
<t
t-set="domain"
t-value="[('account_id', '=', balance['id'])]"
/>
</t>
<span <span
t-att-domain="domain" t-att-domain="domain"
res-model="account.move.line" res-model="account.move.line"
@ -597,11 +775,21 @@
/> />
</div> </div>
<div class="act_as_cell amount"> <div class="act_as_cell amount">
<t <t t-if="only_posted_moves">
t-set="domain" <t
t-value="[('account_id', '=', account_id), t-set="domain"
t-value="[('account_id', '=', account_id),
('parent_state', '=', 'posted'),
('partner_id', '=', partner_id)]" ('partner_id', '=', partner_id)]"
/> />
</t>
<t t-else="">
<t
t-set="domain"
t-value="[('account_id', '=', account_id),
('partner_id', '=', partner_id)]"
/>
</t>
<span <span
t-att-domain="domain" t-att-domain="domain"
res-model="account.move.line" res-model="account.move.line"
@ -620,10 +808,18 @@
<t t-if="balance['type'] == 'account_type'"> <t t-if="balance['type'] == 'account_type'">
<t t-if="balance['currency_id']"> <t t-if="balance['currency_id']">
<div class="act_as_cell amount"> <div class="act_as_cell amount">
<t <t t-if="only_posted_moves">
t-set="domain" <t
t-value="[('account_id', '=', balance['id'])]" t-set="domain"
/> t-value="[('account_id', '=', balance['id']), ('parent_state', '=', 'posted')]"
/>
</t>
<t t-else="">
<t
t-set="domain"
t-value="[('account_id', '=', balance['id'])]"
/>
</t>
<span <span
t-att-domain="domain" t-att-domain="domain"
res-model="account.move.line" res-model="account.move.line"
@ -652,11 +848,21 @@
<t t-if="total_amount[account_id]['currency_id']"> <t t-if="total_amount[account_id]['currency_id']">
<div class="act_as_cell amount"> <div class="act_as_cell amount">
<t t-if="type == 'partner_type'"> <t t-if="type == 'partner_type'">
<t <t t-if="only_posted_moves">
t-set="domain" <t
t-value="[('account_id', '=', account_id), t-set="domain"
t-value="[('account_id', '=', account_id),
('parent_state', '=', 'posted'),
('partner_id', '=', partner_id)]" ('partner_id', '=', partner_id)]"
/> />
</t>
<t t-else="">
<t
t-set="domain"
t-value="[('account_id', '=', account_id),
('partner_id', '=', partner_id)]"
/>
</t>
<span <span
t-att-domain="domain" t-att-domain="domain"
res-model="account.move.line" res-model="account.move.line"

2
account_financial_report/static/src/js/report.js
View File

@ -15,7 +15,7 @@ odoo.define("account_financial_report.report", function (require) {
/** /**
* Convert a model name to a capitalized title style * Convert a model name to a capitalized title style
* Example: account.mode.line --> Account Move Line * Example: account.move.line --> Account Move Line
* *
* @param {String} str * @param {String} str
* @returns {String} * @returns {String}