X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=c928830eaec4f3a7b6d4002d7d77701628d526ea;hb=c7241bf7c547d63999898dee7b5dd486e4d122d3;hp=7accb4bba6ec9d680b65b849dfd33631b6336cf4;hpb=c5fa1d85e9034725d2e58e1e33b663ea2a4a3882;p=kivitendo-erp.git diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index 7accb4bba..c928830ea 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -51,7 +51,6 @@ use strict; our ($form, $locale, %myconfig, $lxdebug, $auth); require "bin/mozilla/io.pl"; -require "bin/mozilla/invoice_io.pl"; require "bin/mozilla/common.pl"; require "bin/mozilla/reportgenerator.pl"; @@ -116,9 +115,7 @@ sub search { $form->header; $form->get_lists('partsgroup' => 'ALL_PARTSGROUPS'); - print $form->parse_html_template('ic/search', { %is_xyz, - dateformat => $myconfig{dateformat}, - limit => $myconfig{vclimit}, }); + print $form->parse_html_template('ic/search', { %is_xyz, }); $lxdebug->leave_sub(); } #end search() @@ -1644,7 +1641,7 @@ sub form_header { if (scalar @{ $form->{CUSTOM_VARIABLES} }); $::request->layout->use_javascript("${_}.js") for qw(ckeditor/ckeditor ckeditor/adapters/jquery kivi.PriceRule); - $::request->layout->add_javascripts_inline("\$(function(){kivi.PriceRule.load_price_rules_for_part(@{[ $::form->{id} * 1 ]})})") if $::form->{id}; + $::request->layout->add_javascripts_inline("\$(function(){kivi.PriceRule.load_price_rules_for_part(@{[ $::form->{id} * 1 ]})});") if $::form->{id}; $form->header; #print $form->parse_html_template('ic/form_header', { ALL_PRICE_FACTORS => $form->{ALL_PRICE_FACTORS}, # ALL_UNITS => $form->{ALL_UNITS}, @@ -1883,7 +1880,7 @@ sub save { $lxdebug->enter_sub(); $auth->assert('part_service_assembly_edit'); - + $::form->mtime_ischanged('parts'); my ($parts_id, %newform, $amount, $callback); # check if there is a part number - commented out, cause there is an automatic allocation of numbers @@ -2118,6 +2115,27 @@ sub ajax_autocomplete { $main::lxdebug->leave_sub(); } +sub display_form { + $::lxdebug->enter_sub; + + $auth->assert('part_service_assembly_edit'); + + relink_accounts(); + + $::form->language_payment(\%::myconfig); + + Common::webdav_folder($::form); + + form_header(); + price_row($::form->{price_rows}); + makemodel_row(++$::form->{makemodel_rows}) if $::form->{item} =~ /^(part|service)$/; + assembly_row(++$::form->{assembly_rows}) if $::form->{item} eq 'assembly'; + + form_footer(); + + $::lxdebug->leave_sub; +} + sub back_to_record { _check_io_auth();