← Back to branch summary

~eoc/openobject-addons/eoc-extra-addons-trunk

« back to all changes in this revision

Viewing changes to account_financial_report/report/invoice_list.rml

[MERGE] [IMP] [account_financial_report] Layout and i18n improvements for 'General Ledger' report. [IMP] [partner_ext] Improvements handling partners and addresses

Show diffs side-by-side

added added

removed removed

Lines of Context:
account_financial_report/report/invoice_list.rml
151
151
        </para>
152
152
        <para style="Header">Customer Invoices [[ (out_invoices or removeParentNode('para')) and '' ]]</para>
153
153
        <section>
154
 
            <section> [[ repeatIn(out_invoices, 'obj') ]] <para style="Standard"> Currency : [[ obj[0] ]] </para>
 
154
            <section> [[ repeatIn(out_invoices, 'obj') ]] <para style="Standard"> Currency : [[ get_head_currency_label(obj[0]) ]] </para>
155
155
                <!--<blockTable colWidths="1.8cm,1.4cm,1.4cm,1.8cm,1.8cm,2cm,3.5cm,2cm,4cm,1.2cm,1.8cm,1.4cm,1.8cm,1.6cm" repeatRows="1" style="Table3">-->
156
 
                <blockTable colWidths="2.0cm,2.3cm,1.8cm,1.8cm,2cm,5.2cm,2cm,1.2cm,2.0cm,1.6cm,1.8cm,2.0cm" repeatRows="1" style="Table3a">
 
156
                <blockTable colWidths="2.8cm,1.8cm,1.8cm,2cm,5.0cm,2.4cm,1.2cm,2.3cm,2.2cm,2.2cm,2.0cm" repeatRows="1" style="Table3a">
157
157
                    <tr>
158
158
                        <td>
159
159
                            <para style="Standard" size="5">Number</para>
160
160
                        </td>
161
 
                        <td>
 
161
                        <!--td>
162
162
                            <para style="Standard" size="5">External ref.</para>
163
 
                        </td>
 
163
                        </td-->
164
164
                        <!--td>
165
165
                            <para style="Standard" size="5">Entry num.</para>
166
166
                        </td-->
200
200
                    </tr>
201
201
                </blockTable>
202
202
                <section>[[ repeatIn(obj[1], 'inv') ]]
203
 
                    <blockTable colWidths="2.0cm,2.3cm,1.8cm,1.8cm,2cm,5.2cm,2cm,1.2cm,2.0cm,1.6cm,1.8cm,2.0cm" style="Table3">
 
203
                    <blockTable colWidths="2.8cm,1.8cm,1.8cm,2cm,5.0cm,2.4cm,1.2cm,2.3cm,2.2cm,2.2cm,2.0cm" style="Table3">
204
204
                        <tr>
205
205
                            <td>
206
206
                                <para style="Text body">[[inv.number]]</para>
207
207
                            </td>
208
 
                            <td>
 
208
                            <!--td>
209
209
                                <para style="Text body" alignment="RIGHT">[[inv.reference]]</para>
210
 
                            </td>
 
210
                            </td-->
211
211
                            <!--td>
212
212
                                <para style="Text body">[[inv.move_id.name_split]]</para>
213
213
                            </td-->
224
224
                                <para style="Text body">[[inv.partner_id.name]]</para>
225
225
                            </td>
226
226
                            <td>
227
 
                                <para style="Text body">[[inv.partner_id.vat]]</para>
 
227
                                <para style="Text body">[[get_vat_formated(inv.partner_id.vat)]]</para>
228
228
                            </td>
229
229
                            <!--<td>
230
230
                                <para style="Text body">[[inv.name]]</para>
303
303
                            <para/>
304
304
                        </td>
305
305
                        <td>
306
 
                            <para alignment="RIGHT" style="Standard">TOTAL [[ detailed_taxes and 'TAXABLE' or '' ]] - [[obj[0] or '' ]] - Customer Invoices</para>
 
306
                            <para alignment="RIGHT" style="Standard">TOTAL [[ detailed_taxes and 'TAXABLE' or '' ]] - [[get_currency_label(obj[0]) or '' ]] - Customer Invoices</para>
307
307
                        </td>
308
308
                        <td>
309
309
                            <para alignment="RIGHT" style="Standard">[[formatLang(obj[2])]]</para>
323
323
                            <para/>
324
324
                        </td>
325
325
                        <td>
