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

[IMP] hr_expense: Review expense sheet form view

Browse Source 
PURPOSE
=======

Improve the expense sheet form view.

From SaaS 14, one expense sheet will generate one journal entry. So there is no need for a button for journal entries anymore.
The form view of the expense sheet needed to be reviewed

SPECIFICATION
=============

Remove "Account Entries" button
Clickable to see related journal entry
This commit is contained in:
Mehul Patel
2017-07-10 12:47:00 +02:00
committed by Yannick Tivisse
parent faacacb45f
commit 548dd8bec7
2 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_expense/models/hr_expense.py
-8
View File
@@ -548,14 +548,6 @@ class HrExpenseSheet(models.Model):
res['context'] = {'default_res_model': 'hr.expense.sheet', 'default_res_id': self.id}
return res
@api.multi
def action_open_journal_entries(self):
res = self.env['ir.actions.act_window'].for_xml_id('account', 'action_move_journal_line')
res['domain'] = [('id', 'in', self.mapped('account_move_id').ids)]
res['context'] = {}
return res
@api.one
@api.constrains('expense_line_ids')
def _check_employee(self):
addons/hr_expense/views/hr_expense_views.xml
+17 -14
View File
@@ -422,13 +422,6 @@
type="object">
<field name="attachment_number" widget="statinfo" string="Documents"/>
</button>
<button name="action_open_journal_entries"
class="oe_stat_button"
icon="fa-book"
string="Accounting Entries"
attrs="{'invisible': [('account_move_id', '=', False)]}"
type="object">
</button>
</div>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
@@ -447,13 +440,9 @@
<field name="department_id" invisible="1"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
<group>
<field name="journal_id" domain="[('type', '=', 'purchase')]" groups="account.group_account_user" options="{'no_open': True, 'no_create': True}" attrs="{'invisible': [('payment_mode', '!=', 'own_account')]}"/>
<field name="bank_journal_id" groups="account.group_account_user" options="{'no_open': True, 'no_create': True}" attrs="{'invisible': [('payment_mode', '!=', 'company_account')]}" domain="[('type', 'in', ['cash', 'bank'])]"/>
<field name="accounting_date" groups="account.group_account_user" attrs="{'invisible': [('state', 'not in', ['approve', 'post', 'done'])]}"/>
<field name="account_move_id" invisible="1"/>
</group>
</group>
<notebook>
<page string="Expense Lines">
<field name="expense_line_ids" nolabel="1" widget="many2many" domain="[('state', '=', 'draft')]" options="{'not_delete': True}">
<tree>
<field name="date"/>
@@ -465,9 +454,23 @@
<field name="attachment_number" string=" "/>
<button name="action_get_attachment_view" string="View Attachments" type="object" icon="fa-paperclip"/>
<field name="tax_ids" widget="many2many_tags" options="{'color_field': 'color'}"/>
<field name="total_amount" sum="Total Amount" widget="monetary"/>
<field name="total_amount" sum="Total Amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
</tree>
</field>
</page>
<page string="Other Info" attrs="{'invisible': [('payment_mode', '=', False)]}">
<group>
<group>
<field name="journal_id" domain="[('type', '=', 'purchase')]" groups="account.group_account_user" options="{'no_open': True, 'no_create': True}" attrs="{'invisible': [('payment_mode', '!=', 'own_account')]}"/>
<field name="bank_journal_id" groups="account.group_account_user" options="{'no_open': True, 'no_create': True}" attrs="{'invisible': [('payment_mode', '!=', 'company_account')]}" domain="[('type', 'in', ['cash', 'bank'])]"/>
<field name="accounting_date" groups="account.group_account_user" attrs="{'invisible': [('state', 'not in', ['approve', 'post', 'done'])]}"/>
</group>
<group>
<field name="account_move_id" groups="account.group_account_user" attrs="{'invisible': [('state', 'not in', ['post', 'done'])]}" readonly="1"/>
</group>
</group>
</page>
</notebook>
</sheet>
<div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/>