From c3b1dd56dfa0ed40d119b85ae90618a2421d1054 Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Tue, 6 Apr 2010 09:55:02 +0530 Subject: [PATCH 001/272] [MERGE] Merge with main branch bzr revid: mra@tinyerp.com-20100406042502-56ohzoawginbfrqd --- addons/olap/wizard/olap_load_column.py | 0 addons/olap/wizard/olap_query_logs_clear.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 addons/olap/wizard/olap_load_column.py mode change 100755 => 100644 addons/olap/wizard/olap_query_logs_clear.py diff --git a/addons/olap/wizard/olap_load_column.py b/addons/olap/wizard/olap_load_column.py old mode 100755 new mode 100644 diff --git a/addons/olap/wizard/olap_query_logs_clear.py b/addons/olap/wizard/olap_query_logs_clear.py old mode 100755 new mode 100644 From a26fe9f3d058149e4f5e966a4444957e1f2ad23c Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Tue, 6 Apr 2010 10:41:22 +0530 Subject: [PATCH 002/272] [REM]: crm: Removed unused date fields demo from opportunity bzr revid: rpa@tinyerp.com-20100406051122-mf72e1qpcrpn8g0l --- addons/crm/crm_opportunity_demo.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/addons/crm/crm_opportunity_demo.xml b/addons/crm/crm_opportunity_demo.xml index e88e0f1ec8e..b893d536e44 100644 --- a/addons/crm/crm_opportunity_demo.xml +++ b/addons/crm/crm_opportunity_demo.xml @@ -18,7 +18,6 @@ - @@ -34,7 +33,6 @@ - @@ -51,7 +49,6 @@ - @@ -68,7 +65,6 @@ - @@ -84,7 +80,6 @@ - From a1646c335db8eb09615377b3ef0233afb5252679 Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Tue, 6 Apr 2010 11:43:55 +0530 Subject: [PATCH 003/272] [ADD] Project: Convert osv wizard to memory type (delegate task) bzr revid: mra@tinyerp.com-20100406061355-dwkd6dxqv75cc8c8 --- addons/project/__terp__.py | 1 + addons/project/project_view.xml | 4 +- addons/project/wizard/__init__.py | 2 +- .../project/wizard/project_task_delegate.py | 109 ++++++++++++++++++ .../wizard/project_task_delegate_view.xml | 47 ++++++++ addons/project/wizard/task_delegate.py | 107 ----------------- 6 files changed, 160 insertions(+), 110 deletions(-) create mode 100644 addons/project/wizard/project_task_delegate.py create mode 100644 addons/project/wizard/project_task_delegate_view.xml delete mode 100644 addons/project/wizard/task_delegate.py diff --git a/addons/project/__terp__.py b/addons/project/__terp__.py index 65e3c58fb5e..3c7e80d4c11 100644 --- a/addons/project/__terp__.py +++ b/addons/project/__terp__.py @@ -33,6 +33,7 @@ works done on tasks, eso. It is able to render planning, order tasks, eso. "init_xml" : [], "update_xml": [ "security/project_security.xml", + "wizard/project_task_delegate_view.xml", "security/ir.model.access.csv", "project_data.xml", "project_wizard.xml", diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 5e7b4fa7549..11aa50c934f 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -270,7 +270,7 @@