pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]

Browse Source 
bzr revid: sgo@tinyerp.com-20120405090618-g7ianc93x6dhjdz6
This commit is contained in:
Sanjay Gohel (Open ERP)
2012-04-05 14:36:18 +05:30
parent f70b651ae0 1616333862
commit 2fc71b5ac3
6 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project/__openerp__.py
+1 -1
View File
@@ -29,7 +29,7 @@
"sequence": 8,
'complexity': "easy",
"images": ["images/gantt.png", "images/project_dashboard.jpeg","images/project_task_tree.jpeg","images/project_task.jpeg","images/project.jpeg","images/task_analysis.jpeg"],
"depends": ["base_setup", "product", "analytic", "board", "mail", "resource"],
"depends": ["base_setup", "product", "analytic", "board", "mail", "resource","web_kanban"],
"description": """
Project management module tracks multi-level projects, tasks, work done on tasks, eso.
======================================================================================
addons/project/project_view.xml
+5 -6
View File
@@ -196,7 +196,7 @@
<h4 id="list" height="10px">
<a>
<t t-if="record.task.raw_value">
<button name="open_tasks" class="oe_project_buttons" type="object"><t t-esc="record.open_task.value" t-if="record.open_task.value &lt;= 1"> Task</t><t t-esc="record.open_task.value" t-if="record.open_task.value > 1"> Tasks</t></button>
<button name="open_tasks" class="oe_project_buttons" type="object"><t t-if="record.open_task.value &lt;= 1"> Task</t><t t-if="record.open_task.value &gt; 1"> Tasks</t>(<t t-esc="record.open_task.value"/>)</button>
</t>
</a>
</h4>
@@ -216,18 +216,17 @@
</td>
</tr>
</table>
<t t-if="record.members.raw_value.length > 7">
<img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" class="project_avatar"/>
<img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" t-att-id="record.user_id.raw_value[0]" class="project_avatar"/>
<t t-foreach="record.members.raw_value" t-as="member">
<img t-att-src="kanban_image('res.users', 'avatar', member)" t-att-title="member" class="project_avatar"/>
<img t-att-src="kanban_image('res.users', 'avatar', member)" t-att-title="member" t-att-id="member" class="project_avatar"/>
</t>
</t>
<t t-if="record.members.raw_value.length &lt;= 7">
<br/><br/>
<img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" class="project_avatar"/>
<img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" t-att-id="record.user_id.raw_value[0]" class="project_avatar"/>
<t t-foreach="record.members.raw_value" t-as="member">
<img t-att-src="kanban_image('res.users', 'avatar', member)" t-att-title="member" class="project_avatar"/>
<img t-att-src="kanban_image('res.users', 'avatar', member)" t-att-title="member" t-att-id="member" class="project_avatar"/>
</t>
</t>
</li>
addons/project/static/src/js/project.js
+17 -9
View File
@@ -1,16 +1,24 @@
openerp.project = function(openerp) {
openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({
bind_events: function() {
self = this
self._super()
if(this.view.dataset.model == 'project.project') {
$('.oe_project_kanban_vignette').mouseover(function() {
return $(this).find('.oe_project_kanban_action').show();
}).mouseout(function() {
return $(this).find('.oe_project_kanban_action').hide();
self = this;
self._super();
$('.dropdown-toggle').dropdown();
$('.oe_project_kanban_vignette').mouseover(function() {
return $(this).find('.oe_project_kanban_action').show();
}).mouseout(function() {
return $(this).find('.oe_project_kanban_action').hide();
});
_.each($('.oe_project_kanban_vignette'),function(record){
_.each(record.getElementsByTagName('img'),function(img){
var domain = [['id','=',img.getAttribute("id")]];
var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, domain);
dataset.read_slice([]).then(function(result){
img.setAttribute("title",result[0].name)
});
});
$('.dropdown-toggle').dropdown();
}
});
}
});
}
addons/project_issue/project_issue_view.xml
+1 -1
View File
@@ -392,7 +392,7 @@
<xpath expr="//h4[@id='list']" position="inside">
<a>
<t t-if="record.issues.raw_value">
<button name="open_issues" class="oe_project_buttons" type="object"><t t-esc="record.total_issues.value" t-if="record.total_issues.value &lt;= 1"> Issue</t><t t-esc="record.total_issues.value" t-if="record.total_issues.value > 1"> Issues</t></button>
<button name="open_issues" class="oe_project_buttons" type="object"><t t-if="record.total_issues.value &lt;= 1"> Issue</t><t t-if="record.total_issues.value > 1"> Issues</t>(<t t-esc="record.total_issues.value"/>)</button>
</t>
</a>
</xpath>
addons/project_long_term/project_long_term_view.xml
+1 -1
View File
@@ -123,7 +123,7 @@
<xpath expr="//h4[@id='list']" position="inside">
<a>
<t t-if="record.phases.raw_value">
<button name="open_phase" class="oe_project_buttons" type="object"><t t-esc="record.open_phases.value" t-if="record.open_phases.value &lt;= 1"> Phase</t><t t-esc="record.open_phases.value" t-if="record.open_phases.value > 1"> Phases</t></button>
<button name="open_phase" class="oe_project_buttons" type="object"><t t-if="record.open_phases.value &lt;= 1"> Phase</t><t t-if="record.open_phases.value > 1"> Phases</t>(<t t-esc="record.open_phases.value"/>)</button>
</t>
</a>
</xpath>
addons/project_timesheet/project_timesheet_view.xml
+1 -1
View File
@@ -39,7 +39,7 @@
<xpath expr="//h4[@id='list']" position="inside">
<a>
<t t-if="record.timesheets.raw_value">
<button name="open_timesheets" class="oe_project_buttons" type="object"><t t-esc="record.total_timesheet.value" t-if="record.total_timesheet.value &lt;= 1"> Timesheet</t><t t-esc="record.total_timesheet.value" t-if="record.total_timesheet.value > 1"> Timesheets</t></button>
<button name="open_timesheets" class="oe_project_buttons" type="object"><t t-if="record.total_timesheet.value &lt;= 1"> Timesheet</t><t t-if="record.total_timesheet.value &gt; 1"> Timesheets</t>(<t t-esc="record.total_timesheet.value"/>)</button>
</t>
</a>
</xpath>