X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fis.pl;h=e29ca4c005c92e6a03d046df12a5521e10c94724;hb=c046c42244acda83029d00cb06ff636063765fb2;hp=879d3d1b3746cbca30aeee3179b3ec25db01ff34;hpb=54e4131e091831e00a861fe2c4f53e344b87ddca;p=kivitendo-erp.git
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 879d3d1b3..e29ca4c00 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -69,8 +69,6 @@ sub add {
}
&invoice_links;
&prepare_invoice;
- $form->{format} = "pdf";
-
&display_form;
$lxdebug->leave_sub();
@@ -138,6 +136,11 @@ sub invoice_links {
$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;
}
@@ -158,7 +161,7 @@ sub invoice_links {
}
# currencies
- @curr = split /:/, $form->{currencies};
+ @curr = split(/:/, $form->{currencies});
chomp $curr[0];
$form->{defaultcurrency} = $curr[0];
@@ -166,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}) {
@@ -315,16 +320,22 @@ sub form_header {
}
}
+ 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} .=
- "";
+ "";
}
}
@@ -334,11 +345,6 @@ sub form_header {
$form->{selecttaxzone} =~ s/value=$form->{taxzone_id}/value=$form->{taxzone_id} selected/;
}
}
- if ($form->{rowcount} >0) {
- $form->{selecttaxzone} =~ /";
- foreach $item (@{ $form->{SHIPTO} }) {
- if ($item->{id} == $form->{shipto_id}) {
- $form->{selectshipto} .=
- "";
- } else {
- $form->{selectshipto} .=
- "";
- }
-
- }
- } else {
- $form->{selectshipto} =~ s/ selected//g;
- if ($form->{shipto_id} ne "") {
- $form->{selectshipto} =~ s/value=$form->{shipto_id}/value=$form->{shipto_id} selected/;
- }
+ my (%labels, @values);
+ foreach my $item (@{ $form->{"ALL_CONTACTS"} }) {
+ push(@values, $item->{"cp_id"});
+ $labels{$item->{"cp_id"}} = $item->{"cp_name"} .
+ ($item->{"cp_abteilung"} ? " ($item->{cp_abteilung})" : "");
+ }
+ my $contact =
+ $cgi->popup_menu('-name' => 'cp_id', '-values' => \@values,
+ '-labels' => \%labels, '-default' => $form->{"cp_id"});
+
+ %labels = ();
+ @values = ("");
+ foreach my $item (@{ $form->{"ALL_SHIPTO"} }) {
+ push(@values, $item->{"shipto_id"});
+ $labels{$item->{"shipto_id"}} =
+ $item->{"shiptoname"} . " " . $item->{"shiptodepartment_1"};
}
- $shipto = qq|
+ my $shipto = qq|
| . $locale->text('Shipping Address') . qq| |
- |
- |;
-
-
+ | .
+ $cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values,
+ '-labels' => \%labels, '-default' => $form->{"shipto_id"})
+ . qq| | |;
# set option selected
foreach $item (qw(AR customer currency department employee)) {
@@ -381,35 +388,15 @@ sub form_header {
s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
}
- #build contacts
- if ($form->{all_contacts}) {
-
- $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/;
- }
- }
-
-
+ #quote customer Bug 133
+ $form->{selectcustomer} = $form->quote($form->{selectcustomer});
+
if (($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update}) {
$creditwarning = 1;
} else {
$creditwarning = 0;
}
- #else {$form->{all_contacts} = 0;}
-
$form->{exchangerate} =
$form->format_amount(\%myconfig, $form->{exchangerate});
@@ -441,12 +428,6 @@ sub form_header {
? qq|\n|
: qq||;
- #sk
- $contact =
- ($form->{selectcontact})
- ? qq|\n|
- : qq||;
-
$department = qq|
| . $locale->text('Department') . qq| |
@@ -569,6 +550,13 @@ sub form_header {
$onload = qq|alert('$credittext')|;
}
+ $form->{"javascript"} .= qq||;
+
+ $jsscript .=
+ $form->write_trigger(\%myconfig, 2,
+ "orddate", "BL", "trigger_orddate",
+ "quodate", "BL", "trigger_quodate");
+
$form->header;
print qq|
@@ -652,7 +640,7 @@ sub form_header {
$dunning
| . $locale->text('Record in') . qq| |
- |
+ |
$taxzone
@@ -735,10 +723,20 @@ print qq|
| . $locale->text('Order Number') . qq| |
|
+
+ | . $locale->text('Order Date') . qq| |
+ |
+ |
+
| . $locale->text('Quotation Number') . qq| |
|
+
+ | . $locale->text('Quotation Date') . qq| |
+ |
+ |
+
| . $locale->text('Customer Order Number') . qq| |
|
@@ -899,7 +897,7 @@ sub form_footer {
$notes |
$intnotes |
- |
@@ -990,6 +988,8 @@ if ($form->{type} eq "credit_note") {
";
+ my @triggers = ();
+
$form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
for $i (1 .. $form->{paidaccounts}) {
@@ -1002,8 +1002,10 @@ if ($form->{type} eq "credit_note") {
# format amounts
$totalpaid += $form->{"paid_$i"};
- $form->{"paid_$i"} =
- $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
+ if ($form->{"paid_$i"}) {
+ $form->{"paid_$i"} =
+ $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
+ }
$form->{"exchangerate_$i"} =
$form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
@@ -1028,7 +1030,8 @@ if ($form->{type} eq "credit_note") {
$column_data{"AR_paid_$i"} =
qq|$form->{"selectAR_paid_$i"} | |;
$column_data{"datepaid_$i"} =
- qq|{"datepaid_$i"}> | |;
+ qq|{"datepaid_$i"}>
+ | |;
$column_data{"source_$i"} =
qq| | |;
$column_data{"memo_$i"} =
@@ -1037,6 +1040,7 @@ if ($form->{type} eq "credit_note") {
map { print qq|$column_data{"${_}_$i"}\n| } @column_index;
print "
\n";
+ push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
}
print qq|
@@ -1067,7 +1071,7 @@ if ($form->{type} eq "credit_note") {
if ($form->{id}) {
print qq|
-
@@ -1079,6 +1083,9 @@ if ($form->{type} eq "credit_note") {
. $locale->text('Storno') . qq|">| unless ($form->{storno});
print qq|
+|;
+ print qq|
|;
if ($form->{id} && !($form->{type} eq "credit_note")) {
print qq|
@@ -1086,6 +1093,12 @@ if ($form->{type} eq "credit_note") {
. $locale->text('Credit Note') . qq|">
|;
}
+ if ($form->{radier}) {
+ print qq|
+
+|;
+ }
if ($invdate > $closedto) {
@@ -1097,7 +1110,7 @@ if ($form->{type} eq "credit_note") {
} else {
if ($invdate > $closedto) {
- print qq|text('Update') . qq|">
@@ -1112,12 +1125,8 @@ if ($form->{type} eq "credit_note") {
}
}
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
-
- print qq|
+ print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .
+ qq|
{rowcount}>
@@ -1190,8 +1199,6 @@ sub update {
} else {
- $form->{"selected_unit_$i"} = $form->{"unit_$i"};
-
IS->retrieve_item(\%myconfig, \%$form);
$rows = scalar @{ $form->{item_list} };
@@ -1209,7 +1216,7 @@ sub update {
} else {
- $sellprice = $form->format_amount(\%myconfig, $form->{"sellprice_$i"});
+ $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
map { $form->{item_list}[$i]{$_} =~ s/\"/"/g }
qw(partnumber description unit);
@@ -1326,6 +1333,7 @@ sub post_payment {
($form->{AR}) = split /--/, $form->{AR};
($form->{AR_paid}) = split /--/, $form->{AR_paid};
+ relink_accounts();
$form->redirect($locale->text(' Payment posted!'))
if (IS->post_payment(\%myconfig, \%$form));
$form->error($locale->text('Cannot post payment!'));
@@ -1360,7 +1368,7 @@ sub post {
if ($form->{currency} ne $form->{defaultcurrency});
for $i (1 .. $form->{paidaccounts}) {
- if ($form->{"paid_$i"}) {
+ if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) {
$datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig);
$form->isblank("datepaid_$i", $locale->text('Payment date missing!'));
@@ -1392,6 +1400,7 @@ sub post {
$form->{invnumber} = $form->update_defaults(\%myconfig, "invnumber");
}
}
+ relink_accounts();
if ($print_post) {
if (!(IS->post_invoice(\%myconfig, \%$form))) {
$form->error($locale->text('Cannot post invoice!'));
@@ -1419,6 +1428,18 @@ sub print_and_post {
}
+sub use_as_template {
+ $lxdebug->enter_sub();
+
+ map { delete $form->{$_} } qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno);
+ $form->{paidaccounts} = 1;
+ $form->{rowcount}--;
+ $form->{invdate} = $form->current_date(\%myconfig);
+ &display_form;
+
+ $lxdebug->leave_sub();
+}
+
sub storno {
$lxdebug->enter_sub();
@@ -1430,7 +1451,6 @@ sub storno {
$form->{storno} = 1;
$form->{id} = "";
$form->{invnumber} = "Storno zu " . $form->{invnumber};
- $form->{rowcount}--;
&post();
$lxdebug->leave_sub();