Revision a523371d
Von Moritz Bunkus vor fast 12 Jahren hinzugefügt
SL/DB/MetaSetup/Invoice.pm | ||
---|---|---|
56 | 56 |
marge_percent => { type => 'numeric', precision => 5, scale => 15 }, |
57 | 57 |
donumber => { type => 'text' }, |
58 | 58 |
invnumber_for_credit_note => { type => 'text' }, |
59 |
direct_debit => { type => 'boolean', default => 'false' }, |
|
59 | 60 |
], |
60 | 61 |
|
61 | 62 |
primary_key_columns => [ 'id' ], |
SL/IS.pm | ||
---|---|---|
1017 | 1017 |
cp_id = ?, marge_total = ?, marge_percent = ?, |
1018 | 1018 |
globalproject_id = ?, delivery_customer_id = ?, |
1019 | 1019 |
transaction_description = ?, delivery_vendor_id = ?, |
1020 |
donumber = ?, invnumber_for_credit_note = ? |
|
1020 |
donumber = ?, invnumber_for_credit_note = ?, direct_debit = ?
|
|
1021 | 1021 |
WHERE id = ?|; |
1022 | 1022 |
@values = ( $form->{"invnumber"}, $form->{"ordnumber"}, $form->{"quonumber"}, $form->{"cusordnumber"}, |
1023 | 1023 |
conv_date($form->{"invdate"}), conv_date($form->{"orddate"}), conv_date($form->{"quodate"}), conv_i($form->{"customer_id"}), |
... | ... | |
1030 | 1030 |
conv_i($form->{"cp_id"}), 1 * $form->{marge_total} , 1 * $form->{marge_percent}, |
1031 | 1031 |
conv_i($form->{"globalproject_id"}), conv_i($form->{"delivery_customer_id"}), |
1032 | 1032 |
$form->{transaction_description}, conv_i($form->{"delivery_vendor_id"}), |
1033 |
$form->{"donumber"}, $form->{"invnumber_for_credit_note"}, |
|
1033 |
$form->{"donumber"}, $form->{"invnumber_for_credit_note"}, $form->{direct_debit} ? 't' : 'f',
|
|
1034 | 1034 |
conv_i($form->{"id"})); |
1035 | 1035 |
do_query($form, $dbh, $query, @values); |
1036 | 1036 |
|
... | ... | |
1508 | 1508 |
a.employee_id, a.salesman_id, a.payment_id, |
1509 | 1509 |
a.language_id, a.delivery_customer_id, a.delivery_vendor_id, a.type, |
1510 | 1510 |
a.transaction_description, a.donumber, a.invnumber_for_credit_note, |
1511 |
a.marge_total, a.marge_percent, |
|
1511 |
a.marge_total, a.marge_percent, a.direct_debit,
|
|
1512 | 1512 |
e.name AS employee |
1513 | 1513 |
FROM ar a |
1514 | 1514 |
LEFT JOIN employee e ON (e.id = a.employee_id) |
... | ... | |
1684 | 1684 |
c.email, c.cc, c.bcc, c.language_id, c.payment_id, |
1685 | 1685 |
c.street, c.zipcode, c.city, c.country, |
1686 | 1686 |
c.notes AS intnotes, c.klass as customer_klass, c.taxzone_id, c.salesman_id, c.curr, |
1687 |
c.taxincluded_checked, |
|
1687 |
c.taxincluded_checked, c.direct_debit,
|
|
1688 | 1688 |
$duedate + COALESCE(pt.terms_netto, 0) AS duedate, |
1689 | 1689 |
b.discount AS tradediscount, b.description AS business |
1690 | 1690 |
FROM customer c |
locale/de/all | ||
---|---|---|
2333 | 2333 |
'delete' => 'Löschen', |
2334 | 2334 |
'delivered' => 'geliefert', |
2335 | 2335 |
'deliverydate' => 'Lieferdatum', |
2336 |
'direct debit' => 'Lastschrift', |
|
2336 |
'direct debit' => 'Lastschrifteinzug',
|
|
2337 | 2337 |
'disposed' => 'Entsorgung', |
2338 | 2338 |
'do not include' => 'Nicht aufnehmen', |
2339 | 2339 |
'done' => 'erledigt', |
sql/Pg-upgrade2/ar_add_direct_debit.sql | ||
---|---|---|
1 |
-- @tag: ar_add_direct_debit |
|
2 |
-- @description: Spalte für Bankeinzug bei Verkaufsrechnungen |
|
3 |
-- @depends: release_3_0_0 |
|
4 |
-- @charset: utf-8 |
|
5 |
ALTER TABLE ar ADD COLUMN direct_debit boolean; |
|
6 |
ALTER TABLE ar ALTER COLUMN direct_debit SET DEFAULT FALSE; |
|
7 |
UPDATE ar SET direct_debit = FALSE; |
templates/webpages/is/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%"> |
... | ... | |
29 | 30 |
show_empty = 1 |
30 | 31 |
allow_textbox = 0 -%] |
31 | 32 |
<script type='text/javascript'>$('#payment_id').change(function(){ if (this.value) set_duedate()})</script> |
33 |
<br> |
|
34 |
[%- L.checkbox_tag('direct_debit', 'checked', direct_debit, 'label', LxERP.t8('direct debit')) %] |
|
32 | 35 |
</td> |
33 | 36 |
</tr> |
34 | 37 |
[%- IF id && follow_ups.size %] |
Auch abrufbar als: Unified diff
Verkaufsrechnungen: Checkbox für "Lastschrifteinzug"; Vorbelegung aus Stammdaten