Foram Katharotiya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons11-hr-fka into
lp:~openerp-dev/openobject-addons/trunk-addons11-hr-apa.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons11-hr-fka/+merge/125681
Hello sir,
- In job position, remove the tab
- In applicant add right to create tag for a Human Resources/Officer
- rename quantity in timesheets
- In analytic account, select as customer a supplier whose customer checkbox
is empty
- romove error:message_subscribe() got an unexpected keyword argument
'user_ids'
Thanks,
FKA
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons11-hr-fka/+merge/125681
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons11-hr-apa.
=== modified file 'analytic/analytic_view.xml'
--- analytic/analytic_view.xml 2012-09-16 16:27:30 +0000
+++ analytic/analytic_view.xml 2012-09-21 11:32:31 +0000
@@ -21,7 +21,7 @@
<group name="main">
<group>
- <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'required':[('type','=','contract')]}"/>
+ <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'required':[('type','=','contract')]}" domain="[('customer','=',False)]"/>
<field name="manager_id"/>
<field name="code"/>
</group>
=== modified file 'hr/hr_view.xml'
--- hr/hr_view.xml 2012-09-17 06:16:38 +0000
+++ hr/hr_view.xml 2012-09-21 11:32:31 +0000
@@ -374,14 +374,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>
=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py 2012-09-03 09:55:26 +0000
+++ hr_holidays/hr_holidays.py 2012-09-21 11:32:31 +0000
@@ -303,7 +303,8 @@
self.check_holidays(cr, uid, ids, context=context)
for record in self.browse(cr, uid, ids, context=context):
if record.employee_id and record.employee_id.parent_id and record.employee_id.parent_id.user_id:
- self.message_subscribe(cr, uid, [record.id], user_ids=[record.employee_id.parent_id.user_id.id], context=context)
+ user_ids=[record.employee_id.parent_id.user_id.id]
+ self.message_subscribe(cr, uid, [record.id], user_ids, context=context)
self.holidays_confirm_notificate(cr, uid, ids, context=context)
return self.write(cr, uid, ids, {'state':'confirm'})
=== modified file 'hr_recruitment/security/ir.model.access.csv'
--- hr_recruitment/security/ir.model.access.csv 2012-08-16 14:44:03 +0000
+++ hr_recruitment/security/ir.model.access.csv 2012-09-21 11:32:31 +0000
@@ -8,5 +8,5 @@
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
=== modified file 'hr_timesheet_invoice/report/hr_timesheet_invoice_report.py'
--- hr_timesheet_invoice/report/hr_timesheet_invoice_report.py 2011-12-21 22:15:04 +0000
+++ hr_timesheet_invoice/report/hr_timesheet_invoice_report.py 2012-09-21 11:32:31 +0000
@@ -31,7 +31,7 @@
'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 Quantity', 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 @@
_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 Quantity', 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 @@
'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 Quantity', 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 @@
'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 Quantity', 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 @@
'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 Quantity', readonly=True),
'amount_invoice': fields.float('To invoice', readonly=True)
}
_rec_name = 'user_id'
=== modified file 'hr_timesheet_sheet/report/hr_timesheet_report.py'
--- hr_timesheet_sheet/report/hr_timesheet_report.py 2011-12-19 16:54:40 +0000
+++ hr_timesheet_sheet/report/hr_timesheet_report.py 2012-09-21 11:32:31 +0000
@@ -43,7 +43,7 @@
'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 Quantity',readonly=True),
}
def init(self, cr):
=== modified file 'hr_timesheet_sheet/report/timesheet_report.py'
--- hr_timesheet_sheet/report/timesheet_report.py 2012-05-04 11:57:48 +0000
+++ hr_timesheet_sheet/report/timesheet_report.py 2012-09-21 11:32:31 +0000
@@ -52,7 +52,7 @@
('draft','Draft'),
('confirm','Confirmed'),
('done','Done')], 'Status', readonly=True),
- 'quantity': fields.float('#Quantity',readonly=True),
+ 'quantity': fields.float('#Time Quantity',readonly=True),
'cost': fields.float('#Cost',readonly=True),
}
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
