diff --git a/entities.py b/entities.py index 6f326f9908bd375725287b703693d68901b0d4e5_ZW50aXRpZXMucHk=..efe4197be8e198f2e66d66d3b1714071119f91cc_ZW50aXRpZXMucHk= 100644 --- a/entities.py +++ b/entities.py @@ -7,7 +7,7 @@ @property def workcase(self): rql = 'Any R WHERE E has_lines EL, EL eid %(el)s, E spent_for W, W ref R' - rset = self._cw.execute(rql, {'el': self.eid}, 'el') + rset = self._cw.execute(rql, {'el': self.eid}) if rset: return rset[0][0] return None diff --git a/views/accounting.py b/views/accounting.py index 6f326f9908bd375725287b703693d68901b0d4e5_dmlld3MvYWNjb3VudGluZy5weQ==..efe4197be8e198f2e66d66d3b1714071119f91cc_dmlld3MvYWNjb3VudGluZy5weQ== 100644 --- a/views/accounting.py +++ b/views/accounting.py @@ -9,9 +9,9 @@ from logilab.mtconverter import xml_escape -from cubicweb.selectors import implements +from cubicweb.selectors import is_instance from cubicweb.view import EntityView class ExpenseAccountingXmlView(EntityView): __regid__ = 'accexpense' @@ -13,9 +13,9 @@ from cubicweb.view import EntityView class ExpenseAccountingXmlView(EntityView): __regid__ = 'accexpense' - __select__ = implements('Expense') + __select__ = is_instance('Expense') title = _('accounting entry view') templatable = False @@ -41,7 +41,7 @@ class ExpenseLineAccountingEntryXmlView(EntityView): __regid__ = 'accentry' - __select__ = implements('ExpenseLine',) + __select__ = is_instance('ExpenseLine',) title = _('accounting entry view') templatable = False diff --git a/views/actions.py b/views/actions.py index 6f326f9908bd375725287b703693d68901b0d4e5_dmlld3MvYWN0aW9ucy5weQ==..efe4197be8e198f2e66d66d3b1714071119f91cc_dmlld3MvYWN0aW9ucy5weQ== 100644 --- a/views/actions.py +++ b/views/actions.py @@ -6,8 +6,8 @@ """ __docformat__ = "restructuredtext en" -from cubicweb.selectors import implements +from cubicweb.selectors import is_instance from cubicweb.web.action import Action class AccountingAction(Action): __regid__ = 'accaction' @@ -10,8 +10,8 @@ from cubicweb.web.action import Action class AccountingAction(Action): __regid__ = 'accaction' - __select__ = implements('Expense') + __select__ = is_instance('Expense') title = _('generate accounting entries') def url(self):