Revision f47c2cd1
Von Moritz Bunkus vor fast 12 Jahren hinzugefügt
SL/DB/MetaSetup/PurchaseInvoice.pm | ||
---|---|---|
43 | 43 |
globalproject_id => { type => 'integer' }, |
44 | 44 |
transaction_description => { type => 'text' }, |
45 | 45 |
storno_id => { type => 'integer' }, |
46 |
direct_debit => { type => 'boolean', default => 'false' }, |
|
46 | 47 |
], |
47 | 48 |
|
48 | 49 |
primary_key_columns => [ 'id' ], |
SL/IR.pm | ||
---|---|---|
658 | 658 |
invoice = ?, taxzone_id = ?, notes = ?, taxincluded = ?, |
659 | 659 |
intnotes = ?, curr = ?, storno_id = ?, storno = ?, |
660 | 660 |
cp_id = ?, employee_id = ?, department_id = ?, |
661 |
globalproject_id = ? |
|
661 |
globalproject_id = ?, direct_debit = ?
|
|
662 | 662 |
WHERE id = ?|; |
663 | 663 |
@values = ( |
664 | 664 |
$form->{invnumber}, $form->{ordnumber}, $form->{quonumber}, conv_date($form->{invdate}), |
... | ... | |
668 | 668 |
$form->{intnotes}, $form->{currency}, conv_i($form->{storno_id}), $form->{storno} ? 't' : 'f', |
669 | 669 |
conv_i($form->{cp_id}), conv_i($form->{employee_id}), conv_i($form->{department_id}), |
670 | 670 |
conv_i($form->{globalproject_id}), |
671 |
$form->{direct_debit} ? 't' : 'f', |
|
671 | 672 |
conv_i($form->{id}) |
672 | 673 |
); |
673 | 674 |
do_query($form, $dbh, $query, @values); |
... | ... | |
911 | 912 |
$query = qq|SELECT cp_id, invnumber, transdate AS invdate, duedate, |
912 | 913 |
orddate, quodate, globalproject_id, |
913 | 914 |
ordnumber, quonumber, paid, taxincluded, notes, taxzone_id, storno, gldate, |
914 |
intnotes, curr AS currency |
|
915 |
intnotes, curr AS currency, direct_debit
|
|
915 | 916 |
FROM ap |
916 | 917 |
WHERE id = ?|; |
917 | 918 |
$ref = selectfirst_hashref_query($form, $dbh, $query, conv_i($form->{id})); |
... | ... | |
1061 | 1062 |
v.id AS vendor_id, v.name AS vendor, v.discount as vendor_discount, |
1062 | 1063 |
v.creditlimit, v.terms, v.notes AS intnotes, |
1063 | 1064 |
v.email, v.cc, v.bcc, v.language_id, v.payment_id, |
1064 |
v.street, v.zipcode, v.city, v.country, v.taxzone_id, v.curr, |
|
1065 |
v.street, v.zipcode, v.city, v.country, v.taxzone_id, v.curr, v.direct_debit,
|
|
1065 | 1066 |
$duedate + COALESCE(pt.terms_netto, 0) AS duedate, |
1066 | 1067 |
b.description AS business |
1067 | 1068 |
FROM vendor v |
locale/de/all | ||
---|---|---|
1380 | 1380 |
'Password' => 'Passwort', |
1381 | 1381 |
'Payables' => 'Verbindlichkeiten', |
1382 | 1382 |
'Payment' => 'Zahlungsausgang', |
1383 |
'Payment Options' => 'Zahlungsoptionen', |
|
1383 | 1384 |
'Payment Reminder' => 'Zahlungserinnerung', |
1384 | 1385 |
'Payment Terms' => 'Zahlungsbedingungen', |
1385 | 1386 |
'Payment Terms missing in row ' => 'Zahlungsfrist fehlt in Zeile ', |
sql/Pg-upgrade2/ap_add_direct_debit.sql | ||
---|---|---|
1 |
-- @tag: ap_add_direct_debit |
|
2 |
-- @description: Spalte für Bankeinzug bei Einkaufsrechnungen |
|
3 |
-- @depends: release_3_0_0 |
|
4 |
-- @charset: utf-8 |
|
5 |
ALTER TABLE ap ADD COLUMN direct_debit boolean; |
|
6 |
ALTER TABLE ap ALTER COLUMN direct_debit SET DEFAULT FALSE; |
|
7 |
UPDATE ap SET direct_debit = FALSE; |
templates/webpages/ir/form_footer.html | ||
---|---|---|
1 | 1 |
[%- USE T8 %] |
2 | 2 |
[%- USE HTML %] |
3 | 3 |
[%- USE LxERP %] |
4 |
[%- USE L %] |
|
4 | 5 |
<tr> |
5 | 6 |
<td> |
6 | 7 |
<table width="100%"> |
... | ... | |
10 | 11 |
<tr> |
11 | 12 |
<th align="left">[% 'Notes' | $T8 %]</th> |
12 | 13 |
<th align="left">[% 'Internal Notes' | $T8 %]</th> |
14 |
<th align="left">[% 'Payment Options' | $T8 %]</th> |
|
13 | 15 |
</tr> |
14 | 16 |
<tr valign="top"> |
15 | 17 |
<td> |
... | ... | |
18 | 20 |
<td> |
19 | 21 |
<textarea name="intnotes" rows="[% rows %]" cols="35" wrap="soft">[% intnotes %]</textarea> |
20 | 22 |
</td> |
23 |
<td> |
|
24 |
[%- L.checkbox_tag('direct_debit', 'checked', direct_debit, 'label', LxERP.t8('direct debit')) %] |
|
25 |
</td> |
|
21 | 26 |
</tr> |
22 | 27 |
[%- IF id && follow_ups.size %] |
23 | 28 |
<tr> |
Auch abrufbar als: Unified diff
Einkaufsrechnungen: Checkbox für "Lastschrifteinzug"; Vorbelegung aus Stammdaten