X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=9dd8e8cc4c8a72a9fba2bd47144b411fcdcc690e;hb=b02735f55360e5a4e02dca40458b48cf057ecd7b;hp=c65d742da99bc0ce36f3a0ffaaf7fae058e48a65;hpb=cb25314000db992f8b413d10a0d20f0e80b4b677;p=kivitendo-erp.git diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index c65d742da..9dd8e8cc4 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -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, }, @@ -352,6 +351,9 @@ sub display_row { $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; + + $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 @@ -438,125 +440,28 @@ sub set_pricegroup { sub select_item { $main::lxdebug->enter_sub(); - my %params = @_; - - my $form = $main::form; - my %myconfig = %main::myconfig; - my $locale = $main::locale; - my $cgi = $main::cgi; - - my $mode = $params{mode} || croak "Missing parameter 'mode'"; - my $is_purchase = $mode eq 'IS'; + my %params = @_; + my $mode = $params{mode} || croak "Missing parameter 'mode'"; _check_io_auth(); - my @column_index = qw(ndx partnumber description rop onhand unit sellprice); - my %column_data; - $column_data{ndx} = qq| |; - $column_data{partnumber} = - qq|| . $locale->text('Number') . qq||; - $column_data{description} = - qq|| . $locale->text('Part Description') . qq||; - $column_data{sellprice} = - qq|| . $locale->text('Price') . qq||; - if ($is_purchase){ - $column_data{rop} = - qq|| . $locale->text('ROP') . qq||; - }# ende if $is_purchase -> Überschrift Mindestlagerbestand - ähnliche Prüfung weiter unten - $column_data{onhand} = - qq|| . $locale->text('Qty') . qq||; - $column_data{unit} = - qq|| . $locale->text('Unit') . qq||; - # list items with radio button on a form - $form->header; - - my $title = $locale->text('Select from one of the items below'); - my $colspan = $#column_index + 1; - - print qq| - - -
- - - - - - - |; - - map { print "\n$column_data{$_}" } @column_index; - - print qq||; - - my $i = 0; - my $j; - foreach my $ref (@{ $form->{item_list} }) { - my $checked = ($i++) ? "" : "checked"; + my $previous_form = $::auth->save_form_in_session(form => $::form); + $::form->{title} = $::locale->text('Select from one of the items below'); + $::form->header; - if ($::lx_office_conf{features}->{lizenzen}) { - if ($ref->{inventory_accno} > 0) { - $ref->{"lizenzen"} = qq||; - foreach my $item (@{ $form->{LIZENZEN}{ $ref->{"id"} } }) { - $ref->{"lizenzen"} .= - qq||; - } - $ref->{"lizenzen"} .= qq||; - $ref->{"lizenzen"} =~ s/\"/"/g; - } - } - - my $display_sellprice = $ref->{sellprice} * (1 - $form->{tradediscount}); - $display_sellprice /= $ref->{price_factor} if ($ref->{price_factor}); - $display_sellprice = $form->format_amount(\%myconfig, $display_sellprice, 2); - my $new_id = $ref->{id}; - - map { $ref->{$_} = H($ref->{$_}) } qw(id partnumber description unit); - - $column_data{ndx} = qq||; - $column_data{partnumber} = qq||; - $column_data{description} = qq||; - $column_data{sellprice} = qq||; - $column_data{onhand} = qq||; - $column_data{unit} = qq||; - - if ($is_purchase){ - $column_data{rop} = qq||; - }# ende if $is_purchase -> Falls der Aufruf über eine Einkaufsmaske kam, handelt es sich um einen Lieferantenauftrag und uns interessiert auch die Mindestbestandsmenge - - $j++; - $j %= 2; - print qq| -|; - - map { print "\n$column_data{$_}" } @column_index; - - print("\n"); - } - - print qq| - -
$title
$ref->{partnumber}$ref->{description}${display_sellprice}| . $form->format_amount(\%myconfig, $ref->{onhand}, '', " ") . qq|$ref->{unit}| . $form->format_amount(\%myconfig, $ref->{rop}, '', " ") . qq|
-|; + my @item_list = map { + $_->{display_sellprice} = $_->{sellprice} * (1 - $::form->{tradediscount}); + $_->{display_sellprice} /= $_->{price_factor} if ($_->{price_factor}); + $_; + } @{ $::form->{item_list} }; # delete action variable - map { delete $form->{$_} } qw(action item_list header); - - my $previous_form = $::auth->save_form_in_session(form => $form); + delete @{$::form}{qw(action item_list header)}; - print qq| - - - - -
- -
- - - -|; + print $::form->parse_html_template('io/select_item', { PREVIOUS_FORM => $previous_form, + MODE => $mode, + ITEM_LIST => \@item_list, + IS_PURCHASE => $mode eq 'IS' }); $main::lxdebug->leave_sub(); } @@ -598,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 }; @@ -1715,226 +1618,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}); - - my $nextsub = ($form->{display_form}) ? $form->{display_form} : "display_form"; + set_pricegroup($::form->{rowcount}); - $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| - - -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
| - . $locale->text('Billing Address') . qq|| - . $locale->text('Shipping Address') . qq|
$number$form->{"$form->{vc}number"}
| . $locale->text('Company Name') . qq|$form->{name}
| . $locale->text('Department') . qq|$form->{department_1}
 $form->{department_2}
