seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed issue in excel exporter of equipmentincome in API 

Merge branch 'develop'
pull/35/head^2
13621160019@163.com 2021-04-05 19:52:55 +08:00
parent ec4c2f42c5 152ab66064
commit 842f5aec8b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
myems-api/excelexporters/equipmentincome.py
View File

@ -294,9 +294,10 @@ def generate_excel(report,
ws['D' + str(current_row_number)].font = title_font
ws['D' + str(current_row_number)].alignment = c_c_alignment
ws['D' + str(current_row_number)].border = f_border
ws['D' + str(current_row_number)] = '{:.2%}'.format(round(reporting_period_data['subtotals'][i], 2) /
income_sum if income_sum is not None and
income_sum != Decimal(0.0) else "")
ws['D' + str(current_row_number)] = '{:.2%}'.format(round(
reporting_period_data['subtotals'][i], 2) / income_sum) \
if income_sum is not None and income_sum != Decimal(0.0) \
else ''
current_row_number += 1