]> wagnertech.de Git - kivitendo-erp.git/commitdiff
projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d7c969e)
Optik in den Einkaufs- und Verkaufsformularen etwas verbessert:
authorMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 11 May 2007 13:52:18 +0000 (13:52 +0000)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 11 May 2007 13:52:18 +0000 (13:52 +0000)
1. Drop-Down-Boxen "Ansprechpartner" und "Lieferadresse" werden direkt unterhalb der Kunden-/Lieferantenauswahlbox/-zeile angezeigt.
2. Die Zeile "Kreditlimit" wird wie alle anderen Zeilen auch in der linken Spalte (der "Beschreibungsspalte") angefangen und erstreckt sich nur über eine Zeile.
3. Die Zeile "höchste Mahnstufe" wird wie alle anderen Zeilen auch in der linken Spalte (der "Beschreibungsspalte") angefangen.
4. Die Drop-Down-Boxen für Ansprechpartner, Lieferadresse und Währungen werden nur angezeigt, wenn es dort auch etwas auszuwählen gibt.

bin/mozilla/ir.pl patch | blob | history
bin/mozilla/is.pl patch | blob | history
bin/mozilla/oe.pl patch | blob | history

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index e6f035d01fbe3fddc91be1fc9a375e2103bccf11..159dc45e8941d0896c74b8453c3e777648f649ae 100644 (file)
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -286,9 +286,19 @@ sub form_header {
     $labels{$item->{"cp_id"}} = $item->{"cp_name"} .
       ($item->{"cp_abteilung"} ? " ($item->{cp_abteilung})" : "");
   }
-  my $contact =
-    NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values,
-                         '-labels' => \%labels, '-default' => $form->{"cp_id"}));
+
+  my $contact;
+  if (scalar @values > 1) {
+    $contact = qq|
+    <tr>
+      <th align="right">| . $locale->text('Contact Person') . qq|</th>
+      <td>| .
+      NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values,
+                           '-labels' => \%labels, '-default' => $form->{"cp_id"}))
+      . qq|
+      </td>
+    </tr>|;
+  }
 
   %labels = ();
   @values = ("");
@@ -309,8 +319,10 @@ sub form_header {
     $labels{$item} = $item;
   }
   
-  $form->{currency}        = $form->{defaultcurrency} unless $form->{currency};
-  my $currencies = qq|
+  $form->{currency} = $form->{defaultcurrency} unless $form->{currency};
+  my $currencies;
+  if (scalar @values) {
+    $currencies = qq|
     <tr>
       <th align="right">| . $locale->text('Currency') . qq|</th>
       <td>| .
@@ -318,7 +330,8 @@ sub form_header {
                              '-values' => \@values, '-labels' => \%labels)) . qq|
       </td>
     </tr>|;
-    
+  }
+
   %labels = ();
   @values = ();
   my $i = 0;
