X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fct.pl;h=de0a436596f99bb3a4dda02adf73a3b4d49905ff;hb=cc5d61a92113701ad19ef3c366da307307a764b0;hp=cdb08529d606d0f23eaf422a812e41ec482d31c9;hpb=59486b328d1d3b7ee01cfab020b5732581cbfb1c;p=kivitendo-erp.git

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index cdb08529d..de0a43659 100644
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -50,6 +50,7 @@ use POSIX qw(strftime);
 use SL::CT;
 use SL::CVar;
 use SL::DB::Business;
+use SL::DB::Default;
 use SL::ReportGenerator;
 
 require "bin/mozilla/common.pl";
@@ -285,6 +286,8 @@ sub edit {
 
   # format discount
   $form->{discount} *= 100;
+  # format uri
+  $form->{homepage} = 'http://' . $form->{homepage} unless $form->{homepage} =~ m|^https?://|;
 
   &form_header;
   &form_footer;
@@ -310,15 +313,15 @@ sub form_header {
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;
 
-  $form->get_lists(employees => "ALL_EMPLOYEES",
-                   taxzones  => "ALL_TAXZONES");
+  $form->get_lists(employees  => "ALL_EMPLOYEES",
+                   taxzones   => "ALL_TAXZONES",
+                   currencies => "ALL_CURRENCIES");
   $form->get_pricegroup(\%myconfig, { all => 1 });
 
   $form->get_lists(customers => { key => "ALL_SALESMAN_CUSTOMERS", business_is_salesman => 1 }) if $::lx_office_conf{features}->{vertreter};
 
   $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}   = \&_shipto_label;
@@ -336,6 +339,19 @@ sub form_header {
 
   $form->{NOTES} ||= [ ];
 
+  if (!$form->{'language_id'}) {
+    my $l_id = SL::DB::Default->get->{'language_id'};
+    if ($l_id) {
+      $form->{'default_language_id'} = $l_id;
+    }
+  }
+
+  if (!$form->{'id'}) {
+    $form->{'currency'} = $form->get_default_currency(\%myconfig);
+  } else {
+    $form->{currency} = $form->{curr};
+  }
+
   $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} });