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

[FIX] account: fix account dashboard quick wins

Browse Source 
* Make Connect button primary if the Reconcile button is not shown
primary)
* Rollback the change "Create Manually" > "New Invoice"

closes odoo/odoo#54250

X-original-commit: e50b378520aa7d9674ee3dca169365eeb1ecac85
Signed-off-by: Quentin De Paoli (qdp) <qdp@openerp.com>
Signed-off-by: wan <william-andre@users.noreply.github.com>
This commit is contained in:
william
2020-07-08 21:37:09 +00:00
parent 1ade38923c
commit ec7986cba3
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/views/account_journal_dashboard_view.xml
+11 -9
View File
@@ -240,18 +240,19 @@
- If there are statements to reconcile, a link to reconcile them -->
<div id="dashboard_bank_cash_left" class="col-12 col-sm-5 mb-3 mb-sm-0 o_kanban_primary_left">
<t t-if="journal_type == 'bank'">
<a t-if="dashboard.bank_statements_source == 'undefined'" name="action_configure_bank_journal" type="object" class="oe_inline" groups="account.group_account_invoice">Connect</a>
<t t-if="dashboard.bank_statements_source == 'undefined'">
<a t-if="dashboard.number_to_reconcile > 0" name="action_configure_bank_journal" type="object" class="oe_inline" groups="account.group_account_invoice">Connect</a>
<button t-if="dashboard.number_to_reconcile == 0" name="action_configure_bank_journal" type="object" class="btn btn-primary" groups="account.group_account_invoice">Connect</button>
</t>
<div name="bank_journal_cta" class="mt-3 mt-sm-0">
<div name="bank_statement_create_button" groups="account.group_account_invoice">
<a type="object" name="create_bank_statement" class="oe_inline">Create</a><span name="button_import_placeholder"/> Statements
</div>
</div>
</t>
<t t-if="dashboard.number_to_reconcile > 0">
<a t-if="journal_type == 'cash'" type="object" name="create_cash_statement" class="oe_inline" groups="account.group_account_invoice">New Transactions</a>
</t>
<t t-if="dashboard.number_to_reconcile == 0">
<button t-if="journal_type == 'cash'" type="object" name="create_cash_statement" class="btn btn-primary" groups="account.group_account_invoice">New Transactions</button>
<t t-if="journal_type == 'cash'">
<a t-if="dashboard.number_to_reconcile > 0" type="object" name="create_cash_statement" class="oe_inline" groups="account.group_account_invoice">New Transactions</a>
<button t-if="dashboard.number_to_reconcile == 0" type="object" name="create_cash_statement" class="btn btn-primary" groups="account.group_account_invoice">New Transactions</button>
</t>
</div>
<!-- On the right, show other common informations/actions -->
@@ -288,13 +289,14 @@
<div class="col-12 col-sm-5 mb-3 mb-sm-0 o_kanban_primary_left">
<t t-if="journal_type == 'sale'">
<button type="object" name="action_create_new" class="btn btn-primary o_invoice_new" groups="account.group_account_invoice">
<span>Create Manually</span>
<span>New Invoice</span>
</button>
</t>
<t t-if="journal_type == 'purchase'">
<button class="btn btn-primary o_button_upload_bill" journal_type="purchase" groups="account.group_account_invoice">
<span>Upload Bills</span>
<button class="btn btn-primary o_button_upload_bill oe_kanban_action_button" journal_type="purchase" groups="account.group_account_invoice">
<span>Upload</span>
</button>
<a type="object" name="action_create_new" class="o_invoice_new" groups="account.group_account_invoice"><span>Create</span></a><span> Manually</span>
</t>
</div>
<div class="col-12 col-sm-7 o_kanban_primary_right">