Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision c23b1062

Von Bernd Bleßmann vor fast 10 Jahren hinzugefügt

trailing whitespaces entfernt

Unterschiede anzeigen:

SL/Controller/AccTrans.pm
5 5

  
6 6
__PACKAGE__->run_before('check_auth');
7 7

  
8
sub action_list_transactions {                                                                                
9
  my ($self) = @_;                                                                                      
8
sub action_list_transactions {
9
  my ($self) = @_;
10 10

  
11 11
  return $self->render('generic/error', { layout => 0 }, label_error => "list_transactions needs a trans_id") unless $::form->{trans_id};
12 12

  
13
  my $transactions = SL::DB::Manager::AccTransaction->get_all(query => [ trans_id => $::form->{trans_id} ], sort_by => 'acc_trans_id ASC'); 
13
  my $transactions = SL::DB::Manager::AccTransaction->get_all(query => [ trans_id => $::form->{trans_id} ], sort_by => 'acc_trans_id ASC');
14 14

  
15 15
  return $self->render(\'', { type => 'json' }) unless scalar @{$transactions};
16 16

  
17 17
  my $acc_trans_table = $self->_mini_ledger($transactions);
18 18
  my $balances_table  = $self->_mini_trial_balance($transactions);
19
  
19

  
20 20
  return $self->render('acc_trans/acc_trans', { header => 0 }, acc_trans_table => $acc_trans_table, balances_table => $balances_table);
21 21
}
22 22

  
SL/Controller/CsvImport/Helper/Consistency.pm
54 54
  my $object = $entry->{object};
55 55

  
56 56
  # Check whether the CSV contains the parameters taxzone_id or taxzone, and
57
  # check them for validity. 
57
  # check them for validity.
58 58
  # If one of them was given, but is invalid, return an error
59 59

  
60 60
  # If neither was given:
......
63 63
  # b) if param take_default was not set, do nothing, return without error, and
64 64
  #    taxzone_id may be set later by other means (order import uses cv settings)
65 65

  
66
 
66

  
67 67
  # if $object->taxzone_id is defined (from CSV line), check if it is valid
68 68
  if ($object->taxzone_id && ! _taxzones_by($self)->{id}->{ $object->taxzone_id }) {
69 69
    push @{ $entry->{errors} }, $::locale->text('Error: Invalid tax zone');
......
101 101
  };
102 102

  
103 103
  # for the order import at this stage $object->taxzone_id may still not be
104
  # defined, in this case the customer/vendor taxzone will be used. 
104
  # defined, in this case the customer/vendor taxzone will be used.
105 105

  
106 106
  return 1;
107 107
}
SL/Controller/GL.pm
14 14
sub action_quicksearch {
15 15

  
16 16
  my ($self, %params) = @_;
17
  
17

  
18 18
  my $limit = $::form->{limit} || 40; # max number of results per type (AR/AP/GL)
19 19
  my $term  = $::form->{term}  || '';
20
  
20

  
21 21
  my $descriptionquery = { ilike => '%' . $term . '%' };
22 22
  my $referencequery   = { ilike => '%' . $term . '%' };
23 23
  my $apinvnumberquery = { ilike => '%' . $term . '%' };
templates/webpages/rp/bwa.html
11 11
  </td>
12 12
  <td class="right">Blatt 1</td>
13 13
</tr>
14
  
15
  
16
</tr>  
14

  
15

  
16
</tr>
17 17
<tr class="querkopf">
18 18
  <th class="left">&nbsp;</th>
19 19
  <th class="center" colspan="5">Im Betrachtungszeitraum</th>
......
56 56
  <td><nobr>[% jetztgl2 %]</nobr></td>
57 57
  <td></td>
58 58
  <td></td>
59
  <td></td>  
59
  <td></td>
60 60
  <td><nobr>[% kumm2 %]</nobr></td>
61 61
  <td><nobr>[% kummgl2 %]</nobr></td>
62 62
  <td></td>
......
79 79
</tr>
80 80

  
81 81
<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
82
  
82

  
83 83
<tr class="grey subtotal">
84 84
  <td class="left"><nobr>Gesamtleistung</nobr></td>
85 85
  <td><nobr>[% jetztgesamtleistung %]</nobr></td>
......
95 95
</tr>
96 96

  
97 97
<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
98
  
98

  
99 99
<tr class="grey">
100 100
  <td class="left"><nobr>Mat./Wareneinkauf</nobr></td>
101 101
  <td><nobr>[% jetzt4 %]</nobr></td>
......
109 109
  <td><nobr>[% kummpk4 %]</nobr></td>
110 110
  <td class="right"><nobr>[% kummauf4 %]</nobr>&nbsp;</td>
111 111
</tr>
112
  
112

  
113 113
<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
114
    
114

  
115 115
<tr class="grey subtotal">
116 116
  <td class="left"><nobr>Rohertrag</nobr></td>
117 117
  <td><nobr>[% jetztrohertrag %]</nobr></td>
......
125 125
  <td><nobr>[% kummpkrohertrag %]</nobr></td>
126 126
  <td class="right"><nobr>[% kummaufrohertrag %]</nobr>&nbsp;</td>
127 127
</tr>
128
  
128

  
129 129
<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
130
    
130

  
131 131
<tr class="grey">
132 132
  <td class="left"><nobr>So.betr.Erl&ouml;se</nobr></td>
133 133
  <td><nobr>[% jetzt5 %]</nobr></td>
......
143 143
</tr>
144 144

  
145 145
<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
146
    
146

  
147 147
<tr class="grey subtotal">
148 148
  <td class="left"><nobr>Betriebl. Rohertrag</nobr></td>
149 149
  <td><nobr>[% jetztbetriebrohertrag %]</nobr></td>
......
164 164
<tr class="grey subtotal">
165 165
  <td class="left">Kostenarten:</td>
166 166
  <td class="right" colspan="10">&nbsp;</td>
167
</tr>  
168
    
167
</tr>
168

  
169 169
<tr class="white">
170 170
  <td class="left"><nobr>Personalkosten</nobr></td>
171 171
  <td><nobr>[% jetzt10 %]</nobr></td>
......
323 323

  
324 324
<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
325 325

  
326
  
326

  
327 327
<tr class="grey subtotal">
328 328
<td class="left"><nobr>Betriebsergebnis</nobr></td>
329 329
  <td><nobr>[% jetztbetriebsergebnis %]</nobr></td>
......
455 455
  <td><nobr>[% kummpkneutralerertrag %]</nobr></td>
456 456
  <td class="right">&nbsp;</td>
457 457
</tr>
458
  
458

  
459 459
<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
460 460

  
461 461
<tr class="grey subtotal">
......
471 471
  <td><nobr>[% kummpkergebnisvorsteuern %]</nobr></td>
472 472
  <td class="right">&nbsp;</td>
473 473
</tr>
474
  
474

  
475 475
<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
476 476

  
477 477
<tr class="grey">
......
487 487
  <td><nobr>[% kummpk35 %]</nobr></td>
488 488
  <td class="right">&nbsp;</td>
489 489
</tr>
490
  
490

  
491 491
<tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
492 492

  
493 493
<tr class="grey subtotal">
......
503 503
  <td><nobr>[% kummpkergebnis %]</nobr></td>
504 504
  <td class="right">&nbsp;</td>
505 505
</tr>
506
  
506

  
507 507
<tr class="white" id=last><td class="left right"
508 508
colspan="11">&nbsp;</td></tr>
509 509

  
templates/webpages/rp/income_statement.html
18 18

  
19 19
<tr>
20 20
  <td>
21
    Umsatzerl&ouml;se  
21
    Umsatzerl&ouml;se
22 22
  </td>
23 23
  <td>
24 24
    [% eur1 %]
......
26 26
</tr>
27 27
<tr>
28 28
  <td>
29
    sonstige Erl&ouml;se  
29
    sonstige Erl&ouml;se
30 30
  </td>
31 31
  <td>
32
    [% eur2 %]  
32
    [% eur2 %]
33 33
  </td>
34 34
</tr>
35 35
<tr>
......
37 37
    Privatanteile
38 38
  </td>
39 39
  <td>
40
    [% eur3 %]  
40
    [% eur3 %]
41 41
  </td>
42 42
</tr>
43 43
<tr>
......
45 45
    Zinsertr&auml;ge
46 46
  </td>
47 47
  <td>
48
    [% eur4 %]  
48
    [% eur4 %]
49 49
  </td>
50 50
</tr>
51 51
<tr>
......
53 53
    Au&szlig;erordentliche Ertr&auml;ge
54 54
  </td>
55 55
  <td>
56
    [% eur5 %]  
56
    [% eur5 %]
57 57
  </td>
58 58
</tr>
59 59
<tr>
......
61 61
    Vereinnahmte Umsatzsteuer
62 62
  </td>
63 63
  <td>
64
    [% eur6 %]  
64
    [% eur6 %]
65 65
  </td>
66 66
</tr>
67 67
<tr>
......
69 69
    Umsatzsteuererstattungen
70 70
  </td>
71 71
  <td>
72
    [% eur7 %]  
72
    [% eur7 %]
73 73
  </td>
74 74
</tr>
75 75

  
......
97 97
    Wareneing&auml;nge
98 98
  </td>
99 99
  <td>
100
    [% eur8 %]  
100
    [% eur8 %]
101 101
  </td>
102 102
</tr>
103 103
<tr>
......
105 105
    L&ouml;hne und Geh&auml;lter
106 106
  </td>
107 107
  <td>
108
    [% eur9 %]  
108
    [% eur9 %]
109 109
  </td>
110 110
</tr>
111 111
<tr>
......
113 113
    Gesetzlicher sozialer Aufwand
114 114
  </td>
115 115
  <td>
116
    [% eur10 %]  
116
    [% eur10 %]
117 117
  </td>
118 118
</tr>
119 119
<tr>
......
121 121
    Mieten
122 122
  </td>
123 123
  <td>
124
    [% eur11 %]  
124
    [% eur11 %]
125 125
  </td>
126 126
</tr>
127 127
<tr>
......
129 129
    Gas, Strom, Wasser
130 130
  </td>
131 131
  <td>
132
    [% eur12 %]  
132
    [% eur12 %]
133 133
  </td>
134 134
</tr>
135 135
<tr>
......
137 137
    Instandhaltung
138 138
  </td>
139 139
  <td>
140
    [% eur13 %]  
140
    [% eur13 %]
141 141
  </td>
142 142
</tr>
143 143
<tr>
......
145 145
    Steuern, Versicherungen, Beitr&auml;ge
146 146
  </td>
147 147
  <td>
148
    [% eur14 %]  
148
    [% eur14 %]
149 149
  </td>
150 150
</tr>
151 151
<tr>
......
153 153
    Kfz-Steuern
154 154
  </td>
155 155
  <td>
156
    [% eur15 %]  
156
    [% eur15 %]
157 157
  </td>
158 158
</tr><tr>
159 159
  <td>
160 160
    Kfz-Versicherungen
161 161
  </td>
162 162
  <td>
163
    [% eur16 %]  
163
    [% eur16 %]
164 164
  </td>
165 165
</tr><tr>
166 166
  <td>
167 167
    Sonstige Fahrzeugkosten
168 168
  </td>
169 169
  <td>
170
    [% eur17 %]  
170
    [% eur17 %]
171 171
  </td>
172 172
</tr><tr>
173 173
  <td>
174 174
    Werbe- und Reisekosten
175 175
  </td>
176 176
  <td>
177
    [% eur18 %]  
177
    [% eur18 %]
178 178
  </td>
179 179
</tr><tr>
180 180
  <td>
181 181
    Instandhaltung und Werkzeuge
182 182
  </td>
183 183
  <td>
184
    [% eur19 %]  
184
    [% eur19 %]
185 185
  </td>
186 186
</tr><tr>
187 187
  <td>
188 188
    Fachzeitschriften, B&uuml;cher
189 189
  </td>
190 190
  <td>
191
    [% eur20 %]  
191
    [% eur20 %]
192 192
  </td>
193 193
</tr><tr>
194 194
  <td>
195 195
    Miete f&uuml;r Einrichtungen
196 196
  </td>
197 197
  <td>
198
    [% eur21 %]  
198
    [% eur21 %]
199 199
  </td>
200 200
</tr><tr>
201 201
  <td>
202 202
    Rechts- und Beratungskosten
203 203
  </td>
204 204
  <td>
205
    [% eur22 %]  
205
    [% eur22 %]
206 206
  </td>
207 207
</tr><tr>
208 208
  <td>
209 209
    B&uuml;robedarf, Porto, Telefon
210 210
  </td>
211 211
  <td>
212
    [% eur23 %]  
212
    [% eur23 %]
213 213
  </td>
214 214
</tr><tr>
215 215
  <td>
216 216
    Sonstige Aufwendungen
217 217
  </td>
218 218
  <td>
219
    [% eur24 %]  
219
    [% eur24 %]
220 220
  </td>
221 221
</tr><tr>
222 222
  <td>
223 223
    Abschreibungen auf Anlageverm&ouml;gen
224 224
  </td>
225 225
  <td>
226
    [% eur25 %]  
226
    [% eur25 %]
227 227
  </td>
228 228
</tr><tr>
229 229
  <td>
230 230
    Abschreibungen auf GWG
231 231
  </td>
232 232
  <td>
233
    [% eur26 %]  
233
    [% eur26 %]
234 234
  </td>
235 235
</tr><tr>
236 236
  <td>
237 237
    Vorsteuer
238 238
  </td>
239 239
  <td>
240
    [% eur27 %]  
240
    [% eur27 %]
241 241
  </td>
242 242
</tr><tr>
243 243
  <td>
244 244
    Umsatzsteuerzahlungen
245 245
  </td>
246 246
  <td>
247
    [% eur28 %]  
247
    [% eur28 %]
248 248
  </td>
249 249
</tr><tr>
250 250
  <td>
251 251
    Zinsaufwand
252 252
  </td>
253 253
  <td>
254
    [% eur29 %]  
254
    [% eur29 %]
255 255
  </td>
256 256
</tr><tr>
257 257
  <td>
258 258
    Au&szlig;erordentlicher Aufwand
259 259
  </td>
260 260
  <td>
261
    [% eur30 %]  
261
    [% eur30 %]
262 262
  </td>
263 263
</tr><tr>
264 264
  <td>
265 265
    Betriebliche Steuern
266 266
  </td>
267 267
  <td>
268
    [% eur31 %]  
268
    [% eur31 %]
269 269
  </td>
270 270
</tr>
271 271

  
templates/webpages/webdav/_list.html
2 2

  
3 3
[%- IF INSTANCE_CONF.get_webdav %]
4 4
<div id="ui-tabs-webdav">
5
<div class="listtop">[%- 'Documents in the WebDAV repository' | $T8 %]</div> 
5
<div class="listtop">[%- 'Documents in the WebDAV repository' | $T8 %]</div>
6 6

  
7 7
 <table width="100%">
8 8
  <tr>

Auch abrufbar als: Unified diff