-
- | |
- . $locale->text('') . qq| |
+
+
+
+ $buchungsgruppe
+ $linkaccounts
+
+ |
-
-
- $buchungsgruppe
- $linkaccounts
-
- |
| | . $locale->text('Notes') . qq| |
$formula_label |
@@ -2439,6 +2445,7 @@ sub form_header {
{sellprice}> |
$lastcost
+ $price_factor
| | . $locale->text('Unit') . qq| |
$unit_select |
@@ -2892,7 +2899,7 @@ sub save {
# now take it apart and restore original values
foreach my $item (split /&/, $previousform) {
- my ($key, $value) = split /=/, $item, 2;
+ my ($key, $value) = split m/=/, $item, 2;
$value =~ s/%26/&/g;
$form->{$key} = $value;
}
@@ -2912,8 +2919,7 @@ sub save {
$form->{weight} -= $form->{"weight_$i"} * $form->{"qty_$i"};
# change/add values for assembly item
- map { $form->{"${_}_$i"} = $newform{$_} }
- qw(partnumber description bin unit weight listprice sellprice inventory_accno income_accno expense_accno);
+ map { $form->{"${_}_$i"} = $newform{$_} } qw(partnumber description bin unit weight listprice sellprice inventory_accno income_accno expense_accno price_factor_id);
$form->{sellprice} += $form->{"sellprice_$i"} * $form->{"qty_$i"};
$form->{weight} += $form->{"weight_$i"} * $form->{"qty_$i"};
@@ -2924,15 +2930,17 @@ sub save {
$i = $form->{rowcount};
$form->{"qty_$i"} = 1 unless ($form->{"qty_$i"});
- map { $form->{"${_}_$i"} = $newform{$_} }
- qw(partnumber description bin unit listprice inventory_accno income_accno expense_accno sellprice);
+ map { $form->{"${_}_$i"} = $newform{$_} } qw(partnumber description bin unit listprice inventory_accno income_accno expense_accno sellprice lastcost price_factor_id);
+
$form->{"sellprice_$i"} = $newform{lastcost} if ($form->{vendor_id});
+
if ($form->{exchangerate} != 0) {
$form->{"sellprice_$i"} /= $form->{exchangerate};
}
+
$lxdebug->message($LXDebug::DEBUG1, qq|sellprice_$i in previousform 2 = | . $form->{"sellprice_$i"} . qq|\n|);
- map { $form->{"taxaccounts_$i"} .= "$_ " } split / /,
- $newform{taxaccount};
+
+ map { $form->{"taxaccounts_$i"} .= "$_ " } split / /, $newform{taxaccount};
chop $form->{"taxaccounts_$i"};
foreach my $item (qw(description rate taxnumber)) {
my $index = $form->{"taxaccounts_$i"} . "_$item";
@@ -2940,26 +2948,28 @@ sub save {
}
# credit remaining calculation
- $amount =
- $form->{"sellprice_$i"} * (1 - $form->{"discount_$i"} / 100) *
- $form->{"qty_$i"};
- map { $form->{"${_}_base"} += $amount }
- (split / /, $form->{"taxaccounts_$i"});
- map { $amount += ($form->{"${_}_base"} * $form->{"${_}_rate"}) }
- split / /, $form->{"taxaccounts_$i"}
- if !$form->{taxincluded};
+ $amount = $form->{"sellprice_$i"} * (1 - $form->{"discount_$i"} / 100) * $form->{"qty_$i"};
+
+ map { $form->{"${_}_base"} += $amount } (split / /, $form->{"taxaccounts_$i"});
+ map { $amount += ($form->{"${_}_base"} * $form->{"${_}_rate"}) } split / /, $form->{"taxaccounts_$i"} if !$form->{taxincluded};
$form->{creditremaining} -= $amount;
# redo number formatting, because invoice parse them!
- $i = $form->{rowcount};
- map {
- $form->{"${_}_$i"} =
- $form->format_amount(\%myconfig, $form->{"${_}_$i"})
- } qw(weight listprice sellprice rop);
+ map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}) } qw(weight listprice sellprice rop);
}
$form->{"id_$i"} = $parts_id;
+
+ # Get the actual price factor (not just the ID) for the marge calculation.
+ $form->get_lists('price_factors' => 'ALL_PRICE_FACTORS');
+ foreach my $pfac (@{ $form->{ALL_PRICE_FACTORS} }) {
+ next if ($pfac->{id} != $newform{price_factor_id});
+ $form->{"marge_price_factor_$i"} = $pfac->{factor};
+ last;
+ }
+ delete $form->{ALL_PRICE_FACTORS};
+
delete $form->{action};
# restore original callback
@@ -3063,10 +3073,19 @@ sub parts_language_selection {
my $languages = IC->retrieve_languages(\%myconfig, $form);
+ if ($form->{language_values} ne "") {
+ foreach $item (split(/---\+\+\+---/, $form->{language_values})) {
+ my ($language_id, $translation, $longdescription) = split(/--\+\+--/, $item);
- my $callback = "$form->{script}?action=parts_language_selection&";
- map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" }
- (qw(login password name input_name), grep({ /^[fl]_/ } keys %$form)));
+ foreach my $language (@{ $languages }) {
+ next unless ($language->{id} == $language_id);
+
+ $language->{translation} = $translation;
+ $language->{longdescription} = $longdescription;
+ last;
+ }
+ }
+ }
my @header_sort = qw(name longdescription);
my %header_title = ( "name" => $locale->text("Name"),
@@ -3082,9 +3101,9 @@ sub parts_language_selection {
$form->{"title"} = $locale->text("Language Values");
$form->header();
- print($form->parse_html_template("ic/parts_language_selection", { "HEADER" => \@header,
- "LANGUAGES" => $languages,
- "onload" => $onload }));
+ print $form->parse_html_template2("ic/parts_language_selection", { "HEADER" => \@header,
+ "LANGUAGES" => $languages,
+ "onload" => $onload });
$lxdebug->leave_sub();
}
|