X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fis.pl;h=9b6da27c60bf5c538ee6ffdbf6ca0f4ccdf40ee0;hb=9fd46de37d7906b7c104c17112b34bae7d534d67;hp=52e668233527e97381d66369a09cbb0d4a7fa537;hpb=bd32b6070b6d73d60cb8df4a2425d0c711a96615;p=kivitendo-erp.git
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 52e668233..9b6da27c6 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -37,6 +37,7 @@ use Data::Dumper;
require "$form->{path}/io.pl";
require "$form->{path}/arap.pl";
+require "bin/mozilla/drafts.pl";
1;
@@ -44,7 +45,9 @@ require "$form->{path}/arap.pl";
sub add {
$lxdebug->enter_sub();
-
+
+ return $lxdebug->leave_sub() if (load_draft_maybe());
+
if ($form->{type} eq "credit_note") {
$form->{title} = $locale->text('Add Credit Note');
@@ -69,8 +72,6 @@ sub add {
}
&invoice_links;
&prepare_invoice;
- $form->{format} = "pdf";
-
&display_form;
$lxdebug->leave_sub();
@@ -79,7 +80,10 @@ sub add {
sub edit {
$lxdebug->enter_sub();
-
+ # show history button
+ $form->{javascript} = qq||;
+ #/show hhistory button
+
if ($myconfig{acs} =~ "AR--Add Sales Invoice" || $myconfig{acs} =~ "AR--AR")
{
$form->error("Access Denied");
@@ -246,11 +250,9 @@ sub prepare_invoice {
if ($form->{type} eq "credit_note") {
$form->{type} = "credit_note";
$form->{formname} = "credit_note";
- $form->{media} = "screen";
} else {
$form->{type} = "invoice";
$form->{formname} = "invoice";
- $form->{media} = "screen";
}
if ($form->{id}) {
@@ -324,16 +326,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} .=
- "";
+ "";
}
}
@@ -343,11 +351,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->{shipto_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 @old_project_ids = ($form->{"globalproject_id"});
+ map({ push(@old_project_ids, $form->{"project_id_$_"})
+ if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
+
+ $form->get_lists("contacts" => "ALL_CONTACTS",
+ "shipto" => "ALL_SHIPTO",
+ "projects" => { "key" => "ALL_PROJECTS",
+ "all" => 0,
+ "old_id" => \@old_project_ids });
+
+ 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 =
+ NTI($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| |
- |
- |;
-
-
+ | .
+ NTI($cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values,
+ '-labels' => \%labels, '-default' => $form->{"shipto_id"}))
+ . qq| | |;
+
+ %labels = ();
+ @values = ("");
+ foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
+ push(@values, $item->{"id"});
+ $labels{$item->{"id"}} = $item->{"projectnumber"};
+ }
+ my $globalprojectnumber =
+ NTI($cgi->popup_menu('-name' => 'globalproject_id', '-values' => \@values,
+ '-labels' => \%labels,
+ '-default' => $form->{"globalproject_id"}));
# set option selected
foreach $item (qw(AR customer currency department employee)) {
@@ -393,35 +415,12 @@ sub form_header {
#quote customer Bug 133
$form->{selectcustomer} = $form->quote($form->{selectcustomer});
- #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/;
- }
- }
-
-
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});
@@ -453,12 +452,6 @@ sub form_header {
? qq|\n|
: qq||;
- #sk
- $contact =
- ($form->{selectcontact})
- ? qq|\n|
- : qq||;
-
$department = qq|
| . $locale->text('Department') . qq| |
@@ -581,6 +574,15 @@ sub form_header {
$onload = qq|alert('$credittext')|;
}
+ $form->{"javascript"} .= qq||;
+
+ $jsscript .=
+ $form->write_trigger(\%myconfig, 2,
+ "orddate", "BL", "trigger_orddate",
+ "quodate", "BL", "trigger_quodate");
+ # show history button js
+ $form->{javascript} .= qq||;
+ #/show history button js
$form->header;
print qq|
@@ -622,7 +624,7 @@ sub form_header {
{storno}>
{storno_id}>
-
+| . ($form->{saved_message} ? qq|$form->{saved_message}
| : "") . qq|
@@ -840,7 +856,8 @@ sub form_footer {
$tax .= qq|
- $form->{"${item}_description"} |
+ $form->{"${item}_description"} |
+ . $form->{"${item}_rate"} * 100 .qq|% |
$form->{"${item}_total"} |
|;
@@ -879,7 +896,8 @@ sub form_footer {
$tax .= qq|
- Enthaltene $form->{"${item}_description"} |
+ Enthaltene $form->{"${item}_description"} |
+ . $form->{"${item}_rate"} * 100 .qq|% |
$form->{"${item}_total"} |
@@ -911,7 +929,7 @@ sub form_footer {
$notes |
$intnotes |
- |
@@ -1002,6 +1020,8 @@ if ($form->{type} eq "credit_note") {
";
+ my @triggers = ();
+
$form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
for $i (1 .. $form->{paidaccounts}) {
@@ -1042,7 +1062,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"} =
@@ -1051,6 +1072,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|
@@ -1081,18 +1103,21 @@ if ($form->{type} eq "credit_note") {
if ($form->{id}) {
print qq|
-
|;
+ . $locale->text('E-mail') . qq|"> |;
print qq|| unless ($form->{storno});
+ . $locale->text('Storno') . qq|"> | unless ($form->{storno});
print qq|
+|;
+ print qq|
|;
if ($form->{id} && !($form->{type} eq "credit_note")) {
print qq|
@@ -1117,7 +1142,7 @@ if ($form->{type} eq "credit_note") {
} else {
if ($invdate > $closedto) {
- print qq|text('Update') . qq|">
@@ -1128,21 +1153,34 @@ if ($form->{type} eq "credit_note") {
|;
+ . $locale->text('Post') . qq|"> | .
+ NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'),
+ '-class' => 'submit'));
}
}
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
+ # button for saving history
+ if($form->{id} ne "") {
+ print qq|
+ |;
}
+ # /button for saving history
- print qq|
+
+ print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) .
+ qq|
{rowcount}>
-
+|
+. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
+. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
+. qq|
{path}>
{login}>
{password}>
@@ -1170,8 +1208,6 @@ sub update {
&check_name(customer);
- &check_project;
-
$form->{exchangerate} = $exchangerate
if (
$form->{forex} = (
@@ -1322,6 +1358,7 @@ sub update {
}
$lxdebug->leave_sub();
}
+
sub post_payment {
$lxdebug->enter_sub();
for $i (1 .. $form->{paidaccounts}) {
@@ -1416,10 +1453,32 @@ sub post {
if (!(IS->post_invoice(\%myconfig, \%$form))) {
$form->error($locale->text('Cannot post invoice!'));
}
+ remove_draft() if $form->{remove_draft};
+ # saving the history
+ if(!exists $form->{addition}) {
+ $form->{addition} = "PRINTED AND POSTED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
+
} else {
- $form->redirect(
- $form->{label} . " $form->{invnumber} " . $locale->text('posted!'))
- if (IS->post_invoice(\%myconfig, \%$form));
+ if (IS->post_invoice(\%myconfig, \%$form)){
+ remove_draft() if $form->{remove_draft};
+ # saving the history
+ if(!exists $form->{addition}) {
+ if($form->{storno}) {
+ $form->{addition} = "STORNO";
+ }
+ else {
+ $form->{addition} = "POSTED";
+ }
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
+
+ $form->redirect(
+ $form->{label} . " $form->{invnumber} " . $locale->text('posted!'));
+ }
$form->error($locale->text('Cannot post invoice!'));
}
@@ -1439,6 +1498,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();
@@ -1450,7 +1521,6 @@ sub storno {
$form->{storno} = 1;
$form->{id} = "";
$form->{invnumber} = "Storno zu " . $form->{invnumber};
- $form->{rowcount}--;
&post();
$lxdebug->leave_sub();
@@ -1564,9 +1634,15 @@ sub credit_note {
sub yes {
$lxdebug->enter_sub();
-
- $form->redirect($locale->text('Invoice deleted!'))
- if (IS->delete_invoice(\%myconfig, \%$form, $spool));
+ if (IS->delete_invoice(\%myconfig, \%$form, $spool)) {
+ # saving the history
+ if(!exists $form->{addition}) {
+ $form->{addition} = "DELETED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
+ $form->redirect($locale->text('Invoice deleted!'));
+ }
$form->error($locale->text('Cannot delete invoice!'));
$lxdebug->leave_sub();