pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] account: usability of accounting dashboard

Browse Source 
* [IMP] account: on 'Accounting Dashboard', 'Payments to do' under 'Vendor Bills' block should show total of amount to be(that is, 'To Pay' column total) paid and not the total of open invoices.

* [IMP] account: minor improvements in accounting dashboard,
- changed string from Invoices to validate/Invoices to Validate and Draft Bills to Bills to Validate
- moved above strings slightly left side in Accounting dashboard so that the whole string displayed

Was PR #18730. Was task 35125
This commit is contained in:
Mitali Patel
2017-12-01 11:02:29 +01:00
committed by qdp-odoo
parent 477d28644b
commit 7e9e2ada32
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/models/account_journal_dashboard.py
+1 -1
View File
@@ -215,7 +215,7 @@ class account_journal(models.Model):
data as its first element, and the arguments dictionary to use to run
it as its second.
"""
return ("""SELECT state, amount_total, currency_id AS currency
return ("""SELECT state, residual_signed as amount_total, currency_id AS currency
FROM account_invoice
WHERE journal_id = %(journal_id)s AND state = 'open';""", {'journal_id':self.id})
addons/account/views/account_journal_dashboard_view.xml
+16 -16
View File
@@ -221,7 +221,7 @@
<!-- On the left, display :
- A button corresponding to the bank_statements_source, if it wasn't configured, a button for each of them
- If there are statements to reconcile, a link to reconcile them -->
<div class="col-xs-6 o_kanban_primary_left">
<div class="col-xs-5 o_kanban_primary_left">
<t t-if="dashboard.number_to_reconcile > 0">
<button type="object" name="action_open_reconcile" class="btn btn-primary btn-sm"> Reconcile <t t-esc="dashboard.number_to_reconcile"/> Items</button>
</t>
@@ -243,27 +243,27 @@
</t>
</div>
<!-- On the right, show other common informations/actions -->
<div class="col-xs-6 o_kanban_primary_right">
<div class="col-xs-7 o_kanban_primary_right">
<div class="row">
<div class="col-xs-6">
<div class="col-xs-7">
<span title="Balance in Odoo">Balance in GL</span>
</div>
<div class="col-xs-6 text-right">
<div class="col-xs-5 text-right">
<span><t t-esc="dashboard.account_balance"/></span>
</div>
</div>
<div class="row" name="latest_statement" t-if="dashboard.last_balance != dashboard.account_balance">
<div class="col-xs-6">
<div class="col-xs-7">
<span title="Latest Statement">Latest Statement</span>
</div>
<div class="col-xs-6 text-right">
<div class="col-xs-5 text-right">
<span><t t-esc="dashboard.last_balance"/></span>
</div>
</div>
</div>
</t>
<t t-name="JournalBodySalePurchase" id="account.JournalBodySalePurchase">
<div class="col-xs-6 o_kanban_primary_left">
<div class="col-xs-5 o_kanban_primary_left">
<t t-if="journal_type == 'sale'">
<button type="object" name="action_create_new" class="btn btn-primary btn-sm o_invoice_new">
<span>New Invoice</span>
@@ -275,31 +275,31 @@
</button>
</t>
</div>
<div class="col-xs-6 o_kanban_primary_right">
<div class="col-xs-7 o_kanban_primary_right">
<div class="row">
<div class="col-xs-6">
<div class="col-xs-7">
<a type="object" name="open_action" context="{'search_default_draft': '1'}">
<span t-if="journal_type == 'sale'" title="Invoices to validate"><t t-esc="dashboard.number_draft"/> Invoices to validate</span>
<span t-if="journal_type == 'purchase'" title="Draft bills"><t t-esc="dashboard.number_draft"/> Draft bills</span>
<span t-if="journal_type == 'sale'" title="Invoices to Validate"><t t-esc="dashboard.number_draft"/> Invoices to Validate</span>
<span t-if="journal_type == 'purchase'" title="Bills to Validate"><t t-esc="dashboard.number_draft"/> Bills to Validate</span>
</a>
</div>
<div class="col-xs-6 text-right">
<div class="col-xs-5 text-right">
<span><t t-esc="dashboard.sum_draft"/></span>
</div>
</div>
<div class="row">
<div class="col-xs-6">
<div class="col-xs-7">
<a type="object" t-if="journal_type == 'sale'" name="open_action"
context="{'search_default_unpaid':1}" id="account_dashboard_sale_pay_link">
<t t-esc="dashboard.number_waiting"/> Awaiting payments
<t t-esc="dashboard.number_waiting"/> Payments to Receive
</a>
<a type="object" t-if="journal_type == 'purchase'" name="open_action"
context="{'search_default_unpaid':1}" id="account_dashboard_purchase_pay_link">
<t t-esc="dashboard.number_waiting"/> Payments to do
<t t-esc="dashboard.number_waiting"/> Payments to Do
</a>
</div>
<div class="col-xs-6 text-right">
<div class="col-xs-5 text-right">
<span><t t-esc="dashboard.sum_waiting"/></span>
</div>
</div>