X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fis.pl;h=65cc0609d4788d7683d6494f260f99f4f0e6cd11;hb=1d027d8883ed6b13cf6c78b95b3493acc1fb715f;hp=59d4b479053bcbc73252bce6aefbad24de0aa59e;hpb=83d48a07af73da318458780e40814cf89579cb94;p=kivitendo-erp.git diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index 59d4b4790..65cc0609d 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -34,8 +34,10 @@ use SL::IS; use SL::PE; use Data::Dumper; +use List::Util qw(max); require "bin/mozilla/io.pl"; +require "bin/mozilla/invoice_io.pl"; require "bin/mozilla/arap.pl"; require "bin/mozilla/drafts.pl"; @@ -83,7 +85,7 @@ sub edit { # show history button $form->{javascript} = qq||; #/show hhistory button - + if ($myconfig{acs} =~ "AR--Add Sales Invoice" || $myconfig{acs} =~ "AR--AR") { $form->error("Access Denied"); @@ -169,12 +171,6 @@ sub invoice_links { $form->{oldcustomer} = "$form->{customer}--$form->{customer_id}"; - if (@{ $form->{all_customer} }) { - $form->{customer} = "$form->{customer}--$form->{customer_id}"; - map { $form->{selectcustomer} .= "\n" } - (@{ $form->{all_customer} }); - } - # departments if ($form->{all_departments}) { $form->{selectdepartment} = "\n" } - (@{ $form->{all_employees} }); - } - # forex $form->{forex} = $form->{exchangerate}; $exchangerate = ($form->{exchangerate}) ? $form->{exchangerate} : 1; @@ -292,25 +281,20 @@ sub prepare_invoice { sub form_header { $lxdebug->enter_sub(); - if ($edit) { + $form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id}; + $form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id}; + if ($edit) { if ($form->{type} eq "credit_note") { $form->{title} = $locale->text('Edit Credit Note'); - - if ($form->{storno}) { - $form->{title} = $locale->text('Edit Storno Credit Note'); - } + $form->{title} = $locale->text('Edit Storno Credit Note') if $form->{storno}; } else { $form->{title} = $locale->text('Edit Sales Invoice'); - - if ($form->{storno}) { - $form->{title} = $locale->text('Edit Storno Invoice'); - } + $form->{title} = $locale->text('Edit Storno Invoice') if $form->{storno}; } } - - $form->{radier} = - ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0; + $form->{defaultcurrency} = $form->get_default_currency(\%myconfig); + $form->{radier} = ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0; $payment = qq||; foreach $item (@{ $form->{payment_terms} }) { @@ -321,67 +305,113 @@ sub form_header { } } - my $set_duedate_url = - "$form->{script}?login=$form->{login}&password=$form->{password}&action=set_duedate"; + my $set_duedate_url = "$form->{script}?login=$form->{login}&password=$form->{password}&action=set_duedate"; my $pjx = new CGI::Ajax( 'set_duedate' => $set_duedate_url ); push(@ { $form->{AJAX} }, $pjx); my @old_project_ids = ($form->{"globalproject_id"}); - map({ push(@old_project_ids, $form->{"project_id_$_"}) - if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"})); - - $form->get_lists("contacts" => "ALL_CONTACTS", - "shipto" => "ALL_SHIPTO", - "projects" => { "key" => "ALL_PROJECTS", - "all" => 0, - "old_id" => \@old_project_ids }, - "employees" => "ALL_SALESMEN", - "taxzones" => "ALL_TAXZONES", - "currencies" => "ALL_CURRENCIES"); + map { push @old_project_ids, $form->{"project_id_$_"} if $form->{"project_id_$_"}; } 1..$form->{"rowcount"}; + + $form->get_lists("contacts" => "ALL_CONTACTS", + "shipto" => "ALL_SHIPTO", + "projects" => { "key" => "ALL_PROJECTS", + "all" => 0, + "old_id" => \@old_project_ids }, + "employees" => "ALL_SALESMEN", + "taxzones" => "ALL_TAXZONES", + "currencies" => "ALL_CURRENCIES", + "customers" => "ALL_CUSTOMERS", + "price_factors" => "ALL_PRICE_FACTORS"); my %labels; my @values = (undef); foreach my $item (@{ $form->{"ALL_CONTACTS"} }) { push(@values, $item->{"cp_id"}); - $labels{$item->{"cp_id"}} = $item->{"cp_name"} . - ($item->{"cp_abteilung"} ? " ($item->{cp_abteilung})" : ""); + $labels{$item->{"cp_id"}} = $item->{"cp_name"} . ($item->{"cp_abteilung"} ? " ($item->{cp_abteilung})" : ""); + } + my $contact; + if (scalar @values > 1) { + $contact = qq| + + | . $locale->text('Contact Person') . qq| + | . NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values, '-style' => 'width: 250px', + '-labels' => \%labels, '-default' => $form->{"cp_id"})) . qq| + + |; } - my $contact = - NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values, - '-labels' => \%labels, '-default' => $form->{"cp_id"})); + + %labels = (); + @values = (); + foreach my $item (@{ $form->{"ALL_SALESMEN"} }) { + push(@values, $item->{"id"}); + $labels{$item->{id}} = $item->{name} ne "" ? $item->{name} : $item->{login}; + } + + my $employees = qq| + + | . $locale->text('Employee') . qq| + | . NTI($cgi->popup_menu('-name' => 'employee_id', '-default' => $form->{"employee_id"}, + '-values' => \@values, '-labels' => \%labels)) . qq| + + |; + + + %labels = (); + @values = (); + foreach my $item (@{ $form->{"ALL_CUSTOMERS"} }) { + push(@values, $item->{name}.qq|--|.$item->{"id"}); + $labels{$item->{name}.qq|--|.$item->{"id"}} = $item->{"name"}; + } + + $form->{selectcustomer} = ($myconfig{vclimit} > scalar(@values)); + + my $customers = qq| + | . $locale->text('Customer') . qq| + | . + (($myconfig{vclimit} <= scalar(@values)) + ? qq|| + : (NTI($cgi->popup_menu('-name' => 'customer', '-default' => $form->{oldcustomer}, + '-onChange' => 'document.getElementById(\'update_button\').click();', + '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px')))) . qq| + + |; %labels = (); @values = (""); foreach my $item (@{ $form->{"ALL_SHIPTO"} }) { push(@values, $item->{"shipto_id"}); - $labels{$item->{"shipto_id"}} = - $item->{"shiptoname"} . " " . $item->{"shiptodepartment_1"}; + $labels{$item->{"shipto_id"}} = join "; ", grep { $_ } map { $item->{"shipto${_}" } } qw(name department_1 street city); } - my $shipto = qq| - | . $locale->text('Shipping Address') . qq| - | . - NTI($cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values, - '-labels' => \%labels, '-default' => $form->{"shipto_id"})) - . qq||; + my $shipto; + if (scalar @values > 1) { + $shipto = qq| + + | . $locale->text('Shipping Address') . qq| + | . NTI($cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values, '-style' => 'width: 250px', + '-labels' => \%labels, '-default' => $form->{"shipto_id"})). qq| + |; + } %labels = (); @values = (); foreach my $item (@{ $form->{"ALL_CURRENCIES"} }) { - push(@values, $item->{"currency"}); - $labels{$item->{"currency"}} = $item->{"currency"}; + push(@values, $item); + $labels{$item} = $item; } - + $form->{currency} = $form->{defaultcurrency} unless $form->{currency}; - my $currencies = qq| + my $currencies; + if (scalar @values) { + $currencies = qq| | . $locale->text('Currency') . qq| - | . - NTI($cgi->popup_menu('-name' => 'currency', '-default' => $form->{"currency"}, - '-values' => \@values, '-labels' => \%labels)) . qq| + | . NTI($cgi->popup_menu('-name' => 'currency', '-default' => $form->{"currency"}, + '-values' => \@values, '-labels' => \%labels)) . qq| |; + } %labels = (); @values = (""); @@ -389,26 +419,23 @@ sub form_header { push(@values, $item->{"id"}); $labels{$item->{"id"}} = $item->{"projectnumber"}; } - my $globalprojectnumber = - NTI($cgi->popup_menu('-name' => 'globalproject_id', '-values' => \@values, - '-labels' => \%labels, - '-default' => $form->{"globalproject_id"})); + my $globalprojectnumber = NTI($cgi->popup_menu('-name' => 'globalproject_id', '-values' => \@values, + '-labels' => \%labels, + '-default' => $form->{"globalproject_id"})); %labels = (); - @values = (""); + @values = (); foreach my $item (@{ $form->{ALL_SALESMEN} }) { push(@values, $item->{id}); $labels{$item->{id}} = $item->{name} ne "" ? $item->{name} : $item->{login}; } $salesman = - qq| - | . $locale->text('Salesman') . qq| - | . - NTI($cgi->popup_menu('-name' => 'salesman_id', '-default' => $form->{salesman_id}, - '-values' => \@values, '-labels' => \%labels)) - . qq| - |; + qq| | . $locale->text('Salesman') . qq| + | . NTI($cgi->popup_menu('-name' => 'salesman_id', '-values' => \@values, '-labels' => \%labels, + '-default' => $form->{salesman_id} ? $form->{salesman_id} : $form->{employee_id})) . qq| + + |; %labels = (); @values = (); @@ -421,9 +448,8 @@ sub form_header { $taxzone = qq| | . $locale->text('Steuersatz') . qq| - | . - NTI($cgi->popup_menu('-name' => 'taxzone_id', '-default' => $form->{"taxzone_id"}, - '-values' => \@values, '-labels' => \%labels)) . qq| + | . NTI($cgi->popup_menu('-name' => 'taxzone_id', '-default' => $form->{"taxzone_id"}, + '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px',)) . qq| |; @@ -441,61 +467,32 @@ sub form_header { # set option selected foreach $item (qw(AR customer currency department employee)) { $form->{"select$item"} =~ s/ selected//; - $form->{"select$item"} =~ - s/option>\Q$form->{$item}\E/option selected>$form->{$item}/; - } - - #quote customer Bug 133 - $form->{selectcustomer} = $form->quote($form->{selectcustomer}); - - #substitute \n and \r to \s (bug 543) - $form->{selectcustomer} =~ s/[\n\r]/ /g; - - if (($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update}) { - $creditwarning = 1; - } else { - $creditwarning = 0; + $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/; } - $form->{exchangerate} = - $form->format_amount(\%myconfig, $form->{exchangerate}); + $creditwarning = (($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update}) ? 1 : 0; - $form->{creditlimit} = - $form->format_amount(\%myconfig, $form->{creditlimit}, 0, "0"); - $form->{creditremaining} = - $form->format_amount(\%myconfig, $form->{creditremaining}, 0, "0"); + $form->{exchangerate} = $form->format_amount(\%myconfig, $form->{exchangerate}); + $form->{creditlimit} = $form->format_amount(\%myconfig, $form->{creditlimit}, 0, "0"); + $form->{creditremaining} = $form->format_amount(\%myconfig, $form->{creditremaining}, 0, "0"); $exchangerate = ""; if ($form->{currency} ne $form->{defaultcurrency}) { if ($form->{forex}) { - $exchangerate .= - qq|| - . $locale->text('Exchangerate') - . qq|$form->{exchangerate}|; + $exchangerate .= qq|| . $locale->text('Exchangerate') . qq| + $form->{exchangerate}|; } else { - $exchangerate .= - qq|| - . $locale->text('Exchangerate') - . qq||; + $exchangerate .= qq|| . $locale->text('Exchangerate') . qq| + |; } } - $exchangerate .= qq| - -|; - - $customer = - ($form->{selectcustomer}) - ? qq|\n| - : qq||; + $exchangerate .= qq|\n\n|; $department = qq| | . $locale->text('Department') . qq| - - + + | if $form->{selectdepartment}; @@ -505,115 +502,79 @@ onchange="document.getElementById('update_button').click();">| . if ($form->{business}) { $business = qq| - | . $locale->text('Business') . qq| - $form->{business} - | . $locale->text('Trade Discount') . qq| - | + | . $locale->text('Customer type') . qq| + $form->{business}; | . $locale->text('Trade Discount') . qq| | . $form->format_amount(\%myconfig, $form->{tradediscount} * 100) . qq| % - + |; } if ($form->{max_dunning_level}) { $dunning = qq| - - - - - - - - - -
| . $locale->text('Max. Dunning Level') . qq|:$form->{max_dunning_level}| . $locale->text('Dunning Amount') . qq|:| - . $form->format_amount(\%myconfig, $form->{dunning_amount},2) - . qq|
- - + + | . $locale->text('Max. Dunning Level') . qq|: + + $form->{max_dunning_level}; + | . $locale->text('Dunning Amount') . qq|: | + . $form->format_amount(\%myconfig, $form->{dunning_amount},2) + . qq| + + |; } $form->{fokus} = "invoice.customer"; # use JavaScript Calendar or not - $form->{jsscript} = $jscalendar; + $form->{jsscript} = 1; $jsscript = ""; if ($form->{type} eq "credit_note") { - if ($form->{jsscript}) { - - # with JavaScript Calendar - $button1 = qq| - - |; - - #write Trigger - $jsscript = - Form->write_trigger(\%myconfig, "1", - "invdate", "BL", - "trigger1"); - } else { - - # without JavaScript Calendar - $button1 = - qq||; - $button2 = - qq||; - } + $button1 = qq| + + |; + + #write Trigger + $jsscript = + Form->write_trigger(\%myconfig, "1", + "invdate", "BL", + "trigger1"); } else { - if ($form->{jsscript}) { - - # with JavaScript Calendar - $button1 = qq| - - - |; - $button2 = qq| - - + $button1 = qq| + + |; - $button3 = qq| - - - |; - - #write Trigger - $jsscript = - Form->write_trigger(\%myconfig, "3", - "invdate", "BL", - "trigger1", "duedate", - "BL", "trigger2", - "deliverydate", "BL", - "trigger3"); - } else { - - # without JavaScript Calendar - $button1 = - qq||; - $button2 = - qq|{duedate} onBlur=\"check_right_date_format(this)\">|; - } - } - if ($form->{resubmit} && ($form->{format} eq "html")) { - $onload = - qq|window.open('about:blank','Beleg'); document.invoice.target = 'Beleg';document.invoice.submit()|; - } elsif ($form->{resubmit}) { - $onload = qq|document.invoice.submit()|; - } else { - $onload = "focus()"; + $button2 = qq| + + + |; + $button3 = qq| + + + |; + + #write Trigger + $jsscript = + Form->write_trigger(\%myconfig, "3", + "invdate", "BL", "trigger1", + "duedate", "BL", "trigger2", + "deliverydate", "BL", "trigger3"); } + + $credittext = $locale->text('Credit Limit exceeded!!!'); + $onload = ($form->{resubmit} && ($form->{format} eq "html")) ? qq|window.open('about:blank','Beleg'); document.invoice.target = 'Beleg';document.invoice.submit()| + : ($form->{resubmit}) ? qq|document.invoice.submit()| + : ($creditwarning) ? qq|alert('$credittext')| + : "focus()"; $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|; $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|; - $credittext = $locale->text('Credit Limit exceeded!!!'); - if ($creditwarning) { - $onload = qq|alert('$credittext')|; - } - $form->{"javascript"} .= qq||; + $form->{javascript} .= qq||; + $form->{javascript} .= qq||; $jsscript .= $form->write_trigger(\%myconfig, 2, @@ -633,55 +594,44 @@ onchange="document.getElementById('update_button').click();">| .
| ; -map({print $cgi->hidden("-name" => $_ , "-value" => $form->{$_});} - qw(id action type media format queued printed emailed title vc discount - creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id)) ; -print ($form->{saved_message} ? qq|

$form->{saved_message}

| : "") ; -print qq| + + $form->hide_form(qw(id action type media format queued printed emailed title vc discount + creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id + max_dunning_level dunning_amount + shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax + shiptoemail shiptodepartment_1 shiptodepartment_2 message email subject cc bcc taxaccounts), + map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts} ); + + print qq|

