<record id="view_expenses_line_tree" model="ir.ui.view">
<field name="name">hr.expense.line.tree</field>
- <field name="type">tree</field>
<field name="model">hr.expense.line</field>
<field name="arch" type="xml">
<tree string="Expense Lines">
<record id="view_expenses_tree" model="ir.ui.view">
<field name="name">hr.expense.expense.tree</field>
<field name="model">hr.expense.expense</field>
- <field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Expenses" colors="blue:state=='draft'">
<field name="employee_id"/>
<field name="date"/>
<field name="user_id" invisible="1"/>
<field name="name"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency"/>
<field name="amount"/>
<field name="state"/>
</tree>
<record id="view_editable_expenses_tree" model="ir.ui.view">
<field name="name">hr.expense.expense.tree</field>
<field name="model">hr.expense.expense</field>
- <field name="type">tree</field>
<field name="arch" type="xml">
- <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','invoiced','paid');gray:state == 'cancelled'" string="Expenses" editable="top">
+ <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','done');gray:state == 'cancelled'" string="Expenses" editable="top">
<field name="employee_id"/>
<field name="date"/>
<field name="department_id"/>
<record id="view_expenses_form" model="ir.ui.view">
<field name="name">hr.expense.form</field>
- <field name="type">form</field>
<field name="model">hr.expense.expense</field>
<field name="arch" type="xml">
<form string="Expenses Sheet" version="7.0">
<button name="confirm" states="draft" string="Submit to Manager" type="workflow" class="oe_highlight"/>
<button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
<button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user" />
- <button name="invoice" states="accepted" string="Invoice" type="object" groups="base.group_hr_user" class="oe_highlight"/>
+ <button name="done" states="accepted" string="Generate Accounting Entries" type="workflow" groups="account.group_account_invoice" class="oe_highlight"/>
+ <button name="action_view_receipt" states="done" string="Open Receipt" type="object"/>
<button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
- <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
+ <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted,done" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
</header>
<sheet>
<group>
<group>
<field name="name"/>
<field name="user_valid"/>
- <field name="currency_id"/>
+ <field name="currency_id" groups="base.group_multi_currency" on_change="onchange_currency_id(currency_id, company_id)"/>
</group>
</group>
<notebook>
<form string="Expense Lines" version="7.0">
<group>
<group>
- <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" context="{'default_hr_expense_ok':1}"/>
+ <field name="product_id" on_change="onchange_product_id(product_id, context)" context="{'default_hr_expense_ok':1}"/>
<field name="name"/>
<field name="ref"/>
<field domain="[('type','=','normal')]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
<label for="unit_quantity"/>
<div>
<field name="unit_quantity" class="oe_inline"/>
- <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" class="oe_inline"/>
+ <field name="uom_id" on_change="onchange_uom(product_id, uom_id, context)" class="oe_inline"/>
</div>
<field name="date_value" />
</group>
</group>
</form>
+ <tree string="Expense Lines" editable="bottom">
+ <field name="sequence" invisible="1"/>
+ <field name="product_id" on_change="onchange_product_id(product_id, context)" context="{'default_hr_expense_ok':1}"/>
+ <field name="date_value" string="Expense Date"/>
+ <field name="name"/>
+ <field name="ref"/>
+ <field domain="[('type','in',['normal','contract']), ('parent_id','!=',False)]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
+ <field name="uom_id" on_change="onchange_uom(product_id, uom_id, context)"/>
+ <field name="unit_amount"/>
+ <field name="unit_quantity"/>
+ <field name="total_amount" sum="Total"/>
+ </tree>
</field>
- <separator string="Notes"/>
- <field name="note" placeholder="Free Notes"/>
+ <group>
+ <div>
+ <separator string="Notes"/>
+ <field name="note" placeholder="Free Notes"/>
+ </div>
+ <group class="oe_subtotal_footer">
+ <field name="amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+ </group>
+ </group>
</page>
<page string="Other Info">
<group>
- <group string="Accounting Data">
- <field name="journal_id"/>
- <field name="invoice_id" context="{'type':'in_invoice', 'journal_type': 'purchase'}"/>
+ <group string="Accounting Data" groups="account.group_account_user">
+ <field name="journal_id" widget="selection" domain="[('type', '=', 'purchase')]"/>
+ <field name="voucher_id" context="{'form_view_ref': 'account_voucher.view_purchase_receipt_form'}"/>
</group>
</group>
</page>
</sheet>
<div class="oe_chatter">
<field name="message_ids" widget="mail_thread"/>
+ <field name="message_follower_ids" widget="mail_followers"/>
</div>
</form>
</field>
<record id="view_hr_expense_filter" model="ir.ui.view">
<field name="name">hr.expense.expense.filter</field>
<field name="model">hr.expense.expense</field>
- <field name="type">search</field>
<field name="arch" type="xml">
<search string="Expense">
<field name="name" string="Expenses"/>
<field name="date"/>
<filter icon="terp-document-new" domain="[('state','=','draft')]" string="New" help="New Expense"/>
- <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" help="Confirmed Expense"/>
+ <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" help="Confirmed Expenses"/>
<filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay" help="Expenses to Invoice"/>
+ <separator/>
+ <filter domain="[('user_id', '=', uid)]" string="My Expenses"/>
<field name="employee_id"/>
<field name="department_id" string="Department" context="{'invisible_department': False}"/>
- <field name="user_id" string="User"/>
<group expand="0" string="Group By...">
<filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
<filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
<field name="view_type">form</field>
<field name="search_view_id" ref="view_hr_expense_filter"/>
<field name="view_id" ref="view_expenses_tree"/>
- <field name="help" type="xml">
- <p>
+ <field name="help" type="html">
+ <p class="oe_view_nocontent_create">
Click to register new expenses.
</p><p>
OpenERP will ensure the whole process is followed; the expense
<field name="name">product.product.expense.form</field>
<field name="model">product.product</field>
<field name="inherit_id" ref="product.product_normal_form_view"/>
- <field name="type">form</field>
<field name="arch" type="xml">
- <field name="purchase_ok" position="after">
- <field name="hr_expense_ok" on_change="on_change_hr_expense_ok(hr_expense_ok)"/>
- </field>
+ <field name="purchase_ok" position="before">
+ <field name="hr_expense_ok" on_change="on_change_hr_expense_ok(hr_expense_ok)"/>
+ <label for="hr_expense_ok"/>
+ </field>
</field>
</record>
projects / odoo / odoo.git / blobdiff