# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
#======================================================================
#
# Inventory invoicing module
use SL::FU;
use SL::IS;
-use SL::PE;
use SL::OE;
+use SL::MoreCommon qw(restore_form save_form);
use Data::Dumper;
use DateTime;
use List::MoreUtils qw(uniq);
use SL::DB::Default;
use SL::DB::Customer;
+use SL::DB::Invoice;
use SL::DB::PaymentTerm;
require "bin/mozilla/io.pl";
require "bin/mozilla/arap.pl";
-require "bin/mozilla/drafts.pl";
use strict;
$main::auth->assert('invoice_edit');
- return $main::lxdebug->leave_sub() if (load_draft_maybe());
-
$form->{show_details} = $::myconfig{show_form_details};
if ($form->{type} eq "credit_note") {
$form->get_lists("taxzones" => ($form->{id} ? "ALL_TAXZONES" : "ALL_ACTIVE_TAXZONES"),
"currencies" => "ALL_CURRENCIES",
"customers" => "ALL_CUSTOMERS",
- "departments" => "all_departments",
"price_factors" => "ALL_PRICE_FACTORS");
+ $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
+
# Projects
my @old_project_ids = uniq grep { $_ } map { $_ * 1 } ($form->{"globalproject_id"}, map { $form->{"project_id_$_"} } 1..$form->{"rowcount"});
my @old_ids_cond = @old_project_ids ? (id => \@old_project_ids) : ();
# hiddens
$TMPL_VAR{HIDDENS} = [qw(
- id action type media format queued printed emailed title vc discount
+ id type media format queued printed emailed title vc discount
title creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id
max_dunning_level dunning_amount dunning_description
shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptogln shiptocontact shiptophone shiptofax
), @custom_hiddens,
map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];
- $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_customer autocomplete_part client_js));
+ $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.Draft kivi.SalesPurchase ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_customer autocomplete_part client_js));
$TMPL_VAR{payment_terms_obj} = get_payment_terms_for_invoice();
$form->{duedate} = $TMPL_VAR{payment_terms_obj}->calc_date(reference_date => $form->{invdate}, due_date => $form->{duedate})->to_kivitendo if $TMPL_VAR{payment_terms_obj};
}
}
+ my $grossamount = $form->{invtotal};
+ $form->{invtotal} = $form->round_amount( $form->{invtotal}, 2, 1 );
$form->{rounding} = $form->round_amount(
- $form->round_amount($form->{invtotal}, 2, 1) - $form->round_amount($form->{invtotal}, 2), 2
+ $form->{invtotal} - $form->round_amount($grossamount, 2),
+ 2
);
- $form->{invtotal} = $form->round_amount( $form->{invtotal}, 2, 1 );
# follow ups
if ($form->{id}) {
- $form->{follow_ups} = FU->follow_ups('trans_id' => $form->{id}) || [];
+ $form->{follow_ups} = FU->follow_ups('trans_id' => $form->{id}, 'not_done' => 1) || [];
$form->{follow_ups_unfinished} = ( sum map { $_->{due} * 1 } @{ $form->{follow_ups} } ) || 0;
}
($form->current_date(\%myconfig) eq $form->{"gldate_$i"}));
}
+ #deaktivieren von gebuchten Zahlungen ausserhalb der Bücherkontrolle, vorher prüfen ob heute eingegeben
+ if ($form->date_closed($form->{"gldate_$i"})) {
+ $form->{"changeable_$i"} = 0;
+ }
+
$form->{"selectAR_paid_$i"} = $form->{selectAR_paid};
if (!$form->{"AR_paid_$i"}) {
$form->{"selectAR_paid_$i"} =~ s/option>$accno_arap--(.*?)</option selected>$accno_arap--$1</;
}
sub mark_as_paid {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
+ $::auth->assert('invoice_edit');
- $main::auth->assert('invoice_edit');
+ SL::DB::Invoice->new(id => $::form->{id})->load->mark_as_paid;
- &mark_as_paid_common(\%myconfig,"ar");
+ $::form->redirect($::locale->text("Marked as paid"));
+}
- $main::lxdebug->leave_sub();
+sub show_draft {
+ update();
}
sub update {
if ($rows > 1) {
select_item(mode => 'IS', pre_entered_qty => $form->{"qty_$i"});
- ::end_of_request();
+ $::dispatcher->end_request;
} else {
$form->isblank("exchangerate_$i",
$locale->text('Exchangerate for payment missing!'));
}
+ $form->error($locale->text('Cannot post transaction above the maximum future booking date!'))
+ if ($form->date_max_future($form->{"datepaid_$i"}, \%myconfig));
+
+ #Zusätzlich noch das Buchungsdatum in die Bücherkontrolle einbeziehen
+ # (Dient zur Prüfung ob ZE oder ZA geprüft werden soll)
+ $form->error($locale->text('Cannot post payment for a closed period!'))
+ if ($form->date_closed($form->{"datepaid_$i"}) && !$form->date_closed($form->{"gldate_$i"}, \%myconfig));
}
}
- # 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};
# if oldcustomer ne customer redo form
if (&check_name('customer')) {
&update;
- ::end_of_request();
+ $::dispatcher->end_request;
}
if ($myconfig{mandatory_departments} && !$form->{department_id}) {
$form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
+ $form->error($locale->text('Cannot post transaction above the maximum future booking date!'))
+ if ($form->date_max_future($form->{"datepaid_$i"}, \%myconfig));
+
+ #Zusätzlich noch das Buchungsdatum in die Bücherkontrolle einbeziehen
+ # (Dient zur Prüfung ob ZE oder ZA geprüft werden soll)
$form->error($locale->text('Cannot post payment for a closed period!'))
- if ($form->date_closed($form->{"datepaid_$i"}, \%myconfig));
+ if ($form->date_closed($form->{"datepaid_$i"}) && !$form->date_closed($form->{"gldate_$i"}, \%myconfig));
if ($form->{currency} ne $form->{defaultcurrency}) {
$form->{"exchangerate_$i"} = $form->{exchangerate}
}
}
- remove_draft() if $form->{remove_draft};
-
if(!exists $form->{addition}) {
$form->{snumbers} = 'invnumber' .'_'. $form->{invnumber}; # ($form->{type} eq 'credit_note' ? 'cnnumber' : 'invnumber') .'_'. $form->{invnumber};
$form->{what_done} = 'invoice';
$form->{paidaccounts} = 0;
map { my $key = $_; delete $form->{$key} if grep { $key =~ /^$_/ } qw(datepaid_ gldate_ acc_trans_id_ source_ memo_ paid_ exchangerate_ AR_paid_) } keys %{ $form };
+ # record link invoice to storno
+ $form->{convert_from_ar_ids} = $form->{id};
$form->{storno_id} = $form->{id};
$form->{storno} = 1;
$form->{id} = "";
$form->{invdate} = DateTime->today->to_lxoffice;
$form->{rowcount}++;
# set new ids for storno invoice
- delete $form->{"invoice_id_$_"} for 1 .. $form->{"rowcount"};
+ # set new persistent ids for storno invoice items
+ $form->{"converted_from_invoice_id_$_"} = delete $form->{"invoice_id_$_"} for 1 .. $form->{"rowcount"};
post();
$main::lxdebug->leave_sub();
}
-sub delete {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my $locale = $main::locale;
-
- $main::auth->assert('invoice_edit');
-
- if ($form->{second_run}) {
- $form->{print_and_post} = 0;
- }
- $form->header;
-
- print qq|
-<form method="post" action="$form->{script}">
-|;
-
- # delete action variable
- map { delete $form->{$_} } qw(action header);
-
- foreach my $key (keys %$form) {
- next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key}));
- $form->{$key} =~ s/\"/"/g;
- print qq|<input type="hidden" name="$key" value="$form->{$key}">\n|;
- }
-
- print qq|
-<h2 class="confirm">| . $locale->text('Confirm!') . qq|</h2>
-
-<h4>|
- . $locale->text('Are you sure you want to delete Invoice Number')
- . qq| $form->{invnumber}
-</h4>
-
-<p>
-<input name="action" class="submit" type="submit" value="|
- . $locale->text('Yes') . qq|">
-</form>
-|;
-
- $main::lxdebug->leave_sub();
-}
-
sub credit_note {
$main::lxdebug->enter_sub();
$::lxdebug->leave_sub;
}
-sub yes {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- $main::auth->assert('invoice_edit');
+sub delete {
+ $::auth->assert('invoice_edit');
- if (IS->delete_invoice(\%myconfig, \%$form)) {
+ if (IS->delete_invoice(\%::myconfig, $::form)) {
# saving the history
- if(!exists $form->{addition}) {
- $form->{snumbers} = 'invnumber' .'_'. $form->{invnumber}; # ($form->{type} eq 'credit_note' ? 'cnnumber' : 'invnumber') .'_'. $form->{invnumber};
- $form->{what_done} = 'invoice';
- $form->{addition} = "DELETED";
- $form->save_history;
+ if(!exists $::form->{addition}) {
+ $::form->{snumbers} = 'invnumber' .'_'. $::form->{invnumber};
+ $::form->{what_done} = 'invoice';
+ $::form->{addition} = "DELETED";
+ $::form->save_history;
}
# /saving the history
- $form->redirect($locale->text('Invoice deleted!'));
+ $::form->redirect($::locale->text('Invoice deleted!'));
}
- $form->error($locale->text('Cannot delete invoice!'));
-
- $main::lxdebug->leave_sub();
+ $::form->error($::locale->text('Cannot delete invoice!'));
}
sub post_and_e_mail {
$main::lxdebug->leave_sub();
}
+
+sub dispatcher {
+ for my $action (qw(
+ print update ship_to e_mail storno post_payment use_as_new credit_note
+ delete post order preview post_and_e_mail print_and_post
+ mark_as_paid
+ )) {
+ if ($::form->{"action_$action"}) {
+ call_sub($action);
+ return;
+ }
+ }
+
+ $::form->error($::locale->text('No action defined.'));
+}
projects / kivitendo-erp.git / blobdiff