X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fct.pl;h=84e49512275ede22c39b40553d07ae90dc277fca;hb=a751b16cead5e56b62e18ee616e04323919f5fe1;hp=a04cf5e5bdc08699dd00722eac1f6533e2789863;hpb=35fcd2473ad489c63e9bbe313d3f5c9b5d010b34;p=kivitendo-erp.git
diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index a04cf5e5b..84e495122 100644
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -42,6 +42,8 @@ use CGI::Ajax;
use CGI;
use Data::Dumper;
+require "bin/mozilla/common.pl";
+
1;
# end of main
@@ -557,6 +559,10 @@ sub list_names {
sub edit {
$lxdebug->enter_sub();
+ # show history button
+ $form->{javascript} = qq||;
+ #/show hhistory button
+
# $locale->text('Edit Customer')
# $locale->text('Edit Vendor')
@@ -579,6 +585,8 @@ sub edit {
sub form_header {
$lxdebug->enter_sub();
+ $form->get_lists("employees" => "ALL_SALESMEN");
+
$form->{taxincluded} = ($form->{taxincluded}) ? "checked" : "";
$form->{creditlimit} =
$form->format_amount(\%myconfig, $form->{creditlimit}, 0);
@@ -634,11 +642,10 @@ sub form_header {
}
$taxzone = qq|
-
| . $locale->text('Steuersatz') . qq| |
|
-
|;
+|;
$get_contact_url =
"$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=get_contact";
@@ -768,32 +775,28 @@ sub form_header {
|
|;
}
- $business_salesman = "";
- $business = " | | ";
- if ($vertreter) {
- $business_salesman = qq|
-
-
-
- |
-
|;
- $business = qq|
- | . $locale->text('Username') . qq| |
- |
- | . $locale->text('Password') . qq| |
- | |;
- } else {
- $business = qq|
+
+ $business = qq|
| . $locale->text('Type of Business') . qq| |
|
|;
+
+ $salesman = "";
+
+ if ($form->{db} eq "customer") {
+ my (@salesman_values, %salesman_labels);
+ push(@salesman_values, undef);
+ foreach my $item (@{ $form->{ALL_SALESMEN} }) {
+ push(@salesman_values, $item->{id});
+ $salesman_labels{$item->{id}} = $item->{name} ne "" ? $item->{name} : $item->{login};
+ }
+
+ $salesman =
+ qq| | . $locale->text('Salesman') . qq| |
+ | .
+ NTI($cgi->popup_menu('-name' => 'salesman_id', '-default' => $form->{salesman_id},
+ '-values' => \@salesman_values, '-labels' => \%salesman_labels))
+ . qq| | |;
}
## LINET: Create a drop-down box with all prior titles and greetings.
@@ -891,7 +894,6 @@ sub form_header {
@@ -1195,13 +1200,6 @@ sub form_footer {
($form->{db} eq 'customer')
? $locale->text('Save and AR Transaction')
: $locale->text('Save and AP Transaction');
- if ($vertreter) {
- $update_button =
- qq||;
- } else {
- $update_button = "";
- }
##
##
@@ -1224,7 +1222,6 @@ sub form_footer {
-$update_button
\n|;
}
+ # button for saving history
+ if($form->{id} ne "") {
+ print qq|
+ {id}
+ . qq|); name=history id=history value=|
+ . $locale->text('history')
+ . qq|>|;
+ }
+ # /button for saving history
+
print qq|
@@ -1260,10 +1268,14 @@ initializetabcontent("maintab")
sub add_transaction {
$lxdebug->enter_sub();
+# # saving the history
+# if(!exists $form->{addition}) {
+# $form->{addition} = "ADD TRANSACTION";
+# $form->save_history($form->dbconnect(\%myconfig));
+# }
+# # /saving the history
+
$form->isblank("name", $locale->text("Name missing!"));
- if ($vertreter && $form->{db} eq "customer") {
- $form->isblank("salesman_id", $locale->text("Salesman missing!"));
- }
&{"CT::save_$form->{db}"}("", \%myconfig, \%$form);
$form->{callback} = $form->escape($form->{callback}, 1);
@@ -1271,7 +1283,6 @@ sub add_transaction {
$form->{callback} =
"$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&callback=$form->{callback}";
-
$form->redirect;
$lxdebug->leave_sub();
@@ -1281,8 +1292,13 @@ sub save_and_ap_transaction {
$lxdebug->enter_sub();
$form->{script} = "ap.pl";
+ # saving the history
+ if(!exists $form->{addition}) {
+ $form->{addition} = "SAVED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
&add_transaction;
-
$lxdebug->leave_sub();
}
@@ -1290,8 +1306,13 @@ sub save_and_ar_transaction {
$lxdebug->enter_sub();
$form->{script} = "ar.pl";
+ # saving the history
+ if(!exists $form->{addition}) {
+ $form->{addition} = "SAVED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
&add_transaction;
-
$lxdebug->leave_sub();
}
@@ -1300,8 +1321,13 @@ sub save_and_invoice {
$form->{script} = ($form->{db} eq 'customer') ? "is.pl" : "ir.pl";
$form->{type} = "invoice";
+ # saving the history
+ if(!exists $form->{addition}) {
+ $form->{addition} = "SAVED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
&add_transaction;
-
$lxdebug->leave_sub();
}
@@ -1310,8 +1336,13 @@ sub save_and_rfq {
$form->{script} = "oe.pl";
$form->{type} = "request_quotation";
+ # saving the history
+ if(!exists $form->{addition}) {
+ $form->{addition} = "SAVED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
&add_transaction;
-
$lxdebug->leave_sub();
}
@@ -1320,8 +1351,13 @@ sub save_and_quotation {
$form->{script} = "oe.pl";
$form->{type} = "sales_quotation";
+ # saving the history
+ if(!exists $form->{addition}) {
+ $form->{addition} = "SAVED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
&add_transaction;
-
$lxdebug->leave_sub();
}
@@ -1331,8 +1367,13 @@ sub save_and_order {
$form->{script} = "oe.pl";
$form->{type} =
($form->{db} eq 'customer') ? "sales_order" : "purchase_order";
+ # saving the history
+ if(!exists $form->{addition}) {
+ $form->{addition} = "SAVED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
&add_transaction;
-
$lxdebug->leave_sub();
}
@@ -1346,13 +1387,16 @@ sub save_and_close {
$imsg .= " saved!";
$form->isblank("name", $locale->text("Name missing!"));
- if ($vertreter && $form->{db} eq "customer") {
- $form->isblank("salesman_id", $locale->text("Salesman missing!"));
- }
$rc = &{"CT::save_$form->{db}"}("", \%myconfig, \%$form);
if ($rc == 3) {
$form->error($locale->text('customernumber not unique!'));
}
+ # saving the history
+ if(!exists $form->{addition}) {
+ $form->{addition} = "SAVED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
$form->redirect($locale->text($msg));
$lxdebug->leave_sub();
@@ -1368,9 +1412,6 @@ sub save {
$imsg .= " saved!";
$form->isblank("name", $locale->text("Name missing!"));
- if ($vertreter && $form->{db} eq "customer") {
- $form->isblank("salesman_id", $locale->text("Salesman missing!"));
- }
my $res = &{"CT::save_$form->{db}"}("", \%myconfig, \%$form);
@@ -1381,7 +1422,12 @@ sub save {
$form->error($locale->text('This vendor number is already in use.'));
}
}
-
+ # saving the history
+ if(!exists $form->{addition}) {
+ $form->{addition} = "SAVED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
&edit;
exit;
$lxdebug->leave_sub();
@@ -1399,6 +1445,12 @@ sub delete {
$msg = ucfirst $form->{db};
$msg .= " deleted!";
+ # saving the history
+ if(!exists $form->{addition}) {
+ $form->{addition} = "DELETED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
$form->redirect($locale->text($msg));
$msg = "Cannot delete $form->{db}";
@@ -1453,8 +1505,8 @@ sub check_salesman {
} else {
# name is not on file
- # $locale->text('Customer not on file!')
- # $locale->text('Vendor not on file!')
+ # $locale->text('Customer not on file or locked!')
+ # $locale->text('Vendor not on file or locked!')
$msg = ucfirst $name . " not on file or locked!";
$form->error($locale->text($msg));
}
@@ -1606,7 +1658,6 @@ sub get_contact {
}
-
sub get_shipto {
$lxdebug->enter_sub();