my $form = $main::form;
my %myconfig = %main::myconfig;
my $locale = $main::locale;
- my $cgi = $main::cgi;
+ my $cgi = $::request->{cgi};
my $numrows = shift;
{ 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, },
$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
my $form = $main::form;
my $locale = $main::locale;
- my $cgi = $main::cgi;
+ my $cgi = $::request->{cgi};
_check_io_auth();
_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 {
# 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' });
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 };
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);
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|
-<body>
-
-<form method="post" action="$form->{script}">
-
-<table width="100%">
- <tr>
- <td>
- <table>
- <tr class="listheading">
- <th class="listheading" colspan="2" width="50%">|
- . $locale->text('Billing Address') . qq|</th>
- <th class="listheading" width="50%">|
- . $locale->text('Shipping Address') . qq|</th>
- </tr>
- <tr height="5"></tr>
- <tr>
- <th align="right" nowrap>$number</th>
- <td>$form->{"$form->{vc}number"}</td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Company Name') . qq|</th>
- <td>$form->{name}</td>
- <td><input name="shiptoname" size="35" value="$form->{shiptoname}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
- <td>$form->{department_1}</td>
- <td><input name="shiptodepartment_1" size="35" value="$form->{shiptodepartment_1}"></td>
- </tr>
- <tr>
- <th align="right" nowrap> </th>
- <td>$form->{department_2}</td>
- <td><input name="shiptodepartment_2" size="35" value="$form->{shiptodepartment_2}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Street') . qq|</th>
- <td>$form->{street}</td>
- <td><input name="shiptostreet" size="35" value="$form->{shiptostreet}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Zipcode') . qq|</th>
- <td>$form->{zipcode}</td>
- <td><input name="shiptozipcode" size="35" value="$form->{shiptozipcode}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('City') . qq|</th>
- <td>$form->{city}</td>
- <td><input name="shiptocity" size="35" value="$form->{shiptocity}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Country') . qq|</th>
- <td>$form->{country}</td>
- <td><input name="shiptocountry" size="35" value="$form->{shiptocountry}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Contact') . qq|</th>
- <td>$form->{contact}</td>
- <td><input name="shiptocontact" size="35" value="$form->{shiptocontact}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Gender') . qq|</th>
- <td></td>
- <td><select id="shiptocp_gender" name="shiptocp_gender">
- <option value="m"| . $selected_m . qq|>| . $locale->text('male') . qq|</option>
- <option value="f"| . $selected_f . qq|>| . $locale->text('female') . qq|</option>
- </select>
- </td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Phone') . qq|</th>
- <td>$form->{phone}</td>
- <td><input name="shiptophone" size="20" value="$form->{shiptophone}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('Fax') . qq|</th>
- <td>$form->{fax}</td>
- <td><input name="shiptofax" size="20" value="$form->{shiptofax}"></td>
- </tr>
- <tr>
- <th align="right" nowrap>| . $locale->text('E-mail') . qq|</th>
- <td>$form->{email}</td>
- <td><input name="shiptoemail" size="35" value="$form->{shiptoemail}"></td>
- </tr>
- </table>
- </td>
- </tr>
-</table>
-| . $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|<input type="hidden" name="$key" value="$form->{$key}">\n|;
- }
-
- print qq|
-
-<hr size="3" noshade>
-
-<br>
-<input class="submit" type="submit" name="action" value="|
- . $locale->text('Continue') . qq|">
-</form>
-
-</body>
-</html>
-|;
+ 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 {
$description = $cvar->{description} . ' ';
}
+ my $form_key = "ic_cvar_" . $cvar->{name} . "_$params{row}";
+
push @{ $params{ROW2} }, {
line_break => $num_visible_cvars == 1,
description => $description,
name_prefix => 'ic_',
name_postfix => "_$params{row}",
valid => $cvar->{valid},
- value => $form->{"ic_cvar_" . $cvar->{name} . "_$params{row}"},
+ value => CVar->parse($::form->{$form_key}, $cvar),
}
};
}
projects / kivitendo-erp.git / blobdiff