Revision c4767543
Von Bernd Bleßmann vor mehr als 4 Jahren hinzugefügt
SL/AP.pm | ||
---|---|---|
139 | 139 |
|
140 | 140 |
$query = qq|UPDATE ap SET invnumber = ?, |
141 | 141 |
transdate = ?, ordnumber = ?, vendor_id = ?, taxincluded = ?, |
142 |
amount = ?, duedate = ?, paid = ?, netamount = ?, |
|
142 |
amount = ?, duedate = ?, deliverydate = ?, paid = ?, netamount = ?,
|
|
143 | 143 |
currency_id = (SELECT id FROM currencies WHERE name = ?), notes = ?, department_id = ?, storno = ?, storno_id = ?, |
144 | 144 |
globalproject_id = ?, direct_debit = ? |
145 | 145 |
WHERE id = ?|; |
146 | 146 |
@values = ($form->{invnumber}, conv_date($form->{transdate}), |
147 | 147 |
$form->{ordnumber}, conv_i($form->{vendor_id}), |
148 | 148 |
$form->{taxincluded} ? 't' : 'f', $form->{invtotal}, |
149 |
conv_date($form->{duedate}), $form->{invpaid},
|
|
150 |
$form->{netamount}, |
|
149 |
conv_date($form->{duedate}), conv_date($form->{deliverydate}),
|
|
150 |
$form->{invpaid}, $form->{netamount},
|
|
151 | 151 |
$form->{currency}, $form->{notes}, |
152 | 152 |
conv_i($form->{department_id}), $form->{storno}, |
153 | 153 |
$form->{storno_id}, conv_i($form->{globalproject_id}), |
SL/AR.pm | ||
---|---|---|
134 | 134 |
$query = |
135 | 135 |
qq|UPDATE ar set |
136 | 136 |
invnumber = ?, ordnumber = ?, transdate = ?, customer_id = ?, |
137 |
taxincluded = ?, amount = ?, duedate = ?, paid = ?, |
|
137 |
taxincluded = ?, amount = ?, duedate = ?, deliverydate = ?, paid = ?,
|
|
138 | 138 |
currency_id = (SELECT id FROM currencies WHERE name = ?), |
139 | 139 |
netamount = ?, notes = ?, department_id = ?, |
140 | 140 |
employee_id = ?, storno = ?, storno_id = ?, globalproject_id = ?, |
141 | 141 |
direct_debit = ? |
142 | 142 |
WHERE id = ?|; |
143 | 143 |
my @values = ($form->{invnumber}, $form->{ordnumber}, conv_date($form->{transdate}), conv_i($form->{customer_id}), $form->{taxincluded} ? 't' : 'f', $form->{amount}, |
144 |
conv_date($form->{duedate}), $form->{paid}, |
|
144 |
conv_date($form->{duedate}), conv_date($form->{deliverydate}), $form->{paid},
|
|
145 | 145 |
$form->{currency}, |
146 | 146 |
$form->{netamount}, $form->{notes}, conv_i($form->{department_id}), |
147 | 147 |
conv_i($form->{employee_id}), $form->{storno} ? 't' : 'f', $form->{storno_id}, |
SL/Form.pm | ||
---|---|---|
2683 | 2683 |
if ($self->{id}) { |
2684 | 2684 |
$query = |
2685 | 2685 |
qq|SELECT |
2686 |
a.cp_id, a.invnumber, a.transdate, a.${table}_id, a.datepaid, |
|
2686 |
a.cp_id, a.invnumber, a.transdate, a.${table}_id, a.datepaid, a.deliverydate,
|
|
2687 | 2687 |
a.duedate, a.ordnumber, a.taxincluded, (SELECT cu.name FROM currencies cu WHERE cu.id=a.currency_id) AS currency, a.notes, |
2688 | 2688 |
a.mtime, a.itime, |
2689 | 2689 |
a.intnotes, a.department_id, a.amount AS oldinvtotal, |
bin/mozilla/ap.pl | ||
---|---|---|
1211 | 1211 |
$::form->{transdate} = $today->to_kivitendo; |
1212 | 1212 |
$::form->{duedate} = $today->to_kivitendo; |
1213 | 1213 |
$::form->{duedate} = $order->payment_terms->calc_date(reference_date => $today)->to_kivitendo if $order->payment_terms; |
1214 |
$::form->{deliverydate} = $order->reqdate->to_kivitendo if $order->reqdate; |
|
1214 | 1215 |
create_links(); |
1215 | 1216 |
|
1216 | 1217 |
my $config_po_ap_workflow_chart_id = $::instance_conf->get_workflow_po_ap_chart_id; |
templates/webpages/ap/form_header.html | ||
---|---|---|
163 | 163 |
<th align="right" nowrap>[% 'Due Date' | $T8 %]</th> |
164 | 164 |
<td>[% L.date_tag('duedate', duedate) %]</td> |
165 | 165 |
</tr> |
166 |
<tr> |
|
167 |
<th align=right nowrap>[% 'Delivery Date' | $T8 %]</th> |
|
168 |
<td>[% L.date_tag('deliverydate', deliverydate) %]</td> |
|
169 |
</tr> |
|
166 | 170 |
<tr> |
167 | 171 |
<th align="right" nowrap>[% 'Project Number' | $T8 %]</th> |
168 | 172 |
<td> |
templates/webpages/ar/form_header.html | ||
---|---|---|
141 | 141 |
<th align=right nowrap>[% 'Due Date' | $T8 %]</th> |
142 | 142 |
<td>[% L.date_tag('duedate', duedate) %]</td> |
143 | 143 |
</tr> |
144 |
<tr> |
|
145 |
<th align=right nowrap>[% 'Delivery Date' | $T8 %]</th> |
|
146 |
<td>[% L.date_tag('deliverydate', deliverydate) %]</td> |
|
147 |
</tr> |
|
144 | 148 |
<tr> |
145 | 149 |
<th align=right nowrap>[% 'Project Number' | $T8 %]</th> |
146 | 150 |
<td>[% L.select_tag('globalproject_id', ALL_PROJECTS, title_key = 'projectnumber', default = globalproject_id, with_empty = 1, onChange = "document.getElementById('update_button').click();") %]</td> |
Auch abrufbar als: Unified diff
Lieferdatum in Debitoren-und Kreditorenbuchung