Revision e2305bab
Von Philip Reetz vor fast 17 Jahren hinzugefügt
SL/GL.pm | ||
---|---|---|
109 | 109 |
my ($null, $department_id) = split(/--/, $form->{department}); |
110 | 110 |
$department_id *= 1; |
111 | 111 |
|
112 |
$form->{ob_transaction} *= 1; |
|
113 |
$form->{cb_transaction} *= 1; |
|
114 |
|
|
112 | 115 |
$query = |
113 | 116 |
qq|UPDATE gl SET |
114 | 117 |
reference = ?, description = ?, notes = ?, |
115 | 118 |
transdate = ?, department_id = ?, taxincluded = ?, |
116 |
storno = ?, storno_id = ? |
|
119 |
storno = ?, storno_id = ?, ob_transaction = ?, cb_transaction = ?
|
|
117 | 120 |
WHERE id = ?|; |
118 | 121 |
|
119 | 122 |
@values = ($form->{reference}, $form->{description}, $form->{notes}, |
120 | 123 |
conv_date($form->{transdate}), $department_id, $form->{taxincluded}, |
121 |
$form->{storno} ? 't' : 'f', conv_i($form->{storno_id}), |
|
124 |
$form->{storno} ? 't' : 'f', conv_i($form->{storno_id}), $form->{ob_transaction} ? 't' : 'f', $form->{cb_transaction} ? 't' : 'f',
|
|
122 | 125 |
conv_i($form->{id})); |
123 | 126 |
do_query($form, $dbh, $query, @values); |
124 | 127 |
|
... | ... | |
153 | 156 |
if ($amount != 0) { |
154 | 157 |
$query = |
155 | 158 |
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, |
156 |
source, memo, project_id, taxkey) |
|
159 |
source, memo, project_id, taxkey, ob_transaction, cb_transaction)
|
|
157 | 160 |
VALUES (?, (SELECT id FROM chart WHERE accno = ?), |
158 |
?, ?, ?, ?, ?, ?)|; |
|
161 |
?, ?, ?, ?, ?, ?, ?, ?)|;
|
|
159 | 162 |
@values = (conv_i($form->{id}), $accno, $amount, conv_date($form->{transdate}), |
160 |
$form->{"source_$i"}, $form->{"memo_$i"}, $project_id, $taxkey); |
|
163 |
$form->{"source_$i"}, $form->{"memo_$i"}, $project_id, $taxkey, $form->{ob_transaction} ? 't' : 'f', $form->{cb_transaction} ? 't' : 'f');
|
|
161 | 164 |
do_query($form, $dbh, $query, @values); |
162 | 165 |
} |
163 | 166 |
|
... | ... | |
563 | 566 |
if ($form->{id}) { |
564 | 567 |
$query = |
565 | 568 |
qq|SELECT g.reference, g.description, g.notes, g.transdate, g.storno, g.storno_id, |
566 |
d.description AS department, e.name AS employee, g.taxincluded, g.gldate |
|
569 |
d.description AS department, e.name AS employee, g.taxincluded, g.gldate, |
|
570 |
g.ob_transaction, g.cb_transaction |
|
567 | 571 |
FROM gl g |
568 | 572 |
LEFT JOIN department d ON (d.id = g.department_id) |
569 | 573 |
LEFT JOIN employee e ON (e.id = g.employee_id) |
bin/mozilla/gl.pl | ||
---|---|---|
962 | 962 |
|
963 | 963 |
$show_details_checked = "checked" if $form->{show_details}; |
964 | 964 |
|
965 |
$ob_transaction_checked = "checked" if $form->{ob_transaction}; |
|
966 |
$cb_transaction_checked = "checked" if $form->{cb_transaction}; |
|
967 |
|
|
965 | 968 |
# $locale->text('Add General Ledger Transaction') |
966 | 969 |
# $locale->text('Edit General Ledger Transaction') |
967 | 970 |
|
... | ... | |
1155 | 1158 |
</tr>|; |
1156 | 1159 |
} |
1157 | 1160 |
|
1158 |
print qq|<tr> |
|
1161 |
print qq| |
|
1162 |
<tr> |
|
1163 |
<tr><td colspan=4><table><tr> |
|
1164 |
<td> |
|
1165 |
| . $locale->text('OB Transaction') . qq|<input type="checkbox" name="ob_transaction" value="1" $ob_transaction_checked> |
|
1166 |
</td> |
|
1167 |
<td> |
|
1168 |
| . $locale->text('CB Transaction') . qq|<input type="checkbox" name="cb_transaction" value="1" $cb_transaction_checked> |
|
1169 |
</td> |
|
1170 |
</tr></table></td></tr> |
|
1171 |
<tr> |
|
1159 | 1172 |
<td width="1%" align="right" nowrap>| . $locale->text('Show details') . qq|</td> |
1160 | 1173 |
<td width="1%"><input type="checkbox" onclick="show_form_details();" name="show_details" value="1" $show_details_checked></td> |
1161 | 1174 |
</tr>|; |
... | ... | |
1260 | 1273 |
. qq|"> |; |
1261 | 1274 |
|
1262 | 1275 |
} else { |
1263 |
if ($transdate > $closedto) { |
|
1264 | 1276 |
print qq| |
1265 | 1277 |
<input class=submit type=submit name=action id=update_button value="| . $locale->text('Update') . qq|"> |
1266 | 1278 |
<input class=submit type=submit name=action value="| . $locale->text('Post') . qq|">|; |
1267 |
} |
|
1268 | 1279 |
} |
1269 | 1280 |
|
1270 | 1281 |
print " |
locale/de/all | ||
---|---|---|
250 | 250 |
'Business deleted!' => 'Firma gel?scht.', |
251 | 251 |
'Business saved!' => 'Firma gespeichert.', |
252 | 252 |
'CANCELED' => 'Storniert', |
253 |
'CB Transaction' => 'SB-Buchung', |
|
253 | 254 |
'CSV export -- options' => 'CSV-Export -- Optionen', |
254 | 255 |
'Calculate' => 'Berechnen', |
255 | 256 |
'Cancel' => 'Abbrechen', |
... | ... | |
951 | 952 |
'Number of new bins' => 'Anzahl neuer Lagerplätze', |
952 | 953 |
'Number pages' => 'Seiten nummerieren', |
953 | 954 |
'Number variables: \'PRECISION=n\' forces numbers to be shown with exactly n decimal places.' => 'Zahlenvariablen: Mit \'PRECISION=n\' erzwingt man, dass Zahlen mit n Nachkommastellen formatiert werden.', |
955 |
'OB Transaction' => 'EB-Buchung', |
|
954 | 956 |
'OBE-Export erfolgreich!' => 'OBE-Export erfolgreich!', |
955 | 957 |
'Obsolete' => 'Ung?ltig', |
956 | 958 |
'Oct' => 'Okt', |
locale/de/gl | ||
---|---|---|
28 | 28 |
'Buchungsdatum' => 'Buchungsdatum', |
29 | 29 |
'Buchungsnummer' => 'Buchungsnummer', |
30 | 30 |
'CANCELED' => 'Storniert', |
31 |
'CB Transaction' => 'SB-Buchung', |
|
31 | 32 |
'CSV export -- options' => 'CSV-Export -- Optionen', |
32 | 33 |
'Cancel Accounts Receivables Transaction' => 'Debitorenbuchung stornieren', |
33 | 34 |
'Cannot delete transaction!' => 'Buchung kann nicht gel?scht werden!', |
... | ... | |
144 | 145 |
'Notes' => 'Bemerkungen', |
145 | 146 |
'Nov' => 'Nov', |
146 | 147 |
'November' => 'November', |
148 |
'OB Transaction' => 'EB-Buchung', |
|
147 | 149 |
'Oct' => 'Okt', |
148 | 150 |
'October' => 'Oktober', |
149 | 151 |
'Others' => 'Andere', |
sql/Pg-upgrade2/cb_ob_transaction.sql | ||
---|---|---|
1 |
-- @tag: cb_ob_transaction |
|
2 |
-- @description: Spalten für Eröffnungs- und Schlussbilanzbuchungen |
|
3 |
-- @depends: release_2_4_2 |
|
4 |
ALTER TABLE gl ADD COLUMN ob_transaction boolean; |
|
5 |
ALTER TABLE gl ADD COLUMN cb_transaction boolean; |
|
6 |
ALTER TABLE acc_trans ADD COLUMN ob_transaction boolean; |
|
7 |
ALTER TABLE acc_trans ADD COLUMN cb_transaction boolean; |
Auch abrufbar als: Unified diff
Markieren von Dialogbuchungen als Eroeffnungs- oder Schlussbilanzbuchungen