326
 
                            <para alignment="RIGHT" style="Standard">TOTAL - [[obj[0] or '' ]] - Customer Invoices</para>
 
326
                            <para alignment="RIGHT" style="Standard">TOTAL - [[get_currency_label(obj[0]) or '' ]] - Customer Invoices</para>
327
327
                        </td>
328
328
                        <td>
329
329
                            <para alignment="RIGHT" style="Standard">[[formatLang(obj[5])]]</para>
349
349
 
350
350
        <para style="Header">Customer Refund Invoices [[ (out_refunds or removeParentNode('para')) and '' ]]</para>
351
351
        <section>
352
 
            <section> [[ repeatIn(out_refunds, 'obj') ]] <para style="Standard"> Currency : [[ obj[0] ]] </para>
 
352
            <section> [[ repeatIn(out_refunds, 'obj') ]] <para style="Standard"> Currency : [[ get_head_currency_label(obj[0]) ]] </para>
353
353
                <!--<blockTable colWidths="1.8cm,1.4cm,1.4cm,1.8cm,1.8cm,2cm,3.5cm,2cm,4cm,1.2cm,1.8cm,1.4cm,1.8cm,1.6cm" repeatRows="1" style="Table3">-->
354
354
                <blockTable colWidths="2.0cm,2.3cm,1.8cm,1.8cm,2cm,5.2cm,2cm,1.2cm,1.8cm,1.4cm,1.6cm,2.6cm" repeatRows="1" style="Table3a">
355
355
                    <tr>
356
356
                        <td>
357
357
                            <para style="Standard" size="5">Number</para>
358
358
                        </td>
359
 
                        <td>
 
359
                        <!--td>
360
360
                            <para style="Standard" size="5">External ref.</para>
361
 
                        </td>
 
361
                        </td-->
362
362
                        <!--td>
363
363
                            <para style="Standard" size="5">Entry num.</para>
364
364
                        </td-->
398
398
                    </tr>
399
399
                </blockTable>
400
400
                <section>[[ repeatIn(obj[1], 'inv') ]]
401
 
                <blockTable colWidths="2.0cm,2.3cm,1.8cm,1.8cm,2cm,5.2cm,2cm,1.2cm,2.0cm,1.6cm,1.8cm,2.0cm" style="Table3">
 
401
                <blockTable colWidths="2.8cm,1.8cm,1.8cm,2cm,5.0cm,2.4cm,1.2cm,2.3cm,2.2cm,2.2cm,2.0cm" style="Table3">
402
402
                    <tr>
403
403
                        <td>
404
404
                            <para style="Text body">[[inv.number]]</para>
405
405
                        </td>
406
 
                        <td>
 
406
                        <!--td>
407
407
                            <para style="Text body">[[inv.reference]]</para>
408
 
                        </td>
 
408
                        </td-->
409
409
                        <!--td>
410
410
                            <para style="Text body">[[inv.move_id.name_split]]</para>
411
411
                        </td-->
422
422
                            <para style="Text body">[[inv.partner_id.name]]</para>
423
423
                        </td>
424
424
                        <td>
425
 
                            <para style="Text body">[[inv.partner_id.vat]]</para>
 
425
                            <para style="Text body">[[get_vat_formated(inv.partner_id.vat)]]</para>
426
426
                        </td>
427
427
                        <!--<td>
428
428
                            <para style="Text body">[[inv.name]]</para>
501
501
                            <para/>
502
502
                        </td>
503
503
                        <td>
504
 
                            <para alignment="RIGHT" style="Standard">TOTAL [[ detailed_taxes and 'TAXABLE' or '' ]] - [[obj[0] or '' ]] - Customer Refund Invoices</para>
 
504
                            <para alignment="RIGHT" style="Standard">TOTAL [[ detailed_taxes and 'TAXABLE' or '' ]] - [[get_currency_label(obj[0]) or '' ]] - Customer Refund Invoices</para>
505
505
                        </td>
506
506
                        <td>
507
507
                            <para alignment="RIGHT" style="Standard">[[formatLang(obj[2])]]</para>
521
521
                            <para/>
522
522
                        </td>
523
523
                        <td>
524
 
                            <para alignment="RIGHT" style="Standard">TOTAL - [[obj[0] or '' ]] - Customer Refund Invoices</para>
 
524
                            <para alignment="RIGHT" style="Standard">TOTAL - [[get_currency_label(obj[0]) or '' ]] - Customer Refund Invoices</para>
525
525
                        </td>
526
526
                        <td>
