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

[IMP] improve views of expense

Browse Source 
bzr revid: nel@tinyerp.com-20100329095029-crh321t0u57r1d8u
This commit is contained in:
nel@tinyerp.com
2010-03-29 11:50:29 +02:00
parent 2eb6c26df4
commit 40bb8599dd
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_expense/hr_expense.py
+4 -4
View File
@@ -56,17 +56,17 @@ class hr_expense_expense(osv.osv):
'id': fields.integer('Sheet ID', readonly=True),
'ref': fields.char('Reference', size=32),
'date': fields.date('Date'),
'journal_id': fields.many2one('account.journal', 'Force Journal'),
'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is invoiced"),
'employee_id': fields.many2one('hr.employee', "Employee's Name", required=True),
'user_id': fields.many2one('res.users', 'User', required=True),
'date_confirm': fields.date('Date Confirmed'),
'date_valid': fields.date('Date Validated'),
'date_confirm': fields.date('Confirmation Date', help = "Date of the confirmation of the sheet expense. It's filled when the button Confirm is pressed."),
'date_valid': fields.date('Validation Date', help = "Date of the acceptation of the sheet expense. It's filled when the button Accept is pressed."),
'user_valid': fields.many2one('res.users', 'Validation User'),
'account_move_id': fields.many2one('account.move', 'Ledger Posting'),
'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ),
'note': fields.text('Note'),
'amount': fields.function(_amount, method=True, string='Total Amount'),
'invoice_id': fields.many2one('account.invoice', 'Invoice'),
'invoice_id': fields.many2one('account.invoice', "Employee's Invoice"),
'currency_id': fields.many2one('res.currency', 'Currency', required=True),
'department_id':fields.many2one('hr.department','Department'),
'company_id': fields.many2one('res.company', 'Company', required=True),
addons/hr_expense/hr_expense_view.xml
+4 -4
View File
@@ -68,7 +68,7 @@
<group colspan="4" col="6">
<field name="name" select="1"/>
<field name="employee_id" select="1"/>
<field name="id" select="2"/>
<field name="ref" select="2"/>
<field name="date" select="1"/>
<field name="amount"/>
<field name="currency_id"/>
@@ -77,7 +77,6 @@
</group>
<notebook colspan="4">
<page string="Expense Sheet">
<field name="ref" select="2"/>
<newline/>
<field colspan="4" name="line_ids" nolabel="1">
<form string="Expense Lines">
@@ -108,8 +107,8 @@
<separator colspan="4" string="Accounting data"/>
<field name="journal_id"/>
<separator colspan="4" string="Validation"/>
<field name="date_confirm" select="2"/>
<field name="date_valid" select="2"/>
<field name="date_confirm" select="2" readonly = "1"/>
<field name="date_valid" select="2" readonly = "1"/>
<field name="user_valid" select="2"/>
<field name="invoice_id" select="2"/>
<separator colspan="4" string="Notes"/>
@@ -145,6 +144,7 @@
help="Expenses to Invoice"/>
<separator orientation="vertical"/>
<field name="name" select='1'/>
<field name="date" select='1'/>
<field name="user_id" select="1" widget="selection">
<filter
icon="gtk-execute"