diff --git a/addons/project/project.py b/addons/project/project.py
index 3a65449ff69..6f662b519a2 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -203,6 +203,9 @@ class project(osv.osv):
'color': fields.integer('Color Index'),
'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
}
+
+ def dummy(self, cr, uid,ids,context):
+ return False
def _get_type_common(self, cr, uid, context):
ids = self.pool.get('project.task.type').search(cr, uid, [('project_default','=',1)], context=context)
diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js
index 27874b24f25..d841734bacf 100644
--- a/addons/project/static/src/js/project.js
+++ b/addons/project/static/src/js/project.js
@@ -16,7 +16,6 @@ openerp.project = function(openerp) {
});
});
-
// set sequence like Tasks,Issues,Timesheets and Phases
my_list = $("#list a")
my_list.sort(function (a, b) {
@@ -26,8 +25,16 @@ openerp.project = function(openerp) {
});
$('#list').replaceWith(my_list);
- //if task is true , then open the task when click on the anywhere in the box.
- if(this.record.use_tasks.raw_value)$(this.$element).find('.click_button').attr('data-name',my_list[0].getAttribute('data-name'));
+ //it opens action in sequence which ever is first.
+ if (my_list.length!=0){
+ $(this.$element).find('.click_button').attr('data-name',my_list[0].getAttribute('data-name'));
+ }
+ else{
+ $(this.$element).find('.click_button').attr('data-name','dummy');
+ }
+ if(isNaN(parseInt($(this.$element).find('.click_button').attr('data-name')))){
+ $(this.$element).find('.click_button').attr('data-type',"object")
+ }
/* set background color.
we can do other way to implement new widget.
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index dfb40c82ce1..6ddbfb07ea4 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -64,7 +64,6 @@ and decide on their status as they evolve.
'installable': True,
'auto_install': False,
'application': True,
- 'js': ['static/src/js/project_issue.js'],
'certificate' : '001236490750848623845',
}
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index ad870b08106..ffc6017adaf 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -536,28 +536,6 @@ class project(osv.osv):
'use_issues' : True,
}
- def open_issues(self, cr, uid, ids, context=None):
- #Open the View for the Tasks for the project
- """
- This opens Issues views
- @return :Dictionary value for issue view
- """
- if context is None:
- context = {}
- if ids:
- context = dict(context, search_default_project_id=ids[0])
- return {
- 'name': _('Issue'),
- 'view_type': 'form',
- 'view_mode': 'kanban,tree,calendar,form',
- 'res_model': 'project.issue',
- 'view_id': False,
- 'domain':[('project_id','in',ids)],
- 'context': context,
- 'type': 'ir.actions.act_window',
- 'nodestroy': True
- }
-
def _check_escalation(self, cr, uid, ids, context=None):
project_obj = self.browse(cr, uid, ids[0], context=context)
if project_obj.project_escalation_id:
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index 3be4cb0f0f9..1c4cecfe439 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -45,16 +45,6 @@
-
-
-
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 66ad9c04e30..c2db50e8584 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -334,6 +334,15 @@
+
+
# ------------------------------------------------------
# Project
@@ -367,7 +376,7 @@
- IssueIssues()
+ IssueIssues()
diff --git a/addons/project_issue/static/src/img/issue_icon.png b/addons/project_issue/static/src/img/issue_icon.png
deleted file mode 100644
index ce3ccf0f4bc..00000000000
Binary files a/addons/project_issue/static/src/img/issue_icon.png and /dev/null differ
diff --git a/addons/project_issue/static/src/js/project_issue.js b/addons/project_issue/static/src/js/project_issue.js
deleted file mode 100644
index b0433055160..00000000000
--- a/addons/project_issue/static/src/js/project_issue.js
+++ /dev/null
@@ -1,13 +0,0 @@
-openerp.project_issue = function(openerp) {
- openerp.web_kanban.ProjectIssueKanban = openerp.web_kanban.KanbanRecord.include({
- bind_events: function() {
- self = this;
- self._super();
- if(this.view.dataset.model == 'project.project') {
- if(this.record.use_tasks.raw_value && this.record.use_issues.raw_value)$(this.$element).find('.click_button').attr('data-name','open_tasks');
- if(!this.record.use_tasks.raw_value && this.record.use_issues.raw_value)$(this.$element).find('.click_button').attr('data-name','open_issues');
- };
-
- }
- });
-}
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 85e821703fc..0e7fcee25fb 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -234,28 +234,7 @@ class project(osv.osv):
_defaults = {
'use_phases' : True,
}
- def open_phase(self, cr, uid, ids, context=None):
- #Open the View for the Tasks for the project
- """
- This opens Tasks views
- @return :Dictionary value for task view
- """
- if context is None:
- context = {}
- if ids:
- context = dict(context, search_default_project_id=ids[0])
- return {
- 'name': _('Phase'),
- 'view_type': 'form',
- 'view_mode': 'tree,calendar,form',
- 'res_model': 'project.phase',
- 'view_id': False,
- 'domain':[('project_id','in',ids)],
- 'context': context,
- 'type': 'ir.actions.act_window',
- 'nodestroy': True
- }
-
+
def schedule_phases(self, cr, uid, ids, context=None):
context = context or {}
if type(ids) in (long, int,):
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index f5dcb48576d..5747ebba5e7 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -110,6 +110,16 @@
+
+
project.project.kanban.inherited
project.project
@@ -122,7 +132,7 @@
- PhasePhases()
+ PhasePhases()
@@ -357,16 +367,6 @@
view_mode="tree,form"
/>
-
-
# ------------------------------------------------------
# Menu Items
# ------------------------------------------------------
diff --git a/addons/project_long_term/static/src/img/phases_icon.jpg b/addons/project_long_term/static/src/img/phases_icon.jpg
deleted file mode 100644
index df58a827b11..00000000000
Binary files a/addons/project_long_term/static/src/img/phases_icon.jpg and /dev/null differ
diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py
index 465702917ff..2dccbb2e38b 100644
--- a/addons/project_timesheet/__openerp__.py
+++ b/addons/project_timesheet/__openerp__.py
@@ -44,7 +44,6 @@ the Timesheet line entries for particular date and particular user with the eff
],
'installable': True,
'auto_install': False,
- 'js': ['static/src/js/project_timesheet.js'],
'certificate': '0075123647453',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_timesheet/static/src/img/timesheet_icon.png b/addons/project_timesheet/static/src/img/timesheet_icon.png
deleted file mode 100644
index 7d421231891..00000000000
Binary files a/addons/project_timesheet/static/src/img/timesheet_icon.png and /dev/null differ
diff --git a/addons/project_timesheet/static/src/js/project_timesheet.js b/addons/project_timesheet/static/src/js/project_timesheet.js
deleted file mode 100644
index 3eff53a8651..00000000000
--- a/addons/project_timesheet/static/src/js/project_timesheet.js
+++ /dev/null
@@ -1,20 +0,0 @@
-openerp.project_timesheet = function(openerp) {
- openerp.web_kanban.ProjectTimeSheetKanban = openerp.web_kanban.KanbanRecord.include({
- bind_events: function() {
- self = this;
- self._super();
- if(this.view.dataset.model == 'project.project') {
- function include(arr, obj) {
- for(var i=0; i