Manage Your Employees
-Oversee all important information in your company address book. Some information are restricted to HR managers, others are public to easily find colleagues. +Oversee all important information in your company address book. Some information are restricted to HR managers, others are public to easily look colleagues.
Record employee contracts and get alerts when they have to be renewed.
@@ -154,7 +154,7 @@ Inspire achievement with challenges, goals and rewards. Define clear objectives
-
diff --git a/addons/hr/views/hr.xml b/addons/hr/views/hr.xml
new file mode 100644
index 00000000000..099697d67d0
--- /dev/null
+++ b/addons/hr/views/hr.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index 7ff0a63a79b..6c6f31e7861 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -42,6 +42,7 @@ actions(Sign in/Sign out) performed by them.
'wizard/hr_attendance_error_view.xml',
'res_config_view.xml',
'views/report_attendanceerrors.xml',
+ 'views/hr_attendance.xml',
],
'demo': ['hr_attendance_demo.xml'],
'test': [
@@ -51,9 +52,7 @@ actions(Sign in/Sign out) performed by them.
'installable': True,
'auto_install': False,
#web
- "js": ["static/src/js/attendance.js"],
'qweb': ["static/src/xml/attendance.xml"],
- 'css': ["static/src/css/slider.css"],
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/views/hr_attendance.xml b/addons/hr_attendance/views/hr_attendance.xml
new file mode 100644
index 00000000000..f481ec29053
--- /dev/null
+++ b/addons/hr_attendance/views/hr_attendance.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/hr_evaluation/security/hr_evaluation_security.xml b/addons/hr_evaluation/security/hr_evaluation_security.xml
index 209ca281396..051766f2453 100644
--- a/addons/hr_evaluation/security/hr_evaluation_security.xml
+++ b/addons/hr_evaluation/security/hr_evaluation_security.xml
@@ -10,19 +10,7 @@
-
-
-
-
-
-
-
-
-
+
diff --git a/addons/hr_expense/views/report_expense.xml b/addons/hr_expense/views/report_expense.xml
index 5bb2e1dd8e2..42be66c3492 100644
--- a/addons/hr_expense/views/report_expense.xml
+++ b/addons/hr_expense/views/report_expense.xml
@@ -44,7 +44,7 @@
- +
diff --git a/addons/hr_gamification/__openerp__.py b/addons/hr_gamification/__openerp__.py
index 14925421cb1..8d34343f30e 100644
--- a/addons/hr_gamification/__openerp__.py
+++ b/addons/hr_gamification/__openerp__.py
@@ -35,7 +35,7 @@ Badge received are displayed on the user profile.
'security/gamification_security.xml',
'wizard/grant_badge.xml',
'views/gamification.xml',
+ 'views/hr_gamification.xml',
],
- 'js': ['static/src/js/gamification.js'],
'auto_install': True,
}
diff --git a/addons/hr_gamification/views/hr_gamification.xml b/addons/hr_gamification/views/hr_gamification.xml
new file mode 100644
index 00000000000..8d34de257d3
--- /dev/null
+++ b/addons/hr_gamification/views/hr_gamification.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index ffd502c7ba5..8f781d4e8c5 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -59,7 +59,6 @@ A synchronization with an internal agenda (Meetings of the CRM module) is also p
'wizard/hr_holidays_summary_employees_view.xml',
],
'demo': ['hr_holidays_demo.xml',],
- 'js': ['static/src/js/*.js'],
'qweb': [
'static/src/xml/*.xml',
],
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 9e56ccc52ae..555329af1b4 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -58,13 +58,10 @@ You can define the different phases of interviews and easily rate the applicant
'res_config_view.xml',
'survey_data_recruitment.xml',
'hr_recruitment_data.xml',
+ 'views/hr_recruitment.xml',
],
'demo': ['hr_recruitment_demo.xml'],
- 'js': [
- 'static/src/js/job_position.js',
- ],
'test': ['test/recruitment_process.yml'],
- 'css': ['static/src/css/job_position.css'],
'installable': True,
'auto_install': False,
'application': True,
diff --git a/addons/hr_recruitment/views/hr_recruitment.xml b/addons/hr_recruitment/views/hr_recruitment.xml
new file mode 100644
index 00000000000..241f787053e
--- /dev/null
+++ b/addons/hr_recruitment/views/hr_recruitment.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index d86ada2d3d4..9448c3fb7c1 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -57,14 +57,13 @@ The validation can be configured in the company:
'wizard/hr_timesheet_current_view.xml',
'hr_timesheet_sheet_data.xml',
'res_config_view.xml',
+ 'views/hr_timesheet_sheet.xml',
],
'demo': ['hr_timesheet_sheet_demo.xml'],
'test':['test/test_hr_timesheet_sheet.yml'],
'installable': True,
'auto_install': False,
'application': True,
- 'js': ['static/src/js/timesheet.js',],
- 'css': ['static/src/css/timesheet.css',],
'qweb': ['static/src/xml/timesheet.xml',],
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 2a79669d61c..d71f24fd1c0 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -20,10 +20,11 @@
##############################################################################
import time
-from datetime import datetime, timedelta
+from datetime import datetime
from dateutil.relativedelta import relativedelta
from openerp.osv import fields, osv
+from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
from openerp.tools.translate import _
class hr_timesheet_sheet(osv.osv):
@@ -62,28 +63,56 @@ class hr_timesheet_sheet(osv.osv):
def copy(self, cr, uid, ids, *args, **argv):
raise osv.except_osv(_('Error!'), _('You cannot duplicate a timesheet.'))
- def create(self, cr, uid, vals, *args, **argv):
+ def create(self, cr, uid, vals, context=None):
if 'employee_id' in vals:
- if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).user_id:
+ if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id'], context=context).user_id:
raise osv.except_osv(_('Error!'), _('In order to create a timesheet for this employee, you must link him/her to a user.'))
- if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).product_id:
+ if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id'], context=context).product_id:
raise osv.except_osv(_('Error!'), _('In order to create a timesheet for this employee, you must link the employee to a product, like \'Consultant\'.'))
- if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).journal_id:
+ if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id'], context=context).journal_id:
raise osv.except_osv(_('Configuration Error!'), _('In order to create a timesheet for this employee, you must assign an analytic journal to the employee, like \'Timesheet Journal\'.'))
- return super(hr_timesheet_sheet, self).create(cr, uid, vals, *args, **argv)
+ if vals.get('attendances_ids'):
+ # If attendances, we sort them by date asc before writing them, to satisfy the alternance constraint
+ vals['attendances_ids'] = self.sort_attendances(cr, uid, vals['attendances_ids'], context=context)
+ return super(hr_timesheet_sheet, self).create(cr, uid, vals, context=context)
- def write(self, cr, uid, ids, vals, *args, **argv):
+ def write(self, cr, uid, ids, vals, context=None):
if 'employee_id' in vals:
- new_user_id = self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).user_id.id or False
+ new_user_id = self.pool.get('hr.employee').browse(cr, uid, vals['employee_id'], context=context).user_id.id or False
if not new_user_id:
raise osv.except_osv(_('Error!'), _('In order to create a timesheet for this employee, you must link him/her to a user.'))
- if not self._sheet_date(cr, uid, ids, forced_user_id=new_user_id):
+ if not self._sheet_date(cr, uid, ids, forced_user_id=new_user_id, context=context):
raise osv.except_osv(_('Error!'), _('You cannot have 2 timesheets that overlap!\nYou should use the menu \'My Timesheet\' to avoid this problem.'))
- if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).product_id:
+ if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id'], context=context).product_id:
raise osv.except_osv(_('Error!'), _('In order to create a timesheet for this employee, you must link the employee to a product.'))
- if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).journal_id:
+ if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id'], context=context).journal_id:
raise osv.except_osv(_('Configuration Error!'), _('In order to create a timesheet for this employee, you must assign an analytic journal to the employee, like \'Timesheet Journal\'.'))
- return super(hr_timesheet_sheet, self).write(cr, uid, ids, vals, *args, **argv)
+ if vals.get('attendances_ids'):
+ # If attendances, we sort them by date asc before writing them, to satisfy the alternance constraint
+ # In addition to the date order, deleting attendances are done before inserting attendances
+ vals['attendances_ids'] = self.sort_attendances(cr, uid, vals['attendances_ids'], context=context)
+ res = super(hr_timesheet_sheet, self).write(cr, uid, ids, vals, context=context)
+ if vals.get('attendances_ids'):
+ for timesheet in self.browse(cr, uid, ids):
+ if not self.pool['hr.attendance']._altern_si_so(cr, uid, [att.id for att in timesheet.attendances_ids]):
+ raise osv.except_osv(_('Warning !'), _('Error ! Sign in (resp. Sign out) must follow Sign out (resp. Sign in)'))
+ return res
+
+ def sort_attendances(self, cr, uid, attendance_tuples, context=None):
+ date_attendances = []
+ for att_tuple in attendance_tuples:
+ if att_tuple[0] in [0,1,4]:
+ if att_tuple[0] in [0,1]:
+ name = att_tuple[2]['name']
+ else:
+ name = self.pool['hr.attendance'].browse(cr, uid, att_tuple[1]).name
+ date_attendances.append((1, name, att_tuple))
+ elif att_tuple[0] in [2,3]:
+ date_attendances.append((0, self.pool['hr.attendance'].browse(cr, uid, att_tuple[1]).name, att_tuple))
+ else:
+ date_attendances.append((0, False, att_tuple))
+ date_attendances.sort()
+ return [att[2] for att in date_attendances]
def button_confirm(self, cr, uid, ids, context=None):
for sheet in self.browse(cr, uid, ids, context=context):
@@ -368,18 +397,22 @@ class hr_attendance(osv.osv):
attendance_ids.extend([row[0] for row in cr.fetchall()])
return attendance_ids
+ def _get_current_sheet(self, cr, uid, employee_id, date=False, context=None):
+ if not date:
+ date = time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+ # ending date with no time to avoid timesheet with early date_to
+ date_to = date[0:10]+' 00:00:00'
+ # limit=1 because only one sheet possible for an employee between 2 dates
+ sheet_ids = self.pool.get('hr_timesheet_sheet.sheet').search(cr, uid, [
+ ('date_to', '>=', date_to), ('date_from', '<=', date),
+ ('employee_id', '=', employee_id)
+ ], limit=1, context=context)
+ return sheet_ids and sheet_ids[0] or False
+
def _sheet(self, cursor, user, ids, name, args, context=None):
- sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
res = {}.fromkeys(ids, False)
for attendance in self.browse(cursor, user, ids, context=context):
- date_to = datetime.strftime(datetime.strptime(attendance.name[0:10], '%Y-%m-%d'), '%Y-%m-%d %H:%M:%S')
- sheet_ids = sheet_obj.search(cursor, user,
- [('date_to', '>=', date_to), ('date_from', '<=', attendance.name),
- ('employee_id', '=', attendance.employee_id.id)],
- context=context)
- if sheet_ids:
- # [0] because only one sheet possible for an employee between 2 dates
- res[attendance.id] = sheet_obj.name_get(cursor, user, sheet_ids, context=context)[0]
+ res[attendance.id] = self._get_current_sheet(cursor, user, attendance.employee_id.id, attendance.name, context=context)
return res
_columns = {
@@ -398,16 +431,15 @@ class hr_attendance(osv.osv):
def create(self, cr, uid, vals, context=None):
if context is None:
context = {}
- if 'sheet_id' in context:
- ts = self.pool.get('hr_timesheet_sheet.sheet').browse(cr, uid, context['sheet_id'], context=context)
+
+ sheet_id = context.get('sheet_id') or self._get_current_sheet(cr, uid, vals.get('employee_id'), vals.get('name'), context=context)
+ if sheet_id:
+ ts = self.pool.get('hr_timesheet_sheet.sheet').browse(cr, uid, sheet_id, context=context)
if ts.state not in ('draft', 'new'):
- raise osv.except_osv(_('Error!'), _('You cannot modify an entry in a confirmed timesheet.'))
- res = super(hr_attendance,self).create(cr, uid, vals, context=context)
- if 'sheet_id' in context:
- if context['sheet_id'] != self.browse(cr, uid, res, context=context).sheet_id.id:
- raise osv.except_osv(_('User Error!'), _('You cannot enter an attendance ' \
- 'date outside the current timesheet dates.'))
- return res
+ raise osv.except_osv(_('Error!'), _('You can not enter an attendance in a submitted timesheet. Ask your manager to reset it before adding attendance.'))
+ elif ts.date_from > vals.get('name') or ts.date_to < vals.get('name'):
+ raise osv.except_osv(_('User Error!'), _('You can not enter an attendance date outside the current timesheet dates.'))
+ return super(hr_attendance,self).create(cr, uid, vals, context=context)
def unlink(self, cr, uid, ids, *args, **kwargs):
if isinstance(ids, (int, long)):
diff --git a/addons/hr_timesheet_sheet/views/hr_timesheet_sheet.xml b/addons/hr_timesheet_sheet/views/hr_timesheet_sheet.xml
new file mode 100644
index 00000000000..7a13b9ecad4
--- /dev/null
+++ b/addons/hr_timesheet_sheet/views/hr_timesheet_sheet.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/hw_escpos/controllers/main.py b/addons/hw_escpos/controllers/main.py
index 57fba3a4191..9fabe2e96c7 100644
--- a/addons/hw_escpos/controllers/main.py
+++ b/addons/hw_escpos/controllers/main.py
@@ -35,7 +35,6 @@ from PIL import Image
from openerp import http
from openerp.http import request
-from openerp.addons.web.controllers.main import manifest_list, module_boot, html_template
from openerp.tools.translate import _
_logger = logging.getLogger(__name__)
diff --git a/addons/hw_proxy/controllers/main.py b/addons/hw_proxy/controllers/main.py
index c65c7966b7c..e52c20d5039 100644
--- a/addons/hw_proxy/controllers/main.py
+++ b/addons/hw_proxy/controllers/main.py
@@ -16,7 +16,6 @@ _logger = logging.getLogger(__name__)
from openerp import http
from openerp.http import request
-from openerp.addons.web.controllers.main import manifest_list, module_boot, html_template
# drivers modules must add to drivers an object with a get_status() method
diff --git a/addons/im/__openerp__.py b/addons/im/__openerp__.py
index 84775065371..63a5148a747 100644
--- a/addons/im/__openerp__.py
+++ b/addons/im/__openerp__.py
@@ -16,13 +16,9 @@ chat in real time. It support several chats in parallel.
'data': [
'security/ir.model.access.csv',
'security/im_security.xml',
+ 'views/im.xml',
],
'depends' : ['base', 'web'],
- 'js': [
- 'static/src/js/im_common.js',
- 'static/src/js/im.js',
- ],
- 'css': ['static/src/css/*.css'],
'qweb': ['static/src/xml/*.xml'],
'installable': True,
'auto_install': False,
diff --git a/addons/im/views/im.xml b/addons/im/views/im.xml
new file mode 100644
index 00000000000..ef91b1c62a6
--- /dev/null
+++ b/addons/im/views/im.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index 955a1278c03..127e096f92f 100644
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -40,10 +40,18 @@ In addition to a full meal and supplier management, this module offers the possi
If you want to save your employees' time and avoid them to always have coins in their pockets, this module is essential.
""",
- 'data': ['security/lunch_security.xml','lunch_view.xml','wizard/lunch_order_view.xml','wizard/lunch_validation_view.xml','wizard/lunch_cancel_view.xml','lunch_report.xml',
+ 'data': [
+ 'security/lunch_security.xml',
+ 'lunch_view.xml',
+ 'wizard/lunch_order_view.xml',
+ 'wizard/lunch_validation_view.xml',
+ 'wizard/lunch_cancel_view.xml',
+ 'lunch_report.xml',
'report/report_lunch_order_view.xml',
- 'security/ir.model.access.csv','views/report_lunchorder.xml'],
- 'css':['static/src/css/lunch.css'],
+ 'security/ir.model.access.csv',
+ 'views/report_lunchorder.xml',
+ 'views/lunch.xml',
+ ],
'images': ['images/new_order.jpeg','images/lunch_account.jpeg','images/order_by_supplier_analysis.jpeg','images/alert.jpeg'],
'demo': ['lunch_demo.xml',],
'installable': True,
diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index 5f2a351472c..abdd0cea0a6 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_security.xml
@@ -17,38 +17,14 @@
- lunch.order: do not see and create other people's order
- [('user_id', '=', user.id)]
-
-
- lunch.order: do not see and create other people's order
- [(1, '=', 1)]
-
-
- lunch.order.line: do not see and create other people's order line
- [('user_id', '=', user.id)]
-
-
- lunch.order.line: do not see and create other people's order line
- [(1, '=', 1)]
-
- lunch.cashmove: do not see and create other people's cashmove
+ lunch.cashmove: do not see other people's cashmove
[('user_id', '=', user.id)]
- lunch.cashmove: do not see and create other people's cashmove
+ lunch.cashmove: do see other people's cashmove
[(1, '=', 1)]
diff --git a/addons/lunch/views/lunch.xml b/addons/lunch/views/lunch.xml
new file mode 100644
index 00000000000..e4595359720
--- /dev/null
+++ b/addons/lunch/views/lunch.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 59d2e5f81ee..b1cf4901a0a 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -63,6 +63,7 @@ Main Features
'security/ir.model.access.csv',
'mail_alias_view.xml',
'res_users_view.xml',
+ 'views/mail.xml',
],
'demo': [
'data/mail_demo.xml',
@@ -78,18 +79,6 @@ Main Features
'images/join_a_group.jpeg',
'images/share_a_message.jpeg',
],
- 'css': [
- 'static/src/css/mail.css',
- 'static/src/css/mail_group.css',
- 'static/src/css/announcement.css',
- ],
- 'js': [
- 'static/src/js/mail.js',
- 'static/src/js/mail_followers.js',
- 'static/src/js/many2many_tags_email.js',
- 'static/src/js/announcement.js',
- 'static/src/js/suggestions.js',
- ],
'qweb': [
'static/src/xml/mail.xml',
'static/src/xml/mail_followers.xml',
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index ebce0988dd3..7147288f594 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -135,7 +135,7 @@ class mail_mail(osv.Model):
:param browse_record mail: the mail that was just sent
:return: True
"""
- if mail.auto_delete:
+ if mail_sent and mail.auto_delete:
# done with SUPERUSER_ID to avoid giving large unlink access rights
self.unlink(cr, SUPERUSER_ID, [mail.id], context=context)
return True
diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
index e259d28a2b7..52a8d2beadf 100644
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/mail_mail_view.xml
@@ -92,7 +92,7 @@
mail.mail
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/mass_mailing/__openerp__.py b/addons/mass_mailing/__openerp__.py
index 91b57ac5b5a..e96cc910920 100644
--- a/addons/mass_mailing/__openerp__.py
+++ b/addons/mass_mailing/__openerp__.py
@@ -49,15 +49,9 @@ professional emails and reuse templates in a few clicks.
'views/res_partner.xml',
'views/email_template.xml',
'security/ir.model.access.csv',
- ],
- 'js': [
- 'static/src/js/mass_mailing.js',
+ 'views/mass_mailing.xml',
],
'qweb': [],
- 'css': [
- 'static/src/css/mass_mailing.css',
- 'static/src/css/email_template.css'
- ],
'demo': [
'data/mass_mailing_demo.xml',
],
diff --git a/addons/mass_mailing/controllers/main.py b/addons/mass_mailing/controllers/main.py
index 7396c02d453..6a5f058cee5 100644
--- a/addons/mass_mailing/controllers/main.py
+++ b/addons/mass_mailing/controllers/main.py
@@ -14,7 +14,7 @@ class MassMailController(http.Controller):
mail_mail_stats.set_opened(request.cr, SUPERUSER_ID, mail_mail_ids=[mail_id])
response = werkzeug.wrappers.Response()
response.mimetype = 'image/gif'
- response.set_data('R0lGODlhAQABAIAAANvf7wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=='.decode('base64'))
+ response.data = 'R0lGODlhAQABAIAAANvf7wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=='.decode('base64')
return response
@http.route(['/mail/mailing//unsubscribe'], type='http', auth='none')
diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
index bd314f03a3d..2e8a82a8f4d 100644
--- a/addons/mass_mailing/models/mass_mailing.py
+++ b/addons/mass_mailing/models/mass_mailing.py
@@ -271,9 +271,9 @@ class MassMailing(osv.Model):
date_begin_str = date_begin.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
date_end_str = date_end.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
domain = [('mass_mailing_id', '=', mailing.id), ('opened', '>=', date_begin_str), ('opened', '<=', date_end_str)]
- res[mailing.id]['opened_dayly'] = json.dumps(self.__get_bar_values(cr, uid, obj, domain, ['opened'], 'opened_count', 'opened:day', date_begin, context=context))
+ res[mailing.id]['opened_daily'] = json.dumps(self.__get_bar_values(cr, uid, obj, domain, ['opened'], 'opened_count', 'opened:day', date_begin, context=context))
domain = [('mass_mailing_id', '=', mailing.id), ('replied', '>=', date_begin_str), ('replied', '<=', date_end_str)]
- res[mailing.id]['replied_dayly'] = json.dumps(self.__get_bar_values(cr, uid, obj, domain, ['replied'], 'replied_count', 'replied:day', date_begin, context=context))
+ res[mailing.id]['replied_daily'] = json.dumps(self.__get_bar_values(cr, uid, obj, domain, ['replied'], 'replied_count', 'replied:day', date_begin, context=context))
return res
def _get_statistics(self, cr, uid, ids, name, arg, context=None):
@@ -314,7 +314,7 @@ class MassMailing(osv.Model):
'name': fields.char('Subject', required=True),
'email_from': fields.char('From', required=True),
'create_date': fields.datetime('Creation Date'),
- 'sent_date': fields.datetime('Sent Date'),
+ 'sent_date': fields.datetime('Sent Date', oldname='date'),
'body_html': fields.html('Body'),
'attachment_ids': fields.many2many(
'ir.attachment', 'mass_mailing_ir_attachments_rel',
@@ -340,7 +340,7 @@ class MassMailing(osv.Model):
'reply_to': fields.char('Reply To', help='Preferred Reply-To Address'),
# recipients
'mailing_model': fields.selection(_mailing_model, string='Recipients Model', required=True),
- 'mailing_domain': fields.char('Domain'),
+ 'mailing_domain': fields.char('Domain', oldname='domain'),
'contact_list_ids': fields.many2many(
'mail.mass_mailing.list', 'mail_mass_mailing_list_rel',
string='Mailing Lists',
@@ -398,16 +398,14 @@ class MassMailing(osv.Model):
_get_statistics, string='Replied Ratio',
type='integer', multi='_get_statistics',
),
- # dayly ratio
- 'opened_dayly': fields.function(
+ # daily ratio
+ 'opened_daily': fields.function(
_get_daily_statistics, string='Opened',
type='char', multi='_get_daily_statistics',
- oldname='opened_monthly',
),
- 'replied_dayly': fields.function(
+ 'replied_daily': fields.function(
_get_daily_statistics, string='Replied',
type='char', multi='_get_daily_statistics',
- oldname='replied_monthly',
)
}
diff --git a/addons/mass_mailing/models/mass_mailing_stats.py b/addons/mass_mailing/models/mass_mailing_stats.py
index 319a6fde14d..7e8c194f42e 100644
--- a/addons/mass_mailing/models/mass_mailing_stats.py
+++ b/addons/mass_mailing/models/mass_mailing_stats.py
@@ -19,23 +19,8 @@
#
##############################################################################
-from datetime import datetime
-from dateutil import relativedelta
-import random
-try:
- import simplejson as json
-except ImportError:
- import json
-import urllib
-import urlparse
-
-from openerp import tools
-from openerp.exceptions import Warning
-from openerp.tools.safe_eval import safe_eval as eval
-from openerp.tools.translate import _
from openerp.osv import osv, fields
-
class MailMailStats(osv.Model):
""" MailMailStats models the statistics collected about emails. Those statistics
are stored in a separated model and table to avoid bloating the mail_mail table
@@ -48,11 +33,7 @@ class MailMailStats(osv.Model):
_order = 'message_id'
_columns = {
- 'mail_mail_id': fields.integer(
- 'Mail ID',
- help='ID of the related mail_mail. This field is an integer field because'
- 'the related mail_mail can be deleted separately from its statistics.'
- ),
+ 'mail_mail_id': fields.many2one('mail.mail', 'Mail ID', ondelete='set null'),
'message_id': fields.char('Message-ID'),
'model': fields.char('Document model'),
'res_id': fields.integer('Document ID'),
@@ -106,4 +87,3 @@ class MailMailStats(osv.Model):
stat_ids = self._get_ids(cr, uid, ids, mail_mail_ids, mail_message_ids, [('bounced', '=', False)], context)
self.write(cr, uid, stat_ids, {'bounced': fields.datetime.now()}, context=context)
return stat_ids
-
diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index 7892feacacc..82c4cdad54d 100644
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -1,6 +1,13 @@
+
+
+
+
+
+
+
Personnal Objectives
+Personal Objectives
- +