projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rose-Modell f. Buchungsgruppen: Relation zu Chart für inventory_account korrigiert.
[kivitendo-erp.git]
/
SL
/
CT.pm
diff --git
a/SL/CT.pm
b/SL/CT.pm
index
66b3e25
..
8ceab3a
100644
(file)
--- a/
SL/CT.pm
+++ b/
SL/CT.pm
@@
-42,6
+42,7
@@
use Data::Dumper;
use SL::Common;
use SL::CVar;
use SL::DBUtils;
use SL::Common;
use SL::CVar;
use SL::DBUtils;
+use SL::DB::Default;
use SL::FU;
use SL::Notes;
use SL::TransNumber;
use SL::FU;
use SL::Notes;
use SL::TransNumber;
@@
-321,7
+322,8
@@
sub save_customer {
qq|c_vendor_id = ?, | .
qq|klass = ?, | .
qq|currency_id = (SELECT id FROM currencies WHERE name = ?), | .
qq|c_vendor_id = ?, | .
qq|klass = ?, | .
qq|currency_id = (SELECT id FROM currencies WHERE name = ?), | .
- qq|taxincluded_checked = ? | .
+ qq|taxincluded_checked = ?, | .
+ qq|delivery_term_id = ? | .
qq|WHERE id = ?|;
my @values = (
$form->{customernumber},
qq|WHERE id = ?|;
my @values = (
$form->{customernumber},
@@
-365,6
+367,7
@@
sub save_customer {
conv_i($form->{klass}),
$form->{currency},
$form->{taxincluded_checked} ne '' ? $form->{taxincluded_checked} : undef,
conv_i($form->{klass}),
$form->{currency},
$form->{taxincluded_checked} ne '' ? $form->{taxincluded_checked} : undef,
+ conv_i($form->{delivery_term_id}),
$form->{id}
);
do_query( $form, $dbh, $query, @values );
$form->{id}
);
do_query( $form, $dbh, $query, @values );
@@
-472,7
+475,8
@@
sub save_vendor {
qq| username = ?, | .
qq| user_password = ?, | .
qq| v_customer_id = ?, | .
qq| username = ?, | .
qq| user_password = ?, | .
qq| v_customer_id = ?, | .
- qq| currency_id = (SELECT id FROM currencies WHERE name = ?) | .
+ qq| currency_id = (SELECT id FROM currencies WHERE name = ?), | .
+ qq| delivery_term_id = ? | .
qq|WHERE id = ?|;
my @values = (
$form->{vendornumber},
qq|WHERE id = ?|;
my @values = (
$form->{vendornumber},
@@
-513,6
+517,7
@@
sub save_vendor {
$form->{user_password},
$form->{v_customer_id},
$form->{currency},
$form->{user_password},
$form->{v_customer_id},
$form->{currency},
+ conv_i($form->{delivery_term_id}),
$form->{id}
);
do_query($form, $dbh, $query, @values);
$form->{id}
);
do_query($form, $dbh, $query, @values);
@@
-633,6
+638,7
@@
sub search {
"zipcode" => "ct.zipcode",
"city" => "ct.city",
"country" => "ct.country",
"zipcode" => "ct.zipcode",
"city" => "ct.city",
"country" => "ct.country",
+ "discount" => "ct.discount",
"salesman" => "e.name"
);
"salesman" => "e.name"
);
@@
-648,7
+654,7
@@
sub search {
}
my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
}
my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
- if ($sortorder !~ /(business|id)/ && !$join_records) {
+ if ($sortorder !~ /(business|id
|discount
)/ && !$join_records) {
$sortorder = "lower($sortorder) ${sortdir}";
} else {
$sortorder .= " ${sortdir}";
$sortorder = "lower($sortorder) ${sortdir}";
} else {
$sortorder .= " ${sortdir}";
@@
-1080,6
+1086,10
@@
sub parse_excel_file {
my ($self, $myconfig, $form) = @_;
my $locale = $main::locale;
my ($self, $myconfig, $form) = @_;
my $locale = $main::locale;
+ my $defaults = SL::DB::Default->get;
+ $form->error($::locale->text('No print templates have been created for this client yet. Please do so in the client configuration.')) if !$defaults->templates;
+ $form->{templates} = $defaults->templates;
+
$form->{formname} = 'sales_quotation';
$form->{type} = 'sales_quotation';
$form->{format} = 'excel';
$form->{formname} = 'sales_quotation';
$form->{type} = 'sales_quotation';
$form->{format} = 'excel';
@@
-1122,8
+1132,6
@@
sub parse_excel_file {
$form->{notes} =~ s/^\s+//g;
$form->{notes} =~ s/^\s+//g;
- $form->{templates} = $myconfig->{templates};
-
delete $form->{printer_command};
$form->get_employee_info($myconfig);
delete $form->{printer_command};
$form->get_employee_info($myconfig);