X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fis.pl;h=d918b50d813277e6ee82cfd5d67b9523a08ef427;hb=bfaef835c20ba69d5ea4242e67a0dcb4fcbd4f50;hp=7d79ba9f2bd5529583c11ef9e3d11f66b394bedb;hpb=0bb0eb67db98f28ec8faf8dfe8c233268332f842;p=kivitendo-erp.git
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 7d79ba9f2..d918b50d8 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -44,8 +44,18 @@ require "$form->{path}/arap.pl";
sub add {
$lxdebug->enter_sub();
+
+ if ($form->{type} eq "credit_note") {
+ $form->{title} = $locale->text('Add Credit Note');
+
+ if ($form->{storno}) {
+ $form->{title} = $locale->text('Add Storno Credit Note');
+ }
+ } else {
+ $form->{title} = $locale->text('Add Sales Invoice');
+
+ }
- $form->{title} = $locale->text('Add Sales Invoice');
$form->{callback} =
"$form->{script}?action=add&type=$form->{type}&login=$form->{login}&path=$form->{path}&password=$form->{password}"
@@ -57,7 +67,6 @@ sub add {
{
$form->error("Access Denied");
}
-
&invoice_links;
&prepare_invoice;
&display_form;
@@ -68,15 +77,25 @@ sub add {
sub edit {
$lxdebug->enter_sub();
- $form->{title} = $locale->text('Edit Sales Invoice');
if ($myconfig{acs} =~ "AR--Add Sales Invoice" || $myconfig{acs} =~ "AR--AR")
{
$form->error("Access Denied");
}
-
+ $edit = 1;
+ if ($form->{print_and_post}) {
+ $form->{action} = "print";
+ $form->{resubmit} = 1;
+ $language_id = $form->{language_id};
+ $printer_id = $form->{printer_id};
+ }
&invoice_links;
&prepare_invoice;
+ if ($form->{print_and_post}) {
+ $form->{language_id} = $language_id;
+ $form->{printer_id} = $printer_id;
+ }
+
&display_form;
$lxdebug->leave_sub();
@@ -98,14 +117,51 @@ sub invoice_links {
$form->{customer_id} = $form->{all_customer}->[0]->{id};
}
}
+
+ if ($form->{payment_id}) {
+ $payment_id = $form->{payment_id};
+ }
+ if ($form->{language_id}) {
+ $language_id = $form->{language_id};
+ }
+ if ($form->{taxzone_id}) {
+ $taxzone_id = $form->{taxzone_id};
+ }
+ if ($form->{id}) {
+ $id = $form->{id};
+ }
+ if ($form->{shipto_id}) {
+ $shipto_id = $form->{shipto_id};
+ }
+
$cp_id = $form->{cp_id};
IS->get_customer(\%myconfig, \%$form);
+ #quote all_customer Bug 133
+ foreach $ref (@{ $form->{all_customer} }) {
+ $ref->{name} = $form->quote($ref->{name});
+ }
+ if ($id) {
+ $form->{id} = $id;
+ }
IS->retrieve_invoice(\%myconfig, \%$form);
$form->{cp_id} = $cp_id;
+ if ($payment_id) {
+ $form->{payment_id} = $payment_id;
+ }
+ if ($language_id) {
+ $form->{language_id} = $language_id;
+ }
+ if ($taxzone_id) {
+ $form->{taxzone_id} = $taxzone_id;
+ }
+ if ($shipto_id) {
+ $form->{shipto_id} = $shipto_id;
+ }
+
# currencies
- @curr = split /:/, $form->{currencies};
+ @curr = split(/:/, $form->{currencies});
chomp $curr[0];
$form->{defaultcurrency} = $curr[0];
@@ -113,7 +169,7 @@ sub invoice_links {
$form->{oldcustomer} = "$form->{customer}--$form->{customer_id}";
- if ($form->{all_customer}) {
+ if (@{ $form->{all_customer} }) {
$form->{customer} = "$form->{customer}--$form->{customer_id}";
map { $form->{selectcustomer} .= "|;
+ foreach $item (@{ $form->{payment_terms} }) {
+ if ($form->{payment_id} eq $item->{id}) {
+ $payment .= qq||;
+ } else {
+ $payment .= qq||;
+ }
+ }
+
+ my $set_duedate_url =
+ "$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=set_duedate";
+
+ my $pjx = new CGI::Ajax( 'set_duedate' => $set_duedate_url );
+ push(@ { $form->{AJAX} }, $pjx);
+
+ if (@{ $form->{TAXZONE} }) {
+ $form->{selecttaxzone} = "";
+ foreach $item (@{ $form->{TAXZONE} }) {
+ if ($item->{id} == $form->{taxzone_id}) {
+ $form->{selecttaxzone} .=
+ "";
+ } else {
+ $form->{selecttaxzone} .=
+ "";
+ }
+
+ }
+ } else {
+ $form->{selecttaxzone} =~ s/ selected//g;
+ if ($form->{taxzone_id} ne "") {
+ $form->{selecttaxzone} =~ s/value=$form->{taxzone_id}/value=$form->{taxzone_id} selected/;
+ }
+ }
+
+ $taxzone = qq|
+
+ | . $locale->text('Steuersatz') . qq| |
+ |
+
+
|;
+
+
+ if (@{ $form->{SHIPTO} }) {
+ $form->{selectshipto} = "";
+ foreach $item (@{ $form->{SHIPTO} }) {
+ if ($item->{shipto_id} == $form->{shipto_id}) {
+ $form->{selectshipto} .=
+ "";
+ } else {
+ $form->{selectshipto} .=
+ "";
+ }
+
+ }
+ } else {
+ $form->{selectshipto} = $form->unquote($form->{selectshipto});
+ $form->{selectshipto} =~ s/ selected//g;
+ if ($form->{shipto_id} ne "") {
+ $form->{selectshipto} =~ s/value=$form->{shipto_id}/value=$form->{shipto_id} selected/;
+ }
+ }
+
+ $shipto = qq|
+ | . $locale->text('Shipping Address') . qq| |
+ | |;
+ $form->{selectshipto} = $form->quote($form->{selectshipto});
+ $shipto .= qq| |;
+
+
+
# set option selected
- foreach $item (qw(AR customer currency department employee contact)) {
+ foreach $item (qw(AR customer currency department employee)) {
$form->{"select$item"} =~ s/ selected//;
$form->{"select$item"} =~
s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
}
+ #quote customer Bug 133
+ $form->{selectcustomer} = $form->quote($form->{selectcustomer});
+
#build contacts
if ($form->{all_contacts}) {
- $form->{selectcontact} = "";
+ $form->{selectcontact} = "";
foreach $item (@{ $form->{all_contacts} }) {
+ my $department = ($item->{cp_abteilung}) ? "--$item->{cp_abteilung}" : "";
if ($form->{cp_id} == $item->{cp_id}) {
$form->{selectcontact} .=
- "";
} else {
- $form->{selectcontact} .= "";
}
}
+ } else {
+ $form->{selectcontact} =~ s/ selected//g;
+ if ($form->{cp_id} ne "") {
+ $form->{selectcontact} =~ s/value=$form->{cp_id}/value=$form->{cp_id} selected/;
+ }
+ }
+
+
+ if (($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update}) {
+ $creditwarning = 1;
+ } else {
+ $creditwarning = 0;
}
#else {$form->{all_contacts} = 0;}
@@ -286,7 +457,7 @@ sub form_header {
#sk
$contact =
($form->{selectcontact})
- ? qq|\n|
+ ? qq|\n|
: qq||;
$department = qq|
@@ -313,46 +484,114 @@ sub form_header {
|;
}
+ if ($form->{max_dunning_level}) {
+ $dunning = qq|
+
+
+
+
+ | . $locale->text('Max. Dunning Level') . qq|: |
+ $form->{max_dunning_level} |
+ | . $locale->text('Dunning Amount') . qq|: |
+ |
+ . $form->format_amount(\%myconfig, $form->{dunning_amount},2)
+ . qq| |
+
+
+ |
+
+|;
+ }
+
$form->{fokus} = "invoice.customer";
# use JavaScript Calendar or not
$form->{jsscript} = $jscalendar;
$jsscript = "";
- if ($form->{jsscript}) {
-
- # with JavaScript Calendar
- $button1 = qq|
- {invdate}> |
- text('button') . qq|> |
- |;
- $button2 = qq|
- {duedate}> |
- text('button') . qq|> |
- |;
-
- #write Trigger
- $jsscript =
- Form->write_trigger(\%myconfig, "2", "invdate", "BL", "trigger1",
- "duedate", "BL", "trigger2");
+ if ($form->{type} eq "credit_note") {
+ if ($form->{jsscript}) {
+
+ # with JavaScript Calendar
+ $button1 = qq|
+ {invdate}> |
+ text('button') . qq|> |
+ |;
+
+ #write Trigger
+ $jsscript =
+ Form->write_trigger(\%myconfig, "1",
+ "invdate", "BL",
+ "trigger1");
+ } else {
+
+ # without JavaScript Calendar
+ $button1 =
+ qq|{invdate}> | |;
+ $button2 =
+ qq|{duedate}> | |;
+ }
} else {
-
- # without JavaScript Calendar
- $button1 =
- qq|{invdate}> | |;
- $button2 =
- qq|{duedate}> | |;
+ if ($form->{jsscript}) {
+
+ # with JavaScript Calendar
+ $button1 = qq|
+ {invdate}> |
+ text('button') . qq|> |
+ |;
+ $button2 = qq|
+ {duedate}> |
+ text('button') . qq|> |
+ |;
+ $button3 = qq|
+ {deliverydate}> |
+ text('button') . qq|> |
+ |;
+
+ #write Trigger
+ $jsscript =
+ Form->write_trigger(\%myconfig, "3",
+ "invdate", "BL",
+ "trigger1", "duedate",
+ "BL", "trigger2",
+ "deliverydate", "BL",
+ "trigger3");
+ } else {
+
+ # without JavaScript Calendar
+ $button1 =
+ qq|{invdate}> | |;
+ $button2 =
+ qq|{duedate}> | |;
+ }
}
- if ($form->{resubmit}) {
- $onload = "document.invoice.submit()";
+ if ($form->{resubmit} && ($form->{format} eq "html")) {
+ $onload =
+ qq|window.open('about:blank','Beleg'); document.invoice.target = 'Beleg';document.invoice.submit()|;
+ } elsif ($form->{resubmit}) {
+ $onload = qq|document.invoice.submit()|;
} else {
$onload = "fokus()";
}
+
+ $credittext = $locale->text('Credit Limit exceeded!!!');
+ if ($creditwarning) {
+ $onload = qq|alert('$credittext')|;
+ }
+
+ $form->{"javascript"} .= qq|
+
+
+