# 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 SL::DB::Default;
use SL::DB::Customer;
+use SL::DB::Department;
+use SL::DB::Invoice;
use SL::DB::PaymentTerm;
+require "bin/mozilla/common.pl";
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") {
# create links
$form->create_links("AR", \%myconfig, "customer");
- if ($form->{all_customer}) {
- unless ($form->{customer_id}) {
- $form->{customer_id} = $form->{all_customer}->[0]->{id};
- $form->{salesman_id} = $form->{all_customer}->[0]->{salesman_id};
- }
- }
-
my $editing = $form->{id};
$form->backup_vars(qw(payment_id language_id taxzone_id salesman_id
IS->get_customer(\%myconfig, \%$form);
- #quote all_customer Bug 133
- foreach my $ref (@{ $form->{all_customer} }) {
- $ref->{name} = $form->quote($ref->{name});
- }
-
$form->restore_vars(qw(id));
IS->retrieve_invoice(\%myconfig, \%$form);
$form->restore_vars(qw(taxincluded)) if $form->{id};
$form->restore_vars(qw(salesman_id)) if $editing;
-
- # build vendor/customer drop down compatibility... don't ask
- if (@{ $form->{"all_customer"} }) {
- $form->{"selectcustomer"} = 1;
- $form->{customer} = qq|$form->{customer}--$form->{"customer_id"}|;
- }
-
- $form->{"oldcustomer"} = $form->{customer};
-
- 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}";
# forex
if ($form->{type} eq "credit_note") {
$form->{type} = "credit_note";
$form->{formname} = "credit_note";
+ } elsif ($form->{formname} eq "proforma" ) {
+ $form->{type} = "invoice";
} else {
$form->{type} = "invoice";
$form->{formname} = "invoice";
my %TMPL_VAR = ();
my @custom_hiddens;
- if ($form->{id}) {
- require SL::DB::Invoice;
- $TMPL_VAR{invoice_obj} = SL::DB::Invoice->new(id => $form->{id})->load;
- }
+ $TMPL_VAR{customer_obj} = SL::DB::Customer->load_cached($form->{customer_id}) if $form->{customer_id};
+ $TMPL_VAR{invoice_obj} = SL::DB::Invoice->load_cached($form->{id}) if $form->{id};
+
$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->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_sorted;
+
# 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) : ();
]
]
]);
- $TMPL_VAR{department_labels} = sub { "$_[0]->{description}--$_[0]->{id}" };
-
- # customer
- $TMPL_VAR{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" };
- $TMPL_VAR{vclimit} = $myconfig{vclimit};
- $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} };
$TMPL_VAR{creditwarning} = ($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update};
$TMPL_VAR{is_credit_remaining_negativ} = $form->{creditremaining} =~ /-/;
- my $follow_up_vc = $form->{customer};
- $follow_up_vc =~ s/--\d*\s*$//;
- $TMPL_VAR{customer_name} = $follow_up_vc;
-
# set option selected
foreach my $item (qw(AR)) {
$form->{"select$item"} =~ s/ selected//;
# 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.File kivi.SalesPurchase kivi.Part ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_customer 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 @req_trans_desc = qw(kivi.SalesPurchase.check_transaction_description) x!!$::instance_conf->get_require_transaction_description_ps;
+ my $show_delete = ($::instance_conf->get_is_changeable == 2 && $form->current_date(\%myconfig) eq $form->{gldate})
+ || $::instance_conf->get_is_changeable == 1;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add_actions([ t8('Update'),
+ submit => [ '#form', { action_update => 1 } ],
+ disabled => !$::form->{id} && $::form->{locked},
+ ]);
+ $bar->add_actions("combobox");
+ $bar->actions->[-1]->add_actions([ t8('Post'),
+ submit => [ '#form', { action_post => 1 } ],
+ checks => [ @req_trans_desc ],
+ disabled => (!$::form->{id} && $::form->{locked}) || !$show_delete || $::form->{storno},
+ ]);
+ $bar->actions->[-1]->add_actions([ t8('Post Payment'),
+ submit => [ '#form', { action_post_payment => 1 } ],
+ checks => [ @req_trans_desc ],
+ disabled => !$::form->{id},
+ ]);
+ $bar->actions->[-1]->add_actions([ t8('mark as paid'),
+ submit => [ '#form', { action_mark_as_paid => 1 } ],
+ confirm => t8('This will remove the invoice from showing as unpaid even if the unpaid amount does not match the amount. Proceed?'),
+ disabled => !$::form->{id},
+ ]) if $::instance_conf->get_is_show_mark_as_paid;
+
+ $bar->add_actions("combobox");
+ $bar->actions->[-1]->add_actions([ t8('Storno'),
+ submit => [ '#form', { action_storno => 1 } ],
+ confirm => t8('Do you really want to cancel this invoice?'),
+ checks => [ @req_trans_desc ],
+ disabled => !$::form->{id},
+ ]);
+ $bar->actions->[-1]->add_actions([ t8('Delete'),
+ submit => [ '#form', { action_delete => 1 } ],
+ confirm => t8('Do you really want to delete this object?'),
+ checks => [ @req_trans_desc ],
+ disabled => !$::form->{id},
+ ]);
+ $bar->add_actions('separator');
+
+ $bar->add_actions('combobox');
+ $bar->actions->[-1]->add_actions([ t8('Workflow'),
+ disabled => 1,
+ ]);
+ $bar->actions->[-1]->add_actions([ t8('Use As New'),
+ submit => [ '#form', { action_use_as_new => 1 } ],
+ disabled => !$::form->{id},
+ ]);
+ $bar->actions->[-1]->add_actions([ t8('Credit Note'),
+ submit => [ '#form', { action_credit_note => 1 } ],
+ checks => [ @req_trans_desc ],
+ disabled => !$::form->{id} || $form->{type} eq "credit_note",
+ ]);
+ $bar->actions->[-1]->add_actions([ t8('Sales Order'),
+ submit => [ '#form', { action_sales_order => 1 } ],
+ disabled => !$::form->{id},
+ ]);
+
+ $bar->add_actions('combobox');
+ $bar->actions->[-1]->add_actions([ t8('Export'),
+ disabled => 1,
+ ]);
+ $bar->actions->[-1]->add_actions([ ($::form->{id} ? t8('Print') : t8('Preview')),
+ submit => [ '#form', { action_print => 1 } ],
+ checks => [ @req_trans_desc ],
+ disabled => !$::form->{id} && $::form->{locked},
+ ]);
+ $bar->actions->[-1]->add_actions([ t8('E Mail'),
+ submit => [ '#form', { action_print => 1 } ],
+ checks => [ @req_trans_desc ],
+ disabled => !$::form->{id},
+ ]);
+ $bar->add_actions('combobox');
+ $bar->actions->[-1]->add_actions([ t8('more'),
+ disabled => 1,
+ ]);
+ $bar->actions->[-1]->add_actions([ t8('History'),
+ call => [ 'set_history_window', $::form->{id} * 1, 'id' ],
+ disabled => !$::form->{id},
+ ]);
+ $bar->actions->[-1]->add_actions([ t8('Follow-Up'),
+ call => [ 'follow_up_window' ],
+ disabled => !$::form->{id},
+ ]);
+ $bar->actions->[-1]->add_actions([ t8('Drafts'),
+ call => [ 'kivi.Draft.popup', 'is', 'invoice', $::form->{draft_id}, $::form->{draft_description} ],
+ disabled => $::form->{id} || $::form->{locked},
+ ]);
+
+ }
+
$form->header();
print $form->parse_html_template("is/form_header", \%TMPL_VAR);
$form->{taxaccounts_array} = [ split(/ /, $form->{taxaccounts}) ];
if( $form->{customer_id} && !$form->{taxincluded_changed_by_user} ) {
- my $customer = SL::DB::Customer->new(id => $form->{customer_id})->load();
+ my $customer = SL::DB::Customer->load_cached($form->{customer_id});
$form->{taxincluded} = defined($customer->taxincluded_checked) ? $customer->taxincluded_checked : $myconfig{taxincluded_checked};
}
}
}
+ 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 {
my $taxincluded = $form->{taxincluded} ? "checked" : '';
$form->{update} = 1;
- &check_name("customer");
+ if (($form->{previous_customer_id} || $form->{customer_id}) != $form->{customer_id}) {
+ $::form->{salesman_id} = SL::DB::Manager::Employee->current->id if exists $::form->{salesman_id};
+
+ IS->get_customer(\%myconfig, $form);
+ }
$form->{taxincluded} ||= $taxincluded;
$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};
$form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
$form->isblank("invdate", $locale->text('Invoice Date missing!'));
- $form->isblank("customer", $locale->text('Customer missing!'));
+ $form->isblank("customer_id", $locale->text('Customer missing!'));
$form->error($locale->text('Cannot post invoice for a closed period!'))
if ($form->date_closed($form->{"invdate"}, \%myconfig));
$form->{invnumber} =~ s/\s*$//g;
# if oldcustomer ne customer redo form
- if (&check_name('customer')) {
+ if (($form->{previous_customer_id} || $form->{customer_id}) != $form->{customer_id}) {
&update;
$::dispatcher->end_request;
}
$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}
relink_accounts();
my $terms = get_payment_terms_for_invoice();
- $form->{duedate} = $terms->calc_date(reference_date => $form->{invdate}, due_date => $form->{due_due})->to_kivitendo if $terms;
+ $form->{duedate} = $terms->calc_date(reference_date => $form->{invdate}, due_date => $form->{duedate})->to_kivitendo if $terms;
# If transfer_out is requested, get rose db handle and do post and
# transfer out in one transaction. Otherwise just post the invoice.
}
}
- 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';
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 callback saved_message));
- $form->redirect;
+ $form->redirect($form->{label} . " $form->{invnumber} " . $locale->text('posted!'));
}
$main::lxdebug->leave_sub();
$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.'));
+}