X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fct.pl;h=02ac29e1c6550759201373517c28e642cbbaa2bb;hb=ff71dc3fb3a632a6a5856d94c3b336aa5ef6d6d2;hp=b8451f9ff8e0a11b38c93121f18d87161fbc4692;hpb=35182445480f8cfc9f1ed63466be6131466f7c73;p=kivitendo-erp.git
diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index b8451f9ff..02ac29e1c 100644
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -36,12 +36,20 @@
# $locale->text('Vendors')
# $locale->text('Add Customer')
# $locale->text('Add Vendor')
+# $locale->text('Edit Customer')
+# $locale->text('Edit Vendor')
+# $locale->text('Customer saved!')
+# $locale->text('Vendor saved!')
+# $locale->text('Customer deleted!')
+# $locale->text('Cannot delete customer!')
+# $locale->text('Vendor deleted!')
+# $locale->text('Cannot delete vendor!')
-use CGI;
use CGI::Ajax;
use POSIX qw(strftime);
use SL::CT;
+use SL::CVar;
use SL::ReportGenerator;
require "bin/mozilla/common.pl";
@@ -54,11 +62,10 @@ require "bin/mozilla/reportgenerator.pl";
sub add {
$lxdebug->enter_sub();
- $form->{title} = "Add";
+ $auth->assert('customer_vendor_edit');
- $form->{callback} =
- "$form->{script}?action=add&db=$form->{db}&login=$form->{login}&password=$form->{password}"
- unless $form->{callback};
+ $form->{title} = "Add";
+ $form->{callback} = "$form->{script}?action=add&db=$form->{db}" unless $form->{callback};
CT->populate_drop_down_boxes(\%myconfig, \%$form);
@@ -71,13 +78,22 @@ sub add {
sub search {
$lxdebug->enter_sub();
+ $auth->assert('customer_vendor_edit');
+
$form->{IS_CUSTOMER} = $form->{db} eq 'customer';
$form->get_lists("business_types" => "ALL_BUSINESS_TYPES");
$form->{SHOW_BUSINESS_TYPES} = scalar @{ $form->{ALL_BUSINESS_TYPES} } > 0;
- $form->{title} = $form->{IS_CUSTOMER} ? $locale->text('Customers') : $locale->text('Vendors');
- $form->{fokus} = 'Form.name';
+ $form->{CUSTOM_VARIABLES} = CVar->get_configs('module' => 'CT');
+ ($form->{CUSTOM_VARIABLES_FILTER_CODE},
+ $form->{CUSTOM_VARIABLES_INCLUSION_CODE}) = CVar->render_search_options('variables' => $form->{CUSTOM_VARIABLES},
+ 'include_prefix' => 'l_',
+ 'include_value' => 'Y');
+
+ $form->{jsscript} = 1;
+ $form->{title} = $form->{IS_CUSTOMER} ? $locale->text('Customers') : $locale->text('Vendors');
+ $form->{fokus} = 'Form.name';
$form->header();
print $form->parse_html_template('ct/search');
@@ -88,63 +104,80 @@ sub search {
sub list_names {
$lxdebug->enter_sub();
+ $auth->assert('customer_vendor_edit');
+
$form->{IS_CUSTOMER} = $form->{db} eq 'customer';
+ report_generator_set_default_sort('name', 1);
+
CT->search(\%myconfig, \%$form);
+ my $cvar_configs = CVar->get_configs('module' => 'CT');
+
my @options;
if ($form->{status} eq 'all') {
push @options, $locale->text('All');
-
} elsif ($form->{status} eq 'orphaned') {
push @options, $locale->text('Orphaned');
}
- if ($form->{name}) {
- push @options, $locale->text('Name') . " : $form->{name}";
- }
- if ($form->{contact}) {
- push @options, $locale->text('Contact') . " : $form->{contact}";
- }
- if ($form->{"$form->{db}number"}) {
- push @options, $locale->text('Number') . qq| : $form->{"$form->{db}number"}|;
- }
- if ($form->{email}) {
- push @options, $locale->text('E-mail') . " : $form->{email}";
- }
+ push @options, $locale->text('Name') . " : $form->{name}" if $form->{name};
+ push @options, $locale->text('Contact') . " : $form->{contact}" if $form->{contact};
+ push @options, $locale->text('Number') . qq| : $form->{"$form->{db}number"}| if $form->{"$form->{db}number"};
+ push @options, $locale->text('E-mail') . " : $form->{email}" if $form->{email};
+ push @options, $locale->text('Contact person (surname)')
+ . " : $form->{cp_name}" if $form->{cp_name};
+ push @options, $locale->text('Billing/shipping address (city)')
+ . " : $form->{addr_city}" if $form->{addr_city};
+
+ push @options, $locale->text('Billing/shipping address (zipcode)')
+ . " : $form->{zipcode}" if $form->{addr_zipcode};
+ push @options, $locale->text('Billing/shipping address (street)')
+ . " : $form->{street}" if $form->{addr_street};
my @columns = (
- 'id', 'name', "$form->{db}number", 'address', 'contact', 'phone',
- 'fax', 'email', 'taxnumber', 'sic_code', 'business', 'invnumber',
+ 'id', 'name', "$form->{db}number", 'contact', 'phone',
+ 'fax', 'email', 'taxnumber', 'street', 'zipcode' , 'city', 'business', 'invnumber',
'ordnumber', 'quonumber'
);
+ my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs };
+ my @searchable_custom_variables = grep { $_->{searchable} } @{ $cvar_configs };
+ my %column_defs_cvars = map { +"cvar_$_->{name}" => { 'text' => $_->{description} } } @includeable_custom_variables;
+
+ push @columns, map { "cvar_$_->{name}" } @includeable_custom_variables;
+
my %column_defs = (
'id' => { 'text' => $locale->text('ID'), },
"$form->{db}number" => { 'text' => $form->{IS_CUSTOMER} ? $locale->text('Customer Number') : $locale->text('Vendor Number'), },
'name' => { 'text' => $locale->text('Name'), },
- 'address' => { 'text' => $locale->text('Address'), },
'contact' => { 'text' => $locale->text('Contact'), },
'phone' => { 'text' => $locale->text('Phone'), },
'fax' => { 'text' => $locale->text('Fax'), },
'email' => { 'text' => $locale->text('E-mail'), },
'cc' => { 'text' => $locale->text('Cc'), },
'taxnumber' => { 'text' => $locale->text('Tax Number'), },
- 'sic_code' => { 'text' => $locale->text('SIC'), },
'business' => { 'text' => $locale->text('Type of Business'), },
'invnumber' => { 'text' => $locale->text('Invoice'), },
'ordnumber' => { 'text' => $form->{IS_CUSTOMER} ? $locale->text('Sales Order') : $locale->text('Purchase Order'), },
'quonumber' => { 'text' => $form->{IS_CUSTOMER} ? $locale->text('Quotation') : $locale->text('Request for Quotation'), },
+ 'street' => { 'text' => $locale->text('Street'), },
+ 'zipcode' => { 'text' => $locale->text('Zipcode'), },
+ 'city' => { 'text' => $locale->text('City'), },
+ %column_defs_cvars,
);
map { $column_defs{$_}->{visible} = $form->{"l_$_"} eq 'Y' } @columns;
- my @hidden_variables = (qw(db status obsolete), map { "l_$_" } @columns);
+ my @hidden_variables = (qw(db status obsolete name contact email cp_name addr_city), "$form->{db}number", @searchable_custom_variables, map { "l_$_" } @columns);
my @hidden_nondefault = grep({ $form->{$_} } @hidden_variables);
- my $callback = build_std_url('action=list_names', grep { $form->{$_} } @hidden_variables);
- $form->{callback} = "$callback&sort=" . E($form->{sort});
+ my $callback = build_std_url('action=list_names', grep { $form->{$_} } @hidden_nondefault);
+ $form->{callback} = "$callback&sort=" . E($form->{sort}) . "&sortdir=" . E($form->{sortdir});
- map { $column_defs{$_}->{link} = "${callback}&sort=${_}" } @columns;
+ foreach (@columns) {
+ my $sortdir = $form->{sort} eq $_ ? 1 - $form->{sortdir} : $form->{sortdir};
+ $column_defs{$_}->{link} = "${callback}&sort=${_}&sortdir=${sortdir}";
+ }
my ($ordertype, $quotationtype, $attachment_basename);
if ($form->{IS_CUSTOMER}) {
@@ -173,9 +206,15 @@ sub list_names {
$report->set_columns(%column_defs);
$report->set_column_order(@columns);
- $report->set_export_options('list_names', @hidden_variables);
+ $report->set_export_options('list_names', @hidden_variables, qw(sort sortdir));
- $report->set_sort_indicator($form->{sort}, 1);
+ $report->set_sort_indicator($form->{sort}, $form->{sortdir});
+
+ CVar->add_custom_variables_to_report('module' => 'CT',
+ 'trans_id_field' => 'id',
+ 'configs' => $cvar_configs,
+ 'column_defs' => \%column_defs,
+ 'data' => $form->{CT});
my $previous_id;
@@ -208,19 +247,15 @@ sub list_names {
sub edit {
$lxdebug->enter_sub();
+ $auth->assert('customer_vendor_edit');
+
# show history button
$form->{javascript} = qq||;
#/show hhistory button
- # $locale->text('Edit Customer')
- # $locale->text('Edit Vendor')
-
CT->get_tuple(\%myconfig, \%$form);
CT->populate_drop_down_boxes(\%myconfig, \%$form);
- # format " into "
- map { $form->{$_} =~ s/\"/"/g } keys %$form;
-
$form->{title} = "Edit";
# format discount
@@ -235,33 +270,38 @@ sub edit {
sub form_header {
$lxdebug->enter_sub();
- $form->get_lists("employees" => "ALL_SALESMEN",
+ $auth->assert('customer_vendor_edit');
+
+ $form->get_lists("employees" => "ALL_EMPLOYEES",
"taxzones" => "ALL_TAXZONES");
$form->get_pricegroup(\%myconfig, { all => 1 });
+ $form->{ALL_SALESMEN} = $form->{ALL_EMPLOYEES};
$form->{taxincluded} = ($form->{taxincluded}) ? "checked" : "";
$form->{is_admin} = $myconfig{role} eq 'admin';
$form->{is_customer} = $form->{db} eq 'customer';
$form->{salesman_label} = sub { $_[0]->{name} ne "" ? $_[0]->{name} : $_[0]->{login} };
- $form->{shipto_label} = sub { "$_[0]->{shiptoname} $_[0]->{shiptodepartment_1}" };
+ $form->{shipto_label} = sub { my $s = shift(@_); join('; ', grep { $_ } map { $s->{"shipto$_"} } qw(name department_1 street city)) || ' ' };
+ $form->{contacts_label} = sub { join ", ", grep { $_ } $_[0]->{cp_name}, $_[0]->{cp_givenname} };
$form->{taxzone_id} = 0 if !$form->{id};
$form->{jsscript} = 1;
$form->{fokus} = "ct.greeting";
+ $form->{AJAX} = [ new CGI::Ajax( map {; "get_$_" => "$form->{script}?action=get_$_" } qw(shipto contact delivery) ) ];
unshift @{ $form->{SHIPTO} }, +{ shipto_id => '0', shiptoname => '' }, +{ shipto_id => '0', shiptoname => 'Alle' };
unshift @{ $form->{CONTACTS} }, +{ cp_id => '0', cp_name => $locale->text('New contact') };
- push @{ $form->{AJAX} }, map {
- new CGI::Ajax( "get_$_" => "$form->{script}?login=$form->{login}&password=$form->{password}&action=get_$_" )
- } qw(shipto contact delivery);
-
$form->{title} = $form->{title_save}
|| $locale->text("$form->{title} " . ucfirst $form->{db}) . ($form->{title} eq "Edit" ? " $form->{name}" : '');
-## LINET: Create a drop-down box with all prior titles and greetings.
CT->query_titles_and_greetings(\%myconfig, \%$form);
map { $form->{"MB_$_"} = [ map +{ id => $_, description => $_ }, @{ $form->{$_} } ] } qw(TITLES GREETINGS COMPANY_GREETINGS DEPARTMENT);
-## /LINET
+
+ $form->{NOTES} ||= [ ];
+
+ $form->{CUSTOM_VARIABLES} = CVar->get_custom_variables('module' => 'CT', 'trans_id' => $form->{id});
+
+ CVar->render_inputs('variables' => $form->{CUSTOM_VARIABLES}) if (scalar @{ $form->{CUSTOM_VARIABLES} });
$form->header;
print $form->parse_html_template('ct/form_header');
@@ -272,6 +312,8 @@ sub form_header {
sub form_footer {
$lxdebug->enter_sub();
+ $auth->assert('customer_vendor_edit');
+
print $form->parse_html_template('ct/form_footer', { is_orphaned => $form->{status} eq 'orphaned',
is_customer => $form->{db} eq 'customer' });
$lxdebug->leave_sub();
@@ -280,6 +322,10 @@ sub form_footer {
sub add_transaction {
$lxdebug->enter_sub();
+ $auth->assert('customer_vendor_edit & ' .
+ '(general_ledger | invoice_edit | vendor_invoice_edit | ' .
+ ' request_quotation_edit | sales_quotation_edit | sales_order_edit | purchase_order_edit)');
+
# # saving the history
# if(!exists $form->{addition}) {
# $form->{addition} = "ADD TRANSACTION";
@@ -298,7 +344,7 @@ sub add_transaction {
$name = $form->escape("$form->{name}", 1);
$form->{callback} =
- "$form->{script}?login=$form->{login}&password=$form->{password}&action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&callback=$form->{callback}";
+ "$form->{script}?action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&callback=$form->{callback}";
$form->redirect;
$lxdebug->leave_sub();
@@ -307,6 +353,8 @@ sub add_transaction {
sub save_and_ap_transaction {
$lxdebug->enter_sub();
+ $auth->assert('customer_vendor_edit & general_ledger');
+
$form->{script} = "ap.pl";
# saving the history
if(!exists $form->{addition}) {
@@ -322,6 +370,8 @@ sub save_and_ap_transaction {
sub save_and_ar_transaction {
$lxdebug->enter_sub();
+ $auth->assert('customer_vendor_edit & general_ledger');
+
$form->{script} = "ar.pl";
# saving the history
if(!exists $form->{addition}) {
@@ -337,6 +387,12 @@ sub save_and_ar_transaction {
sub save_and_invoice {
$lxdebug->enter_sub();
+ if ($form->{db} eq 'customer') {
+ $auth->assert('customer_vendor_edit & invoice_edit');
+ } else {
+ $auth->assert('customer_vendor_edit & vendor_invoice_edit');
+ }
+
$form->{script} = ($form->{db} eq 'customer') ? "is.pl" : "ir.pl";
$form->{type} = "invoice";
# saving the history
@@ -353,6 +409,8 @@ sub save_and_invoice {
sub save_and_rfq {
$lxdebug->enter_sub();
+ $auth->assert('customer_vendor_edit & request_quotation_edit');
+
$form->{script} = "oe.pl";
$form->{type} = "request_quotation";
# saving the history
@@ -369,6 +427,8 @@ sub save_and_rfq {
sub save_and_quotation {
$lxdebug->enter_sub();
+ $auth->assert('customer_vendor_edit & sales_quotation_edit');
+
$form->{script} = "oe.pl";
$form->{type} = "sales_quotation";
# saving the history
@@ -385,6 +445,12 @@ sub save_and_quotation {
sub save_and_order {
$lxdebug->enter_sub();
+ if ($form->{db} eq 'customer') {
+ $auth->assert('customer_vendor_edit & sales_order_edit');
+ } else {
+ $auth->assert('customer_vendor_edit & purchase_order_edit');
+ }
+
$form->{script} = "oe.pl";
$form->{type} =
($form->{db} eq 'customer') ? "sales_order" : "purchase_order";
@@ -402,8 +468,7 @@ sub save_and_order {
sub save_and_close {
$lxdebug->enter_sub();
- # $locale->text('Customer saved!')
- # $locale->text('Vendor saved!')
+ $auth->assert('customer_vendor_edit');
$msg = ucfirst $form->{db};
$imsg .= " saved!";
@@ -432,8 +497,7 @@ sub save_and_close {
sub save {
$lxdebug->enter_sub();
- # $locale->text('Customer saved!')
- # $locale->text('Vendor saved!')
+ $auth->assert('customer_vendor_edit');
$msg = ucfirst $form->{db};
$imsg .= " saved!";
@@ -469,10 +533,7 @@ sub save {
sub delete {
$lxdebug->enter_sub();
- # $locale->text('Customer deleted!')
- # $locale->text('Cannot delete customer!')
- # $locale->text('Vendor deleted!')
- # $locale->text('Cannot delete vendor!')
+ $auth->assert('customer_vendor_edit');
CT->delete(\%myconfig, \%$form);
@@ -496,6 +557,8 @@ sub delete {
sub display {
$lxdebug->enter_sub();
+ $auth->assert('customer_vendor_edit');
+
&form_header();
&form_footer();
@@ -505,6 +568,8 @@ sub display {
sub update {
$lxdebug->enter_sub();
+ $auth->assert('customer_vendor_edit');
+
&display();
$lxdebug->leave_sub();
}
@@ -512,13 +577,11 @@ sub update {
sub get_contact {
$lxdebug->enter_sub();
- CT->get_contact(\%myconfig, \%$form);
+ $auth->assert('customer_vendor_edit');
- my $q = new CGI;
- $result = "$form->{cp_name}";
- map { $result .= "__pjx__" . $form->{$_} } qw(cp_greeting cp_title cp_givenname cp_phone1 cp_phone2 cp_email cp_abteilung cp_fax cp_mobile1 cp_mobile2 cp_satphone cp_satfax cp_project cp_privatphone cp_privatemail cp_birthday);
- print $q->header();
- print $result;
+ CT->get_contact(\%myconfig, \%$form);
+ print $form->ajax_response_header(), join '__pjx__', map $form->{"cp_$_"},
+ qw(name greeting title givenname phone1 phone2 email abteilung fax mobile1 mobile2 satphone satfax project privatphone privatemail birthday used);
$lxdebug->leave_sub();
}
@@ -526,13 +589,11 @@ sub get_contact {
sub get_shipto {
$lxdebug->enter_sub();
- CT->get_shipto(\%myconfig, \%$form);
+ $auth->assert('customer_vendor_edit');
- my $q = new CGI;
- $result = "$form->{shiptoname}";
- map { $result .= "__pjx__" . $form->{$_} } qw(shiptodepartment_1 shiptodepartment_2 shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail);
- print $q->header();
- print $result;
+ CT->get_shipto(\%myconfig, \%$form);
+ print $form->ajax_response_header(), join '__pjx__', map $form->{"shipto$_"},
+ qw(name department_1 department_2 street zipcode city country contact phone fax email used);
$lxdebug->leave_sub();
}
@@ -540,87 +601,47 @@ sub get_shipto {
sub get_delivery {
$lxdebug->enter_sub();
+ $auth->assert('customer_vendor_edit');
+
CT->get_delivery(\%myconfig, \%$form );
- @column_index =
- $form->sort_columns(shiptoname,
- invnumber,
- ordnumber,
- transdate,
- description,
- qty,
- unit,
- sellprice);
-
-
-
- $column_header{shiptoname} =
- qq|
| . $locale->text('Shipping Address') . qq| | |;
- $column_header{invnumber} =
- qq||. $locale->text('Invoice'). qq| | |;
- $column_header{ordnumber} =
- qq||. $locale->text('Order'). qq| | |;
- $column_header{transdate} =
- qq|| . $locale->text('Invdate') . qq| | |;
- $column_header{description} =
- qq|| . $locale->text('Description') . qq| | |;
- $column_header{qty} =
- qq|| . $locale->text('Qty') . qq| | |;
- $column_header{unit} =
- qq|| . $locale->text('Unit') . qq| | |;
- $column_header{sellprice} =
- qq|| . $locale->text('Sell Price') . qq| | |;
- $result .= qq|
-
-
-
-
-
-
-|;
-
- map { $result .= "$column_header{$_}\n" } @column_index;
-
- $result .= qq|
-
-|;
-
-
- foreach $ref (@{ $form->{DELIVERY} }) {
-
- if ($ref->{shiptoname} eq $sameshiptoname) {
- map { $column_data{$_} = "$ref->{$_} | " } @column_index;
- $column_data{shiptoname} = " | ";
- } else {
- map { $column_data{$_} = "$ref->{$_} | " } @column_index;
- }
- $column_data{sellprice} = "". $form->format_amount(\%myconfig,$ref->{sellprice},2)." | ";
- $i++;
- $i %= 2;
- $result .= "
-
-";
+ print $form->ajax_response_header(), $form->parse_html_template('ct/get_delivery');
- map { $result .= "$column_data{$_}\n" } @column_index;
+ $lxdebug->leave_sub();
+}
- $result .= qq|
-
-|;
+sub delete_shipto {
+ $main::lxdebug->enter_sub();
- $sameshiptoname = $ref->{shiptoname};
+ $auth->assert('customer_vendor_edit');
+ CT->get_shipto(\%myconfig, \%$form);
+
+ unless ($form->{shiptoused}) {
+ CT->delete_shipto($form->{shipto_id});
+ @$form{ grep /^shipto/, keys %$form } = undef;
}
- $result .= qq|
-
-|;
+ edit();
+
+ $main::lxdebug->leave_sub();
+}
+sub delete_contact {
+ $main::lxdebug->enter_sub();
- my $q = new CGI;
- print $q->header();
- print $result;
- $lxdebug->leave_sub();
+ $auth->assert('customer_vendor_edit');
+
+ CT->get_contact(\%myconfig, \%$form);
+
+ unless ($form->{cp_used}) {
+ CT->delete_shipto($form->{cp_id});
+ @$form{ grep /^cp_/, keys %$form } = undef;
+ }
+
+ edit();
+ $main::lxdebug->leave_sub();
}
sub continue { call_sub($form->{nextsub}); }
|