From: Sven Schöling Date: Thu, 29 Nov 2007 18:00:01 +0000 (+0000) Subject: choice umgebaut, und nebenbei den sqlfehler in top100 gefixt X-Git-Tag: release-2.6.0beta1~394 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=83e061c063b3f6b9f34ee0c9b7ff5575362be9a4;p=kivitendo-erp.git choice umgebaut, und nebenbei den sqlfehler in top100 gefixt --- diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index daba6887e..e9b13a327 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -152,62 +152,15 @@ sub choice { $form->header; - print qq| - - -
{script}> - - {searchitems}> - - - - |; - - print qq| - - - - - - - - - -
| . $locale->text('Part Number') . qq|| . $locale->text('Part Description') . qq|
-
|; - - print qq| - -{login}> -{password}> - - - - - - - - - - - - - - - - - - - - - - - - - -{ndxs_counter}> - -{extras}>|; + push @custom_hiddens, qw(login password searchitems title bom titel revers lastsort sort ndxs_counter extras); + push @custom_hiddens, qw(itemstatus l_linetotal l_partnumber l_description l_onhand l_unit l_sellprice l_linetotalsellprice); + my @HIDDENS = ( + +{ name => 'row', value => $j }, + +{ name => 'nextsub', value => 'item_selected' }, + +{ name => 'test', value => 'item_selected' }, + +{ name => 'lastndx', value => $lastndx }, + map(+{ name => $_, value => $form->{$_} }, @custom_hiddens), + ); my ($partnumber, $description, $unit, $sellprice, $soldtotal); # if choice set data @@ -253,15 +206,8 @@ sub choice { } #rof } #fi - print $totop100; - - print qq| - -
+ print $form->parse_html_template('ic/choice', +{ HIDDENS => \@HIDDENS, totop100 => $totop100 }); - - |; $lxdebug->leave_sub(); } #end choice @@ -420,7 +366,7 @@ sub addtop100 { $form->{top100} = "top100"; $form->{l_soldtotal} = "Y"; - $form->{soldtotal} = "soldtotal"; +# $form->{soldtotal} = "soldtotal"; $form->{sort} = "soldtotal"; $form->{l_qty} = "N"; $form->{l_linetotal} = ""; diff --git a/templates/webpages/ic/choice_de.html b/templates/webpages/ic/choice_de.html new file mode 100644 index 000000000..2247bea9a --- /dev/null +++ b/templates/webpages/ic/choice_de.html @@ -0,0 +1,28 @@ +[%- USE HTML %] +[%- USE LxERP %] + + +
+ +[%- FOREACH row = HIDDENS %] + +[%- END %] + + + + + + + + + + +
ArtikelnummerArtikelbeschreibung
+
+ + [% totop100 %] + +
+ + + diff --git a/templates/webpages/ic/choice_master.html b/templates/webpages/ic/choice_master.html new file mode 100644 index 000000000..8eaa3c430 --- /dev/null +++ b/templates/webpages/ic/choice_master.html @@ -0,0 +1,28 @@ +[%- USE HTML %] +[%- USE LxERP %] + + +
+ +[%- FOREACH row = HIDDENS %] + +[%- END %] + + + + + + + + + + +
Part NumberPart Description
+
+ + [% totop100 %] + +
+ + +