Unifield Server

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

  1. US-3888
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4762
Proposed branch: lp:~julie-w/unifield-server/US-3888
Merge into: lp:unifield-server
Diff against target: 755 lines (+207/-205)
2 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+4/-2)
bin/addons/register_accounting/report/fully_report_xls.mako (+203/-203)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-3888
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+340163@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/msf_profile/i18n/fr_MF.po'
2--- bin/addons/msf_profile/i18n/fr_MF.po 2018-02-23 13:41:43 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2018-03-01 09:44:09 +0000
4@@ -107116,5 +107116,7 @@
5 msgid "Page need to be refreshed - please press \"F5\""
6 msgstr "La page doit être rafraîchie, veuillez cliquer sur \"F5\""
7
8-
9-
10+#. module: register_accounting
11+#: report:addons/register_accounting/report/fully_report_xls.mako:476
12+msgid "Code:"
13+msgstr "Code :"
14
15=== modified file 'bin/addons/register_accounting/report/fully_report_xls.mako'
16--- bin/addons/register_accounting/report/fully_report_xls.mako 2018-01-19 09:43:46 +0000
17+++ bin/addons/register_accounting/report/fully_report_xls.mako 2018-03-01 09:44:09 +0000
18@@ -46,7 +46,7 @@
19 </Borders>
20 </Style>
21 <Style ss:ID="header_part_number">
22- <Alignment ss:Horizontal="Right" ss:Vertical="Center" ss:WrapText="0"/>
23+ <Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="0"/>
24 <Borders>
25 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="0.5" ss:Color="#000000"/>
26 <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="0.5" ss:Color="#000000"/>
27@@ -56,7 +56,7 @@
28 <NumberFormat ss:Format="Standard"/>
29 </Style>
30 <Style ss:ID="column_headers">
31- <Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
32+ <Alignment ss:Horizontal="Left" ss:Vertical="Center"/>
33 <Borders>
34 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="0.5" ss:Color="#000000"/>
35 <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="0.5" ss:Color="#000000"/>
36@@ -209,7 +209,7 @@
37 <Font ss:Color="#0000ff" ss:Bold="1"/>
38 </Style>
39 <Style ss:ID="date">
40- <Alignment ss:Horizontal="Center" ss:Indent="0"/>
41+ <Alignment ss:Horizontal="Left" ss:Indent="0"/>
42 <NumberFormat ss:Format="Short Date"/>
43 <Font ss:Bold="1"/>
44 <Borders>
45@@ -220,7 +220,7 @@
46 </Borders>
47 </Style>
48 <Style ss:ID="amount_bold">
49- <Alignment ss:Horizontal="Right" ss:Indent="0"/>
50+ <Alignment ss:Horizontal="Left" ss:Indent="0"/>
51 <NumberFormat ss:Format="Standard"/>
52 <Font ss:Bold="1"/>
53 <Borders>
54@@ -231,8 +231,8 @@
55 </Borders>
56 </Style>
57 <!-- Initially used for invoice line number -->
58- <Style ss:ID="text_center">
59- <Alignment ss:Horizontal="Center" ss:Indent="0"/>
60+ <Style ss:ID="text_left">
61+ <Alignment ss:Horizontal="Left" ss:Indent="0"/>
62 <Borders>
63 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="0.5" ss:Color="#000000"/>
64 <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="0.5" ss:Color="#000000"/>
65@@ -243,7 +243,7 @@
66 </Style>
67 <!-- For Amount IN/OUT in register lines -->
68 <Style ss:ID="amount">
69- <Alignment ss:Horizontal="Right" ss:Indent="0"/>
70+ <Alignment ss:Horizontal="Left" ss:Indent="0"/>
71 <NumberFormat ss:Format="Standard"/>
72 <Borders>
73 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="0.5" ss:Color="#000000"/>
74@@ -266,7 +266,7 @@
75 </Style>
76 <!-- Formated Number (with thousand separator) for analytic distribution amounts (in blue font color) -->
77 <Style ss:ID="blue_ana_amount">
78- <Alignment ss:Horizontal="Right" ss:Indent="0"/>
79+ <Alignment ss:Horizontal="Left" ss:Indent="0"/>
80 <NumberFormat ss:Format="Standard"/>
81 <Borders>
82 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="0.5" ss:Color="#000000"/>
83@@ -278,7 +278,7 @@
84 </Style>
85 <!-- Formated Number (with thousand separator) for analytic distribution amounts (in grey font color) -->
86 <Style ss:ID="grey_ana_amount">
87- <Alignment ss:Horizontal="Right" ss:Indent="0"/>
88+ <Alignment ss:Horizontal="Left" ss:Indent="0"/>
89 <NumberFormat ss:Format="Standard"/>
90 <Borders>
91 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="0.5" ss:Color="#000000"/>
92@@ -290,7 +290,7 @@
93 </Style>
94 <!-- Formated Number (with thousand separator) for analytic distribution amounts (in purple font color) -->
95 <Style ss:ID="purple_ana_amount">
96- <Alignment ss:Horizontal="Right" ss:Indent="0"/>
97+ <Alignment ss:Horizontal="Left" ss:Indent="0"/>
98 <NumberFormat ss:Format="Standard"/>
99 <Borders>
100 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="0.5" ss:Color="#000000"/>
101@@ -302,7 +302,7 @@
102 </Style>
103 <!-- Formated Number in red for analytic distribution amounts -->
104 <Style ss:ID="red_ana_amount">
105- <Alignment ss:Horizontal="Right" ss:Indent="0"/>
106+ <Alignment ss:Horizontal="Left" ss:Indent="0"/>
107 <NumberFormat ss:Format="Standard"/>
108 <Borders>
109 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="0.5" ss:Color="#000000"/>
110@@ -314,7 +314,7 @@
111 </Style>
112 <!-- Formated Number in green for analytic distribution amounts -->
113 <Style ss:ID="green_ana_amount">
114- <Alignment ss:Horizontal="Right" ss:Indent="0"/>
115+ <Alignment ss:Horizontal="Left" ss:Indent="0"/>
116 <NumberFormat ss:Format="Standard"/>
117 <Borders>
118 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="0.5" ss:Color="#000000"/>
119@@ -387,7 +387,7 @@
120 </Borders>
121 </Style>
122 <Style ss:ID="grey_amount_bold">
123- <Alignment ss:Horizontal="Right" ss:Indent="0"/>
124+ <Alignment ss:Horizontal="Left" ss:Indent="0"/>
125 <NumberFormat ss:Format="Standard"/>
126 <Font ss:Bold="1" ss:Color="#9E9E9E"/>
127 <Borders>
128@@ -398,7 +398,7 @@
129 </Borders>
130 </Style>
131 <Style ss:ID="grey_date">
132- <Alignment ss:Horizontal="Center" ss:Indent="0"/>
133+ <Alignment ss:Horizontal="Left" ss:Indent="0"/>
134 <NumberFormat ss:Format="Short Date"/>
135 <Font ss:Bold="1" ss:Color="#9E9E9E"/>
136 <Borders>
137@@ -448,22 +448,22 @@
138 <NamedRange ss:Name="Print_Titles" ss:RefersTo="=!R11"/>
139 </Names>
140 <Table>
141- <Column ss:Width="115"/>
142- <Column ss:Width="70" ss:Span="1"/>
143- <Column ss:Width="155"/>
144- <Column ss:Width="135"/>
145- <Column ss:Width="170"/>
146- <Column ss:Width="170"/>
147+ <Column ss:Width="93.75"/>
148+ <Column ss:Width="60.75" ss:Span="1"/>
149+ <Column ss:Width="132.75"/>
150+ <Column ss:Width="213.75"/>
151+ <Column ss:Width="98.25"/>
152+ <Column ss:Width="150.75"/>
153 % if o.journal_id.type == 'cheque':
154 <Column ss:Width="65"/>
155 % endif
156- <Column ss:Width="80"/>
157- <Column ss:Width="80"/>
158+ <Column ss:Width="92.25"/>
159+ <Column ss:Width="134.25"/>
160 <Column ss:Width="60"/>
161 <Column ss:Width="66"/>
162- <Column ss:Width="72" ss:Span="4"/>
163- <Column ss:Width="36"/>
164- <Column ss:Width="50"/>
165+ <Column ss:Width="30.75"/>
166+ <Column ss:Width="72" ss:Span="3"/>
167+ <Column ss:Width="36" ss:Span="1"/>
168 <Row ss:Height="19.3039">
169 <Cell ss:MergeAcross="3" ss:StyleID="title">
170 <Data ss:Type="String">${o.journal_id.type == 'cash' and _('CASH REGISTER') or o.journal_id.type == 'bank' and _('BANK REGISTER') or o.journal_id.type == 'cheque' and _('CHEQUE REGISTER') or ''|x} REPORT</Data>
171@@ -473,17 +473,17 @@
172 </Row>
173 <Row ss:Height="14.5134">
174 <Cell ss:StyleID="header_part">
175- <Data ss:Type="String">Name: </Data>
176+ <Data ss:Type="String">${_('Code:')}</Data>
177 </Cell>
178- <Cell ss:StyleID="header_part_center">
179- <Data ss:Type="String">${o.name or ''|x}</Data>
180+ <Cell ss:StyleID="header_part">
181+ <Data ss:Type="String">${o.journal_id.code|x}</Data>
182 </Cell>
183 </Row>
184 <Row ss:Height="14.5134">
185 <Cell ss:StyleID="header_part">
186 <Data ss:Type="String">Period: </Data>
187 </Cell>
188- <Cell ss:StyleID="header_part_center">
189+ <Cell ss:StyleID="header_part">
190 <Data ss:Type="String">${o.period_id and o.period_id.name or ''|x}</Data>
191 </Cell>
192 </Row>
193@@ -491,7 +491,7 @@
194 <Cell ss:StyleID="header_part">
195 <Data ss:Type="String">Currency: </Data>
196 </Cell>
197- <Cell ss:StyleID="header_part_center">
198+ <Cell ss:StyleID="header_part">
199 <Data ss:Type="String">${o.currency and o.currency.name or ''|x}</Data>
200 </Cell>
201 </Row>
202@@ -523,7 +523,7 @@
203 <Cell ss:StyleID="header_part">
204 <Data ss:Type="String">State: </Data>
205 </Cell>
206- <Cell ss:StyleID="header_part_center">
207+ <Cell ss:StyleID="header_part">
208 <Data ss:Type="String">${o.state and getSel(o, 'state') or ''|x}</Data>
209 </Cell>
210 </Row>
211@@ -592,7 +592,7 @@
212 </Row>
213 % for line in sorted(o.line_ids, key=lambda x: x.sequence_for_reference):
214 <Row ss:Height="14.5134">
215- <Cell ss:StyleID="centre">
216+ <Cell ss:StyleID="left_bold">
217 <Data ss:Type="String">${line.direct_invoice and _('Direct Invoice') or (line.from_cash_return and line.account_id.type_for_register == 'advance' and _('Advance Return')) or line.is_down_payment and _('Down Payment') and line.from_import_cheque_id and _('Cheque Import') or (line.transfer_journal_id and not line.is_transfer_with_change and _('Transfer')) or (line.transfer_journal_id and line.is_transfer_with_change and _('Transfer with change')) or line.imported_invoice_line_ids and _('Imported Invoice') or line.from_import_cheque_id and _('Imported Cheque') or _('Direct Payment')|x}</Data>
218 </Cell>
219 % if isDate(line.document_date):
220@@ -619,14 +619,14 @@
221 <Cell ss:StyleID="left_bold">
222 <Data ss:Type="String">${line.name or ''|x}</Data>
223 </Cell>
224- <Cell ss:StyleID="centre">
225+ <Cell ss:StyleID="left_bold">
226 <Data ss:Type="String">${getRegRef(line) or ''|x}</Data>
227 </Cell>
228- <Cell ss:StyleID="centre">
229+ <Cell ss:StyleID="left_bold">
230 <Data ss:Type="String"></Data>
231 </Cell>
232 % if o.journal_id.type == 'cheque':
233- <Cell ss:StyleID="centre">
234+ <Cell ss:StyleID="left_bold">
235 <Data ss:Type="String">${line.cheque_number}</Data>
236 </Cell>
237 % endif
238@@ -642,25 +642,25 @@
239 <Cell ss:StyleID="amount_bold">
240 <Data ss:Type="Number">${line.amount_out or 0.0}</Data>
241 </Cell>
242- <Cell ss:StyleID="centre">
243- <Data ss:Type="String"></Data>
244- </Cell>
245- <Cell ss:StyleID="centre">
246- <Data ss:Type="String"></Data>
247- </Cell>
248- <Cell ss:StyleID="centre">
249- <Data ss:Type="String"></Data>
250- </Cell>
251- <Cell ss:StyleID="centre">
252- <Data ss:Type="String"></Data>
253- </Cell>
254- <Cell ss:StyleID="centre">
255- <Data ss:Type="String"></Data>
256- </Cell>
257- <Cell ss:StyleID="centre">
258+ <Cell ss:StyleID="left_bold">
259+ <Data ss:Type="String"></Data>
260+ </Cell>
261+ <Cell ss:StyleID="left_bold">
262+ <Data ss:Type="String"></Data>
263+ </Cell>
264+ <Cell ss:StyleID="left_bold">
265+ <Data ss:Type="String"></Data>
266+ </Cell>
267+ <Cell ss:StyleID="left_bold">
268+ <Data ss:Type="String"></Data>
269+ </Cell>
270+ <Cell ss:StyleID="left_bold">
271+ <Data ss:Type="String"></Data>
272+ </Cell>
273+ <Cell ss:StyleID="left_bold">
274 <Data ss:Type="String">${line.reconciled and 'X' or ''|x}</Data>
275 </Cell>
276- <Cell ss:StyleID="centre">
277+ <Cell ss:StyleID="left_bold">
278 <Data ss:Type="String">${line.state and getSel(line, 'state') or ''|x}</Data>
279 </Cell>
280 </Row>
281@@ -669,13 +669,13 @@
282 <% dp_reversals_ml = getDownPaymentReversals(line) %>
283 % for dp_reversal_ml in sorted(dp_reversals_ml, key=lambda x: x.move_id.name):
284 <Row ss:Height="14.5134">
285- <Cell ss:StyleID="grey_centre">
286+ <Cell ss:StyleID="grey_left_bold">
287 <Data ss:Type="String">${_('REV - Down Payment')|x}</Data>
288 </Cell>
289- <Cell ss:StyleID="grey_centre">
290+ <Cell ss:StyleID="grey_left_bold">
291 <Data ss:Type="String">${_('FALSE')|x}</Data>
292 </Cell>
293- <Cell ss:StyleID="grey_centre">
294+ <Cell ss:StyleID="grey_left_bold">
295 <Data ss:Type="String">${_('FALSE')|x}</Data>
296 </Cell>
297 <Cell ss:StyleID="grey_left_bold">
298@@ -686,49 +686,49 @@
299 <!-- DESC -->
300 <Data ss:Type="String">${dp_reversal_ml.name or ''|x}</Data>
301 </Cell>
302- <Cell ss:StyleID="grey_centre">
303+ <Cell ss:StyleID="grey_left_bold">
304 <!-- REF -->
305 <Data ss:Type="String">${dp_reversal_ml.ref or ''|x}</Data>
306 </Cell>
307- <Cell ss:StyleID="grey_centre">
308+ <Cell ss:StyleID="grey_left_bold">
309 <Data ss:Type="String"></Data>
310 </Cell>
311 % if o.journal_id.type == 'cheque':
312- <Cell ss:StyleID="grey_centre">
313+ <Cell ss:StyleID="grey_left_bold">
314 <Data ss:Type="String"></Data>
315 </Cell>
316 % endif
317- <Cell ss:StyleID="grey_centre">
318- <Data ss:Type="String">${_('FALSE')|x}</Data>
319- </Cell>
320- <Cell ss:StyleID="grey_left_bold">
321- <Data ss:Type="String"></Data>
322- </Cell>
323- <Cell ss:StyleID="grey_amount_bold">
324- <Data ss:Type="Number">0.0</Data>
325- </Cell>
326- <Cell ss:StyleID="grey_amount_bold">
327- <Data ss:Type="Number">0.0</Data>
328- </Cell>
329- <Cell ss:StyleID="grey_centre">
330- <Data ss:Type="String">${_('FALSE')|x}</Data>
331- </Cell>
332- <Cell ss:StyleID="grey_centre">
333- <Data ss:Type="String">${_('FALSE')|x}</Data>
334- </Cell>
335- <Cell ss:StyleID="grey_centre">
336- <Data ss:Type="String">${_('FALSE')|x}</Data>
337- </Cell>
338- <Cell ss:StyleID="grey_centre">
339- <Data ss:Type="String"></Data>
340- </Cell>
341- <Cell ss:StyleID="grey_centre">
342- <Data ss:Type="String"></Data>
343- </Cell>
344- <Cell ss:StyleID="grey_centre">
345- <Data ss:Type="String"></Data>
346- </Cell>
347- <Cell ss:StyleID="grey_centre">
348+ <Cell ss:StyleID="grey_left_bold">
349+ <Data ss:Type="String">${_('FALSE')|x}</Data>
350+ </Cell>
351+ <Cell ss:StyleID="grey_left_bold">
352+ <Data ss:Type="String"></Data>
353+ </Cell>
354+ <Cell ss:StyleID="grey_amount_bold">
355+ <Data ss:Type="Number">0.0</Data>
356+ </Cell>
357+ <Cell ss:StyleID="grey_amount_bold">
358+ <Data ss:Type="Number">0.0</Data>
359+ </Cell>
360+ <Cell ss:StyleID="grey_left_bold">
361+ <Data ss:Type="String">${_('FALSE')|x}</Data>
362+ </Cell>
363+ <Cell ss:StyleID="grey_left_bold">
364+ <Data ss:Type="String">${_('FALSE')|x}</Data>
365+ </Cell>
366+ <Cell ss:StyleID="grey_left_bold">
367+ <Data ss:Type="String">${_('FALSE')|x}</Data>
368+ </Cell>
369+ <Cell ss:StyleID="grey_left_bold">
370+ <Data ss:Type="String"></Data>
371+ </Cell>
372+ <Cell ss:StyleID="grey_left_bold">
373+ <Data ss:Type="String"></Data>
374+ </Cell>
375+ <Cell ss:StyleID="grey_left_bold">
376+ <Data ss:Type="String"></Data>
377+ </Cell>
378+ <Cell ss:StyleID="grey_left_bold">
379 <Data ss:Type="String"></Data>
380 </Cell>
381 </Row>
382@@ -739,13 +739,13 @@
383 % if partner_move_ids:
384 % for partner_move_id in sorted(partner_move_ids, key=lambda x: x.name):
385 <Row ss:Height="14.5134">
386- <Cell ss:StyleID="grey_centre">
387+ <Cell ss:StyleID="grey_left_bold">
388 <Data ss:Type="String">${_('Payable Entry')|x}</Data>
389 </Cell>
390- <Cell ss:StyleID="grey_centre">
391+ <Cell ss:StyleID="grey_left_bold">
392 <Data ss:Type="String">${_('FALSE')|x}</Data>
393 </Cell>
394- <Cell ss:StyleID="grey_centre">
395+ <Cell ss:StyleID="grey_left_bold">
396 <Data ss:Type="String">${_('FALSE')|x}</Data>
397 </Cell>
398 <Cell ss:StyleID="grey_left_bold">
399@@ -756,49 +756,49 @@
400 <!-- DESC -->
401 <Data ss:Type="String">${_('FALSE')|x}</Data>
402 </Cell>
403- <Cell ss:StyleID="grey_centre">
404+ <Cell ss:StyleID="grey_left_bold">
405 <!-- REF -->
406 <Data ss:Type="String">${_('FALSE')|x}</Data>
407 </Cell>
408- <Cell ss:StyleID="grey_centre">
409+ <Cell ss:StyleID="grey_left_bold">
410 <Data ss:Type="String"></Data>
411 </Cell>
412 % if o.journal_id.type == 'cheque':
413- <Cell ss:StyleID="grey_centre">
414+ <Cell ss:StyleID="grey_left_bold">
415 <Data ss:Type="String"></Data>
416 </Cell>
417 % endif
418- <Cell ss:StyleID="grey_centre">
419- <Data ss:Type="String">${_('FALSE')|x}</Data>
420- </Cell>
421- <Cell ss:StyleID="grey_left_bold">
422- <Data ss:Type="String"></Data>
423- </Cell>
424- <Cell ss:StyleID="grey_amount_bold">
425- <Data ss:Type="Number">0.0</Data>
426- </Cell>
427- <Cell ss:StyleID="grey_amount_bold">
428- <Data ss:Type="Number">0.0</Data>
429- </Cell>
430- <Cell ss:StyleID="grey_centre">
431- <Data ss:Type="String">${_('FALSE')|x}</Data>
432- </Cell>
433- <Cell ss:StyleID="grey_centre">
434- <Data ss:Type="String">${_('FALSE')|x}</Data>
435- </Cell>
436- <Cell ss:StyleID="grey_centre">
437- <Data ss:Type="String">${_('FALSE')|x}</Data>
438- </Cell>
439- <Cell ss:StyleID="grey_centre">
440- <Data ss:Type="String"></Data>
441- </Cell>
442- <Cell ss:StyleID="grey_centre">
443- <Data ss:Type="String"></Data>
444- </Cell>
445- <Cell ss:StyleID="grey_centre">
446- <Data ss:Type="String"></Data>
447- </Cell>
448- <Cell ss:StyleID="grey_centre">
449+ <Cell ss:StyleID="grey_left_bold">
450+ <Data ss:Type="String">${_('FALSE')|x}</Data>
451+ </Cell>
452+ <Cell ss:StyleID="grey_left_bold">
453+ <Data ss:Type="String"></Data>
454+ </Cell>
455+ <Cell ss:StyleID="grey_amount_bold">
456+ <Data ss:Type="Number">0.0</Data>
457+ </Cell>
458+ <Cell ss:StyleID="grey_amount_bold">
459+ <Data ss:Type="Number">0.0</Data>
460+ </Cell>
461+ <Cell ss:StyleID="grey_left_bold">
462+ <Data ss:Type="String">${_('FALSE')|x}</Data>
463+ </Cell>
464+ <Cell ss:StyleID="grey_left_bold">
465+ <Data ss:Type="String">${_('FALSE')|x}</Data>
466+ </Cell>
467+ <Cell ss:StyleID="grey_left_bold">
468+ <Data ss:Type="String">${_('FALSE')|x}</Data>
469+ </Cell>
470+ <Cell ss:StyleID="grey_left_bold">
471+ <Data ss:Type="String"></Data>
472+ </Cell>
473+ <Cell ss:StyleID="grey_left_bold">
474+ <Data ss:Type="String"></Data>
475+ </Cell>
476+ <Cell ss:StyleID="grey_left_bold">
477+ <Data ss:Type="String"></Data>
478+ </Cell>
479+ <Cell ss:StyleID="grey_left_bold">
480 <Data ss:Type="String"></Data>
481 </Cell>
482 </Row>
483@@ -817,7 +817,7 @@
484
485 % for inv_line in move_lines:
486 <Row>
487- <Cell ss:Index="4" ss:StyleID="text_center">
488+ <Cell ss:Index="4" ss:StyleID="text_left">
489 <Data ss:Type="String">${hasattr(inv_line, 'line_number') and inv_line.line_number or ''|x}</Data>
490 </Cell>
491 <Cell ss:StyleID="left">
492@@ -867,10 +867,10 @@
493 % endif
494 <Data ss:Type="String">${ana_line.general_account_id.code + ' ' + ana_line.general_account_id.name|x}</Data>
495 </Cell>
496- <Cell>
497+ <Cell ss:StyleID="${line_color}_ana_left">
498 <Data ss:Type="String"></Data>
499 </Cell>
500- <Cell>
501+ <Cell ss:StyleID="${line_color}_ana_left">
502 <Data ss:Type="String"></Data>
503 </Cell>
504 <Cell ss:StyleID="${line_color}_ana_amount">
505@@ -936,10 +936,10 @@
506 % endif
507 <Data ss:Type="String">${ana_line.general_account_id.code + ' ' + ana_line.general_account_id.name|x}</Data>
508 </Cell>
509- <Cell>
510+ <Cell ss:StyleID="${line_color}_ana_left">
511 <Data ss:Type="String"></Data>
512 </Cell>
513- <Cell>
514+ <Cell ss:StyleID="${line_color}_ana_left">
515 <Data ss:Type="String"></Data>
516 </Cell>
517 <Cell ss:StyleID="${line_color}_ana_amount">
518@@ -994,10 +994,10 @@
519 % endif
520 <Data ss:Type="String">${ana_line.general_account_id.code + ' ' + ana_line.general_account_id.name|x}</Data>
521 </Cell>
522- <Cell>
523+ <Cell ss:StyleID="${line_color}_ana_left">
524 <Data ss:Type="String"></Data>
525 </Cell>
526- <Cell>
527+ <Cell ss:StyleID="${line_color}_ana_left">
528 <Data ss:Type="String"></Data>
529 </Cell>
530 <Cell ss:StyleID="${line_color}_ana_amount">
531@@ -1033,7 +1033,7 @@
532 <% manual_amls = getManualAmls(o) %>
533 % for aml in sorted(manual_amls, key=lambda x: x.move_id.name):
534 <Row ss:Height="14.5134">
535- <Cell ss:StyleID="grey_centre">
536+ <Cell ss:StyleID="grey_left_bold">
537 <Data ss:Type="String">${_('Manual Journal Entry')|x}</Data>
538 </Cell>
539 % if isDate(aml.document_date):
540@@ -1041,7 +1041,7 @@
541 <Data ss:Type="DateTime">${aml.document_date|n}T00:00:00.000</Data>
542 </Cell>
543 % else:
544- <Cell ss:StyleID="grey_centre">
545+ <Cell ss:StyleID="grey_left_bold">
546 <Data ss:Type="String"></Data>
547 </Cell>
548 % endif
549@@ -1050,7 +1050,7 @@
550 <Data ss:Type="DateTime">${aml.date|n}T00:00:00.000</Data>
551 </Cell>
552 % else:
553- <Cell ss:StyleID="grey_centre">
554+ <Cell ss:StyleID="grey_left_bold">
555 <Data ss:Type="String"></Data>
556 </Cell>
557 % endif
558@@ -1058,17 +1058,17 @@
559 <!-- SEQUENCE -->
560 <Data ss:Type="String">${aml.move_id.name|x}</Data>
561 </Cell>
562- <Cell ss:StyleID="grey_centre">
563+ <Cell ss:StyleID="grey_left_bold">
564 <Data ss:Type="String">${aml.name|x}</Data>
565 </Cell>
566- <Cell ss:StyleID="grey_centre">
567+ <Cell ss:StyleID="grey_left_bold">
568 <Data ss:Type="String">${aml.ref or ''|x}</Data>
569 </Cell>
570- <Cell ss:StyleID="grey_centre">
571+ <Cell ss:StyleID="grey_left_bold">
572 <Data ss:Type="String"></Data>
573 </Cell>
574 % if o.journal_id.type == 'cheque':
575- <Cell ss:StyleID="grey_centre">
576+ <Cell ss:StyleID="grey_left_bold">
577 <Data ss:Type="String"></Data>
578 </Cell>
579 % endif
580@@ -1084,25 +1084,25 @@
581 <Cell ss:StyleID="grey_amount_bold">
582 <Data ss:Type="Number">${aml.debit_currency or 0.0}</Data>
583 </Cell>
584- <Cell ss:StyleID="grey_centre">
585- <Data ss:Type="String">${_('FALSE')|x}</Data>
586- </Cell>
587- <Cell ss:StyleID="grey_centre">
588- <Data ss:Type="String">${_('FALSE')|x}</Data>
589- </Cell>
590- <Cell ss:StyleID="grey_centre">
591- <Data ss:Type="String">${_('FALSE')|x}</Data>
592- </Cell>
593- <Cell ss:StyleID="grey_centre">
594- <Data ss:Type="String"></Data>
595- </Cell>
596- <Cell ss:StyleID="grey_centre">
597- <Data ss:Type="String"></Data>
598- </Cell>
599- <Cell ss:StyleID="grey_centre">
600+ <Cell ss:StyleID="grey_left_bold">
601+ <Data ss:Type="String">${_('FALSE')|x}</Data>
602+ </Cell>
603+ <Cell ss:StyleID="grey_left_bold">
604+ <Data ss:Type="String">${_('FALSE')|x}</Data>
605+ </Cell>
606+ <Cell ss:StyleID="grey_left_bold">
607+ <Data ss:Type="String">${_('FALSE')|x}</Data>
608+ </Cell>
609+ <Cell ss:StyleID="grey_left_bold">
610+ <Data ss:Type="String"></Data>
611+ </Cell>
612+ <Cell ss:StyleID="grey_left_bold">
613+ <Data ss:Type="String"></Data>
614+ </Cell>
615+ <Cell ss:StyleID="grey_left_bold">
616 <Data ss:Type="String">${aml.reconcile_id and 'X' or ''|x}</Data>
617 </Cell>
618- <Cell ss:StyleID="grey_centre">
619+ <Cell ss:StyleID="grey_left_bold">
620 <Data ss:Type="String">${aml.move_id.state and getSel(aml.move_id, 'state') or ''|x}</Data>
621 </Cell>
622 </Row>
623@@ -1122,10 +1122,10 @@
624 <Cell ss:Index="${cell_index}" ss:StyleID="${aal_color}_ana_left">
625 <Data ss:Type="String">${"%s %s" % (manual_aal.general_account_id.code, manual_aal.general_account_id.name)|x}</Data>
626 </Cell>
627- <Cell>
628+ <Cell ss:StyleID="${aal_color}_ana_left">
629 <Data ss:Type="String"></Data>
630 </Cell>
631- <Cell>
632+ <Cell ss:StyleID="${aal_color}_ana_left">
633 <Data ss:Type="String"></Data>
634 </Cell>
635 <Cell ss:StyleID="${aal_color}_ana_amount">
636@@ -1167,10 +1167,10 @@
637 <Cell ss:Index="${cell_index}" ss:StyleID="${aal_color}_ana_left">
638 <Data ss:Type="String">${"%s %s" % (free_line.general_account_id.code, free_line.general_account_id.name)|x}</Data>
639 </Cell>
640- <Cell>
641+ <Cell ss:StyleID="${aal_color}_ana_left">
642 <Data ss:Type="String"></Data>
643 </Cell>
644- <Cell>
645+ <Cell ss:StyleID="${aal_color}_ana_left">
646 <Data ss:Type="String"></Data>
647 </Cell>
648 <Cell ss:StyleID="${aal_color}_ana_amount">
649@@ -1203,64 +1203,64 @@
650 <!-- DELETED ENTRIES -->
651 % for deleted_line in sorted(o.deleted_line_ids, key=lambda x: x.sequence):
652 <Row ss:Height="14.5134">
653- <Cell ss:StyleID="grey_centre">
654+ <Cell ss:StyleID="grey_left_bold">
655 <Data ss:Type="String">${_('Deleted Entry')|x}</Data>
656 </Cell>
657- <Cell ss:StyleID="grey_centre">
658+ <Cell ss:StyleID="grey_left_bold">
659 <Data ss:Type="String">${_('FALSE')|x}</Data>
660 </Cell>
661- <Cell ss:StyleID="grey_centre">
662+ <Cell ss:StyleID="grey_left_bold">
663 <Data ss:Type="String">${_('FALSE')|x}</Data>
664 </Cell>
665 <Cell ss:StyleID="grey_left_bold">
666 <!-- SEQUENCE -->
667 <Data ss:Type="String">${deleted_line.sequence or ''|x}</Data>
668 </Cell>
669- <Cell ss:StyleID="grey_centre">
670- <Data ss:Type="String">${_('FALSE')|x}</Data>
671- </Cell>
672- <Cell ss:StyleID="grey_centre">
673- <Data ss:Type="String">${_('FALSE')|x}</Data>
674- </Cell>
675- <Cell ss:StyleID="grey_centre">
676+ <Cell ss:StyleID="grey_left_bold">
677+ <Data ss:Type="String">${_('FALSE')|x}</Data>
678+ </Cell>
679+ <Cell ss:StyleID="grey_left_bold">
680+ <Data ss:Type="String">${_('FALSE')|x}</Data>
681+ </Cell>
682+ <Cell ss:StyleID="grey_left_bold">
683 <Data ss:Type="String"></Data>
684 </Cell>
685 % if o.journal_id.type == 'cheque':
686- <Cell ss:StyleID="grey_centre">
687+ <Cell ss:StyleID="grey_left_bold">
688 <Data ss:Type="String"></Data>
689 </Cell>
690 % endif
691- <Cell ss:StyleID="grey_centre">
692- <Data ss:Type="String">${_('FALSE')|x}</Data>
693- </Cell>
694- <Cell ss:StyleID="grey_left_bold">
695- <Data ss:Type="String"></Data>
696- </Cell>
697- <Cell ss:StyleID="grey_amount_bold">
698- <Data ss:Type="Number">0.0</Data>
699- </Cell>
700- <Cell ss:StyleID="grey_amount_bold">
701- <Data ss:Type="Number">0.0</Data>
702- </Cell>
703- <Cell ss:StyleID="grey_centre">
704- <Data ss:Type="String">${_('FALSE')|x}</Data>
705- </Cell>
706- <Cell ss:StyleID="grey_centre">
707- <Data ss:Type="String">${_('FALSE')|x}</Data>
708- </Cell>
709- <Cell ss:StyleID="grey_centre">
710- <Data ss:Type="String">${_('FALSE')|x}</Data>
711- </Cell>
712- <Cell ss:StyleID="grey_centre">
713- <Data ss:Type="String"></Data>
714- </Cell>
715- <Cell ss:StyleID="grey_centre">
716- <Data ss:Type="String"></Data>
717- </Cell>
718- <Cell ss:StyleID="grey_centre">
719- <Data ss:Type="String"></Data>
720- </Cell>
721- <Cell ss:StyleID="grey_centre">
722+ <Cell ss:StyleID="grey_left_bold">
723+ <Data ss:Type="String">${_('FALSE')|x}</Data>
724+ </Cell>
725+ <Cell ss:StyleID="grey_left_bold">
726+ <Data ss:Type="String"></Data>
727+ </Cell>
728+ <Cell ss:StyleID="grey_amount_bold">
729+ <Data ss:Type="Number">0.0</Data>
730+ </Cell>
731+ <Cell ss:StyleID="grey_amount_bold">
732+ <Data ss:Type="Number">0.0</Data>
733+ </Cell>
734+ <Cell ss:StyleID="grey_left_bold">
735+ <Data ss:Type="String">${_('FALSE')|x}</Data>
736+ </Cell>
737+ <Cell ss:StyleID="grey_left_bold">
738+ <Data ss:Type="String">${_('FALSE')|x}</Data>
739+ </Cell>
740+ <Cell ss:StyleID="grey_left_bold">
741+ <Data ss:Type="String">${_('FALSE')|x}</Data>
742+ </Cell>
743+ <Cell ss:StyleID="grey_left_bold">
744+ <Data ss:Type="String"></Data>
745+ </Cell>
746+ <Cell ss:StyleID="grey_left_bold">
747+ <Data ss:Type="String"></Data>
748+ </Cell>
749+ <Cell ss:StyleID="grey_left_bold">
750+ <Data ss:Type="String"></Data>
751+ </Cell>
752+ <Cell ss:StyleID="grey_left_bold">
753 <Data ss:Type="String"></Data>
754 </Cell>
755 </Row>

Subscribers

People subscribed via source and target branches