X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/42f9ff8af5af7a1c1dd75524d11f38f46c3a1898..9f2c4a7dee2483c42ab6147d4949fd949fe067ce:/SL/Controller/File.pm diff --git a/SL/Controller/File.pm b/SL/Controller/File.pm index 3412ffbbb..94581102c 100644 --- a/SL/Controller/File.pm +++ b/SL/Controller/File.pm @@ -43,6 +43,12 @@ use Rose::Object::MakeMethods::Generic __PACKAGE__->run_before('check_object_params', only => [ qw(list ajax_delete ajax_importdialog ajax_import ajax_unimport ajax_upload ajax_files_uploaded) ]); +# gen: bitmask: bit 1 (value is 1 or 3) => file created +# bit 2 (value is 2 or 3) => file from other source +# gltype: is this used somewhere? +# dir: is this used somewhere? +# model: base name of the rose model +# right: access right used for import my %file_types = ( 'sales_quotation' => { gen => 1, gltype => '', dir =>'SalesQuotation', model => 'Order', right => 'import_ar' }, 'sales_order' => { gen => 1, gltype => '', dir =>'SalesOrder', model => 'Order', right => 'import_ar' }, @@ -61,6 +67,7 @@ my %file_types = ( 'csv_customer' => { gen => 1, gltype => '', dir =>'Reports', model => 'Customer', right => 'xx' }, 'csv_vendor' => { gen => 1, gltype => '', dir =>'Reports', model => 'Vendor', right => 'xx' }, 'shop_image' => { gen => 0, gltype => '', dir =>'ShopImages', model => 'Part', right => 'xx' }, + 'letter' => { gen => 3, gltype => '', dir =>'Letter', model => 'Letter', right => 'sales_letter_edit | purchase_letter_edit' }, ); #--- 4 locale ---# @@ -401,7 +408,7 @@ sub _get_from_import { my $language = $::lx_office_conf{system}->{language}; my $timezone = $::locale->get_local_time_zone()->name; if (opendir my $dir, $path) { - my @files = ( readdir $dir); + my @files = (readdir $dir); foreach my $file ( @files) { next if (($file eq '.') || ($file eq '..')); $file = Encode::decode('utf-8', $file); @@ -423,7 +430,12 @@ sub _get_from_import { }; } + closedir($dir); + + } else { + $::lxdebug->message(LXDebug::WARN(), "SL::File::_get_from_import opendir failed to open dir " . $path); } + return @foundfiles; }