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

[FIX] hr_contract: broken icon

Browse Source 
[IMP] hr_expense:
    invert placeholders: trip is a report, lunch is an expense
    total column in latest column
    no default value for expense description
This commit is contained in:
Fabien Pinckaers
2016-06-17 13:20:59 -07:00
parent f1ab3face1
commit ad858bf746
3 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_contract/views/hr_contract_views.xml
+1 -1
View File
@@ -18,7 +18,7 @@
<xpath expr="//div[@name='button_box']" position="inside">
<button name="%(act_hr_employee_2_hr_contract)d"
class="oe_stat_button"
icon="fabook"
icon="fa-book"
type="action"
groups="base.group_hr_manager">
<field name="contracts_count" widget="statinfo" string="Contracts"/>
addons/hr_expense/models/hr_expense.py
+1 -1
View File
@@ -14,7 +14,7 @@ class HrExpense(models.Model):
_description = "Expense"
_order = "date desc, id desc"
name = fields.Char(string='Expense Description', readonly=True, required=True, states={'draft': [('readonly', False)]}, default=fields.Date.context_today)
name = fields.Char(string='Expense Description', readonly=True, required=True, states={'draft': [('readonly', False)]})
date = fields.Date(readonly=True, states={'draft': [('readonly', False)]}, default=fields.Date.context_today, string="Date")
employee_id = fields.Many2one('hr.employee', string="Employee", required=True, readonly=True, states={'draft': [('readonly', False)]}, default=lambda self: self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1))
product_id = fields.Many2one('product.product', string='Product', readonly=True, states={'draft': [('readonly', False)]}, domain=[('can_be_expensed', '=', True)], required=True)
addons/hr_expense/views/hr_expense_views.xml
+24 -12
View File
@@ -43,7 +43,7 @@
<div class="oe_title">
<label for="name"/>
<h1>
<field name="name" placeholder="e.g. Business Trip NY"/>
<field name="name" placeholder="e.g. Lunch with Customer"/>
</h1>
</div>
<group>
@@ -191,10 +191,16 @@
<field name="search_view_id" ref="view_hr_expense_filter"/>
<field name="help" type="html">
<p class="oe_view_nocontent_create">
Click here to create new expenses.
Create a new expense.<br/>
<!-- Or send receipts to .... -->
</p><p>
Once you have created your expense, submit it to your manager who will validate it.
</p>
Expenses will go through these steps:
</p><ol>
<li>You record expenses</li>
<li>Periodically, you submit expenses report to your manager,</li>
<li>Once approved, your expenses report goes to the accounting,</li>
<li>The accountant validates journal entries and reimburse you.</li>
</ol>
</field>
</record>
@@ -207,10 +213,16 @@
<field name="context">{'show_report': True}</field>
<field name="help" type="html">
<p class="oe_view_nocontent_create">
Click here to create new expenses.
Create a new expense.<br/>
<!-- Or send receipts to .... -->
</p><p>
Once you have created your expense, submit it to your manager who will validate it.
</p>
Expenses will go through these steps:
</p><ol>
<li>You record expenses</li>
<li>Periodically, you submit expenses report to your manager,</li>
<li>Once approved, your expenses report goes to the accounting,</li>
<li>The accountant validates journal entries and reimburse you.</li>
</ol>
</field>
</record>
@@ -295,7 +307,7 @@
</record>
<record id="action_approved_expense" model="ir.actions.act_window">
<field name="name">Unsubmitted Expenses</field>
<field name="name">Unreported Expenses</field>
<field name="res_model">hr.expense</field>
<field name="view_type">form</field>
<field name="view_mode">tree,kanban,form,pivot,graph</field>
@@ -362,7 +374,7 @@
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name" placeholder="e.g. Business lunch with X"/>
<field name="name" placeholder="e.g. Trip to NY"/>
</h1>
</div>
<group>
@@ -390,12 +402,12 @@
<field name="name"/>
<field name="state" invisible="1"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
<field name="total_amount" sum="Total Amount" widget="monetary"/>
<field name="message_unread" invisible="1"/>
<field name="attachment_number" invisible="1"/>
<field name="tax_ids" widget="many2many_tags"/>
<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"/>
<field name="total_amount" sum="Total Amount" widget="monetary"/>
</tree>
</field>
</sheet>
@@ -696,7 +708,7 @@
<menuitem id="menu_hr_expense_root" name="Expenses" sequence="100" web_icon="hr_expense,static/description/icon.png"/>
<menuitem id="menu_hr_expense_my_expenses" name="My Expenses" sequence="10" parent="menu_hr_expense_root"/>
<menuitem id="menu_hr_expense_my_unsubmitted" name="Unsubmitted Expenses" sequence="1" parent="menu_hr_expense_my_expenses" action="hr_expense_actions_my_unsubmitted"/>
<menuitem id="menu_hr_expense_my_unsubmitted" name="Unreported Expenses" sequence="1" parent="menu_hr_expense_my_expenses" action="hr_expense_actions_my_unsubmitted"/>
<menuitem id="menu_hr_expense_my_all" name="All Expenses" sequence="2" parent="menu_hr_expense_my_expenses"
action="hr_expense_actions_my_all"/>