diff options
| author | Christophe Simonis <chs@tinyerp.com> | 2010-02-05 16:34:25 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@tinyerp.com> | 2010-02-05 16:34:25 +0100 |
| commit | 5b23f199c128cf1cb3ff54f00904800a9b5eea19 (patch) | |
| tree | 840cfa83081ddddc0d5c663f727963eb8dfa815e /addons/project | |
| parent | 73502052a231c8e3ac1f22ed69dc1fae0f2555df (diff) | |
| parent | 904de67cf5acf691f50995198dd255b7f13c0306 (diff) | |
[MERGE]
bzr revid: chs@tinyerp.com-20100205153425-yct2qfhb2f1rhzij
Diffstat (limited to 'addons/project')
| -rw-r--r-- | addons/project/__terp__.py | 2 | ||||
| -rwxr-xr-x | addons/project/process/task_process.xml | 20 | ||||
| -rw-r--r-- | addons/project/project.py | 5 | ||||
| -rw-r--r-- | addons/project/security/ir.model.access.csv | 4 |
4 files changed, 5 insertions, 26 deletions
diff --git a/addons/project/__terp__.py b/addons/project/__terp__.py index 7f78e3722c0..0753ee91f96 100644 --- a/addons/project/__terp__.py +++ b/addons/project/__terp__.py @@ -26,7 +26,7 @@ "author" : "Tiny", "website" : "http://www.openerp.com", "category" : "Generic Modules/Projects & Services", - "depends" : ["product", "account", "hr", "process", "mail_gateway"], + "depends" : ["product", "analytic", "hr", "process", "mail_gateway"], "description": """Project management module that track multi-level projects, tasks, works done on tasks, eso. It is able to render planning, order tasks, eso. """, diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml index 9aff5f55c60..b3490ce4cf1 100755 --- a/addons/project/process/task_process.xml +++ b/addons/project/process/task_process.xml @@ -60,18 +60,6 @@ <field eval="0" name="flow_start"/> </record> - <record id="process_node_triggerinvoice0" model="process.node"> - <field name="menu_id" ref="account.menu_finance_invoice"/> - <field name="model_id" ref="account.model_account_invoice"/> - <field eval=""""subflow"""" name="kind"/> - <field eval=""""Trigger Invoice"""" name="name"/> - <field name="subflow_id" ref="account.process_process_invoiceprocess0"/> - <field eval=""""Trigger invoices from sale order lines"""" name="note"/> - <field name="process_id" ref="process_process_tasksprocess0"/> - <field eval=""""object.state=='paid'"""" name="model_states"/> - <field eval="0" name="flow_start"/> - </record> - <!-- Process Transition --> @@ -103,14 +91,6 @@ <field model="process.node" name="source_node_id" ref="process_node_opentask0"/> </record> - <record id="process_transition_taskinvoice0" model="process.transition"> - <field eval="[(6,0,[])]" name="role_ids"/> - <field eval="[(6,0,[])]" name="transition_ids"/> - <field eval=""""Task invoice"""" name="name"/> - <field eval=""""After task is completed, Create its invoice."""" name="note"/> - <field model="process.node" name="target_node_id" ref="process_node_triggerinvoice0"/> - <field model="process.node" name="source_node_id" ref="process_node_donetask0"/> - </record> <!-- Process Action diff --git a/addons/project/project.py b/addons/project/project.py index 2a85dd7aa2f..9625db08fc1 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -546,10 +546,9 @@ def _project_get(self, cr, uid, context={}): else: cr.execute("""SELECT project.id,account.name FROM project_project project LEFT JOIN account_analytic_account account ON account.id = project.category_id - WHERE (account.user_id = %s) OR project.id IN (SELECT project_id FROM project_resource_rel - WHERE resource_id IN (SELECT id FROM resource_resource - WHERE (user_id= %s)))"""%(uid, uid)) + WHERE (account.user_id = %s)"""%(uid)) res = cr.fetchall() + print res res = [(str(r[0]),r[1]) for r in res] return res diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv index 15f5609c88e..efeda2170a5 100644 --- a/addons/project/security/ir.model.access.csv +++ b/addons/project/security/ir.model.access.csv @@ -1,8 +1,8 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" "access_project_project_manager","project.project manager","model_project_project","project.group_project_manager",1,1,1,1 -"access_account_analytic_account_manager","account.analytic.account","account.model_account_analytic_account","project.group_project_user",1,1,1,1 +"access_account_analytic_account_manager","account.analytic.account","analytic.model_account_analytic_account","project.group_project_user",1,1,1,1 "access_project_project","project.project","model_project_project","project.group_project_user",1,0,0,0 -"access_account_analytic_account","account.analytic.account","account.model_account_analytic_account","project.group_project_user",1,0,0,0 +"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","project.group_project_user",1,0,0,0 "access_project_task_type_user","project.task.type user","model_project_task_type","project.group_project_user",1,0,0,1 "access_project_task_type","project.task.type","model_project_task_type","project.group_project_manager",1,1,1,1 "access_project_task_manager","project.task manager","model_project_task","project.group_project_manager",1,1,1,1 |