| . $locale->text('Street') . qq|$form->{street}
| . $locale->text('Zipcode') . qq|$form->{zipcode}
| . $locale->text('City') . qq|$form->{city}
| . $locale->text('Country') . qq|$form->{country}
| . $locale->text('Contact') . qq|$form->{contact}
| . $locale->text('Gender') . qq| -
| . $locale->text('Phone') . qq|$form->{phone}
| . $locale->text('Fax') . qq|$form->{fax}
| . $locale->text('E-mail') . qq|$form->{email}
-
-| . $cgi->hidden("-name" => "nextsub", "-value" => $nextsub); -; - - - - # delete shipto - map({ delete $form->{$_} } (@shipto_vars, qw(header shipto_id))); - $form->{title} = $title; - - foreach my $key (keys %$form) { - next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key})); - $form->{$key} =~ s/\"/"/g; - print qq|\n|; - } - - print qq| - -
- -
- -
- - - -|; + print $::form->parse_html_template('io/ship_to', { previousform => $previous_form, + nextsub => $::form->{display_form} || 'display_form', + }); $main::lxdebug->leave_sub(); } -sub new_license { - $main::lxdebug->enter_sub(); - - my $form = $main::form; - - _check_io_auth(); - - my $row = shift; - - # change callback - $form->{old_callback} = $form->escape($form->{callback}, 1); - $form->{callback} = $form->escape("$form->{script}?action=display_form", 1); - $form->{old_callback} = $form->escape($form->{old_callback}, 1); - - # delete action - delete $form->{action}; - my $customer = $form->{customer}; - map { $form->{"old_$_"} = $form->{"${_}_$row"} } qw(partnumber description); - - # save all other form variables in a previousform variable - $form->{row} = $row; - my $previousform; - foreach my $key (keys %$form) { - next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key})); - - # escape ampersands - $form->{$key} =~ s/&/%26/g; - $previousform .= qq|$key=$form->{$key}&|; - } - chop $previousform; - $previousform = $form->escape($previousform, 1); - - $form->{script} = "licenses.pl"; - - map { $form->{$_} = $form->{"old_$_"} } qw(partnumber description); - map { $form->{$_} = $form->escape($form->{$_}, 1) } - qw(partnumber description); - $form->{callback} = - qq|$form->{script}?action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$form->{name}&type=$form->{type}&customer=$customer&partnumber=$form->{partnumber}&description=$form->{description}&previousform="$previousform"&initial=1|; - $form->redirect; - - $main::lxdebug->leave_sub(); +sub ship_to_entered { + $::auth->restore_form_from_session(delete $::form->{previousform}); + call_sub($::form->{nextsub}); } sub relink_accounts {