527
527
                            <para alignment="RIGHT" style="Standard">[[formatLang(obj[5])]]</para>
547
547
 
548
548
        <para style="Header">Supplier Invoices [[ (in_invoices or removeParentNode('para')) and '' ]]</para>
549
549
        <section>
550
 
            <section> [[ repeatIn(in_invoices, 'obj') ]] <para style="Standard"> Currency : [[ obj[0] ]]</para>
 
550
            <section> [[ repeatIn(in_invoices, 'obj') ]] <para style="Standard"> Currency : [[ get_head_currency_label(obj[0]) ]]</para>
551
551
                <!--<blockTable colWidths="1.8cm,1.4cm,1.4cm,1.8cm,1.8cm,2cm,3.5cm,2cm,4cm,1.2cm,1.8cm,1.4cm,1.8cm,1.6cm" repeatRows="1" style="Table3">-->
552
 
                <blockTable colWidths="2.0cm,2.3cm,1.8cm,1.8cm,2cm,5.2cm,2cm,1.2cm,2.0cm,1.6cm,1.8cm,2.0cm" repeatRows="1" style="Table3a">
 
552
                <blockTable colWidths="2.8cm,1.8cm,1.8cm,2cm,5.0cm,2.4cm,1.2cm,2.3cm,2.2cm,2.2cm,2.0cm" repeatRows="1" style="Table3a">
553
553
                    <tr>
554
554
                        <td>
555
555
                            <para style="Standard" size="5">Number</para>
556
556
                        </td>
557
 
                        <td>
 
557
                        <!--td>
558
558
                            <para style="Standard" size="5">External ref.</para>
559
 
                        </td>
 
559
                        </td-->
560
560
                        <!--td>
561
561
                            <para style="Standard" size="5">Entry num.</para>
562
562
                        </td-->
596
596
                    </tr>
597
597
                </blockTable>
598
598
                <section>[[ repeatIn(obj[1], 'inv') ]]
599
 
                    <blockTable colWidths="2.0cm,2.3cm,1.8cm,1.8cm,2cm,5.2cm,2cm,1.2cm,2.0cm,1.6cm,1.8cm,2.0cm" style="Table3">
 
599
                    <blockTable colWidths="2.8cm,1.8cm,1.8cm,2cm,5.0cm,2.4cm,1.2cm,2.3cm,2.2cm,2.2cm,2.0cm" style="Table3">
600
600
                        <tr>
601
601
                            <td>
602
602
                                <para style="Text body">[[inv.number]]</para>
603
603
                            </td>
604
 
                            <td>
 
604
                            <!--td>
605
605
                                <para style="Text body">[[inv.reference]]</para>
606
 
                            </td>
 
606
                            </td-->
607
607
                            <!--td>
608
608
                                <para style="Text body">[[inv.move_id.name_split]]</para>
609
609
                            </td-->
620
620
                                <para style="Text body">[[inv.partner_id.name]]</para>
621
621
                            </td>
622
622
                            <td>
623
 
                                <para style="Text body">[[inv.partner_id.vat]]</para>
 
623
                                <para style="Text body">[[get_vat_formated(inv.partner_id.vat)]]</para>
624
624
                            </td>
625
625
                            <!--<td>
626
626
                                <para style="Text body">[[inv.name]]</para>
699
699
                            <para/>
700
700
                        </td>
701
701
                        <td>
702
 
                            <para alignment="RIGHT" style="Standard">TOTAL [[ detailed_taxes and 'TAXABLE' or '' ]] - [[obj[0] or '' ]] - Supplier Invoices</para>
 
702
                            <para alignment="RIGHT" style="Standard">TOTAL [[ detailed_taxes and 'TAXABLE' or '' ]] - [[get_currency_label(obj[0]) or '' ]] - Supplier Invoices</para>
703
703
                        </td>
704
704
                        <td>
705
705
                            <para alignment="RIGHT" style="Standard">[[formatLang(obj[2])]]</para>
719
719
                            <para/>
720
720
                        </td>
721
721
                        <td>
722
 
                            <para alignment="RIGHT" style="Standard">TOTAL - [[obj[0] or '' ]] - Supplier Invoices</para>
 
722
                            <para alignment="RIGHT" style="Standard">TOTAL - [[get_currency_label(obj[0]) or '' ]] - Supplier Invoices</para>
723
723
                        </td>
724
724
                        <td>
725
725
                            <para alignment="RIGHT" style="Standard">[[formatLang(obj[5])]]</para>
