projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SL::Mailer: content_type statt contenttype, so wie im POD beschrieben
[kivitendo-erp.git]
/
SL
/
DATEV
/
CSV.pm
diff --git
a/SL/DATEV/CSV.pm
b/SL/DATEV/CSV.pm
index
6ac460c
..
c93241b
100644
(file)
--- a/
SL/DATEV/CSV.pm
+++ b/
SL/DATEV/CSV.pm
@@
-3,7
+3,7
@@
package SL::DATEV::CSV;
use strict;
use Carp;
use DateTime;
use strict;
use Carp;
use DateTime;
-use Encode qw(
de
code);
+use Encode qw(
en
code);
use Scalar::Util qw(looks_like_number);
use SL::DB::Datev;
use Scalar::Util qw(looks_like_number);
use SL::DB::Datev;
@@
-22,7
+22,7
@@
my @kivitendo_to_datev = (
max_length => 13,
type => 'Value',
required => 1,
max_length => 13,
type => 'Value',
required => 1,
- input_check => sub { my ($input) = @_; return (looks_like_number($input) && length($input) <= 13 && $input >
=
0) },
+ input_check => sub { my ($input) = @_; return (looks_like_number($input) && length($input) <= 13 && $input > 0) },
formatter => \&_format_amount,
valid_check => sub { my ($check) = @_; return ($check =~ m/^\d{1,10}(\,\d{1,2})?$/) },
},
formatter => \&_format_amount,
valid_check => sub { my ($check) = @_; return ($check =~ m/^\d{1,10}(\,\d{1,2})?$/) },
},
@@
-56,7
+56,7
@@
my @kivitendo_to_datev = (
},
{
kivi_datev_name => 'not yet implemented',
},
{
kivi_datev_name => 'not yet implemented',
- sv_header_name => t8('Base Transaction Value'),
+
c
sv_header_name => t8('Base Transaction Value'),
},
{
kivi_datev_name => 'not yet implemented',
},
{
kivi_datev_name => 'not yet implemented',
@@
-119,7
+119,7
@@
my @kivitendo_to_datev = (
type => 'Value',
},
{
type => 'Value',
},
{
- kivi_datev_name => 'buchungs
bes
',
+ kivi_datev_name => 'buchungs
text
',
csv_header_name => t8('Posting Text'),
max_length => 60,
type => 'Text',
csv_header_name => t8('Posting Text'),
max_length => 60,
type => 'Text',
@@
-231,10
+231,10
@@
my @kivitendo_to_datev = (
input_check => sub {
my ($ustid) = @_;
return 1 if ('' eq $ustid);
input_check => sub {
my ($ustid) = @_;
return 1 if ('' eq $ustid);
- $ustid =~ s{
[\s.]
+}{}g;
+ $ustid =~ s{
\s
+}{}g;
return ($ustid =~ m/^CH|^[A-Z]{2}\w{5,13}$/);
},
return ($ustid =~ m/^CH|^[A-Z]{2}\w{5,13}$/);
},
- formatter => sub { my ($input) = @_; $input =~ s/
[\s.]+
//g; return $input },
+ formatter => sub { my ($input) = @_; $input =~ s/
\s
//g; return $input },
valid_check => sub {
my ($ustid) = @_;
return 1 if ('' eq $ustid);
valid_check => sub {
my ($ustid) = @_;
return 1 if ('' eq $ustid);
@@
-260,7
+260,7
@@
sub check_encoding {
my ($test) = @_;
return undef unless $test;
if (eval {
my ($test) = @_;
return undef unless $test;
if (eval {
-
de
code('Windows-1252', $test, Encode::FB_CROAK|Encode::LEAVE_SRC);
+
en
code('Windows-1252', $test, Encode::FB_CROAK|Encode::LEAVE_SRC);
1
}) {
return 1;
1
}) {
return 1;