Merge branch 'master' of ssh://lx-office/~/lx-office-erp

[kivitendo-erp.git] / bin / mozilla / io.pl

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 41c55b0..fed2ff7 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1780,7 +1780,7 @@ sub ship_to {
 
   my @shipto_vars =
     qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry
-       shiptocontact shiptophone shiptofax shiptoemail
+       shiptocontact shiptocp_gender shiptophone shiptofax shiptoemail
        shiptodepartment_1 shiptodepartment_2);
 
   my @addr_vars =
@@ -1795,6 +1795,19 @@ sub ship_to {
     ? $locale->text('Customer Number')
     : $locale->text('Vendor Number');
 
+  # sieht nicht nett aus, funktioniert aber
+  # das vorausgewählte select-feld wird über shiptocp_gender
+  # entsprechend vorbelegt
+  my $selected_m='';
+  my $selected_f='';
+  if ($form->{shiptocp_gender} eq 'm') {
+    $selected_m='selected';
+    $selected_f='';
+  } elsif ($form->{shiptocp_gender} eq 'f') {
+    $selected_m='';
+    $selected_f='selected';
+  }
+
   # get pricegroups for parts
   IS->get_pricegroups_for_parts(\%myconfig, \%$form);
 
@@ -1867,6 +1880,15 @@ sub ship_to {
           <td>$form->{contact}</td>
           <td><input name="shiptocontact" size="35" value="$form->{shiptocontact}"></td>
         </tr>
+        <tr>
+          <th align="right" nowrap>| . $locale->text('Gender') . qq|</th>
+          <td></td>
+          <td><select id="shiptocp_gender" name="shiptocp_gender">
+              <option value="m"| .  $selected_m . qq|>| . $locale->text('male') . qq|</option>
+              <option value="f"| .  $selected_f . qq|>| . $locale->text('female') . qq|</option>
+              </select>
+          </td>
+        </tr>
         <tr>
           <th align="right" nowrap>| . $locale->text('Phone') . qq|</th>
           <td>$form->{phone}</td>
@@ -2071,7 +2093,7 @@ sub _update_custom_variables {
 
   my $form     = $main::form;
 
-  $form->{CVAR_CONFIGS}       ||= { };
+  $form->{CVAR_CONFIGS}         = { } unless ref $form->{CVAR_CONFIGS} eq 'HASH';
   $form->{CVAR_CONFIGS}->{IC} ||= CVar->get_configs(module => 'IC');
 
   $main::lxdebug->leave_sub();