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

[MISC] misv improvements

Browse Source
This commit is contained in:
Fabien Pinckaers
2015-08-22 11:49:04 +02:00
parent 5fe086a520
commit bfe9d5b747
2 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/models/account_journal_dashboard.py
-1
View File
@@ -187,7 +187,6 @@ class account_journal(models.Model):
'sum_waiting': formatLang(self.env, sum_waiting or 0.0, currency_obj=self.currency_id or self.company_id.currency_id),
'sum_late': formatLang(self.env, sum_late or 0.0, currency_obj=self.currency_id or self.company_id.currency_id),
'currency_id': self.currency_id and self.currency_id.id or self.company_id.currency_id.id,
'no_statement': bool(self.type in ['bank', 'cash'] and len(ac_bnk_stmt) == 0),
'bank_statements_source': self.bank_statements_source,
'title': title,
}
addons/account/views/account_journal_dashboard_view.xml
+17 -19
View File
@@ -213,31 +213,29 @@
</div>
</t>
<button t-if="journal_type == 'cash'" type="object" name="create_cash_statement" class="btn btn-primary btn-sm">New Transactions</button>
<t t-if="!dashboard.no_statement and dashboard.number_to_reconcile > 0">
<t t-if="dashboard.number_to_reconcile > 0">
<a type="object" name="action_open_reconcile" class="oe_inline"> Reconcile <t t-esc="dashboard.number_to_reconcile"/> Items</a>
</t>
</div>
<!-- On the right, show other common informations/actions -->
<t t-if="!dashboard.no_statement">
<div class="col-xs-6 o_kanban_primary_right">
<div class="row">
<div class="col-xs-6">
<span title="Balance in Odoo">Balance in Odoo</span>
</div>
<div class="col-xs-6 text-right">
<span><t t-esc="dashboard.account_balance"/></span>
</div>
<div class="col-xs-6 o_kanban_primary_right">
<div class="row">
<div class="col-xs-6">
<span title="Balance in Odoo">Balance in Odoo</span>
</div>
<div class="row" name="latest_statement">
<div class="col-xs-6">
<span title="Latest Statement">Latest Statement</span>
</div>
<div class="col-xs-6 text-right">
<span><t t-esc="dashboard.last_balance"/></span>
</div>
<div class="col-xs-6 text-right">
<span><t t-esc="dashboard.account_balance"/></span>
</div>
</div>
</t>
<div class="row" name="latest_statement" t-if="dashboard.last_balance &lt;&gt; dashboard.account_balance">
<div class="col-xs-6">
<span title="Latest Statement">Latest Statement</span>
</div>
<div class="col-xs-6 text-right">
<span><t t-esc="dashboard.last_balance"/></span>
</div>
</div>
</div>
</t>
<t t-name="JournalBodySalePurchase">
<div class="col-xs-6 o_kanban_primary_left">
@@ -273,7 +271,7 @@
</t>
<t t-name="JournalBodyGraph">
<div class="row">
<div t-if="!dashboard.no_statement" class="o_kanban_graph_section">
<div class="o_kanban_graph_section">
<field name="kanban_dashboard_graph" t-att-graph_type="_.contains(['cash','bank'],journal_type) ? 'line' : 'bar'" widget="dashboard_graph"></field>
</div>
</div>