odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] merge from trunk addons 

bzr revid: mra@mra-laptop-20100928071819-aztvq0byz7vnnwf8
This commit is contained in:
Mustufa Rangwala 2010-09-28 12:48:19 +05:30
parent 0224f6ac47 ca765d11f8
commit 3569fc7229
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account_payment/__openerp__.py
View File

@ -49,7 +49,7 @@
],
'demo_xml': ['account_payment_demo.xml'],
'test': [
'test/account_payment.yml'
'test/account_payment.yml',
'test/account_payment_report.yml'
],
'installable': True,

2
addons/hr_payroll/report/payslip.rml
View File

@ -333,7 +333,7 @@
<para style="terp_default_Bold_9">Identification No</para>
</td>
<td>
<para style="terp_default_9">[[ o.employee_id.pan_no or '' ]]</para>
<para style="terp_default_9">[[ o.employee_id.otherid or '' ]]</para>
</td>
</tr>
</blockTable>

4
addons/hr_payroll/report/report_emp_salary_structure.rml
View File

@ -290,10 +290,10 @@
<para style="terp_default_9">[[ employee.name ]]</para>
</td>
<td>
<para style="terp_tblheader_Details">PAN No.</para>
<para style="terp_tblheader_Details">Other Id</para>
</td>
<td>
<para style="terp_default_9">[[ employee.pan_no or '' ]]</para>
<para style="terp_default_9">[[ employee.otherid or '' ]]</para>
</td>
<td>
<para style="terp_tblheader_Details">Address</para>

4
addons/hr_payroll/report/report_employees_detail.rml
View File

@ -265,10 +265,10 @@
<para style="terp_default_9">[[ o.name ]]</para>
</td>
<td>
<para style="terp_tblheader_Details">PAN No.</para>
<para style="terp_tblheader_Details">Other Id</para>
</td>
<td>
<para style="terp_default_9">[[ o.pan_no or '' ]]</para>
<para style="terp_default_9">[[ o.otherid or '' ]]</para>
</td>
<td>
<para style="terp_tblheader_Details">Address</para>

2
addons/l10n_ch/report/bvr_invoice_report.rml
View File

@ -250,7 +250,7 @@
<blockTable colWidths="28.0, 499.0" style="Table4">
<tr>
<td>
<para style="P9">[[ note or removeParentNode('blockTable') ]]</para>
<para style="P9">[[ l.note or removeParentNode('blockTable') ]]</para>
</td>
<td>
<xpre style="P16">[[ l.note ]]</xpre>

6
addons/resource/resource.py
View File

@ -270,10 +270,10 @@ class resource_resource(osv.osv):
], context=context)
leaves = resource_calendar_leaves_pool.read(cr, uid, leave_ids, ['date_from', 'date_to'], context=context)
for i in range(len(leaves)):
dt_start = datetime.datetime.strptime(leaves[i]['date_from'], '%Y-%m-%d %H:%M:%S')
dt_end = datetime.datetime.strptime(leaves[i]['date_to'], '%Y-%m-%d %H:%M:%S')
dt_start = datetime.strptime(leaves[i]['date_from'], '%Y-%m-%d %H:%M:%S')
dt_end = datetime.strptime(leaves[i]['date_to'], '%Y-%m-%d %H:%M:%S')
no = dt_end - dt_start
[leave_list.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(no.days + 1))]
[leave_list.append((dt_start + timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(no.days + 1))]
leave_list.sort()
return leave_list