Revision ce2e13e6
Von Moritz Bunkus vor fast 17 Jahren hinzugefügt
SL/DO.pm | ||
---|---|---|
56 | 56 |
my $vc = $form->{vc} eq "customer" ? "customer" : "vendor"; |
57 | 57 |
|
58 | 58 |
$query = |
59 |
qq|SELECT dord.id, dord.donumber, dord.ordnumber, dord.oreqnumber, dord.transdate,
|
|
59 |
qq|SELECT dord.id, dord.donumber, dord.ordnumber, dord.transdate, |
|
60 | 60 |
ct.name, dord.${vc}_id, dord.globalproject_id, |
61 | 61 |
dord.closed, dord.delivered, dord.shippingpoint, dord.shipvia, |
62 | 62 |
dord.transaction_description, |
63 | 63 |
pr.projectnumber AS globalprojectnumber, |
64 | 64 |
e.name AS employee, |
65 | 65 |
sm.name AS salesman, |
66 |
oreq.id AS oreq_id, |
|
67 | 66 |
oe.id AS oe_id |
68 | 67 |
FROM delivery_orders dord |
69 | 68 |
LEFT JOIN $vc ct ON (dord.${vc}_id = ct.id) |
70 | 69 |
LEFT JOIN employee e ON (dord.employee_id = e.id) |
71 | 70 |
LEFT JOIN employee sm ON (dord.salesman_id = sm.id) |
72 | 71 |
LEFT JOIN project pr ON (dord.globalproject_id = pr.id) |
73 |
LEFT JOIN order_request oreq ON (dord.oreqnumber = oreq.oreqnumber) |
|
74 | 72 |
LEFT JOIN oe ON ((dord.ordnumber = oe.ordnumber) AND NOT COALESCE(oe.quotation, FALSE))|; |
75 | 73 |
|
76 | 74 |
push @where, ($form->{type} eq 'sales_delivery_order' ? '' : 'NOT ') . qq|COALESCE(dord.is_sales, FALSE)|; |
... | ... | |
138 | 136 |
"id" => "dord.id", |
139 | 137 |
"donumber" => "dord.donumber", |
140 | 138 |
"ordnumber" => "dord.ordnumber", |
141 |
"oreqnumber" => "dord.oreqnumber", |
|
142 | 139 |
"name" => "ct.name", |
143 | 140 |
"employee" => "e.name", |
144 | 141 |
"salesman" => "sm.name", |
... | ... | |
226 | 223 |
id, delivery_order_id, parts_id, description, longdescription, qty, base_qty, |
227 | 224 |
sellprice, discount, unit, reqdate, project_id, serialnumber, |
228 | 225 |
ordnumber, transdate, cusordnumber, |
229 |
lastcost, price_factor_id, price_factor, marge_price_factor, |
|
230 |
v_partnumber, v_description) |
|
226 |
lastcost, price_factor_id, price_factor, marge_price_factor) |
|
231 | 227 |
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, |
232 |
(SELECT factor FROM price_factors WHERE id = ?), ?, ?, ?)|;
|
|
228 |
(SELECT factor FROM price_factors WHERE id = ?), ?)|; |
|
233 | 229 |
my $h_item = prepare_query($form, $dbh, $q_item); |
234 | 230 |
|
235 | 231 |
my $q_item_stock = |
... | ... | |
277 | 273 |
$form->{"cusordnumber_$i"}, |
278 | 274 |
$form->{"lastcost_$i"}, |
279 | 275 |
conv_i($form->{"price_factor_id_$i"}), conv_i($form->{"price_factor_id_$i"}), |
280 |
conv_i($form->{"marge_price_factor_$i"}), |
|
281 |
$form->{"v_partnumber_$i"}, $form->{"v_description_$i"}); |
|
276 |
conv_i($form->{"marge_price_factor_$i"})); |
|
282 | 277 |
do_statement($form, $h_item, $q_item, @values); |
283 | 278 |
|
284 | 279 |
my $stock_info = DO->unpack_stock_information('packed' => $form->{"stock_${in_out}_$i"}); |
... | ... | |
299 | 294 |
# save DO record |
300 | 295 |
$query = |
301 | 296 |
qq|UPDATE delivery_orders SET |
302 |
donumber = ?, ordnumber = ?, cusordnumber = ?, oreqnumber = ?, transdate = ?, vendor_id = ?,
|
|
297 |
donumber = ?, ordnumber = ?, cusordnumber = ?, transdate = ?, vendor_id = ?, |
|
303 | 298 |
customer_id = ?, reqdate = ?, |
304 | 299 |
shippingpoint = ?, shipvia = ?, notes = ?, intnotes = ?, closed = ?, |
305 | 300 |
delivered = ?, department_id = ?, language_id = ?, shipto_id = ?, |
... | ... | |
308 | 303 |
WHERE id = ?|; |
309 | 304 |
|
310 | 305 |
@values = ($form->{donumber}, $form->{ordnumber}, |
311 |
$form->{cusordnumber}, $form->{oreqnumber}, conv_date($form->{transdate}),
|
|
306 |
$form->{cusordnumber}, conv_date($form->{transdate}), |
|
312 | 307 |
conv_i($form->{vendor_id}), conv_i($form->{customer_id}), |
313 | 308 |
conv_date($reqdate), $form->{shippingpoint}, $form->{shipvia}, |
314 | 309 |
$form->{notes}, $form->{intnotes}, |
... | ... | |
454 | 449 |
# so if any of these infos is important (or even different) for any item, |
455 | 450 |
# it will be killed out and then has to be fetched from the item scope query further down |
456 | 451 |
$query = |
457 |
qq|SELECT dord.cp_id, dord.donumber, dord.ordnumber, dord.oreqnumber, dord.transdate, dord.reqdate,
|
|
452 |
qq|SELECT dord.cp_id, dord.donumber, dord.ordnumber, dord.transdate, dord.reqdate, |
|
458 | 453 |
dord.shippingpoint, dord.shipvia, dord.notes, dord.intnotes, |
459 | 454 |
e.name AS employee, dord.employee_id, dord.salesman_id, |
460 | 455 |
dord.${vc}_id, cv.name AS ${vc}, |
... | ... | |
514 | 509 |
doi.reqdate, doi.project_id, doi.serialnumber, doi.lastcost, |
515 | 510 |
doi.ordnumber, doi.transdate, doi.cusordnumber, doi.longdescription, |
516 | 511 |
doi.price_factor_id, doi.price_factor, doi.marge_price_factor, |
517 |
doi.v_partnumber, doi.v_description, |
|
518 | 512 |
pr.projectnumber, |
519 | 513 |
pg.partsgroup |
520 | 514 |
FROM delivery_order_items doi |
... | ... | |
627 | 621 |
qw(runningnumber number description longdescription qty unit |
628 | 622 |
partnotes serialnumber reqdate projectnumber |
629 | 623 |
si_runningnumber si_number si_description |
630 |
si_warehouse si_bin si_chargenumber si_qty si_unit |
|
631 |
v_partnumber v_description); |
|
624 |
si_warehouse si_bin si_chargenumber si_qty si_unit); |
|
632 | 625 |
|
633 | 626 |
my $sameitem = ""; |
634 | 627 |
foreach $item (sort { $a->[1] cmp $b->[1] } @partsgroup) { |
... | ... | |
661 | 654 |
push @{ $form->{serialnumber} }, $form->{"serialnumber_$i"}; |
662 | 655 |
push @{ $form->{reqdate} }, $form->{"reqdate_$i"}; |
663 | 656 |
push @{ $form->{projectnumber} }, $projectnumbers{$form->{"project_id_$i"}}; |
664 |
push @{ $form->{v_partnumber} }, $form->{"v_partnumber_$i"}; |
|
665 |
push @{ $form->{v_description} }, $form->{"v_description_$i"}; |
|
666 | 657 |
|
667 | 658 |
if ($form->{"assembly_$i"}) { |
668 | 659 |
$sameitem = ""; |
bin/mozilla/do.pl | ||
---|---|---|
417 | 417 |
my @columns = qw( |
418 | 418 |
transdate |
419 | 419 |
id donumber |
420 |
ordnumber oreqnumber
|
|
420 |
ordnumber |
|
421 | 421 |
name employee |
422 | 422 |
shipvia globalprojectnumber |
423 | 423 |
transaction_description |
... | ... | |
445 | 445 |
'id' => { 'text' => $locale->text('ID'), }, |
446 | 446 |
'donumber' => { 'text' => $locale->text('Delivery Order'), }, |
447 | 447 |
'ordnumber' => { 'text' => $locale->text('Order'), }, |
448 |
'oreqnumber' => { 'text' => $locale->text('Order Request Number'), }, |
|
449 | 448 |
'name' => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer') : $locale->text('Vendor'), }, |
450 | 449 |
'employee' => { 'text' => $locale->text('Salesperson'), }, |
451 | 450 |
'shipvia' => { 'text' => $locale->text('Ship via'), }, |
... | ... | |
455 | 454 |
'delivered' => { 'text' => $locale->text('Delivered'), }, |
456 | 455 |
); |
457 | 456 |
|
458 |
foreach my $name (qw(id transdate donumber ordnumber oreqnumber name employee shipvia)) {
|
|
457 |
foreach my $name (qw(id transdate donumber ordnumber name employee shipvia)) { |
|
459 | 458 |
$column_defs{$name}->{link} = $href . "&sort=$name"; |
460 | 459 |
} |
461 | 460 |
|
... | ... | |
524 | 523 |
|
525 | 524 |
my $edit_url = build_std_url('action=edit', 'type', 'vc'); |
526 | 525 |
my $edit_order_url = build_std_url('script=oe.pl', 'type=' . ($form->{type} eq 'sales_delivery_order' ? 'sales_order' : 'purchase_order'), 'action=edit'); |
527 |
my $edit_oreq_url = build_std_url('script=pkoreq.pl', 'action=edit'); |
|
528 | 526 |
|
529 | 527 |
foreach $dord (@{ $form->{DO} }) { |
530 | 528 |
$dord->{open} = $dord->{closed} ? $locale->text('No') : $locale->text('Yes'); |
... | ... | |
532 | 530 |
|
533 | 531 |
my $row = { map { $_ => { 'data' => $dord->{$_} } } @columns }; |
534 | 532 |
|
535 |
$row->{donumber}->{link} = $edit_url . "&id=" . E($dord->{id}) . "&callback=${callback}"; |
|
536 |
$row->{ordnumber}->{link} = $edit_order_url . "&id=" . E($dord->{oe_id}) . "&callback=${callback}"; |
|
537 |
$row->{oreqnumber}->{link} = $edit_oreq_url . "&id=" . E($dord->{oreq_id}) . "&callback=${callback}"; |
|
533 |
$row->{donumber}->{link} = $edit_url . "&id=" . E($dord->{id}) . "&callback=${callback}"; |
|
534 |
$row->{ordnumber}->{link} = $edit_order_url . "&id=" . E($dord->{oe_id}) . "&callback=${callback}"; |
|
538 | 535 |
|
539 | 536 |
$report->add_data($row); |
540 | 537 |
} |
locale/de/all | ||
---|---|---|
785 | 785 |
'Last Credit Note Number' => 'Letzte Gutschriftnummer', |
786 | 786 |
'Last Customer Number' => 'Letzte Kundennummer', |
787 | 787 |
'Last Invoice Number' => 'Letzte Rechnungsnummer', |
788 |
'Last Order Request Number' => 'Letzte Bestellanfragenummer', |
|
789 | 788 |
'Last Purchase Delivery Order Number' => 'Letzte Lieferscheinnummer (Einkauf)', |
790 | 789 |
'Last Purchase Order Number' => 'Letzte Lieferantenautragsnummer', |
791 | 790 |
'Last RFQ Number' => 'Letzte Anfragenummer', |
792 |
'Last Release Material Slip Number' => 'Letzte Materialausgabebelegsnummer', |
|
793 |
'Last Return Material Slip Number' => 'Letzte Materialrückgabescheinnummer', |
|
794 | 791 |
'Last Sales Delivery Order Number' => 'Letzte Lieferscheinnummer (Verkauf)', |
795 | 792 |
'Last Sales Order Number' => 'Letzte Auftragsnummer', |
796 | 793 |
'Last Sales Quotation Number' => 'Letzte Angebotsnummer', |
... | ... | |
972 | 969 |
'Order Date missing!' => 'Auftragsdatum fehlt!', |
973 | 970 |
'Order Number' => 'Auftragsnummer', |
974 | 971 |
'Order Number missing!' => 'Auftragsnummer fehlt!', |
975 |
'Order Request Number' => 'Bestellanfragenummer', |
|
976 | 972 |
'Order deleted!' => 'Auftrag gel?scht!', |
977 | 973 |
'Ordered' => 'Vom Kunde bestellt', |
978 | 974 |
'Orientation' => 'Seitenformat', |
locale/de/do | ||
---|---|---|
162 | 162 |
'Order Date missing!' => 'Auftragsdatum fehlt!', |
163 | 163 |
'Order Number' => 'Auftragsnummer', |
164 | 164 |
'Order Number missing!' => 'Auftragsnummer fehlt!', |
165 |
'Order Request Number' => 'Bestellanfragenummer', |
|
166 | 165 |
'Others' => 'Andere', |
167 | 166 |
'PAYMENT POSTED' => 'Rechung gebucht', |
168 | 167 |
'PDF' => 'PDF', |
locale/de/login | ||
---|---|---|
212 | 212 |
'Order Date missing!' => 'Auftragsdatum fehlt!', |
213 | 213 |
'Order Number' => 'Auftragsnummer', |
214 | 214 |
'Order Number missing!' => 'Auftragsnummer fehlt!', |
215 |
'Order Request Number' => 'Bestellanfragenummer', |
|
216 | 215 |
'Order deleted!' => 'Auftrag gel?scht!', |
217 | 216 |
'Other users\' follow-ups' => 'Wiedervorlagen anderer Benutzer', |
218 | 217 |
'Others' => 'Andere', |
locale/de/oe | ||
---|---|---|
191 | 191 |
'Order Date missing!' => 'Auftragsdatum fehlt!', |
192 | 192 |
'Order Number' => 'Auftragsnummer', |
193 | 193 |
'Order Number missing!' => 'Auftragsnummer fehlt!', |
194 |
'Order Request Number' => 'Bestellanfragenummer', |
|
195 | 194 |
'Order deleted!' => 'Auftrag gel?scht!', |
196 | 195 |
'Others' => 'Andere', |
197 | 196 |
'PAYMENT POSTED' => 'Rechung gebucht', |
locale/de/todo | ||
---|---|---|
209 | 209 |
'Order Date missing!' => 'Auftragsdatum fehlt!', |
210 | 210 |
'Order Number' => 'Auftragsnummer', |
211 | 211 |
'Order Number missing!' => 'Auftragsnummer fehlt!', |
212 |
'Order Request Number' => 'Bestellanfragenummer', |
|
213 | 212 |
'Order deleted!' => 'Auftrag gel?scht!', |
214 | 213 |
'Other users\' follow-ups' => 'Wiedervorlagen anderer Benutzer', |
215 | 214 |
'Others' => 'Andere', |
templates/webpages/am/edit_defaults_de.html | ||
---|---|---|
57 | 57 |
<td><input name="pdonumber" size="10" value="[% HTML.escape(defaults_pdonumber) %]"></td> |
58 | 58 |
</tr> |
59 | 59 |
|
60 |
<tr> |
|
61 |
<th align="right" nowrap>Letzte Materialrückgabescheinnummer</th> |
|
62 |
<td><input name="rmsnumber" size="10" value="[% HTML.escape(defaults_rmsnumber) %]"></td> |
|
63 |
<th align="right" nowrap>Letzte Bestellanfragenummer</th> |
|
64 |
<td><input name="oreqnumber" size="10" value="[% HTML.escape(defaults_oreqnumber) %]"></td> |
|
65 |
</tr> |
|
66 |
|
|
67 |
<tr> |
|
68 |
<th align="right" nowrap>Letzte Materialausgabebelegsnummer</th> |
|
69 |
<td><input name="rlmsnumber" size="10" value="[% HTML.escape(defaults_rlmsnumber) %]"></td> |
|
70 |
</tr> |
|
71 |
|
|
72 | 60 |
<tr class="listheading"> |
73 | 61 |
<th colspan="4">Standardkonten</th> |
74 | 62 |
</tr> |
templates/webpages/am/edit_defaults_master.html | ||
---|---|---|
57 | 57 |
<td><input name="pdonumber" size="10" value="[% HTML.escape(defaults_pdonumber) %]"></td> |
58 | 58 |
</tr> |
59 | 59 |
|
60 |
<tr> |
|
61 |
<th align="right" nowrap><translate>Last Return Material Slip Number</translate></th> |
|
62 |
<td><input name="rmsnumber" size="10" value="[% HTML.escape(defaults_rmsnumber) %]"></td> |
|
63 |
<th align="right" nowrap><translate>Last Order Request Number</translate></th> |
|
64 |
<td><input name="oreqnumber" size="10" value="[% HTML.escape(defaults_oreqnumber) %]"></td> |
|
65 |
</tr> |
|
66 |
|
|
67 |
<tr> |
|
68 |
<th align="right" nowrap><translate>Last Release Material Slip Number</translate></th> |
|
69 |
<td><input name="rlmsnumber" size="10" value="[% HTML.escape(defaults_rlmsnumber) %]"></td> |
|
70 |
</tr> |
|
71 |
|
|
72 | 60 |
<tr class="listheading"> |
73 | 61 |
<th colspan="4"><translate>Default Accounts</translate></th> |
74 | 62 |
</tr> |
templates/webpages/do/form_header_de.html | ||
---|---|---|
305 | 305 |
<td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"[% RO %]></td> |
306 | 306 |
</tr> |
307 | 307 |
|
308 |
[%- UNLESS is_customer %] |
|
309 |
<tr> |
|
310 |
<th width="70%" align="right" nowrap>Bestellanfragenummer</th> |
|
311 |
<td><input name="oreqnumber" size="11" value="[% HTML.escape(oreqnumber) %]"[% RO %]></td> |
|
312 |
</tr> |
|
313 |
[%- END %] |
|
314 |
|
|
315 | 308 |
<tr> |
316 | 309 |
<th align="right" nowrap>Lieferscheindatum</th> |
317 | 310 |
<td nowrap> |
templates/webpages/do/form_header_master.html | ||
---|---|---|
305 | 305 |
<td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"[% RO %]></td> |
306 | 306 |
</tr> |
307 | 307 |
|
308 |
[%- UNLESS is_customer %] |
|
309 |
<tr> |
|
310 |
<th width="70%" align="right" nowrap><translate>Order Request Number</translate></th> |
|
311 |
<td><input name="oreqnumber" size="11" value="[% HTML.escape(oreqnumber) %]"[% RO %]></td> |
|
312 |
</tr> |
|
313 |
[%- END %] |
|
314 |
|
|
315 | 308 |
<tr> |
316 | 309 |
<th align="right" nowrap><translate>Delivery Order Date</translate></th> |
317 | 310 |
<td nowrap> |
templates/webpages/do/search_de.html | ||
---|---|---|
55 | 55 |
<td colspan="3"><input name="ordnumber" class="fixed_width"></td> |
56 | 56 |
</tr> |
57 | 57 |
|
58 |
[%- UNLESS is_customer %] |
|
59 |
<tr> |
|
60 |
<th align="right">Bestellanfragenummer</th> |
|
61 |
<td colspan="3"><input name="oreqnumber" class="fixed_width"></td> |
|
62 |
</tr> |
|
63 |
[%- END %] |
|
64 |
|
|
65 | 58 |
[%- IF ALL_DEPARTMENTS.size %] |
66 | 59 |
<tr> |
67 | 60 |
<th align="right" nowrap>Abteilung</th> |
... | ... | |
184 | 177 |
<input name="l_cusordnumber" id="l_cusordnumber" class="checkbox" type="checkbox" value="Y"> |
185 | 178 |
<label for="l_cusordnumber">Bestellnummer des Kunden</label> |
186 | 179 |
</td> |
187 |
|
|
188 |
[%- UNLESS is_customer %] |
|
189 |
<td> |
|
190 |
<input name="l_oreqnumber" id="l_oreqnumber" class="checkbox" type="checkbox" value="Y" checked> |
|
191 |
<label for="l_oreqnumber">Bestellanfragenummer</label> |
|
192 |
</td> |
|
193 |
[%- END %] |
|
194 | 180 |
</tr> |
195 | 181 |
|
196 | 182 |
<tr> |
templates/webpages/do/search_master.html | ||
---|---|---|
55 | 55 |
<td colspan="3"><input name="ordnumber" class="fixed_width"></td> |
56 | 56 |
</tr> |
57 | 57 |
|
58 |
[%- UNLESS is_customer %] |
|
59 |
<tr> |
|
60 |
<th align="right"><translate>Order Request Number</translate></th> |
|
61 |
<td colspan="3"><input name="oreqnumber" class="fixed_width"></td> |
|
62 |
</tr> |
|
63 |
[%- END %] |
|
64 |
|
|
65 | 58 |
[%- IF ALL_DEPARTMENTS.size %] |
66 | 59 |
<tr> |
67 | 60 |
<th align="right" nowrap><translate>Department</translate></th> |
... | ... | |
184 | 177 |
<input name="l_cusordnumber" id="l_cusordnumber" class="checkbox" type="checkbox" value="Y"> |
185 | 178 |
<label for="l_cusordnumber"><translate>Customer Order Number</translate></label> |
186 | 179 |
</td> |
187 |
|
|
188 |
[%- UNLESS is_customer %] |
|
189 |
<td> |
|
190 |
<input name="l_oreqnumber" id="l_oreqnumber" class="checkbox" type="checkbox" value="Y" checked> |
|
191 |
<label for="l_oreqnumber"><translate>Order Request Number</translate></label> |
|
192 |
</td> |
|
193 |
[%- END %] |
|
194 | 180 |
</tr> |
195 | 181 |
|
196 | 182 |
<tr> |
templates/webpages/oe/orders_header_de.html | ||
---|---|---|
207 | 207 |
<th width=70% align=right nowrap>Auftragsnummer</th> |
208 | 208 |
<td><input name=ordnumber size=11 value="[% HTML.escape(ordnumber) %]"></td> |
209 | 209 |
</tr> |
210 |
[%- END %] |
|
211 |
[%- IF is_pur_ord || is_req_quo %] |
|
212 |
<tr> |
|
213 |
<th width=70% align=right nowrap>Bestellanfragenummer</th> |
|
214 |
<td><input name=oreqnumber size=11 value="[% HTML.escape(oreqnumber) %]"></td> |
|
215 |
</tr> |
|
216 | 210 |
[%- END %] |
217 | 211 |
<tr> |
218 | 212 |
<th width=70% align=right nowrap>[% IF is_req_quo %]Anfragenummer[% ELSE %]Angebotsnummer[% END %]</th> |
templates/webpages/oe/orders_header_master.html | ||
---|---|---|
207 | 207 |
<th width=70% align=right nowrap><translate>Order Number</translate></th> |
208 | 208 |
<td><input name=ordnumber size=11 value="[% HTML.escape(ordnumber) %]"></td> |
209 | 209 |
</tr> |
210 |
[%- END %] |
|
211 |
[%- IF is_pur_ord || is_req_quo %] |
|
212 |
<tr> |
|
213 |
<th width=70% align=right nowrap><translate>Order Request Number</translate></th> |
|
214 |
<td><input name=oreqnumber size=11 value="[% HTML.escape(oreqnumber) %]"></td> |
|
215 |
</tr> |
|
216 | 210 |
[%- END %] |
217 | 211 |
<tr> |
218 | 212 |
<th width=70% align=right nowrap>[% IF is_req_quo %]<translate>RFQ Number</translate>[% ELSE %]<translate>Quotation Number</translate>[% END %]</th> |
Auch abrufbar als: Unified diff
Fälschlicherweise gemergeten Code entfernt.