Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision fdee0091

Von Sven Schöling vor mehr als 15 Jahren hinzugefügt

  • ID fdee0091f00479361820f0f98fe896a14e605b18
  • Vorgänger 9b49681d
  • Nachfolger a0ad15b2

Bilanzfunktion:
- Kontonummern
- korrekte Formatierungen

Unterschiede anzeigen:

SL/RP.pm
66 66
    $form->{period} = $form->{this_period} = conv_dateq($form->{asofdate});
67 67
  }
68 68

  
69
  $form->{decimalplaces} *= 1;
70
  my $dec = $form->{decimalplaces};
71

  
72 69
  get_accounts($dbh, $last_period, "", $form->{asofdate}, $form, \@categories);
73 70

  
74 71
  # if there are any compare dates
templates/webpages/rp/balance_sheet_de.html
19 19
  [% FOREACH row = A %]
20 20
  <tr>
21 21
    <td> </td>
22
    <td>[% row.description %]</td>
23
    <td align="right">[% row.this %]</td>
24
    <td align="right">[% row.last %]</td>
22
    <td>[% row.accno _ ' - ' IF l_accno %][% row.description %]</td>
23
    <td align="right">[% LxERP.format_amount(row.this,2) %]</td>
24
    [%- IF last_period %]
25
    <td align="right">[% LxERP.format_amount(row.last,2) %]</td>
26
    [%- END %]
25 27
  </tr>
26 28
  [% END %]
27 29

  
......
34 36

  
35 37
  <tr valign="top">
36 38
    <th align="left" colspan="2">TOTAL</th>
37
    <td align="right">[% total.A.this %]<hr noshade size="2"></td>
38
    <td align="right">[% total.A.last %]<hr noshade size="2"></td>
39
    <td align="right">[% LxERP.format_amount(total.A.this,2) %]<hr noshade size="2"></td>
40
    [%- IF last_period %]
41
    <td align="right">[% LxERP.format_amount(total.A.last,2) %]<hr noshade size="2"></td>
42
    [%- END %]
39 43
  </tr>
40 44
[% END %]
41 45

  
......
46 50
  [% FOREACH row = L %]
47 51
  <tr>
48 52
    <td></td>
49
    <td>[% row.description %]</td>
50
    <td align="right">[% row.this %]</td>
51
    <td align="right">[% row.last %]</td>
53
    <td>[% row.accno _ ' - ' IF l_accno %][% row.description %]</td>
54
    <td align="right">[% LxERP.format_amount(row.this,2) %]</td>
55
    [%- IF last_period %]
56
    <td align="right">[% LxERP.format_amount(row.last,2) %]</td>
57
    [%- END %]
52 58
  </tr>
53 59
  [% END %]
54 60

  
......
62 68
  <tr valign="top">
63 69
    <td></td>
64 70
    <th align="left">TOTAL</th>
65
    <td align="right">[% total.L.this %]<br><hr noshade size="2"</td>
66
    <td align="right">[% total.L.last %]<br><hr noshade size="2"</td>
71
    <td align="right">[% LxERP.format_amount(total.L.this,2) %]<br><hr noshade size="2"</td>
72
    [%- IF last_period %]
73
    <td align="right">[% LxERP.format_amount(total.L.last,2) %]<br><hr noshade size="2"</td>
74
    [%- END %]
67 75
  </tr>
68 76
[% END %]
69 77

  
......
74 82
  [% FOREACH row = Q %]
75 83
  <tr>
76 84
    <td></td>
77
    <td>[% row.description %]</td>
78
    <td align="right">[% row.this %]</td>
79
    <td align="right">[% row.last %]</td>
85
    <td>[% row.accno _ ' - ' IF l_accno %][% row.description %]</td>
86
    <td align="right">[% LxERP.format_amount(row.this,2) %]</td>
87
    [%- IF last_period %]
88
    <td align="right">[% LxERP.format_amount(row.last,2) %]</td>
89
    [%- END %]
80 90
  </tr>
81 91
  [% END  %]
82 92

  
......
90 100
  <tr valign="top">
91 101
    <td></td>
92 102
    <th align="left">TOTAL</th>
93
    <td align="right">[% total.Q.this %]<br><hr noshade size="2"</td>
94
    <td align="right">[% total.Q.last %]<br><hr noshade size="2"</td>
103
    <td align="right">[% LxERP.format_amount(total.Q.this,2) %]<br><hr noshade size="2"</td>
104
    [%- IF last_period %]
105
    <td align="right">[% LxERP.format_amount(total.Q.last,2) %]<br><hr noshade size="2"</td>
106
    [%- END %]
95 107
  </tr>
96 108
[% END %]
97 109

  
98 110
  <tr valign="top">
99 111
    <th align="left" colspan="2">TOTAL PASSIVA &amp; EIGENTUM</th>
100
    <td align="right">[% total.this %]<br><hr noshade size="2"></td>
