Revision a8787a29
Von Bernd Bleßmann vor etwa 2 Jahren hinzugefügt
SL/IC.pm | ||
---|---|---|
886 | 886 |
} |
887 | 887 |
|
888 | 888 |
my $placeholders = join ', ', ('?') x scalar(@part_ids); |
889 |
my $query = qq|SELECT mm.parts_id, mm.model, mm.lastcost, v.name AS make |
|
889 |
my $query = qq|SELECT mm.parts_id, mm.model, mm.part_description AS mm_part_description, mm.lastcost, v.name AS make
|
|
890 | 890 |
FROM makemodel mm |
891 | 891 |
LEFT JOIN vendor v ON (mm.make = v.id) |
892 | 892 |
WHERE mm.parts_id IN ($placeholders)|; |
... | ... | |
930 | 930 |
my %data = selectall_as_map($form, $dbh, $query, 'id', \@columns, @part_ids); |
931 | 931 |
|
932 | 932 |
my %template_arrays; |
933 |
map { $template_arrays{$_} = [] } (qw(make model customer_make customer_model), @columns); |
|
933 |
map { $template_arrays{$_} = [] } (qw(make model mm_part_description customer_make customer_model), @columns);
|
|
934 | 934 |
|
935 | 935 |
foreach my $i (1 .. $rowcount) { |
936 | 936 |
my $id = $form->{"${prefix}${i}"}; |
... | ... | |
943 | 943 |
|
944 | 944 |
push @{ $template_arrays{make} }, []; |
945 | 945 |
push @{ $template_arrays{model} }, []; |
946 |
push @{ $template_arrays{mm_part_description} }, []; |
|
946 | 947 |
|
947 | 948 |
if ($makemodel{$id}) { |
948 | 949 |
foreach my $ref (@{ $makemodel{$id} }) { |
949 |
map { push @{ $template_arrays{$_}->[-1] }, $ref->{$_} } qw(make model); |
|
950 |
map { push @{ $template_arrays{$_}->[-1] }, $ref->{$_} } qw(make model mm_part_description);
|
|
950 | 951 |
} |
951 | 952 |
} |
952 | 953 |
|
templates/print/RB/request_quotation.tex | ||
---|---|---|
114 | 114 |
|
115 | 115 |
<%if make%> |
116 | 116 |
<%foreach make%> |
117 |
\ifthenelse{\equal{<%make%>}{<%name%>}}{&& \artikelnummer: <%model%>\\}{} |
|
117 |
\ifthenelse{\equal{<%make%>}{<%name%>}}{&& \artikelnummer: <%model%>, \bezeichnung: <%mm_part_description%>\\}{}
|
|
118 | 118 |
<%end foreach%> |
119 | 119 |
<%end if%> |
120 | 120 |
|
templates/print/marei/request_quotation.tex | ||
---|---|---|
71 | 71 |
<%if projectnumber%>\ExtraDescription{\projektnummer: <%projectnumber%>}<%end projectnumber%>% |
72 | 72 |
<%if make%>% |
73 | 73 |
<%foreach make%>% |
74 |
\Ifstr{<%make%>}{<%name%>}{\ExtraDescription{\artikelnummer: <%model%>}}{} |
|
74 |
\Ifstr{<%make%>}{<%name%>}{\ExtraDescription{\artikelnummer: <%model%>} \ExtraDescription{\bezeichnung: <%mm_part_description%>}}{}
|
|
75 | 75 |
<%end foreach%>% |
76 | 76 |
<%end if%>% |
77 | 77 |
\tabularnewline |
Auch abrufbar als: Unified diff
Artikelbeschreibung bei Lieferantenartikelnummern: Druckvariable und Beispiel …
… in der Druckvorlage "Preisanfrage" (Marei und RB)