@@ -396,13 +409,13 @@ sub form_header {
 
     # with JavaScript Calendar
     $button1 = qq|
-       <td><input name=invdate id=invdate size=11 title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\"></td>
-       <td><input type=button name=invdate id="trigger1" value=|
+       <td><input name=invdate id=invdate size=11 title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\">
+        <input type=button name=invdate id="trigger1" value=|
       . $locale->text('button') . qq|></td>
        |;
     $button2 = qq|
-       <td width="13"><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value="$form->{duedate}"  onBlur=\"check_right_date_format(this)\"></td>
-       <td width="4"><input type=button name=duedate id="trigger2" value=|
+       <td width="13"><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value="$form->{duedate}"  onBlur=\"check_right_date_format(this)\">
+        <input type=button name=duedate id="trigger2" value=|
       . $locale->text('button') . qq|></td></td>
      |;
 
@@ -454,40 +467,21 @@ sub form_header {
 
 | . ($form->{saved_message} ? qq|<p>$form->{saved_message}</p>| : "") . qq|
 
+<div class="listtop" width="100%">$form->{title}</div>
+
 <table width=100%>
-  <tr class=listtop>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
   <tr>
-    <td>
-      <table width=100%>
-        <tr valign=top>
-         <td>
+    <td valign="top">
            <table>
-             <tr>
-    $vendors
-                <th align=richt nowrap>|
-    . $locale->text('Contact Person') . qq|</th>
-                <td colspan=3>$contact</td>
-
-                <input type="hidden" name="vendor_id" value="$form->{vendor_id}">
-               <input type="hidden" name="oldvendor" value="$form->{oldvendor}">
-    <input type="hidden" name="selectvendor" value= "1">
-             </tr>
-             <tr>
-               <td></td>
-               <td>
-                 <table>
-                   <tr>
-                     <th nowrap>| . $locale->text('Credit Limit') . qq|</th>
-                     <td>$form->{creditlimit}</td>
-                     <td width=20%></td>
-                     <th nowrap>| . $locale->text('Remaining') . qq|</th>
-                     <td class="plus$n">$form->{creditremaining}</td>
-                   </tr>
-                 </table>
-               </td>  
+        $vendors
+        <input type="hidden" name="vendor_id" value="$form->{vendor_id}">
+        <input type="hidden" name="oldvendor" value="$form->{oldvendor}">
+        <input type="hidden" name="selectvendor" value= "1">
+        $contact
+        <tr>
+          <td align="right">| . $locale->text('Credit Limit') . qq|</td>
+          <td>$form->{creditlimit}; | . $locale->text('Remaining') . qq| <span class="plus$n">$form->{creditremaining}</span></td>
+        </tr>
              <tr>
                <th align="right">| . $locale->text('Record in') . qq|</th>
                <td colspan="3"><select name="AP">$form->{selectAP}</select></td>
@@ -523,13 +517,13 @@ sub form_header {
              </tr>
         <tr>
           <th align="right" nowrap>| . $locale->text('Order Date') . qq|</th>
-          <td><input name="orddate" id="orddate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{orddate}) . qq|" onBlur=\"check_right_date_format(this)\"></td>
-          <td><input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
+          <td><input name="orddate" id="orddate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{orddate}) . qq|" onBlur=\"check_right_date_format(this)\">
+           <input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
         </tr>
         <tr>
           <th align="right" nowrap>| . $locale->text('Quotation Date') . qq|</th>
-          <td><input name="quodate" id="quodate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{quodate}) . qq|" onBlur=\"check_right_date_format(this)\"></td>
-          <td><input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
+          <td><input name="quodate" id="quodate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{quodate}) . qq|" onBlur=\"check_right_date_format(this)\">
+           <input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
         </tr>
              <tr>
           <th align="right" nowrap>| . $locale->text('Project Number') . qq|</th>
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 81ba52141c6994b70ead13dbb1d7bf0a3bcbda8c..f02e066ddc65eecdd8b134499bc287d2ae4da4fb 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -340,9 +340,18 @@ sub form_header {
     $labels{$item->{"cp_id"}} = $item->{"cp_name"} .
       ($item->{"cp_abteilung"} ? " ($item->{cp_abteilung})" : "");
   }
-  my $contact =
-    NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values,
-                         '-labels' => \%labels, '-default' => $form->{"cp_id"}));
+  my $contact;
+  if (scalar @values > 1) {
+    $contact = qq|
+    <tr>
+      <th align="right">| . $locale->text('Contact Person') . qq|</th>
+      <td>| .
+      NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values,
+                           '-labels' => \%labels, '-default' => $form->{"cp_id"}))
+      . qq|
+      </td>
+    </tr>|;
+  }
 
   %labels = ();
   @values = ();
@@ -386,12 +395,16 @@ sub form_header {
       $item->{"shiptoname"} . " " . $item->{"shiptodepartment_1"};
   }
 
