projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Datentypen in der Hilfe und Beispieldatei in der richtigen Reihenfolge anzeigen.
[kivitendo-erp.git]
/
bin
/
mozilla
/
is.pl
diff --git
a/bin/mozilla/is.pl
b/bin/mozilla/is.pl
index
14c2420
..
ecc5f55
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";
@@
-74,8
+76,6
@@
sub add {
$form->{callback} = "$form->{script}?action=add&type=$form->{type}" unless $form->{callback};
$form->{callback} = "$form->{script}?action=add&type=$form->{type}" unless $form->{callback};
- $form->{jsscript} = "date";
-
&invoice_links;
&prepare_invoice;
&display_form;
&invoice_links;
&prepare_invoice;
&display_form;
@@
-136,7
+136,7
@@
sub invoice_links {
$form->{vc} = 'customer';
# create links
$form->{vc} = 'customer';
# create links
- $form->{webdav} = $::
lx_office_conf{features}->{webdav}
;
+ $form->{webdav} = $::
instance_conf->get_webdav
;
$form->create_links("AR", \%myconfig, "customer");
$form->create_links("AR", \%myconfig, "customer");
@@
-351,8
+351,6
@@
sub form_header {
$TMPL_VAR{creditwarning} = ($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update};
$TMPL_VAR{is_credit_remaining_negativ} = $form->{creditremaining} =~ /-/;
$TMPL_VAR{creditwarning} = ($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update};
$TMPL_VAR{is_credit_remaining_negativ} = $form->{creditremaining} =~ /-/;
- $::request->{layout}->focus('#customer');
-
my $follow_up_vc = $form->{customer};
$follow_up_vc =~ s/--\d*\s*$//;
$TMPL_VAR{customer_name} = $follow_up_vc;
my $follow_up_vc = $form->{customer};
$follow_up_vc =~ s/--\d*\s*$//;
$TMPL_VAR{customer_name} = $follow_up_vc;
@@
-379,7
+377,6
@@
sub form_header {
), @custom_hiddens,
map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];
), @custom_hiddens,
map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];
- $form->{jsscript} = 1;
$form->header();
print $form->parse_html_template("is/form_header", \%TMPL_VAR);
$form->header();
print $form->parse_html_template("is/form_header", \%TMPL_VAR);
@@
-406,14
+403,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} }) {
@@
-553,7
+547,10
@@
sub update {
}
if ($rows) {
}
if ($rows) {
- $form->{"qty_$i"} = ($form->{"qty_$i"} * 1) ? $form->{"qty_$i"} : 1;
+ $form->{"qty_$i"} = $form->parse_amount(\%myconfig, $form->{"qty_$i"});
+ if( !$form->{"qty_$i"} ) {
+ $form->{"qty_$i"} = 1;
+ }
if ($rows > 1) {
if ($rows > 1) {
@@
-717,6
+714,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);
@@
-799,7
+798,7
@@
sub print_and_post {
}
}
-sub use_as_
template
{
+sub use_as_
new
{
$main::lxdebug->enter_sub();
my $form = $main::form;
$main::lxdebug->enter_sub();
my $form = $main::form;
@@
-807,12
+806,13
@@
sub use_as_template {
$main::auth->assert('invoice_edit');
$main::auth->assert('invoice_edit');
-
map { delete $form->{$_} } qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 gldate_1 acc_trans_id_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno)
;
+
delete @{ $form }{qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 gldate_1 acc_trans_id_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno locked)}
;
$form->{paidaccounts} = 1;
$form->{rowcount}--;
$form->{invdate} = $form->current_date(\%myconfig);
$form->{paidaccounts} = 1;
$form->{rowcount}--;
$form->{invdate} = $form->current_date(\%myconfig);
+ $form->{duedate} = $form->get_duedate(\%myconfig, $form->{invdate}) || $form->{invdate};
- # remember pricegroups for "use as
template
"
+ # remember pricegroups for "use as
new
"
IS->get_pricegroups_for_parts(\%myconfig, \%$form);
set_pricegroup($_) for 1 .. $form->{rowcount};
IS->get_pricegroups_for_parts(\%myconfig, \%$form);
set_pricegroup($_) for 1 .. $form->{rowcount};