summaryrefslogtreecommitdiff
path: root/addons/hr_holidays/wizard
diff options
context:
space:
mode:
authorRaphael Collet <rco@openerp.com>2014-07-06 16:44:26 +0200
committerAntony Lesuisse <al@openerp.com>2014-07-06 17:05:41 +0200
commitcbe2dbb672a6c55d86f2e515f9d1cdfee426ef80 (patch)
treed6ff62b719fce32392397783c961b734b1e4c50e /addons/hr_holidays/wizard
parentd78192c489d3be66cd6487b39f5ce7ba4733a187 (diff)
[MERGE] new v8 api by rco
A squashed merge is required as the conversion of the apiculture branch from bzr to git was not correctly done. The git history contains irrelevant blobs and commits. This branch brings a lot of changes and fixes, too many to list exhaustively. - New orm api, objects are now used instead of ids - Environements to encapsulates cr uid context while maintaining backward compatibility - Field compute attribute is a new object oriented way to define function fields - Shared browse record cache - New onchange protocol - Optional copy flag on fields - Documentation update - Dead code cleanup - Lots of fixes
Diffstat (limited to 'addons/hr_holidays/wizard')
-rw-r--r--addons/hr_holidays/wizard/hr_holidays_summary_department.py2
-rw-r--r--addons/hr_holidays/wizard/hr_holidays_summary_employees.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department.py b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
index 8a204389572..ff7bacc3e13 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
@@ -39,7 +39,7 @@ class hr_holidays_summary_dept(osv.osv_memory):
}
def print_report(self, cr, uid, ids, context=None):
- data = self.read(cr, uid, ids, [], context=context)[0]
+ data = self.read(cr, uid, ids, context=context)[0]
if not data['depts']:
raise osv.except_osv(_('Error!'), _('You have to select at least one Department. And try again.'))
datas = {
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
index 1ec08eb2c86..324a7f94240 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
@@ -37,7 +37,7 @@ class hr_holidays_summary_employee(osv.osv_memory):
}
def print_report(self, cr, uid, ids, context=None):
- data = self.read(cr, uid, ids, [], context=context)[0]
+ data = self.read(cr, uid, ids, context=context)[0]
data['emp'] = context['active_ids']
datas = {
'ids': [],