diff --git a/__init__.py b/__init__.py index 8abc390360..a5bb951584 100644 --- a/__init__.py +++ b/__init__.py @@ -23,4 +23,4 @@ # ############################################################################## -from project import * +from work import * diff --git a/__tryton__.py b/__tryton__.py index 5ca841ac22..d897021816 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -13,5 +13,6 @@ ], 'xml': [ 'project.xml', + 'work.xml', ], } diff --git a/project.xml b/project.xml index 10a5ddc2fa..69fcac0d79 100644 --- a/project.xml +++ b/project.xml @@ -3,66 +3,5 @@ - - - project.project - tree - - - - - - - ]]> - - - - project.project - form - - - - - Projects - project.project - form - - - - - - - - - - - - diff --git a/project.py b/work.py similarity index 73% rename from project.py rename to work.py index 467c9445ff..d32e617c9b 100644 --- a/project.py +++ b/work.py @@ -3,17 +3,17 @@ from trytond.osv import fields, OSV -class Project(OSV): - 'Project' - _name = 'project.project' +class Work(OSV): + 'Work' + _name = 'project.work' _description = __doc__ _inherits = {'timesheet.work': 'work'} - work = fields.Many2One('timesheet.work', 'Work Type', + work = fields.Many2One('timesheet.work', 'Work', required=True) party = fields.Many2One('relationship.party', 'Party') party_address = fields.Many2One('relationship.address', 'Contact Address', domain="[('party', '=', party)]") comment = fields.Text('Comment') -Project() +Work() diff --git a/work.xml b/work.xml new file mode 100644 index 0000000000..3946efa2a7 --- /dev/null +++ b/work.xml @@ -0,0 +1,66 @@ + + + + + project.work + tree + + + + + + + ]]> + + + + project.work + form + + + + + Works + project.work + form + + + + + + + + + + + + + + +