X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=f2ca8a9294402060220869190525e0a0fd059285;hb=2994c1e9337b80e4e9a60cd4393fcf49595da5df;hp=db33269207778ab3782b56844443043f82228c30;hpb=e309bf11488adf41abefed6a2833761e3d9ab3c9;p=kivitendo-erp.git diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index db3326920..f2ca8a929 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -65,10 +65,12 @@ require "bin/mozilla/reportgenerator.pl"; sub add { $lxdebug->enter_sub(); + $auth->assert('part_service_assembly_edit'); + $form->{title} = $locale->text('Add ' . ucfirst $form->{item}); $form->{callback} = - "$form->{script}?action=add&item=$form->{item}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=add&item=$form->{item}" unless $form->{callback}; $form->{"unit_changeable"} = 1; @@ -83,6 +85,8 @@ sub add { sub search { $lxdebug->enter_sub(); + $auth->assert('part_service_assembly_edit'); + # switch for backward sorting $form->{revers} = 0; @@ -116,6 +120,8 @@ sub search { sub search_update_prices { $lxdebug->enter_sub(); + $auth->assert('part_service_assembly_edit'); + my $pricegroups = IC->get_pricegroups(\%myconfig, \%$form); $form->header; @@ -128,6 +134,8 @@ sub search_update_prices { sub confirm_price_update { $lxdebug->enter_sub(); + $auth->assert('part_service_assembly_edit'); + $form->{nextsub} = "update_prices"; $form->header; @@ -141,6 +149,8 @@ sub confirm_price_update { sub update_prices { $lxdebug->enter_sub(); + $auth->assert('part_service_assembly_edit'); + if (IC->update_prices(\%myconfig, \%$form)) { $form->redirect($form->{update_count} . $locale->text('prices updated!')); } else { @@ -153,6 +163,8 @@ sub update_prices { sub choice { $lxdebug->enter_sub(); + $auth->assert('part_service_assembly_edit'); + our ($j, $lastndx); my ($totop100); @@ -160,7 +172,7 @@ sub choice { $form->header; - push @custom_hiddens, qw(login password searchitems title bom titel revers lastsort sort ndxs_counter extras); + push @custom_hiddens, qw(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 }, @@ -222,6 +234,8 @@ sub choice { sub list { $lxdebug->enter_sub(); + $auth->assert('part_service_assembly_edit'); + our ($lastndx); our ($partnumber, $description, $unit, $sellprice, $soldtotal); @@ -256,7 +270,7 @@ sub list { for ($j = 1; $j <= $i; $j++) { print qq| - |; + |; if ($j == 1) { print qq| |; @@ -282,9 +296,6 @@ sub list {
-{login}> -{password}> - @@ -346,6 +357,8 @@ sub list { sub top100 { $lxdebug->enter_sub(); + $auth->assert('part_service_assembly_edit'); + if ($form->{ndx}) { $form->{ndxs_counter}++; @@ -367,6 +380,8 @@ sub top100 { sub addtop100 { $lxdebug->enter_sub(); + $auth->assert('part_service_assembly_edit'); + my ($revers, $lastsort, $callback, $option, $description, $sameitem, $partnumber, $unit, $sellprice, $soldtotal, $totop100, $onhand, $align); my (@column_index, %column_header, %column_data); @@ -396,7 +411,7 @@ sub addtop100 { } #fi $callback = - "$form->{script}?action=top100&login=$form->{login}&password=$form->{password}&searchitems=$form->{searchitems}&itemstatus=$form->{itemstatus}&bom=$form->{bom}&l_linetotal=$form->{l_linetotal}&title=" + "$form->{script}?action=top100&searchitems=$form->{searchitems}&itemstatus=$form->{itemstatus}&bom=$form->{bom}&l_linetotal=$form->{l_linetotal}&title=" . $form->escape($form->{title}, 1); # if we have a serialnumber limit search @@ -737,8 +752,8 @@ sub addtop100 { } #rof } #fi # build data for columns + my $i = 0; foreach my $ref (@{ $form->{parts} }) { - my $i = 0; if ($form->{l_subtotal} eq 'Y' && !$ref->{assemblyitem}) { if ($sameitem ne $ref->{ $form->{sort} }) { @@ -823,15 +838,15 @@ sub addtop100 { $column_data{invnumber} = ($ref->{module} ne 'oe') - ? "{module}.pl?action=edit&type=invoice&id=$ref->{trans_id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}" + ? "{module}.pl?action=edit&type=invoice&id=$ref->{trans_id}&callback=$callback>$ref->{invnumber}" : "$ref->{invnumber}"; $column_data{ordnumber} = ($ref->{module} eq 'oe') - ? "{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{ordnumber}" + ? "{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&callback=$callback>$ref->{ordnumber}" : "$ref->{ordnumber}"; $column_data{quonumber} = ($ref->{module} eq 'oe' && !$ref->{ordnumber}) - ? "{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber}" + ? "{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&callback=$callback>$ref->{quonumber}" : "$ref->{quonumber}"; $column_data{name} = "$ref->{name}"; @@ -903,9 +918,6 @@ sub addtop100 {
{script}> -{login}> -{password}> - @@ -964,11 +976,13 @@ sub addtop100 { # l_partsgroup l_subtotal l_soldtotal l_deliverydate # # hiddens: -# nextsub login password revers lastsort sort ndxs_counter +# nextsub revers lastsort sort ndxs_counter # sub generate_report { $lxdebug->enter_sub(); + $auth->assert('part_service_assembly_edit'); + my ($revers, $lastsort, $description); $form->{title} = (ucfirst $form->{searchitems}) . "s"; @@ -1287,6 +1301,8 @@ sub generate_report { sub parts_subtotal { $lxdebug->enter_sub(); + $auth->assert('part_service_assembly_edit'); + # imports our (%column_data, @column_index); our ($subtotalonhand, $totalsellprice, $totallastcost, $totallistprice, $subtotalsellprice, $subtotallastcost, $subtotallistprice); @@ -1330,6 +1346,9 @@ sub parts_subtotal { sub edit { $lxdebug->enter_sub(); + + $auth->assert('part_service_assembly_edit'); + # show history button $form->{javascript} = qq||; #/show hhistory button @@ -1348,6 +1367,8 @@ sub edit { sub link_part { $lxdebug->enter_sub(); + $auth->assert('part_service_assembly_edit'); + IC->create_links("IC", \%myconfig, \%$form); # currencies @@ -1437,6 +1458,8 @@ sub link_part { sub form_header { $lxdebug->enter_sub(); + $auth->assert('part_service_assembly_edit'); + $form->{eur} = $eur; # config dumps into namespace - yuck $form->{pg_keys} = sub { "$_[0]->{partsgroup}--$_[0]->{id}" }; $form->{description_area} = ($form->{rows} = $form->numtextrows($form->{description}, 40)) > 1; @@ -1450,7 +1473,7 @@ sub form_header { $form->{notes_rows} = $rows; IC->retrieve_buchungsgruppen(\%myconfig, $form); - @{ $form->{BUCHUNGSGRUPPEN} } = grep { $_->{id} eq $form->{buchungsgruppen_id} || ($form->{id} && $form->{orphaned}) || $form->{id} } @{ $form->{BUCHUNGSGRUPPEN} }; + @{ $form->{BUCHUNGSGRUPPEN} } = grep { $_->{id} eq $form->{buchungsgruppen_id} || ($form->{id} && $form->{orphaned}) || !$form->{id} } @{ $form->{BUCHUNGSGRUPPEN} }; # use JavaScript Calendar or not (yes!) $form->{jsscript} = 1; @@ -1472,6 +1495,8 @@ sub form_header { sub form_footer { $lxdebug->enter_sub(); + $auth->assert('part_service_assembly_edit'); + if ($form->{item} eq "assembly") { print qq| @@ -1490,8 +1515,6 @@ sub form_footer { } print qq| - {login}> - {password}> @@ -1730,7 +1753,7 @@ sub assembly_row { } else { $href = - qq|$form->{script}?action=edit&id=$form->{"id_$i"}&login=$form->{login}&password=$form->{password}&rowcount=$i&previousform=$previousform|; + qq|$form->{script}?action=edit&id=$form->{"id_$i"}&rowcount=$i&previousform=$previousform|; $column_data{partnumber} = qq|$form->{"partnumber_$i"}|; $column_data{runningnumber} = @@ -1836,6 +1859,8 @@ sub update { sub save { $lxdebug->enter_sub(); + $auth->assert('part_service_assembly_edit'); + my ($parts_id, %newform, $previousform, $amount, $callback); # check if there is a part number - commented out, cause there is an automatic allocation of numbers @@ -1929,6 +1954,8 @@ sub save { map { $form->{"${_}_$i"} = $newform{$_} } qw(partnumber description bin unit listprice inventory_accno income_accno expense_accno sellprice lastcost price_factor_id); + $form->{"longdescription_$i"} = $newform{notes}; + $form->{"sellprice_$i"} = $newform{lastcost} if ($form->{vendor_id}); if ($form->{exchangerate} != 0) { @@ -1996,6 +2023,8 @@ sub save { sub save_as_new { $lxdebug->enter_sub(); + $auth->assert('part_service_assembly_edit'); + # saving the history if(!exists $form->{addition}) { $form->{snumbers} = qq|partnumber_| . $form->{partnumber}; @@ -2014,6 +2043,9 @@ sub save_as_new { sub delete { $lxdebug->enter_sub(); + + $auth->assert('part_service_assembly_edit'); + # saving the history if(!exists $form->{addition}) { $form->{snumbers} = qq|partnumber_| . $form->{partnumber}; @@ -2033,32 +2065,17 @@ sub delete { sub price_row { $lxdebug->enter_sub(); + $auth->assert('part_service_assembly_edit'); + my ($numrows) = @_; - print qq| - - - - - - - -|; - for my $i (1 .. $numrows) { - print qq| - - - - - -|; - } + my @PRICES = map +{ + pricegroup => $form->{"pricegroup_$_"}, + pricegroup_id => $form->{"pricegroup_id_$_"}, + price => $form->{"price_$_"}, + }, 1 .. $numrows; - print qq| -
| . $locale->text('Preisklasse') . qq|| . $locale->text('Preis') . qq|
$form->{"pricegroup_$i"}
- - -|; + print $form->parse_html_template('ic/price_row', { PRICES => \@PRICES }); $lxdebug->leave_sub(); } @@ -2066,6 +2083,8 @@ sub price_row { sub parts_language_selection { $lxdebug->enter_sub(); + $auth->assert('part_service_assembly_edit'); + our ($onload); my $languages = IC->retrieve_languages(\%myconfig, $form);