Adapting code to odoo 9

Author: Dazul

staff_management/staff_booking.py

@@ -56,15 +56,15 @@ class staff_booking(models.Model):
 	#Check if the hour from is between 0 and 24
 	@api.model
 	def _check_hour_to(self, ids):
-		for event in self.browse(cr, uid, ids):
+		for event in self.browse(ids):
 			if(event.hour_to < 0 or event.hour_to > 24):
 				return False
 		return True
 
 	#Check if the hour to is between 0 and 24
 	@api.model
 	def _check_hour_from(self, ids):
-		for event in self.browse(cr, uid, ids):
+		for event in self.browse(ids):
 			if(event.hour_from < 0 or event.hour_from > 24):
 				return False
 		return True

staff_management/staff_comments.py

@@ -18,17 +18,15 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp.osv import orm, fields
+from openerp import api, fields, models
 import datetime
 
-class staff_comments(orm.Model):
+class staff_comments(models.Model):
 	_name="staff.comments"
 
 	comment = fields.Text('Comment',required=True)
 	user_id = fields.Many2one('res.users', 'User', readonly=False, relate=True)
 	comment_type = fields.Many2one('staff.comment.type', 'Comment Type', readonly=False, relate=True)
 	create_uid = fields.Many2one('res.users', 'Author', readonly=True, relate=True)
-	write_date = fields.date('Date of comment',readonly=True )
+	write_date = fields.Date('Date of comment',readonly=True )
 
-	
-staff_comments()

staff_management/staff_events.py

@@ -25,8 +25,8 @@ class staff_events(models.Model):
 
 	event_name = fields.Char('Event',size= 32 ,required=True)
 	date = fields.Date('Date', readonly=False)
-	hour_from = fields.float('Start Hour', readonly=False)
-	hour_to = fields.float('End Hour', readonly=False)
+	hour_from = fields.Float('Start Hour', readonly=False)
+	hour_to = fields.Float('End Hour', readonly=False)
 
 
 	_rec_name = 'event_name'

staff_management/staff_pay_push.py

@@ -19,13 +19,12 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp.osv import fields
-from openerp.osv.orm import TransientModel
+from openerp import api, fields, models
 from openerp.tools.translate import _
 from datetime import datetime
 from staff_utils import staff_utils
 
-class staff_pay_push(TransientModel):
+class staff_pay_push(models.TransientModel):
 	_name="staff.pay.push"
 
 	user_id = fields.Many2one('res.users', 'User', relate=True)
@@ -40,37 +39,37 @@ class staff_pay_push(TransientModel):
 	date = fields.Date('Date')
 	state = fields.Selection([('init', 'init'),('defineAmount', 'defineAmount')])
 
-	
-	
-	def getDif(self, cr, uid, user_id):
-		account_lines = self.pool.get('account.analytic.line')
-		user_lines = account_lines.search(cr, uid, [('user_id', '=', user_id)])
+	@api.model
+	def getDif(self, user_id):
+		account_lines = self.env['account.analytic.line']
+		user_lines = account_lines.search([('user_id', '=', user_id)])
 		#Excecute SQL for optimization! "For" loop will take too long on future.
-		cr.execute('Select sum(amount) from account_analytic_line where user_id = '+str(user_id))
+		cr.execute('Select sum(amount) from account_analytic_line where user_id = %s', (str(user_id), ))
 		ammount = cr.fetchone()
 		return ammount[0]
 
-	def getDifMonth(self, cr, uid, user_id, date):
+	@api.model
+	def getDifMonth(self, user_id, date):
 		utils = staff_utils()
-		account_lines = self.pool.get('account.analytic.line')
-		user_lines = account_lines.search(cr, uid, [('user_id', '=', user_id)])
+		account_lines = self.env['account.analytic.line']
+		user_lines = account_lines.search([('user_id', '=', user_id)])
 		#Excecute SQL for optimization! "For" loop will take too long on future.
 		first = utils.get_first_day_month(date.strftime("%Y-%m-%d"))
 		last = utils.get_last_day_month(date.strftime("%Y-%m-%d"))
-		cr.execute('Select sum(amount) from account_analytic_line where user_id = '+str(user_id)+' and date::date <= \'' +last+ '\' and date::date >= \'' + first + '\'')
+		cr.execute('Select sum(amount) from account_analytic_line where user_id = %s and date::date <= %s and date::date >= %s', (str(user_id), last, first, ))
 		ammount = cr.fetchone()
 		return ammount[0]
 
-	
-	def get_form_context(self, cr, uid, user_id, date_str):
+	@api.model
+	def get_form_context(self, user_id, date_str):
 		user_id = int(user_id)
-		creditTotal = self.getDif(cr, uid, user_id)
+		creditTotal = self.getDif(user_id)
 		date = datetime.strptime(date_str, "%Y-%m-%d")
-		creditMonth = self.getDifMonth(cr, uid, user_id, date)
+		creditMonth = self.getDifMonth(user_id, date)
 		#Hard coded. TODO some better code on next releases.
 		account = [0];
-		account_lines = self.pool.get('account.analytic.account')
-		account = account_lines.search(cr, uid, [('name', '=', 'Salaires')])
+		account_lines = self.env['account.analytic.account']
+		account = account_lines.search([('name', '=', 'Salaires')])
 		if len(account) == 0:
 			accoundId = 0
 		else:
