X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/c103dedd31b5aeb5899c191f2950d2db95e12a79..195883fdfd3b10f329036767f027baa6e7c402b9:/bin/mozilla/is.pl diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index 4e6a066db..31d017eef 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -33,6 +33,7 @@ use SL::IS; use SL::PE; +use Data::Dumper; require "$form->{path}/io.pl"; require "$form->{path}/arap.pl"; @@ -66,7 +67,7 @@ sub add { sub edit { $lxdebug->enter_sub(); - +print STDERR "is.pl-edit\n"; $form->{title} = $locale->text('Edit Sales Invoice'); if ($myconfig{acs} =~ "AR--Add Sales Invoice" || $myconfig{acs} =~ "AR--AR") @@ -83,7 +84,7 @@ sub edit { sub invoice_links { $lxdebug->enter_sub(); - +print STDERR "is.pl-invoice_links\n"; $form->{vc} = 'customer'; # create links @@ -183,7 +184,7 @@ sub invoice_links { sub prepare_invoice { $lxdebug->enter_sub(); - +print STDERR "is.pl-prepare_invoice\n"; $form->{type} = "invoice"; $form->{formname} = "invoice"; $form->{format} = "html"; @@ -194,12 +195,14 @@ sub prepare_invoice { map { $form->{$_} =~ s/\"/"/g } qw(invnumber ordnumber quonumber shippingpoint shipvia notes intnotes); +# # get pricegroups for parts +# IS->get_pricegroups_for_parts(\%myconfig, \%$form); + foreach $ref (@{ $form->{invoice_details} }) { $i++; map { $form->{"${_}_$i"} = $ref->{$_} } keys %{$ref}; $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"discount_$i"} * 100); - ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/); $dec = length $dec; $decimalplaces = ($dec > 2) ? $dec : 2; @@ -212,6 +215,10 @@ sub prepare_invoice { map { $form->{"${_}_$i"} =~ s/\"/"/g } qw(partnumber description unit partnotes); $form->{rowcount} = $i; + +# # build up html code for prices_$i +# print STDERR "set_pricegroup aus is.pl-prepare_invoice\n"; +# set_pricegroup(); } } $lxdebug->leave_sub(); @@ -219,7 +226,7 @@ sub prepare_invoice { sub form_header { $lxdebug->enter_sub(); - +print STDERR "is.pl-form_header\n"; # set option selected foreach $item (qw(AR customer currency department employee contact)) { $form->{"select$item"} =~ s/ selected//; @@ -389,6 +396,7 @@ sub form_header { | . $locale->text('Customer') . qq| $customer + {customer_klass}> {customer_id}> | @@ -514,7 +522,7 @@ $jsscript sub form_footer { $lxdebug->enter_sub(); - +print STDERR "is.pl-form_footer\n"; $form->{invtotal} = $form->{invsubtotal}; if (($rows = $form->numtextrows($form->{notes}, 26, 8)) < 2) { @@ -852,7 +860,7 @@ sub form_footer { sub update { $lxdebug->enter_sub(); - +print STDERR "is.pl-update\n"; map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate creditlimit creditremaining); @@ -916,7 +924,7 @@ sub update { } else { $sellprice = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}); - +#print STDERR " SELLPRICE-111- $sellprice\n"; map { $form->{item_list}[$i]{$_} =~ s/\"/"/g } qw(partnumber description unit); map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } @@ -973,6 +981,11 @@ sub update { } } + # get pricegroups for parts + IS->get_pricegroups_for_parts(\%myconfig, \%$form, "new"); + + # build up html code for prices_$i + set_pricegroup(); } &display_form; @@ -1003,7 +1016,7 @@ sub update { sub post { $lxdebug->enter_sub(); - +print STDERR "is.pl-post\n"; $form->isblank("invdate", $locale->text('Invoice Date missing!')); $form->isblank("customer", $locale->text('Customer missing!'));