X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=a4e027d6caa5cbe8ceda64aee203699dc28a1af9;hb=07ccbf8dde5208f1615447aece57a76dc049d8d0;hp=a213a4753b56a5ce5e341a02ac1367faa70b7209;hpb=461b6311d70b58f07997b209d6e55c3d0b9c838c;p=kivitendo-erp.git diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index a213a4753..a4e027d6c 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -113,7 +113,7 @@ sub display_row { my $form = $main::form; my %myconfig = %main::myconfig; my $locale = $main::locale; - my $cgi = $main::cgi; + my $cgi = $::request->{cgi}; my $numrows = shift; @@ -148,7 +148,6 @@ sub display_row { { id => 'qty', width => 5, value => $locale->text('Qty'), display => 1, }, { id => 'price_factor', width => 5, value => $locale->text('Price Factor'), display => !$is_delivery_order, }, { id => 'unit', width => 5, value => $locale->text('Unit'), display => 1, }, - { id => 'license', width => 10, value => $locale->text('License'), display => 0, }, { id => 'serialnr', width => 10, value => $locale->text('Serial No.'), display => 0, }, { id => 'projectnr', width => 10, value => $locale->text('Project'), display => 0, }, { id => 'sellprice', width => 15, value => $locale->text('Price'), display => !$is_delivery_order, }, @@ -351,7 +350,10 @@ sub display_row { $marge_color, $locale->text('Ertrag'),$form->{"marge_absolut_$i"}, $form->{"marge_percent_$i"}, $locale->text('LP'), $form->format_amount(\%myconfig, $form->{"listprice_$i"}, 2), $locale->text('EK'), $form->format_amount(\%myconfig, $form->{"lastcost_$i"}, 2) } - if $form->{"id_$i"} && ($form->{type} =~ /^sales_/ || $form->{type} =~ /invoice/) && !$is_delivery_order; + if $form->{"id_$i"} && ($form->{type} =~ /^sales_/ || $form->{type} =~ /invoice/ || $form->{type} =~ /^credit_note$/ ) && !$is_delivery_order; + + $form->{"listprice_$i"} = $form->format_amount(\%myconfig, $form->{"listprice_$i"}, 2) + if $form->{"id_$i"} && ($form->{type} =~ /^sales_/ || $form->{type} =~ /invoice/) ; # / marge calculations ending # calculate onhand @@ -413,7 +415,7 @@ sub set_pricegroup { my $form = $main::form; my $locale = $main::locale; - my $cgi = $main::cgi; + my $cgi = $::request->{cgi}; _check_io_auth(); @@ -443,7 +445,8 @@ sub select_item { _check_io_auth(); - $::form->{title} = $::locale->text('Select from one of the items below'); + my $previous_form = $::auth->save_form_in_session(form => $::form); + $::form->{title} = $::locale->text('Select from one of the items below'); $::form->header; my @item_list = map { @@ -455,7 +458,7 @@ sub select_item { # delete action variable delete @{$::form}{qw(action item_list header)}; - print $::form->parse_html_template('io/select_item', { PREVIOUS_FORM => $::auth->save_form_in_session(form => $::form), + print $::form->parse_html_template('io/select_item', { PREVIOUS_FORM => $previous_form, MODE => $mode, ITEM_LIST => \@item_list, IS_PURCHASE => $mode eq 'IS' }); @@ -500,8 +503,6 @@ sub item_selected { partsgroup formel longdescription not_discountable partnotes lastcost price_factor_id price_factor); - push @new_fields, 'lizenzen' if $::lx_office_conf{features}->{lizenzen}; - my $ic_cvar_configs = CVar->get_configs(module => 'IC'); push @new_fields, map { "ic_cvar_$_->{name}" } @{ $ic_cvar_configs }; @@ -1311,11 +1312,13 @@ sub print_form { my $payment_id_saved = $form->{payment_id}; my $salesman_id_saved = $form->{salesman_id}; my $cp_id_saved = $form->{cp_id}; + my $taxzone_id_saved = $form->{taxzone_id}; call_sub("$form->{vc}_details") if ($form->{vc}); $form->{language_id} = $language_saved; $form->{payment_id} = $payment_id_saved; + $form->{taxzone_id} = $taxzone_id_saved; $form->{"email"} = $saved_email if ($saved_email); $form->{"cc"} = $saved_cc if ($saved_cc); @@ -1617,226 +1620,40 @@ sub post_as_new { sub ship_to { $main::lxdebug->enter_sub(); - my $form = $main::form; - my %myconfig = %main::myconfig; - my $locale = $main::locale; - my $cgi = $main::cgi; - _check_io_auth(); - if ($form->{second_run}) { - $form->{print_and_post} = 0; - } + $::form->{print_and_post} = 0 if $::form->{second_run}; - my $title = $form->{title}; - $form->{title} = $locale->text('Ship to'); + map { $::form->{$_} = $::form->parse_amount(\%::myconfig, $::form->{$_}) } qw(exchangerate creditlimit creditremaining); - map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } - qw(exchangerate creditlimit creditremaining); - - my @shipto_vars = - qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry - shiptocontact shiptocp_gender shiptophone shiptofax shiptoemail - shiptodepartment_1 shiptodepartment_2); - - my @addr_vars = - (qw(name department_1 department_2 street zipcode city country - contact email phone fax)); - - # get details for name - call_sub("$form->{vc}_details", @addr_vars); - - my $number = - ($form->{vc} eq 'customer') - ? $locale->text('Customer Number') - : $locale->text('Vendor Number'); - - # sieht nicht nett aus, funktioniert aber - # das vorausgewählte select-feld wird über shiptocp_gender - # entsprechend vorbelegt - my $selected_m=''; - my $selected_f=''; - if ($form->{shiptocp_gender} eq 'm') { - $selected_m='selected'; - $selected_f=''; - } elsif ($form->{shiptocp_gender} eq 'f') { - $selected_m=''; - $selected_f='selected'; - } + # get details for customer/vendor + call_sub($::form->{vc} . "_details", qw(name department_1 department_2 street zipcode city country contact email phone fax), $::form->{vc} . "number"); # get pricegroups for parts - IS->get_pricegroups_for_parts(\%myconfig, \%$form); + IS->get_pricegroups_for_parts(\%::myconfig, \%$::form); # build up html code for prices_$i - set_pricegroup($form->{rowcount}); + set_pricegroup($::form->{rowcount}); - my $nextsub = ($form->{display_form}) ? $form->{display_form} : "display_form"; + $::form->{rowcount}--; - $form->{rowcount}--; - - $form->header; + my @shipto_vars = qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry + shiptocontact shiptocp_gender shiptophone shiptofax shiptoemail + shiptodepartment_1 shiptodepartment_2); + my $previous_form = $::auth->save_form_in_session(skip_keys => [ @shipto_vars, qw(header shipto_id) ]); + $::form->{title} = $::locale->text('Ship to'); + $::form->header; - print qq| -
- - - - -