101
    <td align="right">[% total.last %]<br><hr noshade size="2"></td>
112
    <td align="right">[% LxERP.format_amount(total.this,2) %]<br><hr noshade size="2"></td>
113
    [%- IF last_period %]
114
    <td align="right">[% LxERP.format_amount(total.last,2) %]<br><hr noshade size="2"></td>
115
    [%- END %]
102 116
  </tr>
103 117
</table>
templates/webpages/rp/balance_sheet_master.html
19 19
  [% FOREACH row = A %]
20 20
  <tr>
21 21
    <td> </td>
22
    <td>[% row.description %]</td>
23
    <td align="right">[% row.this %]</td>
24
    <td align="right">[% row.last %]</td>
22
    <td>[% row.accno _ ' - ' IF l_accno %][% row.description %]</td>
23
    <td align="right">[% LxERP.format_amount(row.this,2) %]</td>
24
    [%- IF last_period %]
25
    <td align="right">[% LxERP.format_amount(row.last,2) %]</td>
26
    [%- END %]
25 27
  </tr>
26 28
  [% END %]
27 29

  
......
34 36

  
35 37
  <tr valign="top">
36 38
    <th align="left" colspan="2"><translate>TOTAL</translate></th>
37
    <td align="right">[% total.A.this %]<hr noshade size="2"></td>
38
    <td align="right">[% total.A.last %]<hr noshade size="2"></td>
39
    <td align="right">[% LxERP.format_amount(total.A.this,2) %]<hr noshade size="2"></td>
40
    [%- IF last_period %]
41
    <td align="right">[% LxERP.format_amount(total.A.last,2) %]<hr noshade size="2"></td>
42
    [%- END %]
39 43
  </tr>
40 44
[% END %]
41 45

  
......
46 50
  [% FOREACH row = L %]
47 51
  <tr>
48 52
    <td></td>
49
    <td>[% row.description %]</td>
50
    <td align="right">[% row.this %]</td>
51
    <td align="right">[% row.last %]</td>
53
    <td>[% row.accno _ ' - ' IF l_accno %][% row.description %]</td>
54
    <td align="right">[% LxERP.format_amount(row.this,2) %]</td>
55
    [%- IF last_period %]
56
    <td align="right">[% LxERP.format_amount(row.last,2) %]</td>
57
    [%- END %]
52 58
  </tr>
53 59
  [% END %]
54 60

  
......
62 68
  <tr valign="top">
63 69
    <td></td>
64 70
    <th align="left"><translate>TOTAL</translate></th>
65
    <td align="right">[% total.L.this %]<br><hr noshade size="2"</td>
66
    <td align="right">[% total.L.last %]<br><hr noshade size="2"</td>
71
    <td align="right">[% LxERP.format_amount(total.L.this,2) %]<br><hr noshade size="2"</td>
72
    [%- IF last_period %]
73
    <td align="right">[% LxERP.format_amount(total.L.last,2) %]<br><hr noshade size="2"</td>
74
    [%- END %]
67 75
  </tr>
68 76
[% END %]
69 77

  
......
75 83
  <tr>
76 84
    <td></td>
77 85
    <td>[% row.description %]</td>
78
    <td align="right">[% row.this %]</td>
79
    <td align="right">[% row.last %]</td>
86
    <td align="right">[% LxERP.format_amount(row.this,2) %]</td>
87
    [%- IF last_period %]
88
    <td align="right">[% LxERP.format_amount(row.last,2) %]</td>
89
    [%- END %]
80 90
  </tr>
81 91
  [% END  %]
82 92

  
......
90 100
  <tr valign="top">
91 101
    <td></td>
92 102
    <th align="left"><translate>TOTAL</translate></th>
93
    <td align="right">[% total.Q.this %]<br><hr noshade size="2"</td>
94
    <td align="right">[% total.Q.last %]<br><hr noshade size="2"</td>
103
    <td align="right">[% LxERP.format_amount(total.Q.this,2) %]<br><hr noshade size="2"</td>
104
    [%- IF last_period %]
105
    <td align="right">[% LxERP.format_amount(total.Q.last,2) %]<br><hr noshade size="2"</td>
106
    [%- END %]
95 107
  </tr>
96 108
[% END %]
97 109

  
98 110
  <tr valign="top">
99 111
    <th align="left" colspan="2"><translate>TOTAL</translate> <translate>LIABILITIES</translate> &amp; <translate>EQUITY</translate></th>
100
    <td align="right">[% total.this %]<br><hr noshade size="2"></td>
101
    <td align="right">[% total.last %]<br><hr noshade size="2"></td>
112
    <td align="right">[% LxERP.format_amount(total.this,2) %]<br><hr noshade size="2"></td>
113
    [%- IF last_period %]
114
    <td align="right">[% LxERP.format_amount(total.last,2) %]<br><hr noshade size="2"></td>
115
    [%- END %]
102 116
  </tr>
103 117
</table>

Auch abrufbar als: Unified diff