commit
00e8128412
|
@ -372,14 +372,14 @@
|
|||
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
|
||||
</group>
|
||||
</group>
|
||||
<notebook>
|
||||
<page string="Description">
|
||||
<label for="description"/>
|
||||
<field name="description"/>
|
||||
<label for="requirements"/>
|
||||
<field name="requirements"/>
|
||||
</page>
|
||||
</notebook>
|
||||
<div>
|
||||
<label for="description"/>
|
||||
<field name="description"/>
|
||||
</div>
|
||||
<div>
|
||||
<label for="requirements"/>
|
||||
<field name="requirements"/>
|
||||
</div>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
|
|
|
@ -8,5 +8,5 @@ access_survey_hr_user,survey.hr.user,survey.model_survey,base.group_hr_user,1,1,
|
|||
access_crm_meeting_hruser,crm.meeting.hruser,base_calendar.model_crm_meeting,base.group_hr_user,1,1,1,1
|
||||
access_hr_recruitment_source_hr_officer,hr.recruitment.source,model_hr_recruitment_source,base.group_hr_user,1,1,1,1
|
||||
access_hr_recruitment_source_all,hr.recruitment.source,model_hr_recruitment_source,,1,0,0,0
|
||||
access_hr_applicant_category,hr.applicant_category,model_hr_applicant_category,,1,0,0,0
|
||||
access_hr_applicant_category,hr.applicant_category,model_hr_applicant_category,,1,1,1,0
|
||||
access_hr_applicant_category_manager,hr.applicant_category,model_hr_applicant_category,base.group_hr_manager,1,1,1,1
|
||||
|
|
|
|
@ -31,7 +31,7 @@ class report_timesheet_line(osv.osv):
|
|||
'user_id': fields.many2one('res.users', 'User', readonly=True),
|
||||
'date': fields.date('Date', readonly=True),
|
||||
'day': fields.char('Day', size=128, readonly=True),
|
||||
'quantity': fields.float('Quantity', readonly=True),
|
||||
'quantity': fields.float('Time', readonly=True),
|
||||
'cost': fields.float('Cost', readonly=True),
|
||||
'product_id': fields.many2one('product.product', 'Product',readonly=True),
|
||||
'account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
|
||||
|
@ -83,7 +83,7 @@ class report_timesheet_user(osv.osv):
|
|||
_columns = {
|
||||
'name': fields.char('Year',size=64,required=False, readonly=True),
|
||||
'user_id':fields.many2one('res.users', 'User', readonly=True),
|
||||
'quantity': fields.float('Quantity', readonly=True),
|
||||
'quantity': fields.float('Time', readonly=True),
|
||||
'cost': fields.float('Cost', readonly=True),
|
||||
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
|
||||
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
|
||||
|
@ -117,7 +117,7 @@ class report_timesheet_account(osv.osv):
|
|||
'name': fields.char('Year',size=64,required=False, readonly=True),
|
||||
'user_id':fields.many2one('res.users', 'User', readonly=True),
|
||||
'account_id':fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
|
||||
'quantity': fields.float('Quantity', readonly=True),
|
||||
'quantity': fields.float('Time', readonly=True),
|
||||
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
|
||||
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
|
||||
|
||||
|
@ -151,7 +151,7 @@ class report_timesheet_account_date(osv.osv):
|
|||
'name': fields.char('Year',size=64,required=False, readonly=True),
|
||||
'user_id':fields.many2one('res.users', 'User', readonly=True),
|
||||
'account_id':fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
|
||||
'quantity': fields.float('Quantity', readonly=True),
|
||||
'quantity': fields.float('Time', readonly=True),
|
||||
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
|
||||
('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
|
||||
}
|
||||
|
@ -185,7 +185,7 @@ class report_timesheet_invoice(osv.osv):
|
|||
'user_id':fields.many2one('res.users', 'User', readonly=True),
|
||||
'account_id':fields.many2one('account.analytic.account', 'Project', readonly=True),
|
||||
'manager_id':fields.many2one('res.users', 'Manager', readonly=True),
|
||||
'quantity': fields.float('Quantity', readonly=True),
|
||||
'quantity': fields.float('Time', readonly=True),
|
||||
'amount_invoice': fields.float('To invoice', readonly=True)
|
||||
}
|
||||
_rec_name = 'user_id'
|
||||
|
|
|
@ -43,7 +43,7 @@ class hr_timesheet_report(osv.osv):
|
|||
'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),
|
||||
'company_id': fields.many2one('res.company', 'Company',readonly=True),
|
||||
'cost': fields.float('Cost',readonly=True, digits_compute=dp.get_precision('Account')),
|
||||
'quantity': fields.float('Quantity',readonly=True),
|
||||
'quantity': fields.float('Time',readonly=True),
|
||||
}
|
||||
|
||||
def init(self, cr):
|
||||
|
|
|
@ -52,7 +52,7 @@ class timesheet_report(osv.osv):
|
|||
('draft','Draft'),
|
||||
('confirm','Confirmed'),
|
||||
('done','Done')], 'Status', readonly=True),
|
||||
'quantity': fields.float('#Quantity',readonly=True),
|
||||
'quantity': fields.float('Time',readonly=True),
|
||||
'cost': fields.float('#Cost',readonly=True),
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue