odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MOD] hr_contract : added fields of trial period. hr_timesheet_invoice : added tooltip and fix problem of currency id in view 

bzr revid: vir@tinyerp.com-20100914105942-1fiqolelalp08tvs
This commit is contained in:
Vir (Open ERP) 2010-09-14 16:29:42 +05:30
parent 93f76a3c4e
commit ed78df1178
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr_contract/hr_contract.py
View File

@ -100,6 +100,8 @@ class hr_contract(osv.osv):
'job_id': fields.many2one('hr.job', 'Job Title'),
'date_start': fields.date('Start Date', required=True),
'date_end': fields.date('End Date'),
'trial_date_start': fields.date('Trial start Date'),
'trial_date_end': fields.date('Trial end Date'),
'working_hours': fields.many2one('resource.calendar','Working Schedule'),
'wage_type_id': fields.many2one('hr.contract.wage.type', 'Wage Type', required=True),
'wage': fields.float('Wage', digits=(16,2), required=True),

5
addons/hr_contract/hr_contract_view.xml
View File

@ -185,7 +185,10 @@
<field name="date_start" />
<field name="date_end" />
<field name="working_hours"/>
</group>
<separator colspan="2" string="Trial Period"/>
<field name="trial_date_start" />
<field name="trial_date_end" />
</group>
<group col="2" colspan="2">
<separator colspan="2" string="Advantages"/>
<field name="advantages_net"/>

2
addons/hr_contract/test/test_hr_contract.yml
View File

@ -41,6 +41,8 @@
advantages_net: 0.0
date_end: '2011-05-18'
date_start: '2010-05-18'
trial_date_end: '2010-03-01'
trial_date_start: '2010-04-30'
name: contract1
wage: 1.0
wage_type_id: hr_contract_wage_type_monthlygrosswage0

2
addons/hr_timesheet_invoice/hr_timesheet_invoice.py
View File

@ -77,7 +77,7 @@ class account_analytic_line(osv.osv):
_inherit = 'account.analytic.line'
_columns = {
'invoice_id': fields.many2one('account.invoice', 'Invoice', ondelete="set null"),
'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing', help="You can Select the invoice type which you have to created"),
'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing', help="It allows to set the discount while making invoice"),
}
def unlink(self, cursor, user, ids, context=None):

4
addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
View File

@ -21,7 +21,7 @@
</field>
</record>
<record id="view_account_analytic_account_form" model="ir.ui.view">
<!--record id="view_account_analytic_account_form" model="ir.ui.view">
<field name="name">account.analytic.account.form</field>
<field name="model">account.analytic.account</field>
<field name="inherit_id" ref="account.view_account_analytic_account_form"/>
@ -31,7 +31,7 @@
<field name="currency_id"/>
</field>
</field>
</record>
</record-->
<record id="hr_timesheet_line_form" model="ir.ui.view">
<field name="name">hr.analytic.timesheet.form</field>