-  my $shipto = qq|
-               <th align=right>| . $locale->text('Shipping Address') . qq|</th>
-               <td>| .
-    NTI($cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values,
-                         '-labels' => \%labels, '-default' => $form->{"shipto_id"}))
+  my $shipto;
+  if (scalar @values > 1) {
+    $shipto = qq|
+    <tr>
+      <th align="right">| . $locale->text('Shipping Address') . qq|</th>
+      <td>| .
+      NTI($cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values,
+                           '-labels' => \%labels, '-default' => $form->{"shipto_id"}))
     . qq|</td>|;
+  }
 
   %labels = ();
   @values = ();
@@ -401,7 +414,9 @@ sub form_header {
   }
   
   $form->{currency}        = $form->{defaultcurrency} unless $form->{currency};
-  my $currencies = qq|
+  my $currencies;
+  if (scalar @values) {
+    $currencies = qq|
     <tr>
       <th align="right">| . $locale->text('Currency') . qq|</th>
       <td>| .
@@ -409,6 +424,7 @@ sub form_header {
                              '-values' => \@values, '-labels' => \%labels)) . qq|
       </td>
     </tr>|;
+  }
 
   %labels = ();
   @values = ("");
@@ -536,20 +552,15 @@ sub form_header {
 
   if ($form->{max_dunning_level}) {
     $dunning = qq|
-             <tr>
-                <td colspan="4">
-                <table>
-                  <tr>
-               <th align="right">| . $locale->text('Max. Dunning Level') . qq|:</th>
-               <td><b>$form->{max_dunning_level}</b></td>
-               <th align="right">| . $locale->text('Dunning Amount') . qq|:</th>
-               <td><b>|
-      . $form->format_amount(\%myconfig, $form->{dunning_amount},2)
-      . qq|</b></td>
-             </tr>
-              </table>
-             </td>
-            </tr>
+      <tr>
+        <th align="right">| . $locale->text('Max. Dunning Level') . qq|:</th>
+        <td>
+          <b>$form->{max_dunning_level}</b>;
+          | . $locale->text('Dunning Amount') . qq|: <b>|
+        . $form->format_amount(\%myconfig, $form->{dunning_amount},2)
+        . qq|</b>
+        </td>
+      </tr>
 |;
   }
 
@@ -563,8 +574,8 @@ sub form_header {
   
       # with JavaScript Calendar
       $button1 = qq|
-        <td><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\"></td>
-        <td><input type="button" name="invdate" id="trigger1" value="|
+        <td><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\">
+         <input type="button" name="invdate" id="trigger1" value="|
         . $locale->text('button') . qq|"></td>|;
        
       #write Trigger
@@ -585,18 +596,18 @@ sub form_header {
   
       # with JavaScript Calendar
       $button1 = qq|
-        <td><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\"></td>
-        <td><input type="button" name="invdate" id="trigger1" value="|
+        <td><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\">
+         <input type="button" name="invdate" id="trigger1" value="|
         . $locale->text('button') . qq|"></td>
         |;
       $button2 = qq|
-        <td width="13"><input name="duedate" id="duedate" size="11" title="$myconfig{dateformat}" value="$form->{duedate}" onBlur=\"check_right_date_format(this)\"></td>
-        <td width="4"><input type="button" name="duedate" id="trigger2" value="|
+        <td width="13"><input name="duedate" id="duedate" size="11" title="$myconfig{dateformat}" value="$form->{duedate}" onBlur=\"check_right_date_format(this)\">
+         <input type="button" name="duedate" id="trigger2" value="|
         . $locale->text('button') . qq|"></td></td>
       |;
       $button3 = qq|
-        <td width="13"><input name="deliverydate" id="deliverydate" size="11" title="$myconfig{dateformat}" value="$form->{deliverydate}" onBlur=\"check_right_date_format(this)\"></td>
-        <td width="4"><input type="button" name="deliverydate" id="trigger3" value="|
+        <td width="13"><input name="deliverydate" id="deliverydate" size="11" title="$myconfig{dateformat}" value="$form->{deliverydate}" onBlur=\"check_right_date_format(this)\">
+         <input type="button" name="deliverydate" id="trigger3" value="|
         . $locale->text('button') . qq|"></td></td>
       |;
   
@@ -660,44 +671,27 @@ print qq|
 
 <input type="hidden" name="lizenzen" value="$lizenzen">
 
+<div class="listtop" width="100%">$form->{title}</div>
+
 <table width="100%">
-  <tr class="listtop">
-    <th class="listtop">$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
   <tr>
-    <td>
-      <table width="100%">
-       <tr valign="top">
-         <td>
-           <table>
-             <tr>
-               $customers
-    <input type="hidden" name="customer_klass" value="$form->{customer_klass}">
-               <input type="hidden" name="customer_id" value="$form->{customer_id}">
-    <input type="hidden" name="oldcustomer" value="$form->{oldcustomer}">
-        <input type="hidden" name="selectcustomer" value="1">
-                <th align="right" nowrap>|
-    . $locale->text('Contact Person') . qq|</th>
-                <td colspan="3">$contact</td>
-             </tr>
-             <tr>
-               <td></td>
-               <td colspan="3">
-                 <table>
-                   <tr>
-                     <th nowrap>| . $locale->text('Credit Limit') . qq|</th>
-                     <td>$form->{creditlimit}</td>
-                     <td width="20%"></td>
-                     <th nowrap>| . $locale->text('Remaining') . qq|</th>
-                     <td class="plus$n">$form->{creditremaining}</td>
-                   </tr>
-                 </table>
-               </td>
-                $shipto
-             </tr>
-             $business
-              $dunning
+    <td valign="top">
+      <table>
+        <tr>
+          $customers
+          <input type="hidden" name="customer_klass" value="$form->{customer_klass}">
+          <input type="hidden" name="customer_id" value="$form->{customer_id}">
+          <input type="hidden" name="oldcustomer" value="$form->{oldcustomer}">
+          <input type="hidden" name="selectcustomer" value="1">
+        </tr>
+        $contact
+        $shipto
+        <tr>
+          <td align="right">| . $locale->text('Credit Limit') . qq|</td>
+          <td>$form->{creditlimit}; | . $locale->text('Remaining') . qq| <span class="plus$n">$form->{creditremaining}</span></td>
+        </tr>
+        $dunning
+        $business
              <tr>
                <th align="right" nowrap>| . $locale->text('Record in') . qq|</th>
                <td colspan="3"><select name="AR" style="width:280px;">$form->{selectAR}</select></td>
@@ -746,7 +740,7 @@ print qq|
 #               </tr>
 print qq|          </table>
          </td>
-         <td align="right">
+         <td align="right" valign="top">
            <table>
              $employees
         $salesman
@@ -784,8 +778,8 @@ print qq|     <tr>
              </tr>
         <tr>
           <th align="right" nowrap>| . $locale->text('Order Date') . qq|</th>
-          <td><input name="orddate" id="orddate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{orddate}) . qq|" onBlur=\"check_right_date_format(this)\"></td>
-          <td><input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
+          <td><input name="orddate" id="orddate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{orddate}) . qq|" onBlur=\"check_right_date_format(this)\">
+           <input type="button" name="b_orddate" id="trigger_orddate" value="?"></td>
         </tr>
              <tr>
                <th align="right" nowrap>| . $locale->text('Quotation Number') . qq|</th>
@@ -793,8 +787,8 @@ print qq|     <tr>
              </tr>
         <tr>
           <th align="right" nowrap>| . $locale->text('Quotation Date') . qq|</th>
-          <td><input name="quodate" id="quodate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{quodate}) . qq|" onBlur=\"check_right_date_format(this)\"></td>
-          <td><input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
+          <td><input name="quodate" id="quodate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{quodate}) . qq|" onBlur=\"check_right_date_format(this)\">
+           <input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
         </tr>
              <tr>
                <th align="right" nowrap>| . $locale->text('Customer Order Number') . qq|</th>
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index b5cd79d636621c7baad5e47d73daca7b742a4c9a..5b8275c64bb4f2f675c6255bb3e5dd214382528b 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -338,13 +338,13 @@ sub form_header {
 
     # with JavaScript Calendar
     $button1 = qq|
-       <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" onBlur=\"check_right_date_format(this)\"></td>
-       <td><input type=button name=transdate id="trigger1" value=|
+       <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value="$form->{transdate}" onBlur=\"check_right_date_format(this)\">
+        <input type=button name=transdate id="trigger1" value=|
       . $locale->text('button') . qq|></td>
       |;
     $button2 = qq|
-       <td width="13"><input name=reqdate id=reqdate size=11 title="$myconfig{dateformat}" value="$form->{reqdate}" onBlur=\"check_right_date_format(this)\"></td>
-       <td width="4"><input type=button name=reqdate name=reqdate id="trigger2" value=|
+       <td width="13"><input name=reqdate id=reqdate size=11 title="$myconfig{dateformat}" value="$form->{reqdate}" onBlur=\"check_right_date_format(this)\">
+        <input type=button name=reqdate name=reqdate id="trigger2" value=|
       . $locale->text('button') . qq|></td>
      |;
 
@@ -422,9 +422,19 @@ sub form_header {
     $labels{$item->{"cp_id"}} = $item->{"cp_name"} .
       ($item->{"cp_abteilung"} ? " ($item->{cp_abteilung})" : "");
   }
-  my $contact =
-    NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values,
-                         '-labels' => \%labels, '-default' => $form->{"cp_id"}));
+
+  my $contact;
+  if (scalar @values > 1) {
+    $contact = qq|
+    <tr>
+      <th align="right">| . $locale->text('Contact Person') . qq|</th>
+      <td>| .
+      NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values,
+                           '-labels' => \%labels, '-default' => $form->{"cp_id"}))
+      . qq|
+      </td>
+    </tr>|;
+  }
 
   %labels = ();
   @values = ();
