X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fis.pl;h=3aa93b622d07af7ce72def0e5ef8b7db0c7c465c;hb=b65cc47a206d0b5df78123d9b36c1867928bf684;hp=0e67ed4750ab20c337b26949530390b47bd0cc4e;hpb=4cc5904b3ed7efd6a3d1c1f77ed23bf589fe7d0d;p=kivitendo-erp.git diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index 0e67ed475..3aa93b622 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -89,6 +89,7 @@ sub edit { $main::lxdebug->enter_sub(); my $form = $main::form; + my $locale = $main::locale; $main::auth->assert('invoice_edit'); @@ -96,7 +97,14 @@ sub edit { $form->{javascript} = qq||; #/show hhistory button - $edit = 1; + if ($form->{type} eq "credit_note") { + $form->{title} = $locale->text('Edit Credit Note'); + $form->{title} = $locale->text('Edit Storno Credit Note') if $form->{storno}; + } else { + $form->{title} = $locale->text('Edit Sales Invoice'); + $form->{title} = $locale->text('Edit Storno Invoice') if $form->{storno}; + } + my ($language_id, $printer_id); if ($form->{print_and_post}) { $form->{action} = "print"; @@ -139,54 +147,30 @@ sub invoice_links { } } - my $payment_id; - if ($form->{payment_id}) { - $payment_id = $form->{payment_id}; - } - my $language_id; - if ($form->{language_id}) { - $language_id = $form->{language_id}; - } - my $taxzone_id; - if ($form->{taxzone_id}) { - $taxzone_id = $form->{taxzone_id}; - } - my $id; - if ($form->{id}) { - $id = $form->{id}; - } - my $shipto_id; - if ($form->{shipto_id}) { - $shipto_id = $form->{shipto_id}; - } + $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes id shipto_id)); - my $cp_id = $form->{cp_id}; IS->get_customer(\%myconfig, \%$form); #quote all_customer Bug 133 foreach my $ref (@{ $form->{all_customer} }) { $ref->{name} = $form->quote($ref->{name}); } - if ($id) { - $form->{id} = $id; - } - IS->retrieve_invoice(\%myconfig, \%$form); - $form->{cp_id} = $cp_id; - if ($payment_id) { - $form->{payment_id} = $payment_id; - } - if ($language_id) { - $form->{language_id} = $language_id; - } - if ($taxzone_id) { - $form->{taxzone_id} = $taxzone_id; - } - if ($shipto_id) { - $form->{shipto_id} = $shipto_id; + $form->restore_vars(qw(id)); + + IS->retrieve_invoice(\%myconfig, \%$form); + $form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id shipto_id)); + $form->restore_vars(qw(taxincluded)) if $form->{id}; + $form->restore_vars(qw(salesman_id)) if $main::editing; + + # build vendor/customer drop down comatibility... don't ask + if (@{ $form->{"all_customer"} }) { + $form->{"selectcustomer"} = 1; + $form->{customer} = qq|$form->{customer}--$form->{"customer_id"}|; } $form->{oldcustomer} = "$form->{customer}--$form->{customer_id}"; + $form->{selectcustomer} = 1; # departments if ($form->{all_departments}) { @@ -309,15 +293,6 @@ sub form_header { $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'); - $form->{title} = $locale->text('Edit Storno Credit Note') if $form->{storno}; - } else { - $form->{title} = $locale->text('Edit Sales Invoice'); - $form->{title} = $locale->text('Edit Storno Invoice') if $form->{storno}; - } - } $form->{defaultcurrency} = $form->get_default_currency(\%myconfig); $form->{radier} = ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0; @@ -332,8 +307,7 @@ sub form_header { my $set_duedate_url = "$form->{script}?action=set_duedate"; - my $pjx = new CGI::Ajax( 'set_duedate' => $set_duedate_url ); - push(@ { $form->{AJAX} }, $pjx); + push @ { $form->{AJAX} }, new CGI::Ajax( 'set_duedate' => $set_duedate_url ); my @old_project_ids = ($form->{"globalproject_id"}); map { push @old_project_ids, $form->{"project_id_$_"} if $form->{"project_id_$_"}; } 1..$form->{"rowcount"}; @@ -358,10 +332,10 @@ sub form_header { # customer $TMPL_VAR{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" }; $TMPL_VAR{vclimit} = $myconfig{vclimit}; - $TMPL_VAR{vc_select} = "customer_or_vendor_selection_window('$form->{vc}', '', @{[ $form->{vc} eq 'vendor' ? 1 : 0 ]}, 0)"; - push @custom_hiddens, "$form->{vc}_id"; - push @custom_hiddens, "old$form->{vc}"; - push @custom_hiddens, "select$form->{vc}"; + $TMPL_VAR{vc_select} = "customer_or_vendor_selection_window('customer', '', 0, 0)"; + push @custom_hiddens, "customer_id"; + push @custom_hiddens, "oldcustomer"; + push @custom_hiddens, "selectcustomer"; # currencies and exchangerate my @values = map { $_ } @{ $form->{ALL_CURRENCIES} }; @@ -383,20 +357,20 @@ sub form_header { $TMPL_VAR{customer_name} = $follow_up_vc; # set option selected - foreach my $item (qw(AR customer currency department employee)) { + foreach my $item (qw(AR)) { $form->{"select$item"} =~ s/ selected//; $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/; } - $TMPL_VAR{is_type_credit_note} = $form->{type} eq "credit_note"; - $TMPL_VAR{is_format_html} = $form->{format} eq 'html'; - $TMPL_VAR{dateformat} = $myconfig{dateformat}; - $TMPL_VAR{numberformat} = $myconfig{numberformat}; + $TMPL_VAR{is_type_credit_note} = $form->{type} eq "credit_note"; + $TMPL_VAR{is_format_html} = $form->{format} eq 'html'; + $TMPL_VAR{dateformat} = $myconfig{dateformat}; + $TMPL_VAR{numberformat} = $myconfig{numberformat}; # hiddens - $TMPL_VAR{HIDDEN} = [qw( + $TMPL_VAR{HIDDENS} = [qw( id action type media format queued printed emailed title vc discount - creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id + title 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 cursor_fokus @@ -407,198 +381,6 @@ sub form_header { $form->{jsscript} = 1; $form->header(); -# 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 cursor_fokus -# convert_from_do_ids convert_from_oe_ids), -# map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts} ); -# -# print qq|

$form->{saved_message}

| if $form->{saved_message}; -# -# print qq| -# -# -# -# -# -# -# -# -#
$form->{title}
-# -# -# -# -# -# -#
-# -# -# $customers -# -# -# -# -# -# $contact -# $shipto -# -# -# -# -# $dunning -# $business -# -# -# -# -# -# $taxzone -# $department -# -# $currencies -# -# -# $exchangerate -# -# -# -# -# -# -# -# -# -# -# -# -# |; -## -## -## -#print qq|
| . $locale->text('Credit Limit') . qq|$form->{creditlimit}; | . $locale->text('Remaining') . qq| $form->{creditremaining}
| . $locale->text('Record in') . qq|
| . $locale->text('Shipping Point') . qq| | . -# $cgi->textfield("-name" => "shippingpoint", "-size" => 35, "-value" => $form->{shippingpoint}) . -# qq|
| . $locale->text('Ship via') . qq| | . -# $cgi->textfield("-name" => "shipvia", "-size" => 35, "-value" => $form->{shipvia}) . -# qq|
| . $locale->text('Transaction description') . qq|| . $cgi->textfield("-name" => "transaction_description", "-size" => 35, "-value" => $form->{transaction_description}) . qq|
-## -## -## -## -## -## -## -## -## -##
-## -## -##
-## -## -##
-##
-#
-# -# $employees -# $salesman -#|; -# -##ergänzung in der maske um das feld Lieferscheinnummer (Delivery Order Number), meiner meinung nach sinnvoll ueber dem feld lieferscheindatum 12.02.2009 jb -#if ($form->{type} eq "credit_note") { -#print qq| -# -# -# -# -# -# $button1 -# |; -#} else { -#print qq| -# -# -# -# -# -# $button1 -# -# -# -# $button2 -# -# -# -# -# -# -# -# $button3 -# |; -#} -#print qq| -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -#
| . $locale->text('Credit Note Number') . qq| |. -# $cgi->textfield("-name" => "invnumber", "-size" => 11, "-value" => $form->{invnumber}) . -# qq|
| . $locale->text('Credit Note Date') . qq|
| . $locale->text('Invoice Number') . qq| |. -# $cgi->textfield("-name" => "invnumber", "-size" => 11, "-value" => $form->{invnumber}) . -# qq|
| . $locale->text('Invoice Date') . qq|
| . $locale->text('Due Date') . qq|
| . $locale->text('Delivery Order Number') . qq| |. -# $cgi->textfield("-name" => "donumber", "-size" => 11, "-value" => $form->{donumber}) . -# qq|
| . $locale->text('Delivery Date') . qq|
| . $locale->text('Order Number') . qq| |. -# $cgi->textfield("-name" => "ordnumber", "-size" => 11, "-value" => $form->{ordnumber}) . -# qq|
| . $locale->text('Order Date') . qq| -#
| . $locale->text('Quotation Number') . qq| |. -# $cgi->textfield("-name" => "quonumber", "-size" => 11, "-value" => $form->{quonumber}) . -# qq|
| . $locale->text('Quotation Date') . qq| -#
| . $locale->text('Customer Order Number') . qq| |. -# $cgi->textfield("-name" => "cusordnumber", "-size" => 11, "-value" => $form->{cusordnumber}) . -# qq|
| . $locale->text('Project Number') . qq|$globalprojectnumber
-#
-# -# -# -# -# -# -# $jsscript -#|; -# print qq||; - print $form->parse_html_template("is/form_header", \%TMPL_VAR); $main::lxdebug->leave_sub(); @@ -624,18 +406,14 @@ sub form_footer { $introws = 2; } $rows = ($rows > $introws) ? $rows : $introws; - my $notes = - qq||; - my $intnotes = - qq||; + my $notes = qq||; + my $intnotes = qq||; $form->{taxincluded} = ($form->{taxincluded} ? "checked" : ""); my $taxincluded = ""; if ($form->{taxaccounts}) { - $taxincluded = qq| - {taxincluded}> | - . $locale->text('Tax Included') . qq|

|; + $taxincluded = qq| {taxincluded}> | . $locale->text('Tax Included') . qq|

|; } my ($tax, $subtotal); @@ -643,26 +421,20 @@ sub form_footer { foreach my $item (split / /, $form->{taxaccounts}) { if ($form->{"${item}_base"}) { - $form->{"${item}_total"} = - $form->round_amount( - $form->{"${item}_base"} * $form->{"${item}_rate"}, - 2); + $form->{"${item}_total"} = $form->round_amount( $form->{"${item}_base"} * $form->{"${item}_rate"}, 2); $form->{invtotal} += $form->{"${item}_total"}; - $form->{"${item}_total"} = - $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2); + $form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2); $tax .= qq| - $form->{"${item}_description"} | - . $form->{"${item}_rate"} * 100 .qq|% - $form->{"${item}_total"} + $form->{"${item}_description"} | . $form->{"${item}_rate"} * 100 .qq|% + $form->{"${item}_total"} |; } } - $form->{invsubtotal} = - $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0); + $form->{invsubtotal} = $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0); $subtotal = qq| @@ -676,20 +448,10 @@ sub form_footer { if ($form->{taxincluded}) { foreach my $item (split / /, $form->{taxaccounts}) { if ($form->{"${item}_base"}) { - $form->{"${item}_total"} = - $form->round_amount( - ($form->{"${item}_base"} * $form->{"${item}_rate"} / - (1 + $form->{"${item}_rate"}) - ), - 2); - $form->{"${item}_netto"} = - $form->round_amount( - ($form->{"${item}_base"} - $form->{"${item}_total"}), - 2); - $form->{"${item}_total"} = - $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2); - $form->{"${item}_netto"} = - $form->format_amount(\%myconfig, $form->{"${item}_netto"}, 2); + $form->{"${item}_total"} = $form->round_amount( ($form->{"${item}_base"} * $form->{"${item}_rate"} / (1 + $form->{"${item}_rate"})), 2); + $form->{"${item}_netto"} = $form->round_amount( ($form->{"${item}_base"} - $form->{"${item}_total"}), 2); + $form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2); + $form->{"${item}_netto"} = $form->format_amount(\%myconfig, $form->{"${item}_netto"}, 2); $tax .= qq| @@ -708,8 +470,7 @@ sub form_footer { } $form->{oldinvtotal} = $form->{invtotal}; - $form->{invtotal} = - $form->format_amount(\%myconfig, $form->{invtotal}, 2, 0); + $form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2, 0); my $follow_ups_block; if ($form->{id}) { @@ -865,11 +626,9 @@ if ($form->{type} eq "credit_note") { # format amounts $totalpaid += $form->{"paid_$i"}; if ($form->{"paid_$i"}) { - $form->{"paid_$i"} = - $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2); + $form->{"paid_$i"} = $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2); } - $form->{"exchangerate_$i"} = - $form->format_amount(\%myconfig, $form->{"exchangerate_$i"}); + $form->{"exchangerate_$i"} = $form->format_amount(\%myconfig, $form->{"exchangerate_$i"}); if ($form->{"exchangerate_$i"} == 0) { $form->{"exchangerate_$i"} = ""; @@ -948,64 +707,37 @@ if ($form->{type} eq "credit_note") { my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar") && (($totalpaid == 0) || ($totalpaid eq "")); print qq| - - - - |; - print qq| | if ($show_storno); - print qq| -|; - print qq| -|; + + + + |; + print qq| | if ($show_storno); + print qq| |; + print qq| |; if ($form->{id} && !($form->{type} eq "credit_note")) { - print qq| - -|; + print qq| |; } if ($form->{radier}) { - print qq| - -|; + print qq| |; } if ($invdate > $closedto) { - print qq| - -|; + print qq| |; } - print qq| - |; + print qq| |; } else { if ($invdate > $closedto) { - print qq| - - - - - | . - NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'), - '-class' => 'submit')); + print qq| + + + + + + | . + NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'), '-class' => 'submit')); } } @@ -1022,8 +754,7 @@ if ($form->{type} eq "credit_note") { # mark_as_paid button if($form->{id} ne "") { - print qq||; + print qq||; } # /mark_as_paid button print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .