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-20120330055738-pyik91wj6hpnm2ru
bzr revid: sgo@tinyerp.com-20120330083402-dc3vu8w5l887rs5q
This commit is contained in:
Sanjay Gohel (Open ERP)
2012-03-30 14:04:02 +05:30
parent 355f15b456 f9398e1384
commit 5d4b8c2e58
3 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project/project_view.xml
+3 -3
View File
@@ -192,7 +192,7 @@
<td class="td_name">
<div class="oe_project_border">
<h4 class="oe_project_font1">
<a type="edit"><div class="oe_project_font"><t t-esc="record.name.value.substr(0,26)"/><t t-if="record.name.value.length > 26">...</t></div></a>
<a type="edit"><div class="oe_project_font"><t t-esc="record.name.value.substr(0,28)"/><t t-if="record.name.value.length > 28">...</t></div></a>
</h4>
<table >
<tr class ="task">
@@ -216,7 +216,7 @@
<t t-if="record.date.raw_value">
<div class="sequence">
<kbd class="user">Deadline</kbd>
<div class="manager"><field name="date"/></div>
<div class="manager"><b><field name="date"/></b></div>
</div>
</t>
</td>
@@ -224,7 +224,7 @@
</table>
<table class="project_table">
<tr>
<td class="td_hours" align="right">
<td class="td_hours">
<div class="progress invoiced">
<t t-esc="Math.round(record.effective_hours.raw_value)"/> hrs
<progress t-att-value="record.effective_hours.raw_value" t-att-max="record.total_hours.raw_value"></progress>
addons/project/static/src/css/project.css
+11 -7
View File
@@ -1,6 +1,6 @@
.oe_to_invoice_buttons {
min-height: 50px;
min-width: 40px;
min-height: 33px;
min-width: 70px;
vertical-align: top;
}
@@ -12,8 +12,11 @@
.oe_project_border{
border-right: groove;
border-left: groove;
}
.oe_project_font:hover{
text-decoration: underline;
}
.oe_project_desc{
width: 250px;
}
@@ -22,6 +25,7 @@
}
.oe_project_font{
color: #000000;
padding-left: 5px !important;
}
.sequence {
@@ -83,7 +87,7 @@
width:20px;
}
.td_hours{
text-align:right;
text-align:center;
vertical-align:bottom;
width:120px
}
@@ -102,7 +106,7 @@
font-size: 10px;
}
.manager {
font-size: 8px;
font-size: 9px;
}
.oe_project_buttons {
@@ -122,11 +126,11 @@
}
.oe_project_font1{
padding-left: 2px !important;
-webkit-margin-before: 0em;
-webkit-margin-after: 0em;
}
div.oe_fold_column{
padding:0px !important;
padding:2px !important;
}
addons/project_timesheet/project_timesheet_view.xml
+9 -12
View File
@@ -47,21 +47,18 @@
</t>
</xpath>
<xpath expr="//td[@class='td_image']" position="inside">
<div class="sequence">
<kbd class="user">Hours</kbd>
<div class="manager"><t t-esc="Math.round(record.total_hours.raw_value-record.effective_hours.raw_value)"/> h</div>
</div>
<div class="sequence">
<kbd class="user">Remaining Hours</kbd>
<div class="manager"><b><t t-esc="Math.round(record.total_hours.raw_value-record.effective_hours.raw_value)"/> h</b></div>
</div>
</xpath>
<xpath expr="//td[@class='td_deadline']" position="inside">
<div class="sequence">
<button name="open_timesheets" class="oe_to_invoice_buttons" type="object">
<small>To invoice</small>
<div class="manager">
<field name="amount_invoiced"/>
</div>
</button>
<kbd class="user">To invoice</kbd>
<div class="manager"><b><field name="amount_invoiced"/> <field name="currency_id"/></b></div>
</div>
<div class="sequence">
<button name="open_timesheets" class="oe_to_invoice_buttons" type="object">Invoice</button>
</div>
</xpath>
</field>