@@ -469,12 +479,16 @@ sub form_header {
       $item->{"shiptoname"} . " " . $item->{"shiptodepartment_1"};
   }
 
-  my $shipto = qq|
-               <th align=right>| . $locale->text('Shipping Address') . qq|</th>
-               <td>| .
-    NTI($cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values,
-                         '-labels' => \%labels, '-default' => $form->{"shipto_id"}))
+  my $shipto;
+  if (scalar @values > 1) {
+    $shipto = qq|
+    <tr>
+      <th align="right">| . $locale->text('Shipping Address') . qq|</th>
+      <td>| .
+      NTI($cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values,
+                           '-labels' => \%labels, '-default' => $form->{"shipto_id"}))
     . qq|</td>|;
+  }
 
   %labels = ();
   @values = ("");
@@ -545,9 +559,11 @@ sub form_header {
     push(@values, $item);
     $labels{$item} = $item;
   }
-  
-  $form->{currency}        = $form->{defaultcurrency} unless $form->{currency};
-  my $currencies = qq|
+
+  $form->{currency} = $form->{defaultcurrency} unless $form->{currency};
+  my $currencies;
+  if (scalar @values) {
+    $currencies = qq|
     <tr>
       <th align="right">| . $locale->text('Currency') . qq|</th>
       <td>| .
@@ -555,7 +571,7 @@ sub form_header {
                              '-values' => \@values, '-labels' => \%labels)) . qq|
       </td>
     </tr>|;
-
+  }
 
   $form->{exchangerate} =
     $form->format_amount(\%myconfig, $form->{exchangerate});
@@ -801,10 +817,7 @@ sub form_header {
            <table width=100%>
              <tr>
         $vc
-                <th align=richt nowrap>|
-    . $locale->text('Contact Person') . qq|</th>
-                <td colspan=3>$contact</td>
-             </tr>
+        $contact
              $creditremaining
              $business
               $dunning
Unnamed repository; edit this file 'description' to name the repository.