projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Datenbankverwaltung in neuen Admin-Controller verschoben
[kivitendo-erp.git]
/
bin
/
mozilla
/
is.pl
diff --git
a/bin/mozilla/is.pl
b/bin/mozilla/is.pl
index
2f6f620
..
220c993
100644
(file)
--- a/
bin/mozilla/is.pl
+++ b/
bin/mozilla/is.pl
@@
-35,10
+35,12
@@
use SL::FU;
use SL::IS;
use SL::PE;
use SL::OE;
use SL::IS;
use SL::PE;
use SL::OE;
-use SL::DB::Default;
use Data::Dumper;
use List::Util qw(max sum);
use Data::Dumper;
use List::Util qw(max sum);
+use SL::DB::Default;
+use SL::DB::Customer;
+
require "bin/mozilla/io.pl";
require "bin/mozilla/invoice_io.pl";
require "bin/mozilla/arap.pl";
require "bin/mozilla/io.pl";
require "bin/mozilla/invoice_io.pl";
require "bin/mozilla/arap.pl";
@@
-380,7
+382,6
@@
sub form_header {
map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];
$form->{jsscript} = 1;
map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];
$form->{jsscript} = 1;
- $::request->layout->use_stylesheet('presenter/record/record_list.css');
$form->header();
print $form->parse_html_template("is/form_header", \%TMPL_VAR);
$form->header();
print $form->parse_html_template("is/form_header", \%TMPL_VAR);
@@
-407,14
+408,11
@@
sub form_footer {
# tax, total and subtotal calculations
my ($tax, $subtotal);
# tax, total and subtotal calculations
my ($tax, $subtotal);
- $form->{taxaccounts_array} = [ split / /, $form->{taxaccounts} ];
-
- my $paymet_id = $::form->{payment_id};
- IS->get_customer(\%myconfig, \%$form) if $form->{type} =~ /sales_(order|quotation)/;
- $::form->{payment_id} = $paymet_id;
+ $form->{taxaccounts_array} = [ split(/ /, $form->{taxaccounts}) ];
- if ( $form->{vc} eq 'customer' && !$form->{taxincluded_changed_by_user} ) {
- $form->{taxincluded} = defined($form->{taxincluded_checked}) ? $form->{taxincluded_checked} : $myconfig{taxincluded_checked};
+ if( $form->{customer_id} && !$form->{taxincluded_changed_by_user} ) {
+ my $customer = SL::DB::Customer->new(id => $form->{customer_id})->load();
+ $form->{taxincluded} = defined($customer->taxincluded_checked) ? $customer->taxincluded_checked : $myconfig{taxincluded_checked};
}
foreach my $item (@{ $form->{taxaccounts_array} }) {
}
foreach my $item (@{ $form->{taxaccounts_array} }) {
@@
-718,6
+716,8
@@
sub post {
my $closedto = $form->datetonum($form->{closedto}, \%myconfig);
my $invdate = $form->datetonum($form->{invdate}, \%myconfig);
my $closedto = $form->datetonum($form->{closedto}, \%myconfig);
my $invdate = $form->datetonum($form->{invdate}, \%myconfig);
+ $form->error($locale->text('Cannot post transaction above the maximum future booking date!'))
+ if ($form->date_max_future($invdate, \%myconfig));
$form->error($locale->text('Cannot post invoice for a closed period!'))
if ($invdate <= $closedto);
$form->error($locale->text('Cannot post invoice for a closed period!'))
if ($invdate <= $closedto);