@@ -82,8 +81,9 @@ def get_form_context(self, cr, uid, user_id, date_str):
 				'journal':2,
 				'account':1,
 				'analytic_account':accoundId,}
-
-	def create(self, cr, uid, vals, context=None):
+	
+	@api.model
+	def create(self, vals, context=None):
 		if context.has_key('default_user_id_read'):
 			user_id = context['default_user_id_read']
 			if vals.has_key('journal'):
@@ -94,17 +94,17 @@ def create(self, cr, uid, vals, context=None):
 				account = vals['account']
 			else:
 				account = 1
-			account_lines = self.pool.get('account.analytic.line')
+			account_lines = self.env['account.analytic.line']
 			account_lines.create(cr, uid, {'name': vals['comment'], 'account_id': vals['analytic_account'],
 											'journal_id':journal, 'user_id':user_id, 'date': vals['date'],
 											'amount':-vals['amount'], 'general_account_id':account,}, context)
-		return super(staff_pay_push, self).create(cr, uid, vals, context)
+		return super(staff_pay_push, self).create(vals, context)
 
-	
-	def get_month_salaries(self, cr, uid, domain):
-		account = self.pool.get('account.analytic.line')
-		ids = account.search(cr, uid, domain)
-		values = account.browse(cr, uid, ids)
+	@api.model
+	def get_month_salaries(self, domain):
+		account = self.env['account.analytic.line']
+		ids = account.search(domain)
+		values = account.browse(ids)
 		dic = {}
 		for record in values:
 			dayInMonth = record.date[8:10]
@@ -121,7 +121,5 @@ def get_month_salaries(self, cr, uid, domain):
 					userDic[dayInMonth] = {'timework':[dayWorkTime], 'amounts':[dayAmount]}
 			else:
 				dic[record.user_id.id] = {'name':record.user_id.name, dayInMonth:{'timework':[dayWorkTime], 'amounts':[dayAmount]}}
-		
 		return dic
 
-staff_pay_push()

staff_management/staff_scheduler.py

@@ -29,17 +29,15 @@
 class staff_scheduler(models.Model):
 	_name="staff.scheduler"
 
-	_columns={
-		'user_id':fields.Many2one('res.users', 'User', readonly=True, relate=True),
-		'task_id':fields.Many2one('account.analytic.account', 'Task', readonly=False),
-		'date': fields.Date('Date', readonly=True),
-		'hour_from': fields.Float('Start Hour', readonly=False),
-		'hour_to': fields.Float('End Hour', readonly=False),
-		'comment':fields.Char('Comment',size= 512 ,required=False),
-		'work_time':fields.Float('Worked time', readonly=False),
-		'confirm':fields.Boolean('Confirm', readonly=False),
-		'replaceable':fields.Boolean('Replaceable', readonly=False, default=False),
-	}
+	user_id = fields.Many2one('res.users', 'User', readonly=True, relate=True)
+	task_id = fields.Many2one('account.analytic.account', 'Task', readonly=False)
+	date = fields.Date('Date', readonly=True)
+	hour_from = fields.Float('Start Hour', readonly=False)
+	hour_to = fields.Float('End Hour', readonly=False)
+	comment = fields.Char('Comment',size= 512 ,required=False)
+	work_time = fields.Float('Worked time', readonly=False)
+	confirm = fields.Boolean('Confirm', readonly=False)
+	replaceable = fields.Boolean('Replaceable', readonly=False, default=False)
 
 	#Check if the hour from is between 0 and 24
 	@api.model
@@ -214,8 +212,9 @@ def swapUidTask(self, task_id):
 	# add user_id to create the elements
 	@api.model
 	def create(self, vals):
-		vals['user_id']=user
-		vals['task_id']=False
+		user = self._context['uid']
+		vals['user_id'] = user
+		vals['task_id'] = False
 		#Control if an event is set this day.
 		listTasks = self.search([('date','=',vals['date']),('user_id','=',user)])
 		if len(listTasks) >= 1:
@@ -229,13 +228,12 @@ def create(self, vals):
 	#Remove an availability with assignement check.
 	@api.model
 	def unlink(self, ids):
-		records = super(staff_scheduler, self).read(ids, ['id', 'task_id'])
+		record = self.browse(ids)
 		#raise Exception(records) if a user want remove an availibility with a task
-		if(records[0]['task_id']):
+		if record.task_id.id:
 			raise except_orm(_('Error'), _("You can't delete this availability because there is an assigned task on it."))
 		#Check the unlink date.
-		date = super(staff_scheduler, self).read(ids, ['date'])
-		if self.checkPastDay(datetime.strptime(date[0]['date'], "%Y-%m-%d")):
+		if self.checkPastDay(datetime.strptime(record.date, "%Y-%m-%d")):
 			raise except_orm(_('Error'), _("Only future dates can be changed."))
 		return super(staff_scheduler, self).unlink(ids)
 

staff_management/staff_timesheet.py

@@ -23,7 +23,5 @@
 class staff_timesheet(models.Model):
 	_name="staff.timesheet"
 
-	_columns={
-		'user_id':fields.many2one('res.users', 'User', readonly=True, relate=True),
-	}	
+	user_id = fields.Many2one('res.users', 'User', readonly=True, relate=True)