745
745
 
746
746
        <para style="Header">Supplier Refund Invoices [[ (in_refunds or removeParentNode('para')) and '' ]]</para>
747
747
        <section>
748
 
            <section> [[ repeatIn(in_refunds, 'obj') ]] <para style="Standard"> Currency : [[ obj[0] ]] </para>
 
748
            <section> [[ repeatIn(in_refunds, 'obj') ]] <para style="Standard"> Currency : [[ get_head_currency_label(obj[0]) ]] </para>
749
749
                <!--<blockTable colWidths="1.8cm,1.4cm,1.4cm,1.8cm,1.8cm,2cm,3.5cm,2cm,4cm,1.2cm,1.8cm,1.4cm,1.8cm,1.6cm" repeatRows="1" style="Table3">-->
750
 
                <blockTable colWidths="2.0cm,2.3cm,1.8cm,1.8cm,2cm,5.2cm,2cm,1.2cm,2.0cm,1.6cm,1.8cm,2.0cm" repeatRows="1" style="Table3a">
 
750
                <blockTable colWidths="2.8cm,1.8cm,1.8cm,2cm,5.0cm,2.4cm,1.2cm,2.3cm,2.2cm,2.2cm,2.0cm" repeatRows="1" style="Table3a">
751
751
                    <tr>
752
752
                        <td>
753
753
                            <para style="Standard" size="5">Number</para>
754
754
                        </td>
755
 
                        <td>
 
755
                        <!--td>
756
756
                            <para style="Standard" size="5">External ref.</para>
757
 
                        </td>
 
757
                        </td-->
758
758
                        <!--td>
759
759
                            <para style="Standard" size="5">Entry num.</para>
760
760
                        </td-->
794
794
                    </tr>
795
795
                </blockTable>
796
796
                <section>[[ repeatIn(obj[1], 'inv') ]]
797
 
                    <blockTable colWidths="2.0cm,2.3cm,1.8cm,1.8cm,2cm,5.2cm,2cm,1.2cm,2.0cm,1.6cm,1.8cm,2.0cm" repeatRows="1" style="Table3">
 
797
                    <blockTable colWidths="2.8cm,1.8cm,1.8cm,2cm,5.0cm,2.4cm,1.2cm,2.3cm,2.2cm,2.2cm,2.0cm" repeatRows="1" style="Table3">
798
798
                        <tr>
799
799
                            <td>
800
800
                                <para style="Text body">[[inv.number]]</para>
801
801
                            </td>
802
 
                            <td>
 
802
                            <!--td>
803
803
                                <para style="Text body">[[inv.reference]]</para>
804
 
                            </td>
 
804
                            </td-->
805
805
                            <!--td>
806
806
                                <para style="Text body">[[inv.move_id.name_split]]</para>
807
807
                            </td-->
818
818
                                <para style="Text body">[[inv.partner_id.name]]</para>
819
819
                            </td>
820
820
                            <td>
821
 
                                <para style="Text body">[[inv.partner_id.vat]]</para>
 
821
                                <para style="Text body">[[get_vat_formated(inv.partner_id.vat)]]</para>
822
822
                            </td>
823
823
                            <!--<td>
824
824
                                <para style="Text body">[[inv.name]]</para>
897
897
                            <para/>
898
898
                        </td>
899
899
                        <td>
900
 
                            <para alignment="RIGHT" style="Standard">TOTAL [[ detailed_taxes and 'TAXABLE' or '' ]] - [[obj[0] or '' ]] - Supplier Refund Invoices</para>
 
900
                            <para alignment="RIGHT" style="Standard">TOTAL [[ detailed_taxes and 'TAXABLE' or '' ]] - [[get_currency_label(obj[0]) or '' ]] - Supplier Refund Invoices</para>
901
901
                        </td>
902
902
                        <td>
903
903
                            <para alignment="RIGHT" style="Standard">[[formatLang(obj[2])]]</para>
917
917
                            <para/>
918
918
                        </td>
919
919
                        <td>
920
 
                            <para alignment="RIGHT" style="Standard">TOTAL - [[obj[0] or '' ]] - Supplier Refund Invoices</para>
 
920
                            <para alignment="RIGHT" style="Standard">TOTAL - [[get_currency_label(obj[0]) or '' ]] - Supplier Refund Invoices</para>
921
921
                        </td>
922
922
                        <td>
923
923
                            <para alignment="RIGHT" style="Standard">[[formatLang(obj[5])]]</para>