Unifield Server

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

  1. US-1038
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 3742
Proposed branch: lp:~julie-w/unifield-server/US-1038
Merge into: lp:unifield-server
Diff against target: 105 lines (+27/-26)
1 file modified
bin/addons/register_accounting/report/pending_cheque_xls.mako (+27/-26)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-1038
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+293100@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/register_accounting/report/pending_cheque_xls.mako'
2--- bin/addons/register_accounting/report/pending_cheque_xls.mako 2015-08-19 12:30:02 +0000
3+++ bin/addons/register_accounting/report/pending_cheque_xls.mako 2016-04-27 12:22:52 +0000
4@@ -112,22 +112,18 @@
5 % for o in objects:
6 <ss:Worksheet ss:Name="${"%s"%( o.name.split('/')[-1] +'_'+str(o.id) or 'Sheet1')|x}">
7
8-<Table >
9-<Column ss:Width="70.5" ss:Span="1"/>
10-<Column ss:Index="3" ss:Width="72.75"/>
11-<Column ss:Width="67.5"/>
12-<Column ss:Width="73.5"/>
13-<Column ss:Width="61.5"/>
14-<Column ss:Width="75.75"/>
15-<Column ss:Width="113.25"/>
16-<Column ss:Width="100"/>
17-<Column ss:Width="180.75"/>
18-<Column ss:Width="70.5"/>
19-<Column ss:AutoFitWidth="0" ss:Width="229.5"/>
20-<Column ss:Width="57.75"/>
21-<Column ss:Width="44.25"/>
22-<Column ss:Index="16" ss:AutoFitWidth="0" ss:Width="51"/>
23-
24+<Table>
25+ <Column ss:Width="73.5" ss:Span="1"/>
26+ <Column ss:Width="67.5"/>
27+ <Column ss:Width="75.75"/>
28+ <Column ss:Width="113.25" ss:Span="1"/>
29+ <Column ss:Width="180.75"/>
30+ <Column ss:Width="70.5"/>
31+ <Column ss:AutoFitWidth="0" ss:Width="229.5"/>
32+ <Column ss:Width="60.75" ss:Span="1"/>
33+ <Column ss:AutoFitWidth="0" ss:Width="60.75" ss:Span="1"/>
34+ <Column ss:Width="45.25"/>
35+ <Column ss:Width="55.25"/>
36
37 <Row>
38 <Cell ss:StyleID="s25" ><Data ss:Type="String">${_('PENDING CHEQUE')}</Data></Cell>
39@@ -144,15 +140,24 @@
40 <Cell ss:StyleID="title"><Data ss:Type="String">${_('State:')}</Data></Cell>
41 <Cell ss:StyleID="title"><Data ss:Type="String">${(o.state and getSel(o, 'state') or '')|x}</Data></Cell>
42 </Row>
43+ <Row>
44+ <Cell ss:StyleID="title"><Data ss:Type="String">${_('Register name:')}</Data></Cell>
45+ <Cell ss:StyleID="title" ><Data ss:Type="String">${(o.name or '')|x}</Data></Cell>
46+ </Row>
47+ <Row>
48+ <Cell ss:StyleID="title" ><Data ss:Type="String">${_('Journal Code')}</Data></Cell>
49+ <Cell ss:StyleID="title" ><Data ss:Type="String">${(o.journal_id and o.journal_id.code or '')|x}</Data></Cell>
50+ </Row>
51+ <Row>
52+ <Cell ss:StyleID="title" ><Data ss:Type="String">${_('Currency')}</Data></Cell>
53+ <Cell ss:StyleID="title" ><Data ss:Type="String">${(o.journal_id and o.journal_id.currency and o.journal_id.currency.name or '')|x}</Data></Cell>
54+ </Row>
55 <Row><Cell><Data ss:Type="String"></Data></Cell></Row>
56
57 <Row>
58- <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Proprietary Instance')}</Data></Cell>
59- <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Register Name')}</Data></Cell>
60- <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Journal Code')}</Data></Cell>
61- <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Period')}</Data></Cell>
62 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Document Date')}</Data></Cell>
63 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Posting Date')}</Data></Cell>
64+ <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Period')}</Data></Cell>
65 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Cheque Number')}</Data></Cell>
66 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Sequence')}</Data></Cell>
67 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Description')}</Data></Cell>
68@@ -161,7 +166,6 @@
69 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Third Parties')}</Data></Cell>
70 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Amount In')}</Data></Cell>
71 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Amount Out')}</Data></Cell>
72- <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Currency')}</Data></Cell>
73 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Func. In')}</Data></Cell>
74 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Func. Out')}</Data></Cell>
75 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Func. CCY')}</Data></Cell>
76@@ -171,12 +175,9 @@
77 </Row>
78 % for line in getLines(o):
79 <Row>
80- <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.statement_id and line.statement_id.instance_id and line.statement_id.instance_id.code or '')|x}</Data></Cell>
81- <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.statement_id and line.statement_id.name or '')|x}</Data></Cell>
82- <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.statement_id and line.statement_id.journal_id and line.statement_id.journal_id.code or '')|x}</Data></Cell>
83- <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.statement_id and line.statement_id.period_id and line.statement_id.period_id.name or '')|x}</Data></Cell>
84 <Cell ss:StyleID="short_date" ><Data ss:Type="DateTime">${line.document_date|n}T00:00:00.000</Data></Cell>
85 <Cell ss:StyleID="short_date" ><Data ss:Type="DateTime">${line.date|n}T00:00:00.000</Data></Cell>
86+ <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.statement_id and line.statement_id.period_id and line.statement_id.period_id.name or '')|x}</Data></Cell>
87 <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.cheque_number and line.cheque_number or '')|x}</Data></Cell>
88 <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.move_id.name or '')|x}</Data></Cell>
89 <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.name and line.name or '')|x}</Data></Cell>
90@@ -185,7 +186,6 @@
91 <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.partner_txt or '')|x}</Data></Cell>
92 <Cell ss:StyleID="lineN" ><Data ss:Type="Number">${(line.debit_currency and line.debit_currency or 0.00)|x}</Data></Cell>
93 <Cell ss:StyleID="lineN" ><Data ss:Type="Number">${(line.credit_currency and line.credit_currency or 0.00)|x}</Data></Cell>
94- <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.currency_id and line.currency_id.name or '')|x}</Data></Cell>
95
96 <Cell ss:StyleID="lineN" ><Data ss:Type="Number">${(line.debit and line.debit or 0.00)|x}</Data></Cell>
97 <Cell ss:StyleID="lineN" ><Data ss:Type="Number">${(line.credit and line.credit or 0.00)|x}</Data></Cell>
98@@ -196,6 +196,7 @@
99 </Table>
100
101 <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
102+ <FitToPage/>
103 <PageSetup>
104 <Layout x:Orientation="Landscape"/>
105 <Header x:Margin="0.4921259845"/>

Subscribers

People subscribed via source and target branches