$form->{saved_message}

| if $form->{saved_message}; + + print qq| +
$form->{title}
+ - - - - -
$form->{title}
- - -
- - - - - - - - - - - - - - $shipto - - $business - $dunning +
| . $locale->text('Customer') . qq|$customer| - . $locale->text('Contact Person') . qq|$contact
- - - - - - - - -
| . $locale->text('Credit Limit') . qq|$form->{creditlimit}| . $locale->text('Remaining') . qq|$form->{creditremaining}
-
+ + + $customers + + + + + + $contact + $shipto + + + + + $dunning + $business - + $taxzone @@ -700,7 +650,11 @@ print qq| - |; + + + + + |; # # - - + @@ -1160,17 +1132,22 @@ if ($form->{type} eq "credit_note") { . Q($form->{id}) . qq|);" name="history" id="history" value="| . $locale->text('history') - . qq|">|; + . qq|"> |; } # /button for saving history - - + + # mark_as_paid button + if($form->{id} ne "") { + print qq||; + } + # /mark_as_paid button print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) . qq| | . -$cgi->hidden("-name" => "callback", "-value" => $form->{callback}) +$cgi->hidden("-name" => "callback", "-value" => $form->{callback}) . $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}]) . $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}]); map({ print $cgi->hidden("-name" => $_ , "-value" => $form->{$_});} qw(login password)); @@ -1185,46 +1162,39 @@ print qq| $lxdebug->leave_sub(); } +sub mark_as_paid { + $lxdebug->enter_sub(); + &mark_as_paid_common(\%myconfig,"ar"); + $lxdebug->leave_sub(); +} + sub update { $lxdebug->enter_sub(); - map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } - qw(exchangerate creditlimit creditremaining); - if ($form->{second_run}) { - $form->{print_and_post} = 0; - } + my ($recursive_call) = shift; + + map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate creditlimit creditremaining) unless $recursive_call; + $form->{print_and_post} = 0 if $form->{second_run}; + $taxincluded = "checked" if $form->{taxincluded}; $form->{update} = 1; &check_name(customer); - $form->{exchangerate} = $exchangerate - if ( - $form->{forex} = ( - $exchangerate = - $form->check_exchangerate( - \%myconfig, $form->{currency}, $form->{invdate}, 'buy' - ))); + $form->{taxincluded} ||= $taxincluded; + + $form->{exchangerate} = $exchangerate if + $form->{forex} = $exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{invdate}, 'buy'); for $i (1 .. $form->{paidaccounts}) { - if ($form->{"paid_$i"}) { - map { - $form->{"${_}_$i"} = - $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) - } qw(paid exchangerate); - - $form->{"exchangerate_$i"} = $exchangerate - if ( - $form->{"forex_$i"} = ( - $exchangerate = - $form->check_exchangerate( - \%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'buy' - ))); - } + next unless $form->{"paid_$i"}; + map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(paid exchangerate); + $form->{"exchangerate_$i"} = $exchangerate if + $form->{"forex_$i"} = $exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'buy'); } $i = $form->{rowcount}; - $exchangerate = ($form->{exchangerate}) ? $form->{exchangerate} : 1; + $exchangerate = $form->{exchangerate} || 1; # if last row empty, check the form otherwise retrieve new item if ( ($form->{"partnumber_$i"} eq "") @@ -1240,8 +1210,7 @@ sub update { $rows = scalar @{ $form->{item_list} }; - $form->{"discount_$i"} = - $form->format_amount(\%myconfig, $form->{discount} * 100); + $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{discount} * 100); if ($rows) { $form->{"qty_$i"} = ($form->{"qty_$i"} * 1) ? $form->{"qty_$i"} : 1; @@ -1255,27 +1224,20 @@ sub update { $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"}); - map { $form->{item_list}[$i]{$_} =~ s/\"/"/g } - qw(partnumber description unit); - map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } - keys %{ $form->{item_list}[0] }; - if ($form->{"part_payment_id_$i"} ne "") { - $form->{payment_id} = $form->{"part_payment_id_$i"}; - } + map { $form->{item_list}[$i]{$_} =~ s/\"/"/g } qw(partnumber description unit); + map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } keys %{ $form->{item_list}[0] }; + + $form->{payment_id} = $form->{"part_payment_id_$i"} if $form->{"part_payment_id_$i"} ne ""; + $form->{"discount_$i"} = 0 if $form->{"not_discountable_$i"}; - if ($form->{"not_discountable_$i"}) { - $form->{"discount_$i"} = 0; - } + $form->{"marge_price_factor_$i"} = $form->{item_list}->[0]->{price_factor}; - $s = ($sellprice) ? $sellprice : $form->{"sellprice_$i"}; - ($dec) = ($s =~ /\.(\d+)/); - $dec = length $dec; - $decimalplaces = ($dec > 2) ? $dec : 2; + ($sellprice || $form->{"sellprice_$i"}) =~ /\.(\d+)/; + $decimalplaces = max 2, length $1; if ($sellprice) { $form->{"sellprice_$i"} = $sellprice; } else { - # if there is an exchange rate adjust sellprice $form->{"sellprice_$i"} *= (1 - $form->{tradediscount}); $form->{"sellprice_$i"} /= $exchangerate; @@ -1283,36 +1245,24 @@ sub update { $form->{"listprice_$i"} /= $exchangerate; - $amount = - $form->{"sellprice_$i"} * $form->{"qty_$i"} * - (1 - $form->{"discount_$i"} / 100); - map { $form->{"${_}_base"} = 0 } (split / /, $form->{taxaccounts}); - 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"} * $form->{"qty_$i"} * (1 - $form->{"discount_$i"} / 100); + map { $form->{"${_}_base"} = 0 } split / /, $form->{taxaccounts}; + map { $form->{"${_}_base"} += $amount } split / /, $form->{"taxaccounts_$i"}; + map { $amount += ($form->{"${_}_base"} * $form->{"${_}_rate"}) } split / /, $form->{"taxaccounts_$i"} if !$form->{taxincluded}; $form->{creditremaining} -= $amount; - map { - $form->{"${_}_$i"} = - $form->format_amount(\%myconfig, $form->{"${_}_$i"}, - $decimalplaces) - } qw(sellprice listprice); + map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, $decimalplaces) } qw(sellprice listprice); - $form->{"qty_$i"} = - $form->format_amount(\%myconfig, $form->{"qty_$i"}); + $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"}); if ($lizenzen) { if ($form->{"inventory_accno_$i"} ne "") { $form->{"lizenzen_$i"} = qq||; foreach $item (@{ $form->{LIZENZEN}{ $form->{"id_$i"} } }) { - $form->{"lizenzen_$i"} .= - qq||; + $form->{"lizenzen_$i"} .= qq||; } - $form->{"lizenzen_$i"} .= - qq||; + $form->{"lizenzen_$i"} .= qq||; } } @@ -1335,14 +1285,11 @@ sub update { && ($form->{"description_$i"} eq "")) { $form->{rowcount}--; $form->{"discount_$i"} = ""; - &display_form; - } else { + display_form(); + } else { $form->{"id_$i"} = 0; - $form->{"unit_$i"} = $locale->text('ea'); - - &new_item; - + new_item(); } } } @@ -1351,6 +1298,8 @@ sub update { sub post_payment { $lxdebug->enter_sub(); + + $form->{defaultcurrency} = $form->get_default_currency(\%myconfig); for $i (1 .. $form->{paidaccounts}) { if ($form->{"paid_$i"}) { $datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig); @@ -1372,7 +1321,7 @@ sub post_payment { ($form->{AR}) = split /--/, $form->{AR}; ($form->{AR_paid}) = split /--/, $form->{AR_paid}; relink_accounts(); - $form->redirect($locale->text(' Payment posted!')) + $form->redirect($locale->text('Payment posted!')) if (IS->post_payment(\%myconfig, \%$form)); $form->error($locale->text('Cannot post payment!')); @@ -1382,9 +1331,14 @@ sub post_payment { sub post { $lxdebug->enter_sub(); + + $form->{defaultcurrency} = $form->get_default_currency(\%myconfig); $form->isblank("invdate", $locale->text('Invoice Date missing!')); $form->isblank("customer", $locale->text('Customer missing!')); + $form->{invnumber} =~ s/^\s*//g; + $form->{invnumber} =~ s/\s*$//g; + # if oldcustomer ne customer redo form if (&check_name(customer)) { &update; @@ -1423,8 +1377,9 @@ sub post { } } - ($form->{AR}) = split /--/, $form->{AR}; - ($form->{AR_paid}) = split /--/, $form->{AR_paid}; + ($form->{AR}) = split /--/, $form->{AR}; + ($form->{AR_paid}) = split /--/, $form->{AR_paid}; + $form->{storno} ||= 0; $form->{label} = $locale->text('Invoice'); @@ -1451,7 +1406,7 @@ sub post { "POSTED"; $form->save_history($form->dbconnect(\%myconfig)); } - + $form->redirect( $form->{label} . " $form->{invnumber} " . $locale->text('posted!')) unless $print_post; @@ -1495,21 +1450,25 @@ sub storno { } map({ my $key = $_; delete($form->{$key}) - unless (grep({ $key eq $_ } qw(login password id type))); } + unless (grep({ $key eq $_ } qw(login password id stylesheet type))); } keys(%{ $form })); - &invoice_links; - &prepare_invoice; + invoice_links(); + prepare_invoice(); relink_accounts(); + # Payments must not be recorded for the new storno invoice. + $form->{paidaccounts} = 0; + map { my $key = $_; delete $form->{$key} if grep { $key =~ /^$_/ } qw(datepaid_ source_ memo_ paid_ exchangerate_ AR_paid_) } keys %{ $form }; + $form->{storno_id} = $form->{id}; $form->{storno} = 1; $form->{id} = ""; $form->{invnumber} = "Storno zu " . $form->{invnumber}; + $form->{rowcount}++; - &post(); + post(); $lxdebug->leave_sub(); - } sub preview { @@ -1518,7 +1477,6 @@ sub preview { $form->{preview} = 1; $old_form = new Form; for (keys %$form) { $old_form->{$_} = $form->{$_} } - $old_form->{rowcount}++; &print_form($old_form); $lxdebug->leave_sub(); @@ -1579,7 +1537,7 @@ sub credit_note { $form->{script} = 'is.pl'; $script = "is"; $buysell = 'buy'; - + # bo creates the id, reset it map { delete $form->{$_} } @@ -1622,12 +1580,12 @@ sub yes { if (IS->delete_invoice(\%myconfig, \%$form, $spool)) { # saving the history if(!exists $form->{addition}) { - $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; + $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; $form->{addition} = "DELETED"; $form->save_history($form->dbconnect(\%myconfig)); } - # /saving the history - $form->redirect($locale->text('Invoice deleted!')); + # /saving the history + $form->redirect($locale->text('Invoice deleted!')); } $form->error($locale->text('Cannot delete invoice!'));
| . $locale->text('Credit Limit') . qq|$form->{creditlimit}; | . $locale->text('Remaining') . qq| $form->{creditremaining}
| . $locale->text('Record in') . qq|
| . $locale->text('Ship via') . qq|
| . $locale->text('Transaction description') . qq|| . $cgi->textfield("-name" => "transaction_description", "-size" => 35, "-value" => $form->{transaction_description}) . qq|
# @@ -723,14 +677,9 @@ print qq| # print qq|
+ - - - - - - + $employees $salesman |; if ($form->{type} eq "credit_note") { @@ -766,8 +715,8 @@ print qq| - - + @@ -775,8 +724,8 @@ print qq| - - + @@ -795,23 +744,11 @@ print qq| - -| . -$jsscript -. qq| - -| ; -map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } - qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail shiptodepartment_1 shiptodepartment_2)); -print qq| |; -map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } - qw(message email subject cc bcc taxaccounts)); -print qq||; + + $jsscript +|; + print qq||; - foreach $item (split(/ /, $form->{taxaccounts})) { - map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } - ("${item}_rate", "${item}_description", "${item}_taxnumber")); - } $lxdebug->leave_sub(); } @@ -832,12 +769,12 @@ sub form_footer { $intnotes = qq||; - $form->{taxincluded} = ($form->{taxincluded}) ? "checked" : ""; + $form->{taxincluded} = ($form->{taxincluded} ? "checked" : ""); $taxincluded = ""; if ($form->{taxaccounts}) { $taxincluded = qq| - {taxincluded}> | + {taxincluded}> | . $locale->text('Tax Included') . qq|

|; } @@ -933,9 +870,23 @@ sub form_footer {
| . $locale->text('Employee') . qq|
| . $locale->text('Order Date') . qq| +
| . $locale->text('Quotation Number') . qq|
| . $locale->text('Quotation Date') . qq| +
| . $locale->text('Customer Order Number') . qq|
 + + + + + + + + + + + + +
| . $locale->text('Ertrag') . qq|| . $form->format_amount(\%myconfig, $form->{marge_total}, 2, 0) . qq|
| . $locale->text('Ertrag prozentual') . qq|| . $form->format_amount(\%myconfig, $form->{marge_percent}, 2, 0) . qq| %
+ 		$taxincluded - +
$subtotal $tax @@ -961,11 +912,11 @@ sub form_footer { |; - foreach $file (keys %{ $form->{WEBDAV} }) { + foreach $file (@{ $form->{WEBDAV} }) { $webdav_list .= qq| - - + + |; } @@ -1019,7 +970,8 @@ if ($form->{type} eq "credit_note") { "; - my @triggers = (); + my @triggers = (); + my $totalpaid = 0; $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"}); for $i (1 .. $form->{paidaccounts}) { @@ -1040,6 +992,9 @@ if ($form->{type} eq "credit_note") { $form->{"exchangerate_$i"} = $form->format_amount(\%myconfig, $form->{"exchangerate_$i"}); + if ($form->{"exchangerate_$i"} == 0) { + $form->{"exchangerate_$i"} = ""; + } $exchangerate = qq| |; if ($form->{currency} ne $form->{defaultcurrency}) { if ($form->{"forex_$i"}) { @@ -1070,7 +1025,24 @@ if ($form->{type} eq "credit_note") { push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i"); } - map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } qw(paidaccounts selectAR_paid oldinvtotal)); + my $paid_missing = $form->{oldinvtotal} - $totalpaid; + + print qq| + + + + + + + + + + + + +|; + + map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } qw(paidaccounts selectAR_paid oldinvtotal)); print qq|
Dateiname Webdavlink
$file$form->{WEBDAV}{$file}$file->{name}$file->{type}
| . $locale->text('Total') . qq|| . H($form->format_amount(\%myconfig, $totalpaid, 2)) . qq|
| . $locale->text('Missing amount') . qq|| . H($form->format_amount(\%myconfig, $paid_missing, 2)) . qq|