#
#######################################################################
+use Carp;
use CGI;
use CGI::Ajax;
use List::Util qw(min max first);
{ 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, },
- { id => 'sellprice_pg', width => 8, value => $locale->text('Pricegroup'), display => ($form->{type} =~ /^(sales_|invoice)/) && !$is_delivery_order, },
+ { id => 'sellprice_pg', width => 8, value => $locale->text('Pricegroup'), display => !$is_delivery_order && !$is_purchase, },
{ id => 'discount', width => 5, value => $locale->text('Discount'), display => !$is_delivery_order, },
{ id => 'linetotal', width => 10, value => $locale->text('Extended'), display => !$is_delivery_order, },
{ id => 'bin', width => 10, value => $locale->text('Bin'), display => 0, },
# for last row and report
# set pricegroup drop down list from report menu
if ($form->{"sellprice_$i"} != 0) {
+ # remember the pricegroup_id in pricegroup_old
+ # but don't overwrite it
$form->{"pricegroup_old_$i"} = $form->{"pricegroup_id_$i"};
my $default_option = $form->{"sellprice_$i"}.'--'.$form->{"pricegroup_id_$i"};
- $column_data{sellprice_pg} = NTI($cgi->popup_menu("sellpricepg_$i", [ $default_option ], $default_option, { $default_option => $form->{"pricegroup_$i"} || '' }));
+ $column_data{sellprice_pg} = NTI($cgi->popup_menu("sellprice_pg_$i", [ $default_option ], $default_option, { $default_option => $form->{"pricegroup_$i"} || '' }));
} else {
$column_data{sellprice_pg} = qq| |;
}
if ($is_delivery_order) {
map { $form->{"${_}_${i}"} = $form->format_amount(\%myconfig, $form->{"${_}_${i}"}) } qw(sellprice discount lastcost);
- push @hidden_vars, qw(sellprice discount price_factor_id lastcost);
+ push @hidden_vars, qw(sellprice discount not_discountable price_factor_id lastcost);
push @hidden_vars, "stock_${stock_in_out}_sum_qty", "stock_${stock_in_out}";
}
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;
-# diese variable kommt schon in der methode display_row vor, kann man die besser wiederverwenden? @mb fragen. ich check das jetzt erstmal so ein
- my $is_purchase = (first { $_ eq $form->{type} } qw(request_quotation purchase_order purchase_delivery_order)) || ($form->{script} eq 'ir.pl');
+ my $mode = $params{mode} || croak "Missing parameter 'mode'";
+ my $is_purchase = $mode eq 'IS';
+
_check_io_auth();
my @column_index = qw(ndx partnumber description rop onhand unit sellprice);
qq|<th class="listheading">| . $locale->text('Part Description') . qq|</th>|;
$column_data{sellprice} =
qq|<th class="listheading">| . $locale->text('Price') . qq|</th>|;
- if ($is_purchase){
- $column_data{rop} =
- qq|<th class="listheading">| . $locale->text('ROP') . qq|</th>|;
- }# ende if $is_purchase -> Überschrift Mindestlagerbestand - ähnliche Prüfung weiter unten
+ if ($is_purchase){
+ $column_data{rop} =
+ qq|<th class="listheading">| . $locale->text('ROP') . qq|</th>|;
+ }# ende if $is_purchase -> Überschrift Mindestlagerbestand - ähnliche Prüfung weiter unten
$column_data{onhand} =
qq|<th class="listheading">| . $locale->text('Qty') . qq|</th>|;
$column_data{unit} =
print qq|</tr>|;
- my @new_fields =
- qw(bin listprice inventory_accno income_accno expense_accno unit weight
- assembly taxaccounts partsgroup formel longdescription not_discountable
- part_payment_id partnotes id lastcost price_factor_id price_factor);
- push @new_fields, "lizenzen" if ($main::lizenzen);
- push @new_fields, grep { m/^ic_cvar_/ } keys %{ $form->{item_list}->[0] };
-
my $i = 0;
my $j;
foreach my $ref (@{ $form->{item_list} }) {
my $checked = ($i++) ? "" : "checked";
- if ($main::lizenzen) {
+ if ($::lx_office_conf{features}->{lizenzen}) {
if ($ref->{inventory_accno} > 0) {
$ref->{"lizenzen"} = qq|<option></option>|;
foreach my $item (@{ $form->{LIZENZEN}{ $ref->{"id"} } }) {
}
}
- map { $ref->{$_} =~ s/\"/"/g } qw(partnumber description unit);
-
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|<td><input name="select_item_id" class="radio" type="radio" value="${new_id}" $checked></td>|;
+ $column_data{partnumber} = qq|<td>$ref->{partnumber}</td>|;
+ $column_data{description} = qq|<td>$ref->{description}</td>|;
+ $column_data{sellprice} = qq|<td align="right">${display_sellprice}</td>|;
+ $column_data{onhand} = qq|<td align="right">| . $form->format_amount(\%myconfig, $ref->{onhand}, '', " ") . qq|</td>|;
+ $column_data{unit} = qq|<td>$ref->{unit}</td>|;
- $column_data{ndx} =
- qq|<td><input name="ndx" class="radio" type="radio" value="$i" $checked></td>|;
- $column_data{partnumber} =
- qq|<td><input name="new_partnumber_$i" type="hidden" value="$ref->{partnumber}">$ref->{partnumber}</td>|;
- $column_data{description} =
- qq|<td><input name="new_description_$i" type="hidden" value="$ref->{description}">$ref->{description}</td>|;
- $column_data{sellprice} =
- qq|<td align="right"><input name="new_sellprice_$i" type="hidden" value="$ref->{sellprice}">|
- . $display_sellprice
- . qq|</td>|;
- $column_data{onhand} =
- qq|<td align="right"><input name="new_onhand_$i" type="hidden" value="$ref->{onhand}">|
- . $form->format_amount(\%myconfig, $ref->{onhand}, '', " ")
- . qq|</td>|;
if ($is_purchase){
- $column_data{rop} =
- qq|<td align="right"><input name="new_rop$i" type="hidden" value="$ref->{rop}">|
- . $form->format_amount(\%myconfig, $ref->{rop}, '', " ")
- . qq|</td>|;
+ $column_data{rop} = qq|<td align="right">| . $form->format_amount(\%myconfig, $ref->{rop}, '', " ") . qq|</td>|;
}# ende if $is_purchase -> Falls der Aufruf über eine Einkaufsmaske kam, handelt es sich um einen Lieferantenauftrag und uns interessiert auch die Mindestbestandsmenge
- $column_data{unit} =
- qq|<td>$ref->{unit}</td>|;
+
$j++;
$j %= 2;
print qq|
map { print "\n$column_data{$_}" } @column_index;
print("</tr>\n");
-
- print join "\n", map { $cgi->hidden("-name" => "new_${_}_$i", "-value" => $ref->{$_}) } @new_fields;
- print "\n";
}
print qq|
<tr><td colspan="8"><hr size="3" noshade></td></tr>
</table>
-
-<input name="lastndx" type="hidden" value="$i">
-
|;
# delete action variable
map { delete $form->{$_} } qw(action item_list header);
- # save all other form variables
- foreach my $key (keys %${form}) {
- next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
- $form->{$key} =~ s/\"/"/g;
- print qq|<input name="$key" type="hidden" value="$form->{$key}">\n|;
- }
+ my $previous_form = $::auth->save_form_in_session(form => $form);
print qq|
+<input name="select_item_mode" type="hidden" value="$mode">
+<input name="select_item_previous_form" type="hidden" value="${previous_form}">
<input type="hidden" name="nextsub" value="item_selected">
<br>
_check_io_auth();
- # replace the last row with the checked row
- my $i = $form->{rowcount};
- $i = $form->{assembly_rows} if ($form->{item} eq 'assembly');
+ $::auth->restore_form_from_session($form->{select_item_previous_form} || croak('Missing previous form ID'), form => $form);
- # index for new item
- my $j = $form->{ndx};
+ my $mode = delete($form->{select_item_mode}) || croak 'Missing item selection mode';
+ my $id = delete($form->{select_item_id}) || croak 'Missing item selection ID';
+ my $i = $form->{ $mode eq 'IC' ? 'assembly_rows' : 'rowcount' };
- #sk
- #($form->{"sellprice_$i"},$form->{"$pricegroup_old_$i"}) = split /--/, $form->{"sellprice_$i"};
- #$form->{"sellprice_$i"} = $form->{"sellprice_$i"};
+ $form->{"id_${i}"} = $id;
+
+ if ($mode eq 'IS') {
+ IS->retrieve_item(\%myconfig, \%$form);
+ } elsif ($mode eq 'IR') {
+ IR->retrieve_item(\%myconfig, \%$form);
+ } elsif ($mode eq 'IC') {
+ IC->assembly_item(\%myconfig, \%$form);
+ } else {
+ croak "Invalid item selection mode '${mode}'";
+ }
+
+ my $new_item = $form->{item_list}->[0] || croak "No item found for mode '${mode}' and ID '${id}'";
# if there was a price entered, override it
my $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
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 };
- map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} } @new_fields;
+ map { $form->{"${_}_$i"} = $new_item->{$_} } @new_fields;
- $form->{"marge_price_factor_$i"} = $form->{"new_price_factor_$j"};
+ $form->{"marge_price_factor_$i"} = $new_item->{price_factor};
if ($form->{"part_payment_id_$i"} ne "") {
$form->{payment_id} = $form->{"part_payment_id_$i"};
}
- if ($main::lizenzen) {
- map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} } qw(lizenzen);
- }
-
my ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
$dec = length $dec;
my $decimalplaces = ($dec > 2) ? $dec : 2;
$form->{"runningnumber_$i"} = $i;
- # delete all the new_ variables
- for $i (1 .. $form->{lastndx}) {
- map { delete $form->{"new_${_}_$i"} } @new_fields;
- }
-
- map { delete $form->{$_} } qw(ndx lastndx nextsub);
+ delete $form->{nextsub};
# format amounts
map {
$form->{old_callback} = $form->escape($form->{callback}, 1);
$form->{callback} = $form->escape("$form->{script}?action=display_form", 1);
- # save all form variables except action in a previousform variable
- my $previousform = join '&', map { my $value = $form->{$_}; $value =~ s/&/%26/; "$_=$value" } grep { !/action/ } keys %$form;
+ # save all form variables except action in the session and keep the key in the previousform variable
+ my $previousform = $::auth->save_form_in_session(skip_keys => [ qw(action) ]);
my @HIDDENS;
- push @HIDDENS, { 'name' => 'previousform', 'value' => $form->escape($previousform, 1) };
+ push @HIDDENS, { 'name' => 'previousform', 'value' => $previousform };
push @HIDDENS, map +{ 'name' => $_, 'value' => $form->{$_} }, qw(rowcount vc);
push @HIDDENS, map +{ 'name' => $_, 'value' => $form->{"${_}_$form->{rowcount}"} }, qw(partnumber description unit);
push @HIDDENS, { 'name' => 'taxaccount2', 'value' => $form->{taxaccounts} };
my $script = $form->{"script"};
$script =~ s|.*/||;
$script =~ s|.pl$||;
- $locale = new Locale($main::language, $script);
+ $locale = new Locale($::lx_office_conf{system}->{language}, $script);
map { $form->{"select$_"} = "" } ($form->{vc}, "currency");
$form->{email} = $form->{shiptoemail} if $form->{shiptoemail} && $form->{formname} =~ /(pick|packing|bin)_list/;
- if ($form->{"cp_id"} && !$form->{"email"}) {
+ if ($form->{"cp_id"}) {
CT->get_contact(\%myconfig, $form);
- $form->{"email"} = $form->{"cp_email"};
+ $form->{"email"} = $form->{"cp_email"} if $form->{"cp_email"};
}
my $title = $locale->text('E-mail') . " " . $form->get_formname_translation();
push @MEDIA, grep $_,
opthash("screen", $form->{OP}{screen}, $locale->text('Screen')),
- ($form->{printers} && scalar @{ $form->{printers} } && $main::latex_templates) ?
+ ($form->{printers} && scalar @{ $form->{printers} } && $::lx_office_conf{print_templates}->{latex}) ?
opthash("printer", $form->{OP}{printer}, $locale->text('Printer')) : undef,
- ($main::latex_templates && !$options{no_queue}) ?
+ ($::lx_office_conf{print_templates}->{latex} && !$options{no_queue}) ?
opthash("queue", $form->{OP}{queue}, $locale->text('Queue')) : undef
if ($form->{media} ne 'email');
push @FORMAT, grep $_,
- ($main::opendocument_templates && $main::openofficeorg_writer_bin && $main::xvfb_bin
- && (-x $main::openofficeorg_writer_bin) && (-x $main::xvfb_bin)
+ ($::lx_office_conf{print_templates}->{opendocument} && $::lx_office_conf{applications}->{openofficeorg_writer} && $::lx_office_conf{applications}->{xvfb}
+ && (-x $::lx_office_conf{applications}->{openofficeorg_writer}) && (-x $::lx_office_conf{applications}->{xvfb})
&& !$options{no_opendocument_pdf}) ?
opthash("opendocument_pdf", $form->{DF}{"opendocument_pdf"}, $locale->text("PDF (OpenDocument/OASIS)")) : undef,
- ($main::latex_templates) ?
+ ($::lx_office_conf{print_templates}->{latex}) ?
opthash("pdf", $form->{DF}{pdf}, $locale->text('PDF')) : undef,
- ($main::latex_templates && !$options{no_postscript}) ?
+ ($::lx_office_conf{print_templates}->{latex} && !$options{no_postscript}) ?
opthash("postscript", $form->{DF}{postscript}, $locale->text('Postscript')) : undef,
(!$options{no_html}) ?
opthash("html", $form->{DF}{html}, "HTML") : undef,
- ($main::opendocument_templates && !$options{no_opendocument}) ?
+ ($::lx_office_conf{print_templates}->{opendocument} && !$options{no_opendocument}) ?
opthash("opendocument", $form->{DF}{opendocument}, $locale->text("OpenDocument/OASIS")) : undef,
- ($main::excel_templates && !$options{no_excel}) ?
+ ($::lx_office_conf{print_templates}->{excel} && !$options{no_excel}) ?
opthash("excel", $form->{DF}{excel}, $locale->text("Excel")) : undef;
push @LANGUAGE_ID,
);
my %template_vars = (
- display_copies => scalar @{ $form->{printers} || [] } && $main::latex_templates && $form->{media} ne 'email',
+ display_copies => scalar @{ $form->{printers} || [] } && $::lx_office_conf{print_templates}->{latex} && $form->{media} ne 'email',
display_remove_draft => (!$form->{id} && $form->{draft_id}),
display_groupitems => !$dont_display_groupitems{$form->{type}},
groupitems_checked => $form->{groupitems} ? "checked" : '',
&save();
$form->{formname} = $formname;
&edit();
+ $::lxdebug->leave_sub();
::end_of_request();
}
qw(invtotal ordtotal quototal subtotal linetotal
listprice sellprice netprice discount
tax taxbase total paid),
- grep({ /^linetotal_\d+$/ ||
- /^listprice_\d+$/ ||
- /^sellprice_\d+$/ ||
- /^netprice_\d+$/ ||
- /^taxbase_\d+$/ ||
- /^discount_\d+$/ ||
- /^paid_\d+$/ ||
- /^subtotal_\d+$/ ||
- /^total_\d+$/ ||
- /^tax_\d+$/
- } keys(%{$form})));
+ grep({ /^(?:linetotal|nodiscount_linetotal|listprice|sellprice|netprice|taxbase|discount|p_discount|discount_sub|nodiscount_sub|paid|subtotal|total|tax)_\d+$/ } keys(%{$form})));
reformat_numbers($output_numberformat, undef,
qw(qty price_factor),
my $filename;
if ($filename = $queued{ $form->{formname} }) {
$form->{queued} =~ s/\Q$form->{formname} $filename\E//;
- unlink "$main::spool/$filename";
+ unlink $::lx_office_conf{paths}->{spool} . "/$filename";
$filename =~ s/\..*$//g;
} else {
$filename = time;
}
$filename .= ($form->{postscript}) ? '.ps' : '.pdf';
- $form->{OUT} = ">$main::spool/$filename";
+ $form->{OUT} = ">" . $::lx_office_conf{paths}->{spool} . "/$filename";
# add type
$form->{queued} .= " $form->{formname} $filename";
}
# /saving the history
- $form->parse_template(\%myconfig, $main::userspath);
+ $form->parse_template(\%myconfig);
$form->{callback} = "";
projects / kivitendo-erp.git / blobdiff