X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fis.pl;h=9ec9becb8e71def539b85108f0a299c83dc727b1;hb=2bc081d8f636bf558b7f3eb8bb9e4e99d45e6ca1;hp=258e620489720dfb3664e55517e7539ba4e14aa8;hpb=9d7c784cbec4b2d0281148376f8c287c3cd58d61;p=kivitendo-erp.git
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 258e62048..9ec9becb8 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
@@ -147,6 +144,8 @@ sub invoice_links {
}
}
+ my $editing = $form->{id};
+
$form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes id shipto_id));
IS->get_customer(\%myconfig, \%$form);
@@ -156,12 +155,21 @@ sub invoice_links {
$ref->{name} = $form->quote($ref->{name});
}
+ # Load data for a specific order and update form fields
+ my $order_data = OE->get_order_data_by_ordnumber(%$form) if $form->{ordnumber};
+
+ # Copy the fields we need to %form
+ for my $key (qw(payment_id salesman_id orddate taxzone_id quonumber)) {
+ $form->{$key} = $order_data->{$key};
+ }
+
$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;
+ $form->restore_vars(qw(salesman_id)) if $editing;
+
# build vendor/customer drop down comatibility... don't ask
if (@{ $form->{"all_customer"} }) {
@@ -169,18 +177,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};
- # departments
-# if ($form->{all_departments}) {
-# $form->{selectdepartment} = "\n"
-# } @{ $form->{all_departments} };
-# }
+ if ($form->{"oldcustomer"} !~ m/--\d+$/ && $form->{"customer_id"}) {
+ $form->{"oldcustomer"} .= qq|--$form->{"customer_id"}|
+ }
+
+
+# $form->{oldcustomer} = "$form->{customer}--$form->{customer_id}";
+# $form->{selectcustomer} = 1;
$form->{employee} = "$form->{employee}--$form->{employee_id}";
@@ -257,6 +262,8 @@ 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->{rowcount} = $i;
@@ -280,23 +287,13 @@ sub form_header {
$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";
@@ -315,6 +312,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} };
@@ -335,7 +333,7 @@ sub form_header {
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"},
+ $TMPL_VAR{currencies} = NTI($::cgi->popup_menu('-name' => 'currency', '-default' => $form->{"currency"},
'-values' => \@values, '-labels' => \%labels)) if scalar @values;
push @custom_hiddens, "forex";
push @custom_hiddens, "exchangerate" if $form->{forex};
@@ -414,14 +412,10 @@ sub form_footer {
}
}
- # 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
@@ -472,7 +466,7 @@ sub update {
my ($recursive_call) = shift;
- map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate creditlimit creditremaining) unless $recursive_call;
+# map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate creditlimit creditremaining) unless $recursive_call;
$form->{print_and_post} = 0 if $form->{second_run};
my $taxincluded = "checked" if $form->{taxincluded};
@@ -517,7 +511,7 @@ sub update {
if ($rows > 1) {
&select_item;
- exit;
+ ::end_of_request();
} else {
@@ -551,7 +545,7 @@ sub update {
$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 lastcost);
$form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
@@ -604,7 +598,7 @@ sub post_payment {
$main::auth->assert('invoice_edit');
- our $invdate;
+ my $invdate = $form->datetonum($form->{invdate}, \%myconfig);
$form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
for my $i (1 .. $form->{paidaccounts}) {
@@ -613,8 +607,6 @@ sub post_payment {
$form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
- $form->error($locale->text('Cannot post payment for a closed period!'))
- if ($form->date_closed($form->{"datepaid_$i"}, \%myconfig));
if ($form->{currency} ne $form->{defaultcurrency}) {
$form->{"exchangerate_$i"} = $form->{exchangerate}
@@ -624,6 +616,18 @@ sub post_payment {
}
}
}
+ # Abgeschlossene Zeiträume nur für den letzten (aktuellen) Zahlungseingang prüfen
+ # Details s.a. Bug 1502
+ # Das Problem ist jetzt, dass man Zahlungseingänge nachträglich ändern kann
+ # Wobei dies für Installationen die sowieso nicht mit Bücherkontrolle arbeiten keinen
+ # keinen Unterschied macht.
+ # Optimal wäre, wenn gegen einen Zeitstempel des Zahlungsfelds geprüft würde ...
+ # Das Problem hierbei ist, dass in IS.pm post_invoice IMMER alle Zahlungseingänge aus $form
+ # erneut gespeichert werden. Prinzipiell wäre es besser NUR die Ãnderungen des Rechnungs-
+ # belegs (neue Zahlung aber nichts anderes) zu speichern ...
+ # Vielleicht könnte man ähnlich wie bei Rechnung löschen verfahren
+ $form->error($locale->text('Cannot post payment for a closed period!'))
+ if ($form->date_closed($form->{"datepaid_$form->{paidaccounts}"}, \%myconfig));
($form->{AR}) = split /--/, $form->{AR};
($form->{AR_paid}) = split /--/, $form->{AR_paid};
@@ -657,12 +661,20 @@ sub post {
# if oldcustomer ne customer redo form
if (&check_name('customer')) {
&update;
+ ::end_of_request();
+ }
+
+ if ($myconfig{mandatory_departments} && !$form->{department_id}) {
+ $form->{saved_message} = $::locale->text('You have to specify a department.');
+ update();
exit;
}
+
if ($form->{second_run}) {
$form->{print_and_post} = 0;
}
+ remove_emptied_rows();
&validate_items;
my $closedto = $form->datetonum($form->{closedto}, \%myconfig);
@@ -716,14 +728,19 @@ sub post {
if(!exists $form->{addition}) {
$form->{snumbers} = qq|invnumber_| . $form->{invnumber};
- $form->{addition} = $print_post ? "PRINTED AND POSTED" :
- $form->{storno} ? "STORNO" :
- "POSTED";
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->{addition} = $form->{print_and_post} ? "PRINTED AND POSTED" :
+ $form->{storno} ? "STORNO" :
+ "POSTED";
+ $form->save_history;
}
- $form->redirect( $form->{label} . " $form->{invnumber} " . $locale->text('posted!'))
- unless $print_post;
+ if (!$form->{no_redirect_after_post}) {
+ $form->{action} = 'edit';
+ $form->{script} = 'is.pl';
+ $form->{saved_message} = $form->{label} . " $form->{invnumber} " . $locale->text('posted!');
+ $form->{callback} = build_std_url(qw(action edit id saved_message));
+ $form->redirect;
+ }
$main::lxdebug->leave_sub();
}
@@ -735,9 +752,9 @@ sub print_and_post {
$main::auth->assert('invoice_edit');
- my $old_form = new Form;
- $print_post = 1;
- $form->{print_and_post} = 1;
+ my $old_form = new Form;
+ $form->{no_redirect_after_post} = 1;
+ $form->{print_and_post} = 1;
&post();
&edit();
@@ -880,8 +897,6 @@ sub credit_note {
$form->{title} = $locale->text('Add Credit Note');
$form->{script} = 'is.pl';
- our $script = "is";
- our $buysell = 'buy';
# bo creates the id, reset it
@@ -893,18 +908,28 @@ sub credit_note {
map { $form->{"select$_"} = "" } ($form->{vc}, 'currency');
- map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
- qw(creditlimit creditremaining);
+# map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
+# qw(creditlimit creditremaining);
my $currency = $form->{currency};
&invoice_links;
$form->{currency} = $currency;
- $form->{forex} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{invdate}, $buysell);
+ $form->{forex} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{invdate}, 'buy');
$form->{exchangerate} = $form->{forex} || '';
$form->{creditremaining} -= ($form->{oldinvtotal} - $form->{ordtotal});
+ # bei Gutschriften werden Zahlungseingänge aus Rechnung nicht übernommen
+ for my $i (1 .. $form->{paidaccounts}) {
+ delete $form->{"paid_$i"};
+ delete $form->{"source_$i"};
+ delete $form->{"memo_$i"};
+ delete $form->{"datepaid_$i"};
+ delete $form->{"AR_paid_$i"};
+ };
+ $form->{paidaccounts} = 1;
+
&prepare_invoice;
@@ -924,10 +949,10 @@ sub yes {
if (IS->delete_invoice(\%myconfig, \%$form, $main::spool)) {
# saving the history
- if(!exists $form->{addition}) {
+ if(!exists $form->{addition}) {
$form->{snumbers} = qq|invnumber_| . $form->{invnumber};
- $form->{addition} = "DELETED";
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->{addition} = "DELETED";
+ $form->save_history;
}
# /saving the history
$form->redirect($locale->text('Invoice deleted!'));
@@ -945,7 +970,7 @@ sub e_mail {
$main::auth->assert('invoice_edit');
if (!$form->{id}) {
- $print_post = 1;
+ $form->{no_redirect_after_post} = 1;
my $saved_form = save_form();