Unifield Server

Merge lp:~julie-w/unifield-server/US-6483 into lp:unifield-server

  1. US-6483
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5608
Proposed branch: lp:~julie-w/unifield-server/US-6483
Merge into: lp:unifield-server
Diff against target: 33 lines (+8/-8)
1 file modified
bin/addons/financing_contract/report/project_expenses_xls.mako (+8/-8)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-6483
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+378646@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/financing_contract/report/project_expenses_xls.mako'
2--- bin/addons/financing_contract/report/project_expenses_xls.mako 2017-01-17 13:30:54 +0000
3+++ bin/addons/financing_contract/report/project_expenses_xls.mako 2020-02-06 09:41:55 +0000
4@@ -525,7 +525,7 @@
5 </Cell>
6 % endif
7 <Cell ss:StyleID="s36">
8- <Data ss:Type="String">${( line[0] and line[0].journal_id and line[0].journal_id.name or '')|x}</Data>
9+ <Data ss:Type="String">${( line[0] and line[0].journal_id and line[0].journal_id.code or '')|x}</Data>
10 </Cell>
11 <Cell ss:StyleID="s36">
12 <Data ss:Type="String">${( line[0] and line[0].move_id and line[0].move_id.move_id and line[0].move_id.move_id.name or '')|x}</Data>
13@@ -549,13 +549,13 @@
14 <Data ss:Type="String">${( getAccountName(line[0]) or '')|x}</Data>
15 </Cell>
16 <Cell ss:StyleID="s36">
17- <Data ss:Type="String">${( line[0] and line[0].destination_id and line[0].destination_id.name or '')|x}</Data>
18- </Cell>
19- <Cell ss:StyleID="s36">
20- <Data ss:Type="String">${( line[0] and line[0].cost_center_id and line[0].cost_center_id.name or '')|x}</Data>
21- </Cell>
22- <Cell ss:StyleID="s36">
23- <Data ss:Type="String">${( line[0] and line[0].account_id and line[0].account_id.name or '')|x}</Data>
24+ <Data ss:Type="String">${( line[0] and line[0].destination_id and line[0].destination_id.code or '')|x}</Data>
25+ </Cell>
26+ <Cell ss:StyleID="s36">
27+ <Data ss:Type="String">${( line[0] and line[0].cost_center_id and line[0].cost_center_id.code or '')|x}</Data>
28+ </Cell>
29+ <Cell ss:StyleID="s36">
30+ <Data ss:Type="String">${( line[0] and line[0].account_id and line[0].account_id.code or '')|x}</Data>
31 </Cell>
32 <Cell ss:StyleID="s38">
33 <Data ss:Type="Number">${( line[0] and line[0].amount_currency or '')|x}</Data>

Subscribers

People subscribed via source and target branches