diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py index 3486359f183..652f42f0938 100644 --- a/addons/document/document_directory.py +++ b/addons/document/document_directory.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -29,7 +29,7 @@ from tools.translate import _ class document_directory(osv.osv): _name = 'document.directory' _description = 'Directory' - _order = 'name desc' + _order = 'name' _columns = { 'name': fields.char('Name', size=64, required=True, select=1), 'write_date': fields.datetime('Date Modified', readonly=True), @@ -44,13 +44,13 @@ class document_directory(osv.osv): 'child_ids': fields.one2many('document.directory', 'parent_id', 'Children'), 'file_ids': fields.one2many('ir.attachment', 'parent_id', 'Files'), 'content_ids': fields.one2many('document.directory.content', 'directory_id', 'Virtual Files'), - 'type': fields.selection([ + 'type': fields.selection([ ('directory','Static Directory'), ('ressource','Folders per resource'), ], 'Type', required=True, select=1, - help="Defines directory's behaviour."), - + help="Each directory can either have the type Static or be linked to another resource. A static directory, as with Operating Systems, is the classic directory that can contain a set of files. The directories linked to systems resources automatically possess sub-directories for each of resource types defined in the parent directory."), + 'ressource_type_id': fields.many2one('ir.model', 'Resource model', help="Select an object here and there will be one folder per record of that resource."), 'resource_field': fields.many2one('ir.model.fields', 'Name field', help='Field to be used as name on resource directories. If empty, the "name" will be used.'), @@ -95,13 +95,13 @@ class document_directory(osv.osv): return objid.browse(cr, uid, mid, context=context).res_id except Exception: return None - + _defaults = { 'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'document.directory', context=c), 'user_id': lambda self,cr,uid,ctx: uid, 'domain': lambda self,cr,uid,ctx: '[]', 'type': lambda *args: 'directory', - 'ressource_id': lambda *a: 0, + 'ressource_id': lambda *a: 0, 'storage_id': _get_def_storage, 'resource_find_all': True, } @@ -151,7 +151,7 @@ class document_directory(osv.osv): _constraints = [ (_check_recursion, 'Error! You can not create recursive Directories.', ['parent_id']) ] - + def __init__(self, *args, **kwargs): super(document_directory, self).__init__(*args, **kwargs) @@ -172,7 +172,7 @@ class document_directory(osv.osv): """ if not context: context = {} - + return nodes.get_node_context(cr, uid, context).get_uri(cr, uri) def get_dir_permissions(self, cr, uid, ids ): @@ -180,7 +180,7 @@ class document_directory(osv.osv): """ assert len(ids) == 1 id = ids[0] - + cr.execute( "SELECT count(dg.item_id) AS needs, count(ug.uid) AS has " \ " FROM document_directory_group_rel dg " \ " LEFT OUTER JOIN res_groups_users_rel ug " \ @@ -197,7 +197,7 @@ class document_directory(osv.osv): Return a tuple (node_dir, remaining_path) """ return (nodes.node_database(context=ncontext), uri) - + def copy(self, cr, uid, id, default=None, context=None): if not default: default ={} diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index 13e4cff02d4..5b8653cda8c 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -148,6 +148,7 @@ + @@ -403,15 +404,11 @@ src_model="res.partner" groups="base.group_extended"/> - - - - - diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 57008be2aad..59bd8a6aff5 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -114,7 +114,7 @@ - + @@ -380,7 +380,7 @@ - + diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index 682a2c99485..4ca7fde8da4 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -91,7 +91,7 @@ + help="My Projects" domain="[('project_id.user_id','=',uid)]"/> diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml index dc299826419..e5eeed35573 100644 --- a/addons/project/wizard/project_task_delegate_view.xml +++ b/addons/project/wizard/project_task_delegate_view.xml @@ -18,7 +18,7 @@ - + diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index f58cc9f1d20..196d4364f47 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -170,7 +170,7 @@ class project_issue(crm.crm_case, osv.osv): progress = task_pool._hours_get(cr, uid, [issue.task_id.id], field_names, args, context=context)[issue.task_id.id]['progress'] res[issue.id] = {'progress' : progress} return res - + _columns = { 'id': fields.integer('ID'), 'name': fields.char('Issue', size=128, required=True), @@ -201,7 +201,7 @@ class project_issue(crm.crm_case, osv.osv): 'canal_id': fields.many2one('res.partner.canal', 'Channel', help="The channels represent the different communication modes available with the customer." \ " With each commercial opportunity, you can indicate the canall which is this opportunity source."), 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('object_id.model', '=', 'crm.project.bug')]"), - 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Severity'), + 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 'version_id': fields.many2one('project.issue.version', 'Version'), 'partner_name': fields.char("Employee's Name", size=64), 'partner_mobile': fields.char('Mobile', size=32), @@ -313,7 +313,6 @@ class project_issue(crm.crm_case, osv.osv): def convert_to_bug(self, cr, uid, ids, context=None): return self._convert(cr, uid, ids, 'bug_categ', context=context) - def next_type(self, cr, uid, ids, *args): for task in self.browse(cr, uid, ids): typeid = task.type_id.id @@ -339,7 +338,7 @@ class project_issue(crm.crm_case, osv.osv): def onchange_task_id(self, cr, uid, ids, task_id, context=None): if context is None: context = {} - result = {} + result = {} if not task_id: return {'value':{}} task = self.pool.get('project.task').browse(cr, uid, task_id, context) @@ -464,7 +463,7 @@ class project_issue(crm.crm_case, osv.osv): @param **args: Return Dictionary of Keyword Value """ return True - + def copy(self, cr, uid, id, default=None, context=None): if not context: context={} diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml index 013b0b0b154..4de53c0f38d 100644 --- a/addons/project_long_term/project_long_term_demo.xml +++ b/addons/project_long_term/project_long_term_demo.xml @@ -1,11 +1,11 @@ - - + Phuong @@ -91,8 +91,8 @@ This Demo data file includes Users, Human Resources, Projects and it' members li Project Finacial Manager - - + + @@ -101,12 +101,12 @@ This Demo data file includes Users, Human Resources, Projects and it' members li normal Integrate an Sale and Warehouse Management. Integrate an Sale and Warehouse Management. @@ -213,7 +213,7 @@ This Demo data file includes Users, Human Resources, Projects and it' members li - + diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml index 1d9bc2bd90a..5c8d4cc5af9 100644 --- a/addons/project_planning/project_planning_view.xml +++ b/addons/project_planning/project_planning_view.xml @@ -276,8 +276,6 @@ - - @@ -299,6 +297,10 @@ parent="hr.menu_hr_reporting" /> + diff --git a/addons/project_scrum/__openerp__.py b/addons/project_scrum/__openerp__.py index 3e18db77f68..accbae25604 100644 --- a/addons/project_scrum/__openerp__.py +++ b/addons/project_scrum/__openerp__.py @@ -54,6 +54,7 @@ 'project_scrum_report.xml', 'wizard/project_scrum_backlog_create_task_view.xml', 'wizard/project_scrum_backlog_merger_view.xml', + 'wizard/project_scrum_postpone_view.xml', 'project_scrum_view.xml', 'wizard/project_scrum_backlog_sprint_view.xml', 'process/project_scrum_process.xml', diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml index 76094000888..2d146c94367 100644 --- a/addons/project_scrum/board_project_scrum_view.xml +++ b/addons/project_scrum/board_project_scrum_view.xml @@ -6,7 +6,7 @@ project.scrum.sprint tree - + @@ -14,7 +14,6 @@ -