X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fis.pl;h=489a6d936112e4bb5db30286b2d2628505cc3518;hb=540030ff9826439d94f3f4292ab79b9be8795acc;hp=5708ac40772ec868c941e57a557ca15f422ebf50;hpb=cb0dfa9a11519db929421ddc704a1f25b6a50668;p=kivitendo-erp.git
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 5708ac407..489a6d936 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -34,6 +34,7 @@
use SL::FU;
use SL::IS;
use SL::PE;
+use SL::OE;
use Data::Dumper;
use List::Util qw(max sum);
@@ -44,10 +45,6 @@ require "bin/mozilla/drafts.pl";
use strict;
-my $edit;
-my $payment;
-my $print_post;
-
1;
# end of main
@@ -97,14 +94,6 @@ sub edit {
$form->{javascript} = qq||;
#/show hhistory button
- 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";
@@ -112,7 +101,16 @@ sub edit {
$language_id = $form->{language_id};
$printer_id = $form->{printer_id};
}
+
&invoice_links;
+ 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};
+ }
+
&prepare_invoice;
if ($form->{print_and_post}) {
$form->{language_id} = $language_id;
@@ -135,8 +133,7 @@ sub invoice_links {
$form->{vc} = 'customer';
# create links
- $form->{webdav} = $main::webdav;
- $form->{lizenzen} = $main::lizenzen;
+ $form->{webdav} = $::lx_office_conf{features}->{webdav};
$form->create_links("AR", \%myconfig, "customer");
@@ -147,7 +144,9 @@ sub invoice_links {
}
}
- $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes id shipto_id));
+ my $editing = $form->{id};
+
+ $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded currency cp_id intnotes id shipto_id));
IS->get_customer(\%myconfig, \%$form);
@@ -159,9 +158,10 @@ sub invoice_links {
$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(payment_id language_id taxzone_id currency intnotes cp_id shipto_id));
$form->restore_vars(qw(taxincluded)) if $form->{id};
- $form->restore_vars(qw(salesman_id)) if $main::editing;
+ $form->restore_vars(qw(salesman_id)) if $editing;
+
# build vendor/customer drop down comatibility... don't ask
if (@{ $form->{"all_customer"} }) {
@@ -169,18 +169,15 @@ sub invoice_links {
$form->{customer} = qq|$form->{customer}--$form->{"customer_id"}|;
}
- $form->{oldcustomer} = "$form->{customer}--$form->{customer_id}";
- $form->{selectcustomer} = 1;
+ $form->{"oldcustomer"} = $form->{customer};
+
+ if ($form->{"oldcustomer"} !~ m/--\d+$/ && $form->{"customer_id"}) {
+ $form->{"oldcustomer"} .= qq|--$form->{"customer_id"}|
+ }
- # departments
-# if ($form->{all_departments}) {
-# $form->{selectdepartment} = "\n"
-# } @{ $form->{all_departments} };
-# }
+
+# $form->{oldcustomer} = "$form->{customer}--$form->{customer_id}";
+# $form->{selectcustomer} = 1;
$form->{employee} = "$form->{employee}--$form->{employee_id}";
@@ -198,9 +195,11 @@ sub invoice_links {
for my $i (1 .. scalar @{ $form->{acc_trans}{$key} }) {
$form->{"AR_paid_$i"} = "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
+ $form->{"acc_trans_id_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{acc_trans_id};
# reverse paid
$form->{"paid_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{amount} * -1;
$form->{"datepaid_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{transdate};
+ $form->{"gldate_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{gldate};
$form->{"exchangerate_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{exchangerate};
$form->{"forex_$i"} = $form->{"exchangerate_$i"};
$form->{"source_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{source};
@@ -257,15 +256,25 @@ sub prepare_invoice {
(my $dec_qty) = ($form->{"qty_$i"} =~ /\.(\d+)/);
$dec_qty = length $dec_qty;
+ $form->{"lastcost_$i"} = $form->format_amount(\%myconfig, $form->{"lastcost_$i"}, $decimalplaces);
+
$form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
+ $form->{"sellprice_pg_$i"} = join ('--', $form->{"sellprice_$i"}, $form->{"pricegroup_id_$i"});
+
$form->{rowcount} = $i;
}
# get pricegroups for parts
IS->get_pricegroups_for_parts(\%myconfig, \%$form);
- set_pricegroup($_) for 1 .. $form->{rowcount};
+
+ # Problem: set_pricegroup resets the sellprice of old invoices to the price
+ # currently defined in the pricegroup, which is a problem if the price has
+ # changed, as the old invoice gets the new price
+ # set_pricegroup must never be called, when an old invoice is initially loaded
+
+ # set_pricegroup($_) for 1 .. $form->{rowcount};
}
$main::lxdebug->leave_sub();
}
@@ -276,31 +285,17 @@ sub form_header {
my $form = $main::form;
my %myconfig = %main::myconfig;
my $locale = $main::locale;
- my $cgi = $main::cgi;
+ my $cgi = $::request->{cgi};
$main::auth->assert('invoice_edit');
- our %TMPL_VAR = ();
+ my %TMPL_VAR = ();
my @custom_hiddens;
$form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id};
$form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id};
$form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
- $form->{radier} = ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
-
- $payment = qq||;
- foreach my $item (@{ $form->{payment_terms} }) {
- if ($form->{payment_id} eq $item->{id}) {
- $payment .= qq||;
- } else {
- $payment .= qq||;
- }
- }
-
- my $set_duedate_url = "$form->{script}?action=set_duedate";
-
- 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"};
@@ -315,6 +310,7 @@ sub form_header {
"taxzones" => "ALL_TAXZONES",
"currencies" => "ALL_CURRENCIES",
"customers" => "ALL_CUSTOMERS",
+ "departments" => "all_departments",
"price_factors" => "ALL_PRICE_FACTORS");
$TMPL_VAR{sales_employee_labels} = sub { $_[0]->{name} || $_[0]->{login} };
@@ -334,9 +330,11 @@ sub form_header {
my @values = map { $_ } @{ $form->{ALL_CURRENCIES} };
my %labels = map { $_ => $_ } @{ $form->{ALL_CURRENCIES} };
$form->{currency} = $form->{defaultcurrency} unless $form->{currency};
- $TMPL_VAR{show_exchangerate} = $form->{currency} ne $form->{defaultcurrency};
- $TMPL_VAR{currencies} = NTI($cgi->popup_menu('-name' => 'currency', '-default' => $form->{"currency"},
- '-values' => \@values, '-labels' => \%labels)) if scalar @values;
+ $form->{show_exchangerate} = $form->{currency} ne $form->{defaultcurrency};
+ $TMPL_VAR{currencies} = NTI($::request->{cgi}->popup_menu('-name' => 'currency', '-default' => $form->{"currency"},
+ '-values' => \@values, '-labels' => \%labels,
+ '-onchange' => "document.getElementById('update_button').click();"
+ )) if scalar @values;
push @custom_hiddens, "forex";
push @custom_hiddens, "exchangerate" if $form->{forex};
@@ -366,7 +364,7 @@ sub form_header {
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
+ shiptoemail shiptodepartment_1 shiptodepartment_2 shiptocp_gender message email subject cc bcc taxaccounts cursor_fokus
convert_from_do_ids convert_from_oe_ids
), @custom_hiddens,
map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];
@@ -385,17 +383,19 @@ sub form_footer {
my $form = $main::form;
my %myconfig = %main::myconfig;
my $locale = $main::locale;
- my $cgi = $main::cgi;
$main::auth->assert('invoice_edit');
- $form->{invtotal} = $form->{invsubtotal};
+ $form->{invtotal} = $form->{invsubtotal};
+ $form->{oldinvtotal} = $form->{invtotal};
- my ($rows, $introws);
- if (($rows = $form->numtextrows($form->{notes}, 26, 8)) < 2) { $rows = 2; }
- if (($introws = $form->numtextrows($form->{intnotes}, 35, 8)) < 2) { $introws = 2; }
- $form->{rows} = ($rows > $introws) ? $rows : $introws;
+ # note rows
+ $form->{rows} = max 2,
+ $form->numtextrows($form->{notes}, 26, 8),
+ $form->numtextrows($form->{intnotes}, 35, 8);
+
+ # tax, total and subtotal calculations
my ($tax, $subtotal);
$form->{taxaccounts_array} = [ split / /, $form->{taxaccounts} ];
@@ -412,327 +412,51 @@ sub form_footer {
}
}
- $form->{oldinvtotal} = $form->{invtotal};
-
- # unfortunately locales doesn't support extended syntax
+ # follow ups
if ($form->{id}) {
- my $follow_ups = FU->follow_ups('trans_id' => $form->{id});
- if (@{ $follow_ups} ) {
- $form->{follow_up_text} = $locale->text("There are #1 unfinished follow-ups of which #2 are due.",
- scalar(@{ $follow_ups }),
- sum map { $_->{due} * 1 } @{ $follow_ups });
- }
+ $form->{follow_ups} = FU->follow_ups('trans_id' => $form->{id}) || [];
+ $form->{follow_ups_unfinished} = ( sum map { $_->{due} * 1 } @{ $form->{follow_ups} } ) || 0;
}
-
-# payments
+ # payments
my $totalpaid = 0;
-
$form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
$form->{paid_indices} = [ 1 .. $form->{paidaccounts} ];
+ # Standard Konto für Umlaufvermögen
+ my $accno_arap = IS->get_standard_accno_current_assets(\%myconfig, \%$form);
+
for my $i (1 .. $form->{paidaccounts}) {
+ $form->{"changeable_$i"} = 1;
+ if ($::lx_office_conf{features}->{payments_changeable} == 0) {
+ # never
+ $form->{"changeable_$i"} = ($form->{"acc_trans_id_$i"})? 0 : 1;
+ } elsif ($::lx_office_conf{features}->{payments_changeable} == 2) {
+ # on the same day
+ $form->{"changeable_$i"} = (($form->{"gldate_$i"} eq '') ||
+ ($form->current_date(\%myconfig) eq $form->{"gldate_$i"}));
+ }
+
$form->{"selectAR_paid_$i"} = $form->{selectAR_paid};
- $form->{"selectAR_paid_$i"} =~ s/option>\Q$form->{"AR_paid_$i"}\E/option selected>$form->{"AR_paid_$i"}/;
+ if (!$form->{"AR_paid_$i"}) {
+ $form->{"selectAR_paid_$i"} =~ s/option>$accno_arap--(.*?)$accno_arap--$1;
+ } else {
+ $form->{"selectAR_paid_$i"} =~ s/option>\Q$form->{"AR_paid_$i"}\E/option selected>$form->{"AR_paid_$i"}/;
+ }
- # format amounts
$totalpaid += $form->{"paid_$i"};
}
- $form->{print_options} = print_options(inline => 1);
-
- print $form->parse_html_template('is/form_footer');
-# print $form->parse_html_template('is/_payments'); # parser
-
-
-
-# print qq|
-#
-#
-#
-#
-#
-#
-#
-# | . $locale->text('Notes') . qq| |
-# | . $locale->text('Internal Notes') . qq| |
-# | . $locale->text('Payment Terms') . qq| |
-#
-#
-# $notes |
-# $intnotes |
-# |
-#
-# $follow_ups_block
-#
-# |
-#
-#
-#
-# | . $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
-#
-# | . $locale->text('Total') . qq| |
-# $form->{invtotal} |
-#
-#
-# |
-#
-#
-# |
-#
-#|;
-# my $webdav_list;
-# if ($main::webdav) {
-# $webdav_list = qq|
-#
-#
|
-#
-#
-# Dokumente im Webdav-Repository |
-#
-#
-# Dateiname |
-# Webdavlink |
-#|;
-# foreach my $file (@{ $form->{WEBDAV} }) {
-# $webdav_list .= qq|
-#
-# $file->{name} |
-# $file->{type} |
-#
-#|;
-# }
-# $webdav_list .= qq|
-#
-#
-#|;
-#
-# print $webdav_list;
-# }
-#if ($form->{type} eq "credit_note") {
-# print qq|
-#
-#
-#
-#
-# |
-# . $locale->text('Payments') . qq| |
-#
-#|;
-#} else {
-# print qq|
-#
-#
-#
-#
-# |
-# . $locale->text('Incoming Payments') . qq| |
-#
-#|;
-#}
-#
-# my @column_index;
-# if ($form->{currency} eq $form->{defaultcurrency}) {
-# @column_index = qw(datepaid source memo paid AR_paid);
-# } else {
-# @column_index = qw(datepaid source memo paid exchangerate AR_paid);
-# }
-#
-# my %column_data;
-# $column_data{datepaid} = "" . $locale->text('Date') . " | ";
-# $column_data{paid} = "" . $locale->text('Amount') . " | ";
-# $column_data{exchangerate} = "" . $locale->text('Exch') . " | ";
-# $column_data{AR_paid} = "" . $locale->text('Account') . " | ";
-# $column_data{source} = "" . $locale->text('Source') . " | ";
-# $column_data{memo} = "" . $locale->text('Memo') . " | ";
-#
-# print "
-#
-#";
-# map { print "$column_data{$_}\n" } @column_index;
-# print "
-#
-#";
-#
-# my @triggers = ();
-# my $totalpaid = 0;
-#
-# $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
-# for my $i (1 .. $form->{paidaccounts}) {
-#
-# print "
-# \n";
-#
-# $form->{"selectAR_paid_$i"} = $form->{selectAR_paid};
-# $form->{"selectAR_paid_$i"} =~
-# s/option>\Q$form->{"AR_paid_$i"}\E/option selected>$form->{"AR_paid_$i"}/;
-#
-# # format amounts
-# $totalpaid += $form->{"paid_$i"};
-# if ($form->{"paid_$i"}) {
-# $form->{"paid_$i"} = $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
-# }
-# $form->{"exchangerate_$i"} = $form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
-#
-# if ($form->{"exchangerate_$i"} == 0) {
-# $form->{"exchangerate_$i"} = "";
-# }
-# my $exchangerate = qq| |;
-# if ($form->{currency} ne $form->{defaultcurrency}) {
-# if ($form->{"forex_$i"}) {
-# $exchangerate = qq|$form->{"exchangerate_$i"}|;
-# } else {
-# $exchangerate = qq||;
-# }
-# }
-#
-# $exchangerate .= qq||;
-#
-# $column_data{"paid_$i"} =
-# qq| | |;
-# $column_data{"exchangerate_$i"} = qq|$exchangerate | |;
-# $column_data{"AR_paid_$i"} =
-# qq| | |;
-# $column_data{"datepaid_$i"} =
-# qq|
-# | |;
-# $column_data{"source_$i"} =
-# qq| | |;
-# $column_data{"memo_$i"} =
-# qq| | |;
-#
-# map { print qq|$column_data{"${_}_$i"}\n| } @column_index;
-# print "
-# \n";
-# push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
-# }
-#
-# my $paid_missing = $form->{oldinvtotal} - $totalpaid;
-#
-# print qq|
-#
-# |
-# |
-# | . $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| |
-#
-#|;
-#
-# map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } qw(paidaccounts selectAR_paid oldinvtotal));
-# print qq|
-#
-# |
-#
-#
-#
|
-#
-#
-#
-#|;
-#
-# print_options();
-#
-# print qq|
-# |
-#
-#
-#|;
-#
-# my $invdate = $form->datetonum($form->{invdate}, \%myconfig);
-# my $closedto = $form->datetonum($form->{closedto}, \%myconfig);
-#
-# if ($form->{id}) {
-# 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| |;
-# if ($form->{id} && !($form->{type} eq "credit_note")) {
-# print qq| |;
-# }
-# if ($form->{radier}) {
-# print qq| |;
-# }
-#
-#
-# if ($invdate > $closedto) {
-# print qq| |;
-# }
-#
-# print qq| |;
-#
-# } else {
-# if ($invdate > $closedto) {
-# print qq|
-#
-#
-#
-#
-#
-# | .
-# NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'), '-class' => 'submit'));
-# }
-# }
-#
-# # button for saving history
-# if($form->{id} ne "") {
-# print 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' => 'draft_id', '-default' => [$form->{draft_id}])
-#. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
-#. $cgi->hidden('-name' => 'customer_discount', '-value' => [$form->{customer_discount}])
-#. qq|
-#
-#
-# |