Revision ae0968da
Von Moritz Bunkus vor fast 12 Jahren hinzugefügt
| SL/CA.pm | ||
|---|---|---|
| 203 | 203 |
$project = qq| AND ac.project_id = ? |; |
| 204 | 204 |
@project_values = (conv_i($form->{project_id}));
|
| 205 | 205 |
} |
| 206 |
my $acc_cash_where = ""; |
|
| 207 |
my $ar_cash_where = ""; |
|
| 208 |
my $ap_cash_where = ""; |
|
| 209 |
|
|
| 210 |
|
|
| 211 |
if ($form->{method} eq "cash") {
|
|
| 212 |
$where = qq| (ac.trans_id IN (SELECT id FROM ar WHERE datepaid>= ? AND datepaid<= ? UNION SELECT id FROM ap WHERE datepaid>= ? AND datepaid<= ? UNION SELECT id FROM gl WHERE transdate>= ? AND transdate<= ?)) |; |
|
| 213 |
@where_values = (); |
|
| 214 |
push(@where_values, conv_date($form->{fromdate}));
|
|
| 215 |
push(@where_values, conv_date($form->{todate}));
|
|
| 216 |
push(@where_values, conv_date($form->{fromdate}));
|
|
| 217 |
push(@where_values, conv_date($form->{todate}));
|
|
| 218 |
push(@where_values, conv_date($form->{fromdate}));
|
|
| 219 |
push(@where_values, conv_date($form->{todate}));
|
|
| 220 |
} |
|
| 221 |
|
|
| 222 | 206 |
|
| 223 | 207 |
if ($form->{accno}) {
|
| 224 | 208 |
|
| bin/mozilla/ca.pl | ||
|---|---|---|
| 157 | 157 |
$::form->header; |
| 158 | 158 |
print $::form->parse_html_template('ca/list', {
|
| 159 | 159 |
year => DateTime->today->year, |
| 160 |
cash => $::instance_conf->get_accounting_method eq 'cash', |
|
| 161 | 160 |
}); |
| 162 | 161 |
|
| 163 | 162 |
$::lxdebug->leave_sub; |
| templates/webpages/ca/list.html | ||
|---|---|---|
| 7 | 7 |
[% L.hidden_tag('accno', accno) %]
|
| 8 | 8 |
[% L.hidden_tag('decription', description) %]
|
| 9 | 9 |
[% L.hidden_tag('sort', 'transdate') %]
|
| 10 |
[% L.hidden_tag('eur', cash) %]
|
|
| 11 | 10 |
[% L.hidden_tag('accounttype', accounttype) %]
|
| 12 | 11 |
|
| 13 | 12 |
<table border=0 width=100%> |
| ... | ... | |
| 70 | 69 |
<tr> |
| 71 | 70 |
<td colspan=5><hr size=3 noshade></td> |
| 72 | 71 |
</tr> |
| 73 |
<tr> |
|
| 74 |
<th align=leftt>[% 'Method' | $T8 %]</th> |
|
| 75 |
<td colspan=3>[% L.radio_button_tag('method', value='accrual', checked=!cash, label=LxERP.t8('Accrual')) %]
|
|
| 76 |
[% L.radio_button_tag('method', value='cash', checked=cash, label=LxERP.t8('EUR')) %]</td>
|
|
| 77 |
</tr> |
|
| 78 | 72 |
<tr> |
| 79 | 73 |
<th align=right colspan=4>[% 'Decimalplaces' | $T8 %]</th> |
| 80 | 74 |
<td><input name=decimalplaces size=3 value="2"></td> |
| ... | ... | |
| 88 | 82 |
|
| 89 | 83 |
<br>[% L.submit_tag('action', LxERP.t8('List Transactions')) %]
|
| 90 | 84 |
</form> |
| 91 |
|
|
Auch abrufbar als: Unified diff
Kontoübersicht: Unterscheidung nach Bilanzierung/EUR entfernt
Bei einem Konto ergibt es keinen Sinn, auch Buchungen außerhalb des
Zeitraumes anzuzeigen. Dafür gibt es GuV, Bilanz etc. Also die
Auswahlmöglichkeit dafür entfernen.
Fixt #1893.