Rucha (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-temporal-db-intermediate-branch-rpa-ksa-fixes-rpa
into
lp:~openerp-dev/openobject-addons/trunk-temporal-db-intermediate-branch-rpa-ksa.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-temporal-db-intermediate-branch-rpa-ksa-fixes-rpa/+merge/65768
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-temporal-db-intermediate-branch-rpa-ksa-fixes-rpa/+merge/65768
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-temporal-db-intermediate-branch-rpa-ksa-fixes-rpa
into
lp:~openerp-dev/openobject-addons/trunk-temporal-db-intermediate-branch-rpa-ksa.
=== modified file 'base_temporal/base_temporal.py'
--- base_temporal/base_temporal.py 2011-06-21 06:58:52 +0000
+++ base_temporal/base_temporal.py 2011-06-24 07:21:21 +0000
@@ -52,7 +52,7 @@
search_id = obj.search(cr, uid, [('id', 'in', res[record.id]), ('temporal_date_from', '<', record.temporal_date_from)], order='temporal_date_from desc', limit=1, context=context)
return search_id + ids
- def __init__(self, cr):
+ def __init__(self, pool, cr):
self._columns.update({
'temporal_date_from': fields.datetime('Temporal From Date', select=True),
'temporal_date_to': fields.function(self.set_date, method=True, select=True, string='Temporal To Date', type='datetime',
@@ -61,7 +61,7 @@
}),
'temporal_parent_id': fields.integer('Temporal Parent ID', select=True,)
})
- return super(orm_temporal, self).__init__(cr)
+ return super(orm_temporal, self).__init__(pool, cr)
def create(self, cr, uid, vals, context=None):
"""on creation, fill the temporal_date_from and the temporal_parent_id"""
@@ -152,7 +152,7 @@
return result[0]
return result
-class osv_temporal(osv.osv, orm_temporal):
+class osv_temporal(orm_temporal):
pass
setattr(osv, 'osv_temporal', osv_temporal)
_______________________________________________
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
