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}";
}
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 $::lx_office_conf{system}->{lizenzen};
+ push @new_fields, "lizenzen" if $::lx_office_conf{features}->{lizenzen};
push @new_fields, grep { m/^ic_cvar_/ } keys %{ $form->{item_list}->[0] };
my $i = 0;
foreach my $ref (@{ $form->{item_list} }) {
my $checked = ($i++) ? "" : "checked";
- if ($::lx_office_conf{system}->{lizenzen}) {
+ if ($::lx_office_conf{features}->{lizenzen}) {
if ($ref->{inventory_accno} > 0) {
$ref->{"lizenzen"} = qq|<option></option>|;
foreach my $item (@{ $form->{LIZENZEN}{ $ref->{"id"} } }) {
$form->{payment_id} = $form->{"part_payment_id_$i"};
}
- if ($::lx_office_conf{system}->{lizenzen}) {
+ if ($::lx_office_conf{features}->{lizenzen}) {
map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} } qw(lizenzen);
}
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),