Tabs aus *.pl Dateien entfernt.
authorSven Schöling <s.schoeling@linet-services.de>
Fri, 11 Dec 2009 14:29:16 +0000 (15:29 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Fri, 11 Dec 2009 14:29:16 +0000 (15:29 +0100)
26 files changed:
bin/mozilla/am.pl
bin/mozilla/ap.pl
bin/mozilla/ar.pl
bin/mozilla/arap.pl
bin/mozilla/bp.pl
bin/mozilla/ca.pl
bin/mozilla/common.pl
bin/mozilla/cp.pl
bin/mozilla/ct.pl
bin/mozilla/datev.pl
bin/mozilla/dn.pl
bin/mozilla/do.pl
bin/mozilla/gl.pl
bin/mozilla/ic.pl
bin/mozilla/io.pl
bin/mozilla/ir.pl
bin/mozilla/is.pl
bin/mozilla/kopf.pl
bin/mozilla/menujs.pl
bin/mozilla/oe.pl
bin/mozilla/pe.pl
bin/mozilla/projects.pl
bin/mozilla/rc.pl
bin/mozilla/rp.pl
bin/mozilla/wh.pl
sql/Pg-upgrade2/cp_greeting_migration.pl

index 27b18e4..3cb5ac3 100644 (file)
@@ -727,7 +727,7 @@ sub list_department {
     map { print "$column_data{$_}\n" } @column_index;
 
     print qq|
-       </tr>
+        </tr>
 |;
   }
 
@@ -929,7 +929,7 @@ sub list_lead {
   map { print "$column_header{$_}\n" } @column_index;
 
   print qq|
-        </tr>
+  </tr>
 |;
 
   my ($i, %column_data);
@@ -939,17 +939,17 @@ sub list_lead {
     $i %= 2;
 
     print qq|
-        <tr valign=top class=listrow$i>
+  <tr valign=top class=listrow$i>
 |;
 
-#      $lead = $ref->{lead};
+#    $lead = $ref->{lead};
 
     $column_data{description} = qq|<td><a href="am.pl?action=edit_lead&id=$ref->{id}&callback=$callback">$ref->{lead}</td>|;
 
     map { print "$column_data{$_}\n" } @column_index;
 
     print qq|
-       </tr>
+  </tr>
 |;
   }
 
@@ -1163,7 +1163,7 @@ sub list_business {
     map { print "$column_data{$_}\n" } @column_index;
 
     print qq|
-       </tr>
+        </tr>
 |;
   }
 
@@ -1417,7 +1417,7 @@ sub list_language {
     map { print "$column_data{$_}\n" } @column_index;
 
     print qq|
-       </tr>
+        </tr>
 |;
   }
 
@@ -1769,7 +1769,7 @@ sub list_buchungsgruppe {
     map { print "$column_data{$_}\n" } @column_index;
 
     print qq|
-       </tr>
+        </tr>
 |;
 
     $row++;
@@ -1853,10 +1853,10 @@ sub buchungsgruppe_header {
   if (!$main::eur) {
     $linkaccounts = qq|
                <tr>
-               <th align=right>| . $locale->text('Inventory') . qq|</th>
-               <td><select name=inventory_accno_id>$form->{selectIC}</select></td>
-               <input name=selectIC type=hidden value="$form->{selectIC}">
-             </tr>|;
+                <th align=right>| . $locale->text('Inventory') . qq|</th>
+                <td><select name=inventory_accno_id>$form->{selectIC}</select></td>
+                <input name=selectIC type=hidden value="$form->{selectIC}">
+              </tr>|;
   } else {
     $linkaccounts = qq|
                 <input type=hidden name=inventory_accno_id value=$form->{inventory_accno_id}>|;
@@ -1864,28 +1864,28 @@ sub buchungsgruppe_header {
 
 
   $linkaccounts .= qq|
-             <tr>
-               <th align=right>| . $locale->text('National Revenues') . qq|</th>
-               <td><select name=income_accno_id_0>$form->{selectIC_income}</select></td>
-             </tr>
-             <tr>
-               <th align=right>| . $locale->text('National Expenses') . qq|</th>
-               <td><select name=expense_accno_id_0>$form->{selectIC_expense}</select></td>
-             </tr>|;
+              <tr>
+                <th align=right>| . $locale->text('National Revenues') . qq|</th>
+                <td><select name=income_accno_id_0>$form->{selectIC_income}</select></td>
+              </tr>
+              <tr>
+                <th align=right>| . $locale->text('National Expenses') . qq|</th>
+                <td><select name=expense_accno_id_0>$form->{selectIC_expense}</select></td>
+              </tr>|;
   if ($form->{id}) {
     $form->{selectIC_income} =~ s/selected//g;
     $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_1}\E/  value=$form->{income_accno_id_1} selected/;
     $form->{selectIC_expense} =~ s/selected//g;
     $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_1}\E/  value=$form->{expense_accno_id_1} selected/;
   }
-  $linkaccounts .= qq|       <tr>
-               <th align=right>| . $locale->text('Revenues EU with UStId') . qq|</th>
-               <td><select name=income_accno_id_1>$form->{selectIC_income}</select></td>
-             </tr>
-             <tr>
-               <th align=right>| . $locale->text('Expenses EU with UStId') . qq|</th>
-               <td><select name=expense_accno_id_1>$form->{selectIC_expense}</select></td>
-             </tr>|;
+  $linkaccounts .= qq|              <tr>
+                <th align=right>| . $locale->text('Revenues EU with UStId') . qq|</th>
+                <td><select name=income_accno_id_1>$form->{selectIC_income}</select></td>
+              </tr>
+              <tr>
+                <th align=right>| . $locale->text('Expenses EU with UStId') . qq|</th>
+                <td><select name=expense_accno_id_1>$form->{selectIC_expense}</select></td>
+              </tr>|;
 
   if ($form->{id}) {
     $form->{selectIC_income} =~ s/selected//g;
@@ -1894,14 +1894,14 @@ sub buchungsgruppe_header {
     $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_2}\E/  value=$form->{expense_accno_id_2} selected/;
   }
 
-  $linkaccounts .= qq|       <tr>
-               <th align=right>| . $locale->text('Revenues EU without UStId') . qq|</th>
-               <td><select name=income_accno_id_2>$form->{selectIC_income}</select></td>
-             </tr>
-             <tr>
-               <th align=right>| . $locale->text('Expenses EU without UStId') . qq|</th>
-               <td><select name=expense_accno_id_2>$form->{selectIC_expense}</select></td>
-             </tr>|;
+  $linkaccounts .= qq|              <tr>
+                <th align=right>| . $locale->text('Revenues EU without UStId') . qq|</th>
+                <td><select name=income_accno_id_2>$form->{selectIC_income}</select></td>
+              </tr>
+              <tr>
+                <th align=right>| . $locale->text('Expenses EU without UStId') . qq|</th>
+                <td><select name=expense_accno_id_2>$form->{selectIC_expense}</select></td>
+              </tr>|;
 
   if ($form->{id}) {
     $form->{selectIC_income} =~ s/selected//g;
@@ -1910,14 +1910,14 @@ sub buchungsgruppe_header {
     $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_3}\E/  value=$form->{expense_accno_id_3} selected/;
   }
 
-  $linkaccounts .= qq|       <tr>
-               <th align=right>| . $locale->text('Foreign Revenues') . qq|</th>
-               <td><select name=income_accno_id_3>$form->{selectIC_income}</select></td>
-             </tr>
-             <tr>
-               <th align=right>| . $locale->text('Foreign Expenses') . qq|</th>
-               <td><select name=expense_accno_id_3>$form->{selectIC_expense}</select></td>
-             </tr>
+  $linkaccounts .= qq|              <tr>
+                <th align=right>| . $locale->text('Foreign Revenues') . qq|</th>
+                <td><select name=income_accno_id_3>$form->{selectIC_income}</select></td>
+              </tr>
+              <tr>
+                <th align=right>| . $locale->text('Foreign Expenses') . qq|</th>
+                <td><select name=expense_accno_id_3>$form->{selectIC_expense}</select></td>
+              </tr>
 |;
 
 
@@ -2106,7 +2106,7 @@ sub list_printer {
     map { print "$column_data{$_}\n" } @column_index;
 
     print qq|
-       </tr>
+        </tr>
 |;
   }
 
@@ -2393,7 +2393,7 @@ sub list_payment {
     map { print "$column_data{$_}\n" } @column_index;
 
     print qq|
-       </tr>
+       </tr>
 |;
     $row++;
   }
@@ -2787,10 +2787,10 @@ sub audit_control {
   <tr>
     <td>
       <table>
-       <tr>
-         <th>| . $locale->text('Close Books up to') . qq|</th>
-         <td><input name=closedto size=11 title="$myconfig{dateformat}" value=$form->{closedto}></td>
-       </tr>
+        <tr>
+          <th>| . $locale->text('Close Books up to') . qq|</th>
+          <td><input name=closedto size=11 title="$myconfig{dateformat}" value=$form->{closedto}></td>
+        </tr>
       </table>
     </td>
   </tr>
index 3852dad..bac1b81 100644 (file)
@@ -265,13 +265,13 @@ sub form_header {
     if ($form->{forex}) {
       $exchangerate .= qq|
             <tr>
-             <th align=right>| . $locale->text('Exchangerate') . qq|</th>
+              <th align=right>| . $locale->text('Exchangerate') . qq|</th>
               <td><input type=hidden name=exchangerate value=$form->{exchangerate}>$form->{exchangerate}</td>
            </tr>
 |;
     } else {
       $exchangerate .= qq|
-            <th align=right>| . $locale->text('Exchangerate') . qq|</th>
+             <th align=right>| . $locale->text('Exchangerate') . qq|</th>
              <td><input name=exchangerate size=10 value=$form->{exchangerate}></td>
 |;
     }
@@ -296,11 +296,11 @@ sub form_header {
 
   my $department = qq|
               <tr>
-               <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
-               <td colspan=3><select name=department>$form->{selectdepartment}</select>
-               <input type=hidden name=selectdepartment value="$form->{selectdepartment}">
-               </td>
-             </tr>
+                <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
+                <td colspan=3><select name=department>$form->{selectdepartment}</select>
+                <input type=hidden name=selectdepartment value="$form->{selectdepartment}">
+                </td>
+              </tr>
 | if $form->{selectdepartment};
 
   my $n = ($form->{creditremaining} =~ /-/) ? "0" : "1";
@@ -440,64 +440,64 @@ sub form_header {
     <td>
       <table width=100%>
         <tr valign=top>
-         <td>
-           <table>
-             <tr>
-               <th align=right nowrap>| . $locale->text('Vendor') . qq|</th>
-               <td colspan=3>$vendor <input type="button" value="D" onclick="show_vc_details('vendor')"></td>
-               <input type=hidden name=selectvendor value="| . H($form->{selectvendor}) . qq|">
-               <input type=hidden name=oldvendor value="| . H($form->{oldvendor}) . qq|">
-               <input type=hidden name=vendor_id value="| . H($form->{vendor_id}) . qq|">
-               <input type=hidden name=terms value="| . H($form->{terms}) . qq|">
-             </tr>
-             <tr>
-               <td></td>
-               <td colspan=3>
-                 <table width=100%>
-                   <tr>
-                     <th align=left nowrap>| . $locale->text('Credit Limit') . qq|</th>
-                     <td>$form->{creditlimit}</td>
-                     <th align=left nowrap>| . $locale->text('Remaining') . qq|</th>
-                     <td class="plus$n">$form->{creditremaining}</td>
-                     <input type=hidden name=creditlimit value=$form->{creditlimit}>
-                     <input type=hidden name=creditremaining value=$form->{creditremaining}>
-                   </tr>
-                 </table>
-               </td>
-             <tr>
-               <th align=right nowrap>| . $locale->text('Currency') . qq|</th>
-               <td><select name=currency>$form->{selectcurrency}</select></td>
-               <input type=hidden name=selectcurrency value="$form->{selectcurrency}">
-               <input type=hidden name=defaultcurrency value=$form->{defaultcurrency}>
-               <input type=hidden name=fxgain_accno value=$form->{fxgain_accno}>
-               <input type=hidden name=fxloss_accno value=$form->{fxloss_accno}>
-               $exchangerate
-             </tr>
-             $department
-             $taxincluded
-           </table>
-         </td>
-         <td align=right>
-           <table>
-             <tr>
-               <th align=right nowrap>| . $locale->text('Invoice Number') . qq|</th>
-               <td><input name=invnumber size=11 value="$form->{invnumber}" $readonly></td>
-             </tr>
-             <tr>
-               <th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
-               <td><input name=ordnumber size=11 value="$form->{ordnumber}" $readonly></td>
-             </tr>
-             <tr>
-               <th align=right nowrap>| . $locale->text('Invoice Date') . qq|</th>
+          <td>
+            <table>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Vendor') . qq|</th>
+                <td colspan=3>$vendor <input type="button" value="D" onclick="show_vc_details('vendor')"></td>
+                <input type=hidden name=selectvendor value="| . H($form->{selectvendor}) . qq|">
+                <input type=hidden name=oldvendor value="| . H($form->{oldvendor}) . qq|">
+                <input type=hidden name=vendor_id value="| . H($form->{vendor_id}) . qq|">
+                <input type=hidden name=terms value="| . H($form->{terms}) . qq|">
+              </tr>
+              <tr>
+                <td></td>
+                <td colspan=3>
+                  <table width=100%>
+                    <tr>
+                      <th align=left nowrap>| . $locale->text('Credit Limit') . qq|</th>
+                      <td>$form->{creditlimit}</td>
+                      <th align=left nowrap>| . $locale->text('Remaining') . qq|</th>
+                      <td class="plus$n">$form->{creditremaining}</td>
+                      <input type=hidden name=creditlimit value=$form->{creditlimit}>
+                      <input type=hidden name=creditremaining value=$form->{creditremaining}>
+                    </tr>
+                  </table>
+                </td>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Currency') . qq|</th>
+                <td><select name=currency>$form->{selectcurrency}</select></td>
+                <input type=hidden name=selectcurrency value="$form->{selectcurrency}">
+                <input type=hidden name=defaultcurrency value=$form->{defaultcurrency}>
+                <input type=hidden name=fxgain_accno value=$form->{fxgain_accno}>
+                <input type=hidden name=fxloss_accno value=$form->{fxloss_accno}>
+                $exchangerate
+              </tr>
+              $department
+              $taxincluded
+            </table>
+          </td>
+          <td align=right>
+            <table>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Invoice Number') . qq|</th>
+                <td><input name=invnumber size=11 value="$form->{invnumber}" $readonly></td>
+              </tr>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
+                <td><input name=ordnumber size=11 value="$form->{ordnumber}" $readonly></td>
+              </tr>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Invoice Date') . qq|</th>
                 $button1
-             </tr>
-             <tr>
-               <th align=right nowrap>| . $locale->text('Due Date') . qq|</th>
+              </tr>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Due Date') . qq|</th>
                 $button2
-             </tr>
-           </table>
-         </td>
-       </tr>
+              </tr>
+            </table>
+          </td>
+        </tr>
       </table>
     </td>
   </tr>
@@ -507,20 +507,15 @@ sub form_header {
 $jsscript
   <input type=hidden name=rowcount value=$form->{rowcount}>
   <tr>
-      <td>
-          <table width=100%>
-          <tr class=listheading>
-         <th class=listheading style="width:15%">|
-    . $locale->text('Account') . qq|</th>
-         <th class=listheading style="width:10%">|
-    . $locale->text('Amount') . qq|</th>
-          <th class=listheading style="width:10%">|
-    . $locale->text('Tax') . qq|</th>
-          <th class=listheading style="width:10%">|
-    . $locale->text('Taxkey') . qq|</th>
-          <th class=listheading style="width:10%">|
-    . $locale->text('Project') . qq|</th>
-       </tr>
+    <td>
+      <table width=100%>
+        <tr class=listheading>
+          <th class=listheading style="width:15%">| . $locale->text('Account') . qq|</th>
+          <th class=listheading style="width:10%">| . $locale->text('Amount') . qq|</th>
+          <th class=listheading style="width:10%">| . $locale->text('Tax') . qq|</th>
+          <th class=listheading style="width:10%">| . $locale->text('Taxkey') . qq|</th>
+          <th class=listheading style="width:10%">| . $locale->text('Project') . qq|</th>
+        </tr>
 |;
 
   my $amount  = $locale->text('Amount');
@@ -578,13 +573,13 @@ $jsscript
                            '-default' => $form->{"project_id_$i"} ));
 
     print qq|
-       <tr>
+        <tr>
           <td>$selectAP_amount</td>
           <td><input name="amount_$i" size=10 value=$form->{"amount_$i"}></td>
           <td><input type="hidden" name="tax_$i" value="$form->{"tax_$i"}">$form->{"tax_$i"}</td>
           $tax
           <td>$projectnumber</td>
-       </tr>
+        </tr>
 |;
     $amount  = "";
     $project = "";
@@ -610,37 +605,37 @@ $jsscript
           </td>
         </tr>
         <tr>
-         <td>${APselected}</td>
-         <th align=left>$form->{invtotal}</th>
+          <td>${APselected}</td>
+          <th align=left>$form->{invtotal}</th>
 
-         <input type=hidden name=oldinvtotal value=$form->{oldinvtotal}>
-         <input type=hidden name=oldtotalpaid value=$form->{oldtotalpaid}>
+          <input type=hidden name=oldinvtotal value=$form->{oldinvtotal}>
+          <input type=hidden name=oldtotalpaid value=$form->{oldtotalpaid}>
 
-         <input type=hidden name=taxaccounts value="$form->{taxaccounts}">
+          <input type=hidden name=taxaccounts value="$form->{taxaccounts}">
 
-         <td colspan=4></td>
+          <td colspan=4></td>
 
 
         </tr>
-        </table>
-        </td>
+      </table>
+     </td>
     </tr>
     <tr>
       <td>
         <table width=100%>
         <tr>
-         <th align=left width=1%>| . $locale->text('Notes') . qq|</th>
-         <td align=left>$notes</td>
-       </tr>
+          <th align=left width=1%>| . $locale->text('Notes') . qq|</th>
+          <td align=left>$notes</td>
+        </tr>
       </table>
     </td>
   </tr>
   <tr>
     <td>
       <table width=100%>
-       <tr class=listheading>
-         <th class=listheading colspan=7>| . $locale->text('Payments') . qq|</th>
-       </tr>
+        <tr class=listheading>
+          <th class=listheading colspan=7>| . $locale->text('Payments') . qq|</th>
+        </tr>
 |;
 
   my @column_index;
@@ -1105,8 +1100,8 @@ sub post_as_new {
   # saving the history
   if(!exists $form->{addition} && $form->{id} ne "") {
     $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
-       $form->{addition} = "POSTED AS NEW";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "POSTED AS NEW";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
   &post;
@@ -1188,7 +1183,7 @@ sub yes {
     # saving the history
     if(!exists $form->{addition}) {
       $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
-         $form->{addition} = "DELETED";
+      $form->{addition} = "DELETED";
       $form->save_history($form->dbconnect(\%myconfig));
     }
     # /saving the history
index ce22ab0..a740728 100644 (file)
@@ -91,8 +91,8 @@ sub add {
   # saving the history
   if(!exists $form->{addition} && ($form->{id} ne "")) {
     $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
-       $form->{addition} = "ADDED";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "ADDED";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
 
@@ -293,8 +293,8 @@ sub form_header {
   if ($form->{currency} ne $form->{defaultcurrency}) {
     if ($form->{forex}) {
       $exchangerate .= qq|
-       <th align=right>| . $locale->text('Exchangerate') . qq|</th>
-       <td><input type=hidden name=exchangerate value=$form->{exchangerate}>$form->{exchangerate}</td>
+        <th align=right>| . $locale->text('Exchangerate') . qq|</th>
+        <td><input type=hidden name=exchangerate value=$form->{exchangerate}>$form->{exchangerate}</td>
 |;
     } else {
       $exchangerate .= qq|
@@ -305,10 +305,10 @@ sub form_header {
   }
 
   $taxincluded = qq|
-             <tr>
-               <td align=right><input name=taxincluded class=checkbox type=checkbox value=1 $form->{taxincluded}></td>
-               <th align=left nowrap>| . $locale->text('Tax Included') . qq|</th>
-             </tr>
+              <tr>
+                <td align=right><input name=taxincluded class=checkbox type=checkbox value=1 $form->{taxincluded}></td>
+                <th align=left nowrap>| . $locale->text('Tax Included') . qq|</th>
+              </tr>
 |;
 
   if (($rows = $form->numtextrows($form->{notes}, 50)) < 2) {
@@ -318,12 +318,12 @@ sub form_header {
     qq|<textarea name=notes rows=$rows cols=50 wrap=soft>$form->{notes}</textarea>|;
 
   $department = qq|
-             <tr>
-               <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
-               <td colspan=3><select name=department>$form->{selectdepartment}</select>
-               <input type=hidden name=selectdepartment value="$form->{selectdepartment}">
-               </td>
-             </tr>
+              <tr>
+                <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
+                <td colspan=3><select name=department>$form->{selectdepartment}</select>
+                <input type=hidden name=selectdepartment value="$form->{selectdepartment}">
+                </td>
+              </tr>
 | if $form->{selectdepartment};
 
   my $n = ($form->{creditremaining} =~ /-/) ? "0" : "1";
@@ -338,11 +338,11 @@ sub form_header {
 
   if ($form->{selectemployee}) {
     $employee = qq|
-             <tr>
-               <th align=right nowrap>| . $locale->text('Salesperson') . qq|</th>
-               <td  colspan=2><select name=employee>$form->{selectemployee}</select></td>
-               <input type=hidden name=selectemployee value="$form->{selectemployee}">
-             </tr>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Salesperson') . qq|</th>
+                <td  colspan=2><select name=employee>$form->{selectemployee}</select></td>
+                <input type=hidden name=selectemployee value="$form->{selectemployee}">
+              </tr>
 |;
   }
 
@@ -478,66 +478,66 @@ sub form_header {
     <td>
       <table width=100%>
         <tr valign=top>
-         <td>
-           <table>
-             <tr>
-               <th align="right" nowrap>| . $locale->text('Customer') . qq|</th>
-               <td colspan=3>$customer <input type="button" value="| . $locale->text('Details (one letter abbreviation)') . qq|" onclick="show_vc_details('customer')"></td>
-               <input type=hidden name=selectcustomer value="$form->{selectcustomer}">
-               <input type=hidden name=oldcustomer value="$form->{oldcustomer}">
-               <input type=hidden name=customer_id value="$form->{customer_id}">
-               <input type=hidden name=terms value=$form->{terms}>
-             </tr>
-             <tr>
-               <td></td>
-               <td colspan=3>
-                 <table width=100%>
-                   <tr>
-                     <th align=left nowrap>| . $locale->text('Credit Limit') . qq|</th>
-                     <td>$form->{creditlimit}</td>
-                     <th align=left nowrap>| . $locale->text('Remaining') . qq|</th>
-                     <td class="plus$n">$form->{creditremaining}</td>
-                     <input type=hidden name=creditlimit value=$form->{creditlimit}>
-                     <input type=hidden name=creditremaining value=$form->{creditremaining}>
-                   </tr>
-                 </table>
-               </td>
-             </tr>
-             <tr>
-               <th align=right>| . $locale->text('Currency') . qq|</th>
-               <td><select name=currency>$form->{selectcurrency}</select></td>
-               <input type=hidden name=selectcurrency value="$form->{selectcurrency}">
-               <input type=hidden name=defaultcurrency value=$form->{defaultcurrency}>
-               <input type=hidden name=fxgain_accno value=$form->{fxgain_accno}>
-               <input type=hidden name=fxloss_accno value=$form->{fxloss_accno}>
-               $exchangerate
-             </tr>
-             $department
-             $taxincluded
-           </table>
-         </td>
-         <td align=right>
-           <table>
-             $employee
-             <tr>
-               <th align=right nowrap>| . $locale->text('Invoice Number') . qq|</th>
-               <td><input name=invnumber size=11 value="$form->{invnumber}"></td>
-             </tr>
-             <tr>
-               <th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
-               <td><input name=ordnumber size=11 value="$form->{ordnumber}"></td>
-             </tr>
-             <tr>
-               <th align=right nowrap>| . $locale->text('Invoice Date') . qq|</th>
+          <td>
+            <table>
+              <tr>
+                <th align="right" nowrap>| . $locale->text('Customer') . qq|</th>
+                <td colspan=3>$customer <input type="button" value="| . $locale->text('Details (one letter abbreviation)') . qq|" onclick="show_vc_details('customer')"></td>
+                <input type=hidden name=selectcustomer value="$form->{selectcustomer}">
+                <input type=hidden name=oldcustomer value="$form->{oldcustomer}">
+                <input type=hidden name=customer_id value="$form->{customer_id}">
+                <input type=hidden name=terms value=$form->{terms}>
+              </tr>
+              <tr>
+                <td></td>
+                <td colspan=3>
+                  <table width=100%>
+                    <tr>
+                      <th align=left nowrap>| . $locale->text('Credit Limit') . qq|</th>
+                      <td>$form->{creditlimit}</td>
+                      <th align=left nowrap>| . $locale->text('Remaining') . qq|</th>
+                      <td class="plus$n">$form->{creditremaining}</td>
+                      <input type=hidden name=creditlimit value=$form->{creditlimit}>
+                      <input type=hidden name=creditremaining value=$form->{creditremaining}>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+              <tr>
+                <th align=right>| . $locale->text('Currency') . qq|</th>
+                <td><select name=currency>$form->{selectcurrency}</select></td>
+                <input type=hidden name=selectcurrency value="$form->{selectcurrency}">
+                <input type=hidden name=defaultcurrency value=$form->{defaultcurrency}>
+                <input type=hidden name=fxgain_accno value=$form->{fxgain_accno}>
+                <input type=hidden name=fxloss_accno value=$form->{fxloss_accno}>
+                $exchangerate
+              </tr>
+              $department
+              $taxincluded
+            </table>
+          </td>
+          <td align=right>
+            <table>
+              $employee
+              <tr>
+                <th align=right nowrap>| . $locale->text('Invoice Number') . qq|</th>
+                <td><input name=invnumber size=11 value="$form->{invnumber}"></td>
+              </tr>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
+                <td><input name=ordnumber size=11 value="$form->{ordnumber}"></td>
+              </tr>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Invoice Date') . qq|</th>
                 $button1
-             </tr>
-             <tr>
-               <th align=right nowrap>| . $locale->text('Due Date') . qq|</th>
+              </tr>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Due Date') . qq|</th>
                 $button2
-             </tr>
+              </tr>
      </table>
-         </td>
-       </tr>
+          </td>
+        </tr>
       </table>
     </td>
   </tr>
@@ -547,10 +547,10 @@ $jsscript
   <tr>
       <td>
           <table width=100%>
-          <tr class=listheading>
-         <th class=listheading style="width:15%">|
+           <tr class=listheading>
+          <th class=listheading style="width:15%">|
     . $locale->text('Account') . qq|</th>
-         <th class=listheading style="width:10%">|
+          <th class=listheading style="width:10%">|
     . $locale->text('Amount') . qq|</th>
           <th class=listheading style="width:10%">|
     . $locale->text('Tax') . qq|</th>
@@ -558,7 +558,7 @@ $jsscript
     . $locale->text('Taxkey') . qq|</th>
           <th class=listheading style="width:10%">|
     . $locale->text('Project') . qq|</th>
-       </tr>
+        </tr>
 |;
 
   $amount  = $locale->text('Amount');
@@ -622,13 +622,13 @@ $jsscript
                            '-default' => $form->{"project_id_$i"} ));
 
     print qq|
-       <tr>
+        <tr>
           <td>$selectAR_amount</td>
           <td><input name="amount_$i" size=10 value=$form->{"amount_$i"}></td>
           <td><input type="hidden" name="tax_$i" value="$form->{"tax_$i"}">$form->{"tax_$i"}</td>
           $tax
           <td>$projectnumber</td>
-       </tr>
+        </tr>
 |;
     $amount  = "";
     $project = "";
@@ -650,15 +650,15 @@ $jsscript
           </td>
         </tr>
         <tr>
-         <td>${ARselected}</td>
-         <th align=left>$form->{invtotal}</th>
+          <td>${ARselected}</td>
+          <th align=left>$form->{invtotal}</th>
 
-         <input type=hidden name=oldinvtotal value=$form->{oldinvtotal}>
-         <input type=hidden name=oldtotalpaid value=$form->{oldtotalpaid}>
+          <input type=hidden name=oldinvtotal value=$form->{oldinvtotal}>
+          <input type=hidden name=oldtotalpaid value=$form->{oldtotalpaid}>
 
-         <input type=hidden name=taxaccounts value="$form->{taxaccounts}">
+          <input type=hidden name=taxaccounts value="$form->{taxaccounts}">
 
-         <td colspan=4></td>
+          <td colspan=4></td>
 
 
         </tr>
@@ -669,19 +669,19 @@ $jsscript
       <td>
         <table width=100%>
         <tr>
-         <th align=left width=1%>| . $locale->text('Notes') . qq|</th>
-         <td align=left>$notes</td>
-       </tr>
+          <th align=left width=1%>| . $locale->text('Notes') . qq|</th>
+          <td align=left>$notes</td>
+        </tr>
       </table>
     </td>
   </tr>
   <tr>
     <td>
       <table width=100%>
-       <tr class=listheading>
-         <th colspan=7 class=listheading>|
+        <tr class=listheading>
+          <th colspan=7 class=listheading>|
     . $locale->text('Incoming Payments') . qq|</th>
-       </tr>
+        </tr>
 |;
 
   if ($form->{currency} eq $form->{defaultcurrency}) {
@@ -1159,8 +1159,8 @@ sub post_as_new {
   # saving the history
   if(!exists $form->{addition} && $form->{id} ne "") {
     $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
-       $form->{addition} = "POSTED AS NEW";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "POSTED AS NEW";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
   &post;
@@ -1242,8 +1242,8 @@ sub yes {
     # saving the history
     if(!exists $form->{addition}) {
       $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
-         $form->{addition} = "DELETED";
-         $form->save_history($form->dbconnect(\%myconfig));
+      $form->{addition} = "DELETED";
+      $form->save_history($form->dbconnect(\%myconfig));
     }
     # /saving the history
     $form->redirect($locale->text('Transaction deleted!'));
index 7612166..0278aa5 100644 (file)
@@ -173,12 +173,12 @@ sub select_name {
   <tr>
     <td>
       <table width=100%>
-       <tr class=listheading>|;
+        <tr class=listheading>|;
 
   map { print "\n$column_data{$_}" } @column_index;
 
   print qq|
-       </tr>
+        </tr>
 |;
 
   my $i = 0;
@@ -197,12 +197,12 @@ sub select_name {
     $j++;
     $j %= 2;
     print qq|
-       <tr class=listrow$j>|;
+        <tr class=listrow$j>|;
 
     map { print "\n$column_data{$_}" } @column_index;
 
     print qq|
-       </tr>
+        </tr>
 
 <input name="new_id_$i" type=hidden value=$ref->{id}>
 
@@ -371,7 +371,7 @@ sub select_project {
   <tr>
     <td>
       <table width=100%>
-       <tr class=listheading>|;
+        <tr class=listheading>|;
 
   map { print "\n$column_data{$_}" } @column_index;
 
index 421667d..1445eba 100644 (file)
@@ -123,29 +123,29 @@ sub search {
        receipt => { title => 'Receipts', name => 'Customer' });
 
   $label{invoice}{invnumber} = qq|
-       <tr>
-         <th align=right nowrap>| . $locale->text('Invoice Number') . qq|</th>
-         <td colspan=3><input name=invnumber size=20></td>
-       </tr>
+        <tr>
+          <th align=right nowrap>| . $locale->text('Invoice Number') . qq|</th>
+          <td colspan=3><input name=invnumber size=20></td>
+        </tr>
 |;
   $label{invoice}{ordnumber} = qq|
-       <tr>
-         <th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
-         <td colspan=3><input name=ordnumber size=20></td>
-       </tr>
+        <tr>
+          <th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
+          <td colspan=3><input name=ordnumber size=20></td>
+        </tr>
 |;
   $label{sales_quotation}{quonumber} = qq|
-       <tr>
-         <th align=right nowrap>| . $locale->text('Quotation Number') . qq|</th>
-         <td colspan=3><input name=quonumber size=20></td>
-       </tr>
+        <tr>
+          <th align=right nowrap>| . $locale->text('Quotation Number') . qq|</th>
+          <td colspan=3><input name=quonumber size=20></td>
+        </tr>
 |;
 
   $label{check}{chknumber} = qq|
-       <tr>
-         <th align=right nowrap>| . $locale->text('Reference') . qq|</th>
-         <td colspan=3><input name=chknumber size=20></td>
-       </tr>
+          <tr>
+          <th align=right nowrap>| . $locale->text('Reference') . qq|</th>
+          <td colspan=3><input name=chknumber size=20></td>
+        </tr>
 |;
 
   $label{packing_list}{invnumber}      = $label{invoice}{invnumber};
@@ -164,12 +164,12 @@ sub search {
     if (BP->payment_accounts(\%myconfig, \%$form)) {
       $account = qq|
         <tr>
-         <th align=right>| . $locale->text('Account') . qq|</th>
+          <th align=right>| . $locale->text('Account') . qq|</th>
 |;
 
       if ($form->{accounts}) {
         $account .= qq|
-         <td colspan=3><select name=account>
+          <td colspan=3><select name=account>
 |;
         foreach my $ref (@{ $form->{accounts} }) {
           $account .= qq|
@@ -182,13 +182,13 @@ sub search {
 |;
       } else {
         $account .= qq|
-         <td colspan=3><input name=account></td>
+          <td colspan=3><input name=account></td>
 |;
 
       }
 
       $account .= qq|
-       </tr>
+         </tr>
 |;
 
     }
@@ -243,23 +243,23 @@ sub search {
   <tr>
     <td>
       <table>
-       <tr>
-         <th align=right>Kunde</th>
-         <td colspan=3>$name</td>
-       </tr>
-       $account
-       $label{$form->{type}}{invnumber}
-       $label{$form->{type}}{ordnumber}
-       $label{$form->{type}}{quonumber}
-       $label{$form->{type}}{chknumber}
-       $label{$form->{type}}{rctnumber}
-       <tr>
-         <th align=right nowrap>| . $locale->text('From') . qq|</th>
+        <tr>
+          <th align=right>Kunde</th>
+          <td colspan=3>$name</td>
+        </tr>
+        $account
+        $label{$form->{type}}{invnumber}
+        $label{$form->{type}}{ordnumber}
+        $label{$form->{type}}{quonumber}
+        $label{$form->{type}}{chknumber}
+        $label{$form->{type}}{rctnumber}
+        <tr>
+          <th align=right nowrap>| . $locale->text('From') . qq|</th>
           $button1
-         <th align=right>| . $locale->text('Bis') . qq|</th>
+          <th align=right>| . $locale->text('Bis') . qq|</th>
           $button2
-       </tr>
-       <input type=hidden name=sort value=transdate>
+        </tr>
+        <input type=hidden name=sort value=transdate>
       </table>
     </td>
   </tr>
@@ -535,13 +535,13 @@ sub list_spool {
   <tr>
     <td>
       <table width=100%>
-       <tr class=listheading>
+        <tr class=listheading>
 |;
 
   map { print "\n$column_header{$_}" } @column_index;
 
   print qq|
-       </tr>
+        </tr>
 |;
 
   # add sort and escape callback, this one we use for the add sub
index b35b664..e4185ab 100644 (file)
@@ -172,9 +172,9 @@ sub list {
 
   my $department = qq|
         <tr>
-         <th align=right nowrap>| . $locale->text('Department') . qq|</th>
-         <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
-       </tr>
+          <th align=right nowrap>| . $locale->text('Department') . qq|</th>
+          <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
+        </tr>
 | if $form->{selectdepartment};
   my $accrual = ($main::eur) ? ""        : "checked";
   my $cash    = ($main::eur) ? "checked" : "";
@@ -263,107 +263,86 @@ sub list {
 
 </table>
 <table>
-       <tr>
-         <th align=left><input name=reporttype class=radio type=radio value="custom" checked> |
+        <tr>
+          <th align=left><input name=reporttype class=radio type=radio value="custom" checked> |
       . $locale->text('Customized Report') . qq|</th>
-       </tr>
-       <tr>
-         <th colspan=1>| . $locale->text('Year') . qq|</th>
-         <td><input name=year size=11 title="|
+        </tr>
+        <tr>
+          <th colspan=1>| . $locale->text('Year') . qq|</th>
+          <td><input name=year size=11 title="|
       . $locale->text('YYYY') . qq|" value="$year"></td>
-       </tr>
+        </tr>
 |;
 
     our $checked;
     print qq|
-       <tr>
-               <td align=right>
+        <tr>
+                <td align=right>
 <b> | . $locale->text('Yearly') . qq|</b> </td>
-               <th align=left>| . $locale->text('Quarterly') . qq|</th>
-               <th align=left colspan=3>| . $locale->text('Monthly') . qq|</th>
-       </tr>
-       <tr>
-               <td align=right>&nbsp; <input name=duetyp class=radio type=radio value="13"
+                <th align=left>| . $locale->text('Quarterly') . qq|</th>
+                <th align=left colspan=3>| . $locale->text('Monthly') . qq|</th>
+        </tr>
+        <tr>
+                <td align=right>&nbsp; <input name=duetyp class=radio type=radio value="13"
 $checked></td>
-               <td><input name=duetyp class=radio type=radio value="A" $checked >&nbsp;1. |
-      . $locale->text('Quarter') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="A" $checked >&nbsp;1. | . $locale->text('Quarter') . qq|</td>
 |;
     $checked = "checked";
     print qq|
-               <td><input name=duetyp class=radio type=radio value="1" $checked >&nbsp;|
-      . $locale->text('January') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="1" $checked >&nbsp;| . $locale->text('January') . qq|</td>
 |;
     $checked = "";
     print qq|
-               <td><input name=duetyp class=radio type=radio value="5" $checked >&nbsp;|
-      . $locale->text('May') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="9" $checked >&nbsp;|
-      . $locale->text('September') . qq|</td>
-
-       </tr>
-       <tr>
-               <td align= right>&nbsp;</td>
-               <td><input name=duetyp class=radio type=radio value="B" $checked>&nbsp;2. |
-      . $locale->text('Quarter') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="2" $checked >&nbsp;|
-      . $locale->text('February') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="6" $checked >&nbsp;|
-      . $locale->text('June') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="10" $checked >&nbsp;|
-      . $locale->text('October') . qq|</td>
-       </tr>
-       <tr>
-               <td> &nbsp;</td>
-               <td><input name=duetyp class=radio type=radio value="C" $checked>&nbsp;3. |
-      . $locale->text('Quarter') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="3" $checked >&nbsp;|
-      . $locale->text('March') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="7" $checked >&nbsp;|
-      . $locale->text('July') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="11" $checked >&nbsp;|
-      . $locale->text('November') . qq|</td>
-
-       </tr>
-       <tr>
-               <td> &nbsp;</td>
-               <td><input name=duetyp class=radio type=radio value="D" $checked>&nbsp;4. |
-      . $locale->text('Quarter') . qq|&nbsp;</td>
-               <td><input name=duetyp class=radio type=radio value="4" $checked >&nbsp;|
-      . $locale->text('April') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="8" $checked >&nbsp;|
-      . $locale->text('August') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="12" $checked >&nbsp;|
-      . $locale->text('December') . qq|</td>
-
-       </tr>
-       <tr>
-               <td colspan=5><hr size=3 noshade></td>
-       </tr>
-       <tr>
-          <th align=left><input name=reporttype class=radio type=radio value="free" $checked> |
-      . $locale->text('Free report period') . qq|</th>
-         <td align=left colspan=4>| . $locale->text('From') . qq|&nbsp;
-             $button1
+                <td><input name=duetyp class=radio type=radio value="5" $checked >&nbsp;| . $locale->text('May') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="9" $checked >&nbsp;| . $locale->text('September') . qq|</td>
+
+        </tr>
+        <tr>
+                <td align= right>&nbsp;</td>
+                <td><input name=duetyp class=radio type=radio value="B" $checked>&nbsp;2. | . $locale->text('Quarter') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="2" $checked >&nbsp;| . $locale->text('February') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="6" $checked >&nbsp;| . $locale->text('June') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="10" $checked >&nbsp;| . $locale->text('October') . qq|</td>
+        </tr>
+        <tr>
+                <td> &nbsp;</td>
+                <td><input name=duetyp class=radio type=radio value="C" $checked>&nbsp;3. | . $locale->text('Quarter') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="3" $checked >&nbsp;| . $locale->text('March') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="7" $checked >&nbsp;| . $locale->text('July') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="11" $checked >&nbsp;| . $locale->text('November') . qq|</td>
+
+        </tr>
+        <tr>
+                <td> &nbsp;</td>
+                <td><input name=duetyp class=radio type=radio value="D" $checked>&nbsp;4. | . $locale->text('Quarter') . qq|&nbsp;</td>
+                <td><input name=duetyp class=radio type=radio value="4" $checked >&nbsp;| . $locale->text('April') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="8" $checked >&nbsp;| . $locale->text('August') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="12" $checked >&nbsp;| . $locale->text('December') . qq|</td>
+
+        </tr>
+        <tr>
+                   <td colspan=5><hr size=3 noshade></td>
+        </tr>
+        <tr>
+          <th align=left><input name=reporttype class=radio type=radio value="free" $checked> | . $locale->text('Free report period') . qq|</th>
+          <td align=left colspan=4>| . $locale->text('From') . qq|&nbsp;
+              $button1
               $button1_2&nbsp;
-             | . $locale->text('Bis') . qq|&nbsp;
-             $button2
+              | . $locale->text('Bis') . qq|&nbsp;
+              $button2
               $button2_2
           </td>
         </tr>
-       <tr>
-               <td colspan=5><hr size=3 noshade></td>
-       </tr>
-       <tr>
-         <th align=leftt>| . $locale->text('Method') . qq|</th>
-         <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
-      . $locale->text('Accrual') . qq|
-         &nbsp;<input name=method class=radio type=radio value=cash $cash>|
-      . $locale->text('EUR') . qq|</td>
-       </tr>
         <tr>
-         <th align=right colspan=4>|
-      . $locale->text('Decimalplaces')
-      . qq|</th>
+                   <td colspan=5><hr size=3 noshade></td>
+        </tr>
+        <tr>
+          <th align=leftt>| . $locale->text('Method') . qq|</th>
+          <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| . $locale->text('Accrual') . qq|
+          &nbsp;<input name=method class=radio type=radio value=cash $cash>| . $locale->text('EUR') . qq|</td>
+        </tr>
+        <tr>
+         <th align=right colspan=4>| . $locale->text('Decimalplaces') . qq|</th>
              <td><input name=decimalplaces size=3 value="2"></td>
          </tr>
          <tr>
index 2b2016f..17dac99 100644 (file)
@@ -92,7 +92,7 @@ sub select_part {
                                      "nextsub"          => "select_part_internal",
                                      "callback_sub"     => $callback_sub,
                                      "has_charge"       => $has_charge,
-                                     "has_ean"         => $has_ean,
+                                     "has_ean"          => $has_ean,
                                      "remap_parts_id"   => $remap_parts_id,
                                      "remap_partnumber" => $remap_partnumber });
 
@@ -477,27 +477,27 @@ sub reformat_numbers {
 # -------------------------------------------------------------------------
 
 sub show_history {
-       $main::lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;
 
-       my $dbh = $form->dbconnect(\%myconfig);
-       my ($sort, $sortby) = split(/\-\-/, $form->{order});
+  my $dbh = $form->dbconnect(\%myconfig);
+  my ($sort, $sortby) = split(/\-\-/, $form->{order});
   $sort =~ s/.*\.(.*)/$1/;
 
-       $form->{title} = $locale->text("History");
-    $form->header();
-    print $form->parse_html_template( "common/show_history", {
-       "DATEN" => $form->get_history($dbh,$form->{input_name},"",$form->{order}),
-       "SUCCESS" => ($form->get_history($dbh,$form->{input_name}) ne "0"),
-      uc($sort) => 1,
-      uc($sort)."BY" => $sortby
-       } );
-
-       $dbh->disconnect();
-       $main::lxdebug->leave_sub();
+  $form->{title} = $locale->text("History");
+  $form->header();
+  print $form->parse_html_template( "common/show_history", {
+    "DATEN"        => $form->get_history($dbh,$form->{input_name},"",$form->{order}),
+    "SUCCESS"      => ($form->get_history($dbh,$form->{input_name}) ne "0"),
+    uc($sort)      => 1,
+    uc($sort)."BY" => $sortby
+  } );
+
+  $dbh->disconnect();
+  $main::lxdebug->leave_sub();
 }
 
 # -------------------------------------------------------------------------
@@ -531,7 +531,7 @@ sub call_sub {
 # -------------------------------------------------------------------------
 
 sub show_vc_details {
-       $main::lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
@@ -550,7 +550,7 @@ sub show_vc_details {
   $form->header();
   print $form->parse_html_template("common/show_vc_details", { "is_customer" => $form->{vc} eq "customer" });
 
-       $main::lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 # -------------------------------------------------------------------------
index c19cc53..94f82e6 100644 (file)
@@ -145,17 +145,17 @@ sub form_header {
       $form->format_amount(\%myconfig, $form->{exchangerate});
     if ($form->{forex}) {
       $exchangerate = qq|
-             <tr>
-               <th align=right nowrap>| . $locale->text('Exchangerate') . qq|</th>
-               <td colspan=3><input type=hidden name=exchangerate size=10 value=$form->{exchangerate}>$form->{exchangerate}</td>
-             </tr>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Exchangerate') . qq|</th>
+                <td colspan=3><input type=hidden name=exchangerate size=10 value=$form->{exchangerate}>$form->{exchangerate}</td>
+              </tr>
 |;
     } else {
       $exchangerate = qq|
-             <tr>
-               <th align=right nowrap>| . $locale->text('Exchangerate') . qq|</th>
-               <td colspan=3><input name=exchangerate size=10 value=$form->{exchangerate}></td>
-             </tr>
+               <tr>
+                <th align=right nowrap>| . $locale->text('Exchangerate') . qq|</th>
+                <td colspan=3><input name=exchangerate size=10 value=$form->{exchangerate}></td>
+              </tr>
 |;
     }
   }
@@ -340,9 +340,9 @@ sub list_invoices {
   <tr>
     <td>
       <table width=100%>
-       <tr>
-         <th class=listheading colspan=$colspan>$invoice</th>
-       </tr>
+        <tr>
+          <th class=listheading colspan=$colspan>$invoice</th>
+        </tr>
 |;
 
   $column_data{invnumber} =
@@ -405,7 +405,7 @@ sub list_invoices {
     $j++;
     $j %= 2;
     print qq|
-       <tr class=listrow$j>
+        <tr class=listrow$j>
 |;
     map { print "$column_data{$_}\n" } @column_index;
     print qq|
@@ -466,7 +466,7 @@ sub form_footer {
     $format .= qq|
             <option value=postscript $form->{DF}{postscript}>|
       . $locale->text('Postscript') . qq|
-           <option value=pdf $form->{DF}{pdf}>| . $locale->text('PDF');
+            <option value=pdf $form->{DF}{pdf}>| . $locale->text('PDF');
   }
 
   print qq|
index 01de062..c3d0955 100644 (file)
@@ -347,8 +347,8 @@ sub add_transaction {
 
 #  # saving the history
 #  if(!exists $form->{addition}) {
-#      $form->{addition} = "ADD TRANSACTION";
-#      $form->save_history($form->dbconnect(\%myconfig));
+#    $form->{addition} = "ADD TRANSACTION";
+#    $form->save_history($form->dbconnect(\%myconfig));
 #  }
 #  # /saving the history
 
@@ -381,8 +381,8 @@ sub save_and_ap_transaction {
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
-       $form->{addition} = "SAVED";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "SAVED";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
   &add_transaction;
@@ -401,8 +401,8 @@ sub save_and_ar_transaction {
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
-       $form->{addition} = "SAVED";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "SAVED";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
   &add_transaction;
@@ -426,8 +426,8 @@ sub save_and_invoice {
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
-       $form->{addition} = "SAVED";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "SAVED";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
   &add_transaction;
@@ -447,8 +447,8 @@ sub save_and_rfq {
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
-       $form->{addition} = "SAVED";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "SAVED";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
   &add_transaction;
@@ -468,8 +468,8 @@ sub save_and_quotation {
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
-       $form->{addition} = "SAVED";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "SAVED";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
   &add_transaction;
@@ -494,8 +494,8 @@ sub save_and_order {
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
-       $form->{addition} = "SAVED";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "SAVED";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
   &add_transaction;
@@ -528,7 +528,7 @@ sub save_and_close {
   if(!exists $form->{addition}) {
     $form->{snumbers} = ($form->{"db"} eq "customer" ? qq|customernumber_| . $form->{customernumber} : qq|vendornumber_| . $form->{vendornumber});
     $form->{addition} = "SAVED";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
   $form->redirect($locale->text($msg));
@@ -567,8 +567,8 @@ sub save {
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = ($form->{"db"} eq "customer" ? qq|customernumber_| . $form->{customernumber} : qq|vendornumber_| . $form->{vendornumber});
-       $form->{addition} = "SAVED";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "SAVED";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
   &edit;
@@ -592,8 +592,8 @@ sub delete {
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = ($form->{"db"} eq "customer" ? qq|customernumber_| . $form->{customernumber} : qq|vendornumber_| . $form->{vendornumber});
-       $form->{addition} = "DELETED";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "DELETED";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
   $form->redirect($locale->text($msg));
index 8f0bdd8..9f758b0 100644 (file)
@@ -72,45 +72,45 @@ sub export {
   <tr valign=top>
     <td>
       <table>
-       <tr>
-         <td align=left nowrap>| . $locale->text("Beraternummer") . qq|</td>
-         <td><input name=beraternr size=10 maxlength=7 value="$form->{beraternr}"></td>
-
-         <td align=left nowrap>| . $locale->text("DFV-Kennzeichen") . qq|</td>
-         <td><input name=dfvkz size=5 maxlength=2 value="$form->{dfvkz}"></td>
-       </tr>
-       <tr>
-         <td align=left nowrap>| . $locale->text("Beratername") . qq|</td>
-         <td><input name=beratername size=10 maxlength=9 value="$form->{beratername}"></td>
-
-         <td align=left nowrap>| . $locale->text("Password") . qq|</td>
-         <td><input name=passwort size=5 maxlength=4 value="$form->{passwort}"></td>
-       </tr>
-       <tr>
-         <td align=left nowrap>| . $locale->text("Mandantennummer") . qq|</td>
-         <td><input name=mandantennr size=10 maxlength=5 value="$form->{mandantennr}"></td>
-
-         <td align=left nowrap>| . $locale->text("Medium Number") . qq|</td>
-         <td><input name=datentraegernr size=5 maxlength=3 value="$form->{datentraegernr}"></td>
-       </tr>
-       <tr>
-         | . # OBE-Export noch nicht implementiert! <td><input checked name=kne type=checkbox class=checkbox value=1> | . $locale->text("Kontonummernerweiterung (KNE)") . qq|</td>
+        <tr>
+          <td align=left nowrap>| . $locale->text("Beraternummer") . qq|</td>
+          <td><input name=beraternr size=10 maxlength=7 value="$form->{beraternr}"></td>
+
+          <td align=left nowrap>| . $locale->text("DFV-Kennzeichen") . qq|</td>
+          <td><input name=dfvkz size=5 maxlength=2 value="$form->{dfvkz}"></td>
+        </tr>
+        <tr>
+          <td align=left nowrap>| . $locale->text("Beratername") . qq|</td>
+          <td><input name=beratername size=10 maxlength=9 value="$form->{beratername}"></td>
+
+          <td align=left nowrap>| . $locale->text("Password") . qq|</td>
+          <td><input name=passwort size=5 maxlength=4 value="$form->{passwort}"></td>
+        </tr>
+        <tr>
+          <td align=left nowrap>| . $locale->text("Mandantennummer") . qq|</td>
+          <td><input name=mandantennr size=10 maxlength=5 value="$form->{mandantennr}"></td>
+
+          <td align=left nowrap>| . $locale->text("Medium Number") . qq|</td>
+          <td><input name=datentraegernr size=5 maxlength=3 value="$form->{datentraegernr}"></td>
+        </tr>
+        <tr>
+          | . # OBE-Export noch nicht implementiert! <td><input checked name=kne type=checkbox class=checkbox value=1> | . $locale->text("Kontonummernerweiterung (KNE)") . qq|</td>
     qq|<td><input type="hidden" name="kne" value="1"></td>
           <td></td>
 
-         <td align=left nowrap>| . $locale->text("Abrechnungsnummer") . qq|</td>
-         <td><input name=abrechnungsnr size=5 maxlength=3 value="$form->{abrechnungsnr}"></td>
-       </tr>
+          <td align=left nowrap>| . $locale->text("Abrechnungsnummer") . qq|</td>
+          <td><input name=abrechnungsnr size=5 maxlength=3 value="$form->{abrechnungsnr}"></td>
+        </tr>
 
         <tr>
           <td><input name=exporttype type=radio class=radio value=0 checked> |
     . $locale->text("Export Buchungsdaten") . qq|</td>
           <td></td>
 
-         <td><input name=exporttype type=radio class=radio value=1> |
+          <td><input name=exporttype type=radio class=radio value=1> |
     . $locale->text("Export Stammdaten") . qq|</td>
           <td></td>
-       </td>
+        </td>
       </table>
     </td>
   </tr>
@@ -214,17 +214,17 @@ sub export_bewegungsdaten {
   <tr valign=top>
     <td>
       <table>
-       <tr>
+        <tr>
           <td align=left><input checked name=zeitraum class=radio type=radio value=monat>&nbsp;</td><td align=left>|
     . $locale->text('Monat') . qq|</td>
           <td align=left></td>
-         <td align=left></td>
+          <td align=left></td>
           <td align=left><select name=monat>$form->{allemonate}</select></td>
         </tr>
         <tr>
           <td align=left><input name=zeitraum class=radio type=radio value=quartal>&nbsp;</td><td align=left>|
     . $locale->text('Quartal') . qq|</td>
-         <td align=left></td>
+          <td align=left></td>
           <td align=left></td>
           <td align=left><select name=quartal>$form->{allequartale}</select></td>
         </tr>
@@ -233,10 +233,10 @@ sub export_bewegungsdaten {
     . $locale->text('Datum von') . qq|</td>
           <td align=left><input id=transdatefrom name=transdatefrom size=10>
             <input type="button" name="transdatefrom" id="trigger_transdatefrom" value="?"></td>
-         <td align=left>| . $locale->text('bis') . qq|</td>
+          <td align=left>| . $locale->text('bis') . qq|</td>
           <td align=left><input id=transdateto name=transdateto size=10>
             <input type="button" name="transdateto" id="trigger_transdateto" value="?"></td>
-       </tr>
+        </tr>
       </table>
     </td>
   </tr>
@@ -302,11 +302,11 @@ sub export_stammdaten {
     <td>
       <table>
         <tr>
-         <td align=left>| . $locale->text('Von Konto: ') . qq|</td>
+          <td align=left>| . $locale->text('Von Konto: ') . qq|</td>
           <td align=left><input name=accnofrom size=8 maxlength=8></td>
         </tr>
         <tr>
-         <td align=left>| . $locale->text('Bis Konto: ') . qq|</td>
+          <td align=left>| . $locale->text('Bis Konto: ') . qq|</td>
           <td align=left><input name=accnoto size=8 maxlength=8></td>
         </tr>
       </table>
index a72ab89..cf85bf5 100644 (file)
@@ -176,9 +176,9 @@ sub save {
   DN->save_config(\%myconfig, \%$form);
   # saving the history
   if(!exists $form->{addition} && $form->{id} ne "") {
-       $form->{snumbers} = qq|dunning_id_| . $form->{"dunning_id"};
+    $form->{snumbers} = qq|dunning_id_| . $form->{"dunning_id"};
     $form->{addition} = "SAVED FOR DUNNING";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
   $form->redirect($locale->text('Dunning Process Config saved!'));
@@ -245,9 +245,9 @@ sub save_dunning {
 
   # saving the history
   if(!exists $form->{addition} && $form->{id} ne "") {
-       $form->{snumbers} = qq|dunning_id_| . $form->{"dunning_id"};
+    $form->{snumbers} = qq|dunning_id_| . $form->{"dunning_id"};
     $form->{addition} = "DUNNING STARTED";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
 
index fd8482b..8ba48d6 100644 (file)
@@ -624,8 +624,8 @@ sub save {
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|donumber_| . $form->{donumber};
-       $form->{addition} = "SAVED";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "SAVED";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
 
@@ -670,8 +670,8 @@ sub delete_delivery_order {
     # saving the history
     if(!exists $form->{addition}) {
       $form->{snumbers} = qq|donumber_| . $form->{donumber};
-         $form->{addition} = "DELETED";
-         $form->save_history($form->dbconnect(\%myconfig));
+      $form->{addition} = "DELETED";
+      $form->save_history($form->dbconnect(\%myconfig));
     }
     # /saving the history
 
@@ -799,7 +799,7 @@ sub invoice_multi {
   # zwischenspeichern (DO.pm) und als ' '-separierte Liste wieder zurueckschreiben
   # Hinweis: delete gibt den wert zurueck und loescht danach das element (nett und einfach)
   # $shell: perldoc perlunc; /delete EXPR
-  $form->{donumber}           = delete $form->{donumber_array};
+  $form->{donumber}            = delete $form->{donumber_array};
   $form->{deliverydate}        = $form->{transdate};
   $form->{transdate}           = $form->current_date(\%myconfig);
   $form->{duedate}             = $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1);
@@ -829,9 +829,9 @@ sub invoice_multi {
     $ref->{reqdate} ||= $ref->{dord_transdate}; # copy transdates into each invoice row
     map { $form->{"${_}_$form->{rowcount}"} = $ref->{$_} } keys %{ $ref };
     map { $form->{"${_}_$form->{rowcount}"} = $form->format_amount(\%myconfig, $ref->{$_}) } qw(qty sellprice discount lastcost);
-               $form->{"discount_$form->{rowcount}"}   = $form->{"discount_$form->{rowcount}"}  * 100; #s.a. Bug 1151
-               # Anm.: Eine Änderung des discounts in der SL/DO.pm->retrieve (select (doi.discount * 100) as discount) ergibt in psql einen
-               # Wert von 10.0000001490116. Ferner ist der Rabatt in der Rechnung dann bei 1.0 (?). Deswegen lasse ich das hier. jb 10.10.09
+    $form->{"discount_$form->{rowcount}"}   = $form->{"discount_$form->{rowcount}"}  * 100; #s.a. Bug 1151
+    # Anm.: Eine Änderung des discounts in der SL/DO.pm->retrieve (select (doi.discount * 100) as discount) ergibt in psql einen
+    # Wert von 10.0000001490116. Ferner ist der Rabatt in der Rechnung dann bei 1.0 (?). Deswegen lasse ich das hier. jb 10.10.09
   }
   delete $form->{form_details};
 
index 4b34a50..f5f8460 100644 (file)
@@ -250,10 +250,10 @@ sub search {
   }
 
   my $department = qq|
-       <tr>
-         <th align=right nowrap>| . $locale->text('Department') . qq|</th>
-         <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
-       </tr>
+        <tr>
+          <th align=right nowrap>| . $locale->text('Department') . qq|</th>
+          <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
+        </tr>
 | if $form->{selectdepartment};
 
   $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
@@ -321,83 +321,83 @@ sub search {
   <tr>
     <td>
       <table>
-       <tr>
-         <th align=right>| . $locale->text('Reference') . qq|</th>
-         <td><input name=reference size=20></td>
-         <th align=right>| . $locale->text('Source') . qq|</th>
-         <td><input name=source size=20></td>
-       </tr>
-       $department
-       <tr>
-         <th align=right>| . $locale->text('Description') . qq|</th>
-         <td colspan=3><input name=description size=40></td>
-       </tr>
-       <tr>
-         <th align=right>| . $locale->text('Notes') . qq|</th>
-         <td colspan=3><input name=notes size=40></td>
-       </tr>
-       <tr>
-         <th align=right>| . $locale->text('Project Number') . qq|</th>
-         <td colspan=3>$projectnumber</td>
-       </tr>
-       <tr>
-         <th align=right>| . $locale->text('From') . qq|</th>
+        <tr>
+          <th align=right>| . $locale->text('Reference') . qq|</th>
+          <td><input name=reference size=20></td>
+          <th align=right>| . $locale->text('Source') . qq|</th>
+          <td><input name=source size=20></td>
+        </tr>
+        $department
+        <tr>
+          <th align=right>| . $locale->text('Description') . qq|</th>
+          <td colspan=3><input name=description size=40></td>
+        </tr>
+        <tr>
+          <th align=right>| . $locale->text('Notes') . qq|</th>
+          <td colspan=3><input name=notes size=40></td>
+        </tr>
+        <tr>
+          <th align=right>| . $locale->text('Project Number') . qq|</th>
+          <td colspan=3>$projectnumber</td>
+        </tr>
+        <tr>
+          <th align=right>| . $locale->text('From') . qq|</th>
           $button1
-         <th align=right>| . $locale->text('To (time)') . qq|</th>
+          <th align=right>| . $locale->text('To (time)') . qq|</th>
           $button2
-       </tr>
-       <tr>
-         <th align=right>| . $locale->text('Include in Report') . qq|</th>
-         <td colspan=3>
-           <table>
-             <tr>
-               <td>
-                 <input name="category" class=radio type=radio value=X checked>&nbsp;|
+        </tr>
+        <tr>
+          <th align=right>| . $locale->text('Include in Report') . qq|</th>
+          <td colspan=3>
+            <table>
+              <tr>
+                <td>
+                  <input name="category" class=radio type=radio value=X checked>&nbsp;|
     . $locale->text('All') . qq|
-                 <input name="category" class=radio type=radio value=A>&nbsp;|
+                  <input name="category" class=radio type=radio value=A>&nbsp;|
     . $locale->text('Asset') . qq|
-                 <input name="category" class=radio type=radio value=L>&nbsp;|
+                  <input name="category" class=radio type=radio value=L>&nbsp;|
     . $locale->text('Liability') . qq|
-                 <input name="category" class=radio type=radio value=I>&nbsp;|
+                  <input name="category" class=radio type=radio value=I>&nbsp;|
     . $locale->text('Revenue') . qq|
-                 <input name="category" class=radio type=radio value=E>&nbsp;|
+                  <input name="category" class=radio type=radio value=E>&nbsp;|
     . $locale->text('Expense') . qq|
-               </td>
-             </tr>
-             <tr>
-               <table>
-                 <tr>
-                   <td align=right><input name="l_id" class=checkbox type=checkbox value=Y></td>
-                   <td>| . $locale->text('ID') . qq|</td>
-                   <td align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
-                   <td>| . $locale->text('Date') . qq|</td>
-                   <td align=right><input name="l_reference" class=checkbox type=checkbox value=Y checked></td>
-                   <td>| . $locale->text('Reference') . qq|</td>
-                   <td align=right><input name="l_description" class=checkbox type=checkbox value=Y checked></td>
-                   <td>| . $locale->text('Description') . qq|</td>
-                   <td align=right><input name="l_notes" class=checkbox type=checkbox value=Y></td>
-                   <td>| . $locale->text('Notes') . qq|</td>
-                 </tr>
-                 <tr>
-                   <td align=right><input name="l_debit" class=checkbox type=checkbox value=Y checked></td>
-                   <td>| . $locale->text('Debit') . qq|</td>
-                   <td align=right><input name="l_credit" class=checkbox type=checkbox value=Y checked></td>
-                   <td>| . $locale->text('Credit') . qq|</td>
-                   <td align=right><input name="l_source" class=checkbox type=checkbox value=Y checked></td>
-                   <td>| . $locale->text('Source') . qq|</td>
-                   <td align=right><input name="l_accno" class=checkbox type=checkbox value=Y checked></td>
-                   <td>| . $locale->text('Account') . qq|</td>
-                 </tr>
-                 <tr>
-                   <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
-                   <td>| . $locale->text('Subtotal') . qq|</td>
-                   <td align=right><input name="l_projectnumbers" class=checkbox type=checkbox value=Y></td>
-                   <td>| . $locale->text('Project Number') . qq|</td>
-                 </tr>
-               </table>
-             </tr>
-           </table>
-       </tr>
+                </td>
+              </tr>
+              <tr>
+                <table>
+                  <tr>
+                    <td align=right><input name="l_id" class=checkbox type=checkbox value=Y></td>
+                    <td>| . $locale->text('ID') . qq|</td>
+                    <td align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
+                    <td>| . $locale->text('Date') . qq|</td>
+                    <td align=right><input name="l_reference" class=checkbox type=checkbox value=Y checked></td>
+                    <td>| . $locale->text('Reference') . qq|</td>
+                    <td align=right><input name="l_description" class=checkbox type=checkbox value=Y checked></td>
+                    <td>| . $locale->text('Description') . qq|</td>
+                    <td align=right><input name="l_notes" class=checkbox type=checkbox value=Y></td>
+                    <td>| . $locale->text('Notes') . qq|</td>
+                  </tr>
+                  <tr>
+                    <td align=right><input name="l_debit" class=checkbox type=checkbox value=Y checked></td>
+                    <td>| . $locale->text('Debit') . qq|</td>
+                    <td align=right><input name="l_credit" class=checkbox type=checkbox value=Y checked></td>
+                    <td>| . $locale->text('Credit') . qq|</td>
+                    <td align=right><input name="l_source" class=checkbox type=checkbox value=Y checked></td>
+                    <td>| . $locale->text('Source') . qq|</td>
+                    <td align=right><input name="l_accno" class=checkbox type=checkbox value=Y checked></td>
+                    <td>| . $locale->text('Account') . qq|</td>
+                  </tr>
+                  <tr>
+                    <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
+                    <td>| . $locale->text('Subtotal') . qq|</td>
+                    <td align=right><input name="l_projectnumbers" class=checkbox type=checkbox value=Y></td>
+                    <td>| . $locale->text('Project Number') . qq|</td>
+                  </tr>
+                </table>
+              </tr>
+            </table>
+        </tr>
       </table>
     </td>
   </tr>
@@ -1085,11 +1085,11 @@ sub form_header {
 
   my $department;
   $department = qq|
-       <tr>
-         <th align=right nowrap>| . $locale->text('Department') . qq|</th>
-         <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
-         <input type=hidden name=selectdepartment value="$form->{selectdepartment}">
-       </tr>
+        <tr>
+          <th align=right nowrap>| . $locale->text('Department') . qq|</th>
+          <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
+          <input type=hidden name=selectdepartment value="$form->{selectdepartment}">
+        </tr>
 | if $form->{selectdepartment};
   if ($init) {
     $form->{fokus} = "gl.reference";
@@ -1161,71 +1161,71 @@ sub form_header {
     . " $form->{previous_gldate}"
     . qq|</td>
         </tr>
-       <tr>
-         <th align=right>| . $locale->text('Reference') . qq|</th>
-         <td><input name=reference size=20 value="$form->{reference}" $readonly></td>
-         <td align=left>
-           <table>
-             <tr>
-               <th align=right nowrap>| . $locale->text('Date') . qq|</th>
+        <tr>
+          <th align=right>| . $locale->text('Reference') . qq|</th>
+          <td><input name=reference size=20 value="$form->{reference}" $readonly></td>
+          <td align=left>
+            <table>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Date') . qq|</th>
                 $button1
-             </tr>
-           </table>
-         </td>
-       </tr>|;
+              </tr>
+            </table>
+          </td>
+        </tr>|;
   if ($form->{id}) {
     print qq|
-       <tr>
-         <th align=right>| . $locale->text('Belegnummer') . qq|</th>
-         <td><input name=id size=20 value="$form->{id}" $readonly></td>
-         <td align=left>
-         <table>
-             <tr>
-               <th align=right width=50%>| . $locale->text('Buchungsdatum') . qq|</th>
-               <td align=left><input name=gldate size=11 title="$myconfig{dateformat}" value=$form->{gldate} $readonly onBlur=\"check_right_date_format(this)\"></td>
-             </tr>
-           </table>
-         </td>
-       </tr>|;
+        <tr>
+          <th align=right>| . $locale->text('Belegnummer') . qq|</th>
+          <td><input name=id size=20 value="$form->{id}" $readonly></td>
+          <td align=left>
+          <table>
+              <tr>
+                <th align=right width=50%>| . $locale->text('Buchungsdatum') . qq|</th>
+                <td align=left><input name=gldate size=11 title="$myconfig{dateformat}" value=$form->{gldate} $readonly onBlur=\"check_right_date_format(this)\"></td>
+              </tr>
+            </table>
+          </td>
+        </tr>|;
   }
   print qq|
-       $department|;
+        $department|;
   if ($form->{id}) {
     print qq|
-       <tr>
-         <th align=right width=1%>| . $locale->text('Description') . qq|</th>
-         <td width=1%>$description</td>
+        <tr>
+          <th align=right width=1%>| . $locale->text('Description') . qq|</th>
+          <td width=1%>$description</td>
           <td>
-           <table>
-             <tr>
-               <th align=left>| . $locale->text('MwSt. inkl.') . qq|</th>
-               <td><input type=checkbox name=taxincluded value=1 $taxincluded></td>
-             </tr>
-           </table>
-        </td>
-         <td align=left>
-           <table width=100%>
-             <tr>
-               <th align=right width=50%>| . $locale->text('Mitarbeiter') . qq|</th>
-               <td align=left><input name=employee size=20  value="| . H($form->{employee}) . qq|" readonly></td>
-             </tr>
-           </table>
-         </td>
-       </tr>|;
+            <table>
+              <tr>
+                <th align=left>| . $locale->text('MwSt. inkl.') . qq|</th>
+                <td><input type=checkbox name=taxincluded value=1 $taxincluded></td>
+              </tr>
+            </table>
+         </td>
+          <td align=left>
+            <table width=100%>
+              <tr>
+                <th align=right width=50%>| . $locale->text('Mitarbeiter') . qq|</th>
+                <td align=left><input name=employee size=20  value="| . H($form->{employee}) . qq|" readonly></td>
+              </tr>
+            </table>
+          </td>
+        </tr>|;
   } else {
     print qq|
-       <tr>
-         <th align=left width=1%>| . $locale->text('Description') . qq|</th>
-         <td width=1%>$description</td>
-         <td>
-           <table>
-             <tr>
-               <th align=left>| . $locale->text('MwSt. inkl.') . qq|</th>
-               <td><input type=checkbox name=taxincluded value=1 $taxincluded></td>
-             </tr>
-           </table>
-        </td>
-       </tr>|;
+        <tr>
+          <th align=left width=1%>| . $locale->text('Description') . qq|</th>
+          <td width=1%>$description</td>
+          <td>
+            <table>
+              <tr>
+                <th align=left>| . $locale->text('MwSt. inkl.') . qq|</th>
+                <td><input type=checkbox name=taxincluded value=1 $taxincluded></td>
+              </tr>
+            </table>
+         </td>
+        </tr>|;
   }
 
   print qq|
@@ -1247,13 +1247,13 @@ sub form_header {
       <tr>
       <td colspan=4>
           <table width=100%>
-          <tr class=listheading>
-         <th class=listheading style="width:15%">|
+           <tr class=listheading>
+          <th class=listheading style="width:15%">|
     . $locale->text('Account') . qq|</th>
-         <th class=listheading style="width:10%">| . $locale->text('Chart balance') . qq|</th>
-         <th class=listheading style="width:10%">|
+          <th class=listheading style="width:10%">| . $locale->text('Chart balance') . qq|</th>
+          <th class=listheading style="width:10%">|
     . $locale->text('Debit') . qq|</th>
-         <th class=listheading style="width:10%">|
+          <th class=listheading style="width:10%">|
     . $locale->text('Credit') . qq|</th>
           <th class=listheading style="width:10%">|
     . $locale->text('Tax') . qq|</th>
@@ -1262,14 +1262,14 @@ sub form_header {
 
   if ($form->{show_details}) {
     print qq|
-         <th class=listheading style="width:20%">| . $locale->text('Source') . qq|</th>
-         <th class=listheading style="width:20%">| . $locale->text('Memo') . qq|</th>
-         <th class=listheading style="width:20%">| . $locale->text('Project Number') . qq|</th>
+          <th class=listheading style="width:20%">| . $locale->text('Source') . qq|</th>
+          <th class=listheading style="width:20%">| . $locale->text('Memo') . qq|</th>
+          <th class=listheading style="width:20%">| . $locale->text('Project Number') . qq|</th>
 |;
   }
 
   print qq|
-       </tr>
+        </tr>
 
 $jsscript
 |;
@@ -1422,8 +1422,8 @@ sub yes {
     # saving the history
       if(!exists $form->{addition} && $form->{id} ne "") {
         $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
-           $form->{addition} = "DELETED";
-           $form->save_history($form->dbconnect(\%myconfig));
+        $form->{addition} = "DELETED";
+        $form->save_history($form->dbconnect(\%myconfig));
       }
     # /saving the history
     $form->redirect($locale->text('Transaction deleted!'))
index 9b5b20a..add1895 100644 (file)
@@ -290,14 +290,14 @@ sub update_prices {
 #      <th class=listtop colspan=6>| . $locale->text('choice part') . qq|</th>
 #     </tr>
 #        <tr height="5"></tr>
-#      <tr class=listheading>
-#        <th>&nbsp;</th>
-#        <th class=listheading>| . $locale->text('Part Number') . qq|</th>
-#        <th class=listheading>| . $locale->text('Part Description') . qq|</th>
-#        <th class=listheading>| . $locale->text('Unit of measure') . qq|</th>
-#        <th class=listheading>| . $locale->text('Sell Price') . qq|</th>
-#        <th class=listheading>| . $locale->text('soldtotal') . qq|</th>
-#      </tr>|;
+#        <tr class=listheading>
+#          <th>&nbsp;</th>
+#          <th class=listheading>| . $locale->text('Part Number') . qq|</th>
+#          <th class=listheading>| . $locale->text('Part Description') . qq|</th>
+#          <th class=listheading>| . $locale->text('Unit of measure') . qq|</th>
+#          <th class=listheading>| . $locale->text('Sell Price') . qq|</th>
+#          <th class=listheading>| . $locale->text('soldtotal') . qq|</th>
+#        </tr>|;
 #
 #  my $j = 0;
 #  my $i = $form->{rows};
@@ -308,20 +308,20 @@ sub update_prices {
 #        <tr class=listrow| . ($j % 2) . qq|>|;
 #    if ($j == 1) {
 #      print qq|
-#          <td><input name=ndx class=radio type=radio value=$j checked></td>|;
+#            <td><input name=ndx class=radio type=radio value=$j checked></td>|;
 #    } else {
 #      print qq|
-#        <td><input name=ndx class=radio type=radio value=$j></td>|;
+#          <td><input name=ndx class=radio type=radio value=$j></td>|;
 #    }
 #    print qq|
-#        <td><input name="new_partnumber_$j" type=hidden value="$form->{"partnumber_$j"}">$form->{"partnumber_$j"}</td>
-#        <td><input name="new_description_$j" type=hidden value="$form->{"description_$j"}">$form->{"description_$j"}</td>
-#        <td><input name="new_unit_$j" type=hidden value="$form->{"unit_$j"}">$form->{"unit_$j"}</td>
-#        <td><input name="new_sellprice_$j" type=hidden value="$form->{"sellprice_$j"}">$form->{"sellprice_$j"}</td>
-#        <td><input name="new_soldtotal_$j" type=hidden value="$form->{"soldtotal_$j"}">$form->{"soldtotal_$j"}</td>
+#          <td><input name="new_partnumber_$j" type=hidden value="$form->{"partnumber_$j"}">$form->{"partnumber_$j"}</td>
+#          <td><input name="new_description_$j" type=hidden value="$form->{"description_$j"}">$form->{"description_$j"}</td>
+#          <td><input name="new_unit_$j" type=hidden value="$form->{"unit_$j"}">$form->{"unit_$j"}</td>
+#          <td><input name="new_sellprice_$j" type=hidden value="$form->{"sellprice_$j"}">$form->{"sellprice_$j"}</td>
+#          <td><input name="new_soldtotal_$j" type=hidden value="$form->{"soldtotal_$j"}">$form->{"soldtotal_$j"}</td>
 #        </tr>
 #
-#      <input name="new_id_$j" type=hidden value="$form->{"id_$j"}">|;
+#        <input name="new_id_$j" type=hidden value="$form->{"id_$j"}">|;
 #  }
 #
 #  print qq|
@@ -1781,8 +1781,8 @@ sub save {
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|partnumber_| . $form->{partnumber};
-       $form->{addition} = "SAVED";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "SAVED";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
   $parts_id = $form->{id};
@@ -1914,8 +1914,8 @@ sub save_as_new {
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|partnumber_| . $form->{partnumber};
-       $form->{addition} = "SAVED AS NEW";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "SAVED AS NEW";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
   $form->{id} = 0;
@@ -1935,8 +1935,8 @@ sub delete {
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|partnumber_| . $form->{partnumber};
-       $form->{addition} = "DELETED";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "DELETED";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
   my $rc = IC->delete(\%myconfig, \%$form);
index 5ac873e..07db7ea 100644 (file)
@@ -750,7 +750,7 @@ sub check_form {
         #($form->{"sellprice_$i"},$form->{"$pricegroup_old_$i"}) = split /--/, $form->{"sellprice_$i"};
 
         # fuer assemblies auskommentiert. siehe oben
-       #    $form->{sellprice} += ($form->{"qty_$i"} * $form->{"sellprice_$i"} / ($form->{"price_factor_$i"} || 1));
+        #    $form->{sellprice} += ($form->{"qty_$i"} * $form->{"sellprice_$i"} / ($form->{"price_factor_$i"} || 1));
         $form->{weight}    += ($form->{"qty_$i"} * $form->{"weight_$i"} / ($form->{"price_factor_$i"} || 1));
         $count++;
       }
@@ -1421,10 +1421,10 @@ sub print_form {
 
       call_sub($display_form);
       # saving the history
-         if(!exists $form->{addition}) {
+      if(!exists $form->{addition}) {
         $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
-           $form->{addition} = "PRINTED";
-           $form->save_history($form->dbconnect(\%myconfig));
+        $form->{addition} = "PRINTED";
+        $form->save_history($form->dbconnect(\%myconfig));
       }
       # /saving the history
       exit;
@@ -1641,16 +1641,16 @@ sub print_form {
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
     if($form->{media} =~ /printer/) {
-       $form->{addition} = "PRINTED";
+      $form->{addition} = "PRINTED";
     }
     elsif($form->{media} =~ /email/) {
-       $form->{addition} = "MAILED";
+      $form->{addition} = "MAILED";
     }
     elsif($form->{media} =~ /queue/) {
-       $form->{addition} = "QUEUED";
+      $form->{addition} = "QUEUED";
     }
     elsif($form->{media} =~ /screen/) {
-       $form->{addition} = "SCREENED";
+      $form->{addition} = "SCREENED";
     }
     $form->save_history($form->dbconnect(\%myconfig));
   }
@@ -1809,72 +1809,72 @@ sub ship_to {
   <tr>
     <td>
       <table>
-       <tr class="listheading">
-         <th class="listheading" colspan="2" width="50%">|
+        <tr class="listheading">
+          <th class="listheading" colspan="2" width="50%">|
     . $locale->text('Billing Address') . qq|</th>
-         <th class="listheading" width="50%">|
+          <th class="listheading" width="50%">|
     . $locale->text('Shipping Address') . qq|</th>
-       </tr>
-       <tr height="5"></tr>
-       <tr>
-         <th align="right" nowrap>$number</th>
-         <td>$form->{"$form->{vc}number"}</td>
-       </tr>
-       <tr>
-         <th align="right" nowrap>| . $locale->text('Company Name') . qq|</th>
-         <td>$form->{name}</td>
-         <td><input name="shiptoname" size="35" value="$form->{shiptoname}"></td>
-       </tr>
-       <tr>
-         <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
-         <td>$form->{department_1}</td>
-         <td><input name="shiptodepartment_1" size="35" value="$form->{shiptodepartment_1}"></td>
-       </tr>
-       <tr>
-         <th align="right" nowrap>&nbsp;</th>
-         <td>$form->{department_2}</td>
-         <td><input name="shiptodepartment_2" size="35" value="$form->{shiptodepartment_2}"></td>
-       </tr>
-       <tr>
-         <th align="right" nowrap>| . $locale->text('Street') . qq|</th>
-         <td>$form->{street}</td>
-         <td><input name="shiptostreet" size="35" value="$form->{shiptostreet}"></td>
-       </tr>
-       <tr>
-         <th align="right" nowrap>| . $locale->text('Zipcode') . qq|</th>
-         <td>$form->{zipcode}</td>
-         <td><input name="shiptozipcode" size="35" value="$form->{shiptozipcode}"></td>
-       </tr>
-       <tr>
-         <th align="right" nowrap>| . $locale->text('City') . qq|</th>
-         <td>$form->{city}</td>
-         <td><input name="shiptocity" size="35" value="$form->{shiptocity}"></td>
-       </tr>
-       <tr>
-         <th align="right" nowrap>| . $locale->text('Country') . qq|</th>
-         <td>$form->{country}</td>
-         <td><input name="shiptocountry" size="35" value="$form->{shiptocountry}"></td>
-       </tr>
-       <tr>
-         <th align="right" nowrap>| . $locale->text('Contact') . qq|</th>
-         <td>$form->{contact}</td>
-         <td><input name="shiptocontact" size="35" value="$form->{shiptocontact}"></td>
-       </tr>
-       <tr>
-         <th align="right" nowrap>| . $locale->text('Phone') . qq|</th>
-         <td>$form->{phone}</td>
-         <td><input name="shiptophone" size="20" value="$form->{shiptophone}"></td>
-       </tr>
-       <tr>
-         <th align="right" nowrap>| . $locale->text('Fax') . qq|</th>
-         <td>$form->{fax}</td>
-         <td><input name="shiptofax" size="20" value="$form->{shiptofax}"></td>
-       </tr>
-       <tr>
-         <th align="right" nowrap>| . $locale->text('E-mail') . qq|</th>
-         <td>$form->{email}</td>
-         <td><input name="shiptoemail" size="35" value="$form->{shiptoemail}"></td>
-       </tr>
+        </tr>
+        <tr height="5"></tr>
+        <tr>
+          <th align="right" nowrap>$number</th>
+          <td>$form->{"$form->{vc}number"}</td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>| . $locale->text('Company Name') . qq|</th>
+          <td>$form->{name}</td>
+          <td><input name="shiptoname" size="35" value="$form->{shiptoname}"></td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
+          <td>$form->{department_1}</td>
+          <td><input name="shiptodepartment_1" size="35" value="$form->{shiptodepartment_1}"></td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>&nbsp;</th>
+          <td>$form->{department_2}</td>
+          <td><input name="shiptodepartment_2" size="35" value="$form->{shiptodepartment_2}"></td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>| . $locale->text('Street') . qq|</th>
+          <td>$form->{street}</td>
+          <td><input name="shiptostreet" size="35" value="$form->{shiptostreet}"></td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>| . $locale->text('Zipcode') . qq|</th>
+          <td>$form->{zipcode}</td>
+          <td><input name="shiptozipcode" size="35" value="$form->{shiptozipcode}"></td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>| . $locale->text('City') . qq|</th>
+          <td>$form->{city}</td>
+          <td><input name="shiptocity" size="35" value="$form->{shiptocity}"></td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>| . $locale->text('Country') . qq|</th>
+          <td>$form->{country}</td>
+          <td><input name="shiptocountry" size="35" value="$form->{shiptocountry}"></td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>| . $locale->text('Contact') . qq|</th>
+          <td>$form->{contact}</td>
+          <td><input name="shiptocontact" size="35" value="$form->{shiptocontact}"></td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>| . $locale->text('Phone') . qq|</th>
+          <td>$form->{phone}</td>
+          <td><input name="shiptophone" size="20" value="$form->{shiptophone}"></td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>| . $locale->text('Fax') . qq|</th>
+          <td>$form->{fax}</td>
+          <td><input name="shiptofax" size="20" value="$form->{shiptofax}"></td>
+        </tr>
+        <tr>
+          <th align="right" nowrap>| . $locale->text('E-mail') . qq|</th>
+          <td>$form->{email}</td>
+          <td><input name="shiptoemail" size="35" value="$form->{shiptoemail}"></td>
+        </tr>
       </table>
     </td>
   </tr>
index 0e64a5b..c44ef42 100644 (file)
@@ -475,9 +475,8 @@ sub update {
         # override sellprice if there is one entered
         my $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
 
-       # ergaenzung fuer bug 736 Lieferanten-Rabatt auch in Einkaufsrechnungen vorbelegen jb
-        $form->{"discount_$i"} = $form->format_amount(\%myconfig,
-                                                     $form->{vendor_discount} * 100 );
+        # ergaenzung fuer bug 736 Lieferanten-Rabatt auch in Einkaufsrechnungen vorbelegen jb
+        $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{vendor_discount} * 100 );
         map { $form->{item_list}[$i]{$_} =~ s/\"/&quot;/g } qw(partnumber description unit);
         map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } keys %{ $form->{item_list}[0] };
 
@@ -614,14 +613,14 @@ sub post_payment {
   ($form->{AP})      = split /--/, $form->{AP};
   ($form->{AP_paid}) = split /--/, $form->{AP_paid};
   if (IR->post_payment(\%myconfig, \%$form)){
-       if (!exists $form->{addition} && $form->{id} ne "") {
-               # saving the history
+    if (!exists $form->{addition} && $form->{id} ne "") {
+      # saving the history
       $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
-               $form->{addition} = "PAYMENT POSTED";
+      $form->{addition} = "PAYMENT POSTED";
       $form->{what_done} = $form->{currency} . qq| | . $form->{paid} . qq| | . $locale->text("POSTED");
-               $form->save_history($form->dbconnect(\%myconfig));
-               # /saving the history
-       }
+      $form->save_history($form->dbconnect(\%myconfig));
+      # /saving the history
+    }
 
     $form->redirect($locale->text('Payment posted!'));
   }
@@ -707,16 +706,16 @@ sub post {
 
   relink_accounts();
   if (IR->post_invoice(\%myconfig, \%$form)){
-       # saving the history
-       if(!exists $form->{addition} && $form->{id} ne "") {
+    # saving the history
+    if(!exists $form->{addition} && $form->{id} ne "") {
       $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
       $form->{addition} = "POSTED";
-               #$form->{what_done} = $locale->text("Rechnungsnummer") . qq| | . $form->{invnumber};
-               $form->save_history($form->dbconnect(\%myconfig));
-       }
-       # /saving the history
+      #$form->{what_done} = $locale->text("Rechnungsnummer") . qq| | . $form->{invnumber};
+      $form->save_history($form->dbconnect(\%myconfig));
+    }
+    # /saving the history
     remove_draft() if $form->{remove_draft};
-       $form->redirect(  $locale->text('Invoice')
+    $form->redirect(  $locale->text('Invoice')
                   . " $form->{invnumber} "
                   . $locale->text('posted!'));
   }
@@ -777,8 +776,8 @@ sub yes {
     # saving the history
     if(!exists $form->{addition}) {
       $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
-         $form->{addition} = "DELETED";
-         $form->save_history($form->dbconnect(\%myconfig));
+      $form->{addition} = "DELETED";
+      $form->save_history($form->dbconnect(\%myconfig));
     }
     # /saving the history
     $form->redirect($locale->text('Invoice deleted!'));
index 0b53602..4b9b1a5 100644 (file)
@@ -907,10 +907,10 @@ sub yes {
 
   if (IS->delete_invoice(\%myconfig, \%$form, $main::spool)) {
     # saving the history
-       if(!exists $form->{addition}) {
+    if(!exists $form->{addition}) {
     $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
-         $form->{addition} = "DELETED";
-         $form->save_history($form->dbconnect(\%myconfig));
+      $form->{addition} = "DELETED";
+      $form->save_history($form->dbconnect(\%myconfig));
     }
     # /saving the history
     $form->redirect($locale->text('Invoice deleted!'));
index b5a895a..3e01a31 100644 (file)
@@ -65,37 +65,37 @@ if (seconds < 10) {seconds="0"+seconds}
 var thistime = hours+":"+minutes
 
 function writeclock() {
-       i_clock++
-       if (document.all \|\| document.getElementById \|\| document.layers) {
-               clockid[i_clock]="clock"+i_clock
-               document.write("<font family=arial size=2><span id='"+clockid[i_clock]+"' style='position:relative'>"+thistime+"</span></font>")
-       }
+  i_clock++
+  if (document.all \|\| document.getElementById \|\| document.layers) {
+    clockid[i_clock]="clock"+i_clock
+    document.write("<font family=arial size=2><span id='"+clockid[i_clock]+"' style='position:relative'>"+thistime+"</span></font>")
+  }
 }
 
 function clockon() {
-       thistime= new Date()
-       hours=thistime.getHours()
-       minutes=thistime.getMinutes()
-       seconds=thistime.getSeconds()
-       if (eval(hours) <10) {hours="0"+hours}
-       if (eval(minutes) < 10) {minutes="0"+minutes}
-       if (seconds < 10) {seconds="0"+seconds}
-       //thistime = hours+":"+minutes+":"+seconds
-       thistime = hours+":"+minutes
+  thistime= new Date()
+  hours=thistime.getHours()
+  minutes=thistime.getMinutes()
+  seconds=thistime.getSeconds()
+  if (eval(hours) <10) {hours="0"+hours}
+  if (eval(minutes) < 10) {minutes="0"+minutes}
+  if (seconds < 10) {seconds="0"+seconds}
+  //thistime = hours+":"+minutes+":"+seconds
+  thistime = hours+":"+minutes
 
-       if (document.all) {
-               for (i=0;i<=clockid.length-1;i++) {
-                       var thisclock=eval(clockid[i])
-                       thisclock.innerHTML=thistime
-               }
-       }
+  if (document.all) {
+    for (i=0;i<=clockid.length-1;i++) {
+      var thisclock=eval(clockid[i])
+      thisclock.innerHTML=thistime
+    }
+  }
 
-       if (document.getElementById) {
-               for (i=0;i<=clockid.length-1;i++) {
-                       document.getElementById(clockid[i]).innerHTML=thistime
-               }
-       }
-       var timer=setTimeout("clockon()",60000)
+  if (document.getElementById) {
+    for (i=0;i<=clockid.length-1;i++) {
+      document.getElementById(clockid[i]).innerHTML=thistime
+    }
+  }
+  var timer=setTimeout("clockon()",60000)
 }
 window.onload=clockon
 //-->
@@ -107,12 +107,12 @@ print qq|
 <body bgcolor="#ffffff" text="#ffffff" link="#ffffff" vlink="#ffffff" alink="#ffffff" topmargin="0" leftmargin="0"  marginwidth="0" marginheight="0" style="background-image: url('image/fade.png'); background-repeat:repeat-x;">
 
 <table border="0" width="100%" background="image/bg_titel.gif" cellpadding="0" cellspacing="0">
-       <tr>
-               <td  style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;"> &nbsp; [<a href="JavaScript:top.main_window.print()">| . $locale->text('drucken') . qq|</a>]</td>
-               <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>|
+  <tr>
+    <td  style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;"> &nbsp; [<a href="JavaScript:top.main_window.print()">| . $locale->text('drucken') . qq|</a>]</td>
+    <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>|
   . $login . $datum . qq| <script>writeclock()</script>&nbsp;
-               </td>
-       </tr>
+    </td>
+  </tr>
 </table>
 </body>
 </html>
index f4455d6..ef7b2b8 100644 (file)
@@ -181,152 +181,152 @@ var isNS4 = (document.layers ? true : false);
 //var KO = (navigator.appName=="Konqueror" \|\| navigator.appName=="Opera") ;
 var KO = ((navigator.userAgent.indexOf('Opera',0) != -1) \|\| (navigator.userAgent.indexOf('Konqueror',0) != -1));
 function getRef(id) {
-       if (isDOM) return document.getElementById(id);
-       if (isIE4) return document.all[id];
-       if (isNS4) return document.layers[id];
+  if (isDOM) return document.getElementById(id);
+  if (isIE4) return document.all[id];
+  if (isNS4) return document.layers[id];
 }
 function getSty(id) {
-       return (isNS4 ? getRef(id) : getRef(id).style);
+  return (isNS4 ? getRef(id) : getRef(id).style);
 }
 var popTimer = 0;
 var litNow = new Array();
 function popOver(menuNum, itemNum) {
-       if (KO) document.getElementById("win1").style.visibility = "hidden";
-       clearTimeout(popTimer);
-       hideAllBut(menuNum);
-       litNow = getTree(menuNum, itemNum);
-       changeCol(litNow, true);
-       targetNum = menu[menuNum][itemNum].target;
-       if (targetNum > 0) {
-               thisX = parseInt(menu[menuNum][0].ref.left) + parseInt(menu[menuNum][itemNum].ref.left);
-               thisY = parseInt(menu[menuNum][0].ref.top) + parseInt(menu[menuNum][itemNum].ref.top);
-               with (menu[targetNum][0].ref) {
-                       left = parseInt(thisX + menu[targetNum][0].x);
-                       top = parseInt(thisY + menu[targetNum][0].y);
-                       visibility = 'visible';
-               }
-       }
+  if (KO) document.getElementById("win1").style.visibility = "hidden";
+  clearTimeout(popTimer);
+  hideAllBut(menuNum);
+  litNow = getTree(menuNum, itemNum);
+  changeCol(litNow, true);
+  targetNum = menu[menuNum][itemNum].target;
+  if (targetNum > 0) {
+    thisX = parseInt(menu[menuNum][0].ref.left) + parseInt(menu[menuNum][itemNum].ref.left);
+    thisY = parseInt(menu[menuNum][0].ref.top) + parseInt(menu[menuNum][itemNum].ref.top);
+    with (menu[targetNum][0].ref) {
+      left = parseInt(thisX + menu[targetNum][0].x);
+      top = parseInt(thisY + menu[targetNum][0].y);
+      visibility = 'visible';
+    }
+  }
 }
 function popOut(menuNum, itemNum) {
-       if ((menuNum == 0) && !menu[menuNum][itemNum].target)
-               hideAllBut(0)
-               if (KO) document.getElementById("win1").style.visibility = "visible";
-       else
-               popTimer = setTimeout('hideAllBut(0)', 500);
+  if ((menuNum == 0) && !menu[menuNum][itemNum].target)
+    hideAllBut(0)
+    if (KO) document.getElementById("win1").style.visibility = "visible";
+  else
+    popTimer = setTimeout('hideAllBut(0)', 500);
 }
 function getTree(menuNum, itemNum) {
-       itemArray = new Array(menu.length);
-       while(1) {
-               itemArray[menuNum] = itemNum;
-               if (menuNum == 0) return itemArray;
-               itemNum = menu[menuNum][0].parentItem;
-               menuNum = menu[menuNum][0].parentMenu;
-       }
+  itemArray = new Array(menu.length);
+  while(1) {
+    itemArray[menuNum] = itemNum;
+    if (menuNum == 0) return itemArray;
+    itemNum = menu[menuNum][0].parentItem;
+    menuNum = menu[menuNum][0].parentMenu;
+  }
 }
 function changeCol(changeArray, isOver) {
-       for (menuCount = 0; menuCount < changeArray.length; menuCount++) {
-               if (changeArray[menuCount]) {
-                       newCol = isOver ? menu[menuCount][0].overCol : menu[menuCount][0].backCol;
-                       with (menu[menuCount][changeArray[menuCount]].ref) {
-                               if (isNS4) bgColor = newCol;
-                               else backgroundColor = newCol;
-                       }
-               }
-       }
+  for (menuCount = 0; menuCount < changeArray.length; menuCount++) {
+    if (changeArray[menuCount]) {
+      newCol = isOver ? menu[menuCount][0].overCol : menu[menuCount][0].backCol;
+      with (menu[menuCount][changeArray[menuCount]].ref) {
+        if (isNS4) bgColor = newCol;
+        else backgroundColor = newCol;
+      }
+    }
+  }
 }
 function hideAllBut(menuNum) {
-       var keepMenus = getTree(menuNum, 1);
-       for (count = 0; count < menu.length; count++)
-               if (!keepMenus[count])
-                       menu[count][0].ref.visibility = 'hidden';
-       changeCol(litNow, false);
+  var keepMenus = getTree(menuNum, 1);
+  for (count = 0; count < menu.length; count++)
+    if (!keepMenus[count])
+      menu[count][0].ref.visibility = 'hidden';
+  changeCol(litNow, false);
 }
 
 function Menu(isVert, popInd, x, y, width, overCol, backCol, borderClass, textClass) {
-       this.isVert = isVert;
-       this.popInd = popInd
-       this.x = x;
-       this.y = y;
-       this.width = width;
-       this.overCol = overCol;
-       this.backCol = backCol;
-       this.borderClass = borderClass;
-       this.textClass = textClass;
-       this.parentMenu = null;
-       this.parentItem = null;
-       this.ref = null;
+  this.isVert = isVert;
+  this.popInd = popInd
+  this.x = x;
+  this.y = y;
+  this.width = width;
+  this.overCol = overCol;
+  this.backCol = backCol;
+  this.borderClass = borderClass;
+  this.textClass = textClass;
+  this.parentMenu = null;
+  this.parentItem = null;
+  this.ref = null;
 }
 function Item(text, href, frame, length, spacing, target) {
-       this.text = text;
-       this.href = href;
-       this.frame = frame;
-       this.length = length;
-       this.spacing = spacing;
-       this.target = target;
-       this.ref = null;
+  this.text = text;
+  this.href = href;
+  this.frame = frame;
+  this.length = length;
+  this.spacing = spacing;
+  this.target = target;
+  this.ref = null;
 }
 function go(link,frame) {
-       tmp=eval("top."+frame);
-       tmp.location=link;
+  tmp=eval("top."+frame);
+  tmp.location=link;
         //top.main_window.location=link;
 }
 function writeMenus() {
-       if (!isDOM && !isIE4 && !isNS4) return;
-       for (currMenu = 0; currMenu < menu.length; currMenu++) with (menu[currMenu][0]) {
-               var str = '', itemX = 0, itemY = 0;
-               for (currItem = 1; currItem < menu[currMenu].length; currItem++) with (menu[currMenu][currItem]) {
-                       var itemID = 'menu' + currMenu + 'item' + currItem;
-                       var w = (isVert ? width : length);
-                       var h = (isVert ? length : width);
-                       if (isDOM \|\| isIE4) {
-                               str += '<div id="' + itemID + '" style="position: absolute; left: ' + itemX + '; top: ' + itemY + '; width: ' + w + '; height: ' + h + '; visibility: inherit; ';
-                               if (backCol) str += 'background: ' + backCol + '; ';
-                               str += '" ';
-                       }
-                       if (isNS4) {
-                               str += '<layer id="' + itemID + '" left="' + itemX + '" top="' + itemY + '" width="' +  w + '" height="' + h + '" visibility="inherit" ';
-                               if (backCol) str += 'bgcolor="' + backCol + '" ';
-                       }
-                       if (borderClass) str += 'class="' + borderClass + '" "';
-                       str += 'onMouseOver="popOver(' + currMenu + ',' + currItem + ')" onMouseOut="popOut(' + currMenu + ',' + currItem + ')">';
-                       str += '<table width="' + (w - 8) + '" border="0" cellspacing="0" cellpadding="' + (!isNS4 && borderClass ? 3 : 0) + '">';
-                       str +='<tr><td class="' + textClass + '" style="cursor:pointer;" align="left" height="' + (h - 7) + '" onClick=\\'go("' + href + '","' + frame + '")\\'>' + text + '</a></td>';
-                       if (target > 0) {
-                               menu[target][0].parentMenu = currMenu;
-                               menu[target][0].parentItem = currItem;
-                               if (popInd) str += '<td class="' + textClass + '" align="right">' + popInd + '</td>';
-                       }
-                       str += '</tr></table>' + (isNS4 ? '</layer>' : '</div>');
-                       if (isVert) itemY += length + spacing;
-                       else itemX += length + spacing;
-               }
-               if (isDOM) {
-                       var newDiv = document.createElement('div');
-                       document.getElementsByTagName('body').item(0).appendChild(newDiv);
-                       newDiv.innerHTML = str;
-                       ref = newDiv.style;
-                       ref.position = 'absolute';
-                       ref.visibility = 'hidden';
-               }
-               if (isIE4) {
-                       document.body.insertAdjacentHTML('beforeEnd', '<div id="menu' + currMenu + 'div" ' + 'style="position: absolute; visibility: hidden">' + str + '</div>');
-                       ref = getSty('menu' + currMenu + 'div');
-               }
-               if (isNS4) {
-                       ref = new Layer(0);
-                       ref.document.write(str);
-                       ref.document.close();
-               }
-               for (currItem = 1; currItem < menu[currMenu].length; currItem++) {
-                       itemName = 'menu' + currMenu + 'item' + currItem;
-                       if (isDOM \|\| isIE4) menu[currMenu][currItem].ref = getSty(itemName);
-                       if (isNS4) menu[currMenu][currItem].ref = ref.document[itemName];
-               }
-       }
-       with(menu[0][0]) {
-               ref.left = x;
-               ref.top = y;
-               ref.visibility = 'visible';
+  if (!isDOM && !isIE4 && !isNS4) return;
+  for (currMenu = 0; currMenu < menu.length; currMenu++) with (menu[currMenu][0]) {
+    var str = '', itemX = 0, itemY = 0;
+    for (currItem = 1; currItem < menu[currMenu].length; currItem++) with (menu[currMenu][currItem]) {
+      var itemID = 'menu' + currMenu + 'item' + currItem;
+      var w = (isVert ? width : length);
+      var h = (isVert ? length : width);
+      if (isDOM \|\| isIE4) {
+        str += '<div id="' + itemID + '" style="position: absolute; left: ' + itemX + '; top: ' + itemY + '; width: ' + w + '; height: ' + h + '; visibility: inherit; ';
+        if (backCol) str += 'background: ' + backCol + '; ';
+        str += '" ';
+      }
+      if (isNS4) {
+        str += '<layer id="' + itemID + '" left="' + itemX + '" top="' + itemY + '" width="' +  w + '" height="' + h + '" visibility="inherit" ';
+        if (backCol) str += 'bgcolor="' + backCol + '" ';
+      }
+      if (borderClass) str += 'class="' + borderClass + '" "';
+      str += 'onMouseOver="popOver(' + currMenu + ',' + currItem + ')" onMouseOut="popOut(' + currMenu + ',' + currItem + ')">';
+      str += '<table width="' + (w - 8) + '" border="0" cellspacing="0" cellpadding="' + (!isNS4 && borderClass ? 3 : 0) + '">';
+      str +='<tr><td class="' + textClass + '" style="cursor:pointer;" align="left" height="' + (h - 7) + '" onClick=\\'go("' + href + '","' + frame + '")\\'>' + text + '</a></td>';
+      if (target > 0) {
+        menu[target][0].parentMenu = currMenu;
+        menu[target][0].parentItem = currItem;
+        if (popInd) str += '<td class="' + textClass + '" align="right">' + popInd + '</td>';
+      }
+      str += '</tr></table>' + (isNS4 ? '</layer>' : '</div>');
+      if (isVert) itemY += length + spacing;
+      else itemX += length + spacing;
+    }
+    if (isDOM) {
+      var newDiv = document.createElement('div');
+      document.getElementsByTagName('body').item(0).appendChild(newDiv);
+      newDiv.innerHTML = str;
+      ref = newDiv.style;
+      ref.position = 'absolute';
+      ref.visibility = 'hidden';
+    }
+    if (isIE4) {
+      document.body.insertAdjacentHTML('beforeEnd', '<div id="menu' + currMenu + 'div" ' + 'style="position: absolute; visibility: hidden">' + str + '</div>');
+      ref = getSty('menu' + currMenu + 'div');
+    }
+    if (isNS4) {
+      ref = new Layer(0);
+      ref.document.write(str);
+      ref.document.close();
+    }
+    for (currItem = 1; currItem < menu[currMenu].length; currItem++) {
+      itemName = 'menu' + currMenu + 'item' + currItem;
+      if (isDOM \|\| isIE4) menu[currMenu][currItem].ref = getSty(itemName);
+      if (isNS4) menu[currMenu][currItem].ref = ref.document[itemName];
+    }
+  }
+  with(menu[0][0]) {
+    ref.left = x;
+    ref.top = y;
+    ref.visibility = 'visible';
    }
 }
 var menu = new Array();
@@ -346,12 +346,12 @@ nsResizeHandler = new Function('if (popOldWidth != window.innerWidth) location.r
 if (isNS4) document.captureEvents(Event.CLICK);
 document.onclick = clickHandle;
 function clickHandle(evt) {
-       if (isNS4) document.routeEvent(evt);
-       hideAllBut(0);
-       if (KO) document.getElementById("win1").style.visibility = "visible";
+  if (isNS4) document.routeEvent(evt);
+  hideAllBut(0);
+  if (KO) document.getElementById("win1").style.visibility = "visible";
 }
 function moveRoot() {
-       with(menu[0][0].ref) left = ((parseInt(left) < 100) ? 100 : 5);
+  with(menu[0][0].ref) left = ((parseInt(left) < 100) ? 100 : 5);
 }
 //  End -->
 </script>
@@ -399,11 +399,11 @@ sub section_menu {
 
       # Untermen
       if ($mlz{"s$ml"} > 1) {
-               $z++;
-               $sm = 1;
+        $z++;
+        $sm = 1;
       } else {
-               $z = $sm;
-               $mlz{"s$ml"}++;
+        $z = $sm;
+        $mlz{"s$ml"}++;
       }
       print
         qq|menu[$mlz{$ml}][$z] = new Item('$label', '#', '', defLength, 0, |
@@ -435,7 +435,7 @@ sub section_menu {
         $sm    = 1;
         my $breit = 15 + length($label) * 6;
         print
-          qq|menu[0][$mm] = new Item('  $label', '#', '', $breit, 10, $pm);    \n|;
+          qq|menu[0][$mm] = new Item('  $label', '#', '', $breit, 10, $pm); \n|;
         print qq|menu[$pm] = new Array();\n|;
         print
           qq|menu[$pm][0] = new Menu(true, '>', 0, 20, 180, defOver, defBack, 'itemBorder', 'itemText');\n|;
index f05bcfb..9cc570a 100644 (file)
@@ -452,10 +452,10 @@ sub form_footer {
         $form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2);
 
         $TMPL_VAR{tax} .= qq|
-             <tr>
-               <th align=right>$form->{"${item}_description"}&nbsp;| . $form->{"${item}_rate"} * 100 .qq|%</th>
-               <td align=right>$form->{"${item}_total"}</td>
-             </tr> |;
+              <tr>
+                <th align=right>$form->{"${item}_description"}&nbsp;| . $form->{"${item}_rate"} * 100 .qq|%</th>
+                <td align=right>$form->{"${item}_total"}</td>
+              </tr> |;
       }
     }
 
@@ -470,14 +470,14 @@ sub form_footer {
         $form->{"${item}_netto"} = $form->format_amount(\%myconfig, $form->{"${item}_netto"}, 2);
 
         $TMPL_VAR{tax} .= qq|
-             <tr>
-               <th align=right>Enthaltene $form->{"${item}_description"}&nbsp;| . $form->{"${item}_rate"} * 100 .qq|%</th>
-               <td align=right>$form->{"${item}_total"}</td>
-             </tr>
-             <tr>
-               <th align=right>Nettobetrag</th>
-               <td align=right>$form->{"${item}_netto"}</td>
-             </tr> |;
+              <tr>
+                <th align=right>Enthaltene $form->{"${item}_description"}&nbsp;| . $form->{"${item}_rate"} * 100 .qq|%</th>
+                <td align=right>$form->{"${item}_total"}</td>
+              </tr>
+              <tr>
+                <th align=right>Nettobetrag</th>
+                <td align=right>$form->{"${item}_netto"}</td>
+              </tr> |;
       }
     }
   }
@@ -552,7 +552,7 @@ sub update {
     my $rows = scalar @{ $form->{item_list} };
 
     # hier ist das problem fuer bug 817 $form->{discount} wird nicht durchgeschliffen
-    # ferner fallunterscheidung fuer verkauf oder einkauf s.a. bug 736 jb 04.05.2009
+    # ferner fallunterscheidung fuer verkauf oder einkauf s.a. bug 736 jb 04.05.2009
     # select discount as vendor_discount from vendor ||
     # select discount as customer_discount from customer
     $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"$form->{vc}_discount"} * 100);
@@ -1059,8 +1059,8 @@ sub save_and_close {
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
-       $form->{addition} = "SAVED";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "SAVED";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
 
@@ -1166,8 +1166,8 @@ sub save {
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
-       $form->{addition} = "SAVED";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "SAVED";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
 
@@ -1254,8 +1254,8 @@ sub delete_order_quotation {
     # saving the history
     if(!exists $form->{addition}) {
       $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
-         $form->{addition} = "DELETED";
-         $form->save_history($form->dbconnect(\%myconfig));
+      $form->{addition} = "DELETED";
+      $form->save_history($form->dbconnect(\%myconfig));
     }
     # /saving the history
     $form->info($msg);
@@ -1460,16 +1460,16 @@ sub backorder_exchangerate {
     <td>
       <table>
         <tr>
-         <th align=right>| . $locale->text('Currency') . qq|</th>
-         <td>$form->{currency}</td>
-       </tr>
-       <tr>
-         <th align=right>| . $locale->text('Date') . qq|</th>
-         <td>$orddate</td>
-       </tr>
+          <th align=right>| . $locale->text('Currency') . qq|</th>
+          <td>$form->{currency}</td>
+        </tr>
+        <tr>
+          <th align=right>| . $locale->text('Date') . qq|</th>
+          <td>$orddate</td>
+        </tr>
         <tr>
-         <th align=right>| . $locale->text('Exchangerate') . qq|</th>
-         <td><input name=exchangerate size=11></td>
+          <th align=right>| . $locale->text('Exchangerate') . qq|</th>
+          <td><input name=exchangerate size=11></td>
         </tr>
       </table>
     </td>
index 4d06f52..e003e07 100644 (file)
@@ -101,10 +101,10 @@ sub search {
     $form->{title} = $locale->text('Groups');
 
     $number = qq|
-       <tr>
-         <th align=right width=1%>| . $locale->text('Group') . qq|</th>
-         <td><input name=partsgroup size=20></td>
-       </tr>
+  <tr>
+    <th align=right width=1%>| . $locale->text('Group') . qq|</th>
+    <td><input name=partsgroup size=20></td>
+  </tr>
 |;
 
   }
@@ -116,10 +116,10 @@ sub search {
     $form->{title} = $locale->text('Pricegroup');
 
     $number = qq|
-       <tr>
-         <th align=right width=1%>| . $locale->text('Pricegroup') . qq|</th>
-         <td><input name=pricegroup size=20></td>
-       </tr>
+  <tr>
+    <th align=right width=1%>| . $locale->text('Pricegroup') . qq|</th>
+    <td><input name=pricegroup size=20></td>
+  </tr>
 |;
 
   }
@@ -143,13 +143,11 @@ sub search {
     <td>
       <table width=100%>
         $number
-       <tr>
-         <td></td>
-         <td><input name=status class=radio type=radio value=all checked>&nbsp;|
-    . $locale->text('All') . qq|
-         <input name=status class=radio type=radio value=orphaned>&nbsp;|
-    . $locale->text('Orphaned') . qq|</td>
-       </tr>
+        <tr>
+          <td></td>
+          <td><input name=status class=radio type=radio value=all checked>&nbsp;| . $locale->text('All') . qq|
+          <input name=status class=radio type=radio value=orphaned>&nbsp;| . $locale->text('Orphaned') . qq|</td>
+        </tr>
       </table>
     </td>
   </tr>
@@ -196,8 +194,8 @@ sub save {
   # saving the history
   if(!exists $form->{addition} && $form->{id} ne "") {
     $form->{snumbers} = qq|projectnumber_| . $form->{projectnumber};
-       $form->{addition} = "SAVED";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "SAVED";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
 
@@ -224,8 +222,8 @@ sub delete {
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|projectnumber_| . $form->{projectnumber};
-       $form->{addition} = "DELETED";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "DELETED";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
   $main::lxdebug->leave_sub();
@@ -283,7 +281,7 @@ sub partsgroup_report {
   <tr>
     <td>
       <table width=100%>
-       <tr class=listheading>
+        <tr class=listheading>
 |;
 
   map { print "$column_header{$_}\n" } @column_index;
@@ -378,11 +376,10 @@ sub form_partsgroup_header {
   <tr>
     <td>
       <table width=100%>
-       <tr>
-         <th align=right>| . $locale->text('Group') . qq|</th>
-
+        <tr>
+          <th align=right>| . $locale->text('Group') . qq|</th>
           <td><input name=partsgroup size=30 value="$form->{partsgroup}"></td>
-       </tr>
+        </tr>
       </table>
     </td>
   </tr>
@@ -419,11 +416,11 @@ sub form_partsgroup_footer {
 
 # button for saving history
 print qq|
-       <input type=button onclick=set_history_window(|
-       . $form->{id}
-       . qq|); name=history id=history value=|
-       . $locale->text('history')
-       . qq|>|;
+    <input type=button onclick=set_history_window(|
+    . $form->{id}
+    . qq|); name=history id=history value=|
+    . $locale->text('history')
+    . qq|>|;
 # /button for saving history
   print qq|
 </form>
@@ -491,7 +488,7 @@ sub pricegroup_report {
   <tr>
     <td>
       <table width=100%>
-       <tr class=listheading>
+        <tr class=listheading>
 |;
 
   map { print "$column_header{$_}\n" } @column_index;
@@ -589,10 +586,10 @@ sub form_pricegroup_header {
   <tr>
     <td>
       <table width=100%>
-       <tr>
-         <th align=right>| . $locale->text('Preisgruppe') . qq|</th>
+        <tr>
+          <th align=right>| . $locale->text('Preisgruppe') . qq|</th>
           <td><input name=pricegroup size=30 value="$form->{pricegroup}"></td>
-       </tr>
+        </tr>
       </table>
     </td>
   </tr>
@@ -631,11 +628,11 @@ sub form_pricegroup_footer {
 
 # button for saving history
 print qq|
-       <input type=button onclick=set_history_window(|
-       . $form->{id}
-       . qq|); name=history id=history value=|
-       . $locale->text('history')
-       . qq|>|;
+    <input type=button onclick=set_history_window(|
+    . $form->{id}
+    . qq|); name=history id=history value=|
+    . $locale->text('history')
+    . qq|>|;
 # /button for saving history
   print qq|
 </form>
index d340ddb..0e74d53 100644 (file)
@@ -234,8 +234,8 @@ sub save {
   if(!exists $form->{addition} && $project->{id} ne "") {
     $form->{id}       = $project->{id};
     $form->{snumbers} = qq|projectnumber_| . $project->{projectnumber};
-       $form->{addition} = "SAVED";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "SAVED";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
 
@@ -277,8 +277,8 @@ sub delete {
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|projectnumber_| . $project->{projectnumber};
-       $form->{addition} = "DELETED";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "DELETED";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
 
index df360ad..0f01ac9 100644 (file)
@@ -76,19 +76,19 @@ sub reconciliation {
   <tr>
     <td>
       <table>
-       <tr>
-         <th align=right nowrap>| . $locale->text('Account') . qq|</th>
-         <td colspan=3><select name=accno>$selection</select>
-         </td>
-       </tr>
-       <tr>
-         <th align=right>| . $locale->text('From') . qq|</th>
-         <td><input name=fromdate id=fromdate size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">
-     <input type="button" name="fromdate" id="trigger_fromdate" value="?"></td>
-         <th align=right>| . $locale->text('Until') . qq|</th>
-         <td><input name=todate id=todate size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">
-     <input type="button" name="todate" id="trigger_todate" value="?"></td>
-       </tr>
+        <tr>
+          <th align=right nowrap>| . $locale->text('Account') . qq|</th>
+          <td colspan=3><select name=accno>$selection</select>
+          </td>
+        </tr>
+        <tr>
+          <th align=right>| . $locale->text('From') . qq|</th>
+          <td><input name=fromdate id=fromdate size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">
+         <input type="button" name="fromdate" id="trigger_fromdate" value="?"></td>
+          <th align=right>| . $locale->text('Until') . qq|</th>
+          <td><input name=todate id=todate size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">
+         <input type="button" name="todate" id="trigger_todate" value="?"></td>
+        </tr>
       </table>
     </td>
   </tr>
@@ -203,7 +203,7 @@ sub display_form {
   <tr>
     <td>
       <table width=100%>
-       <tr class=listheading>
+        <tr class=listheading>
 |;
 
   map { print "\n$column_header{$_}" } @column_index;
@@ -227,13 +227,13 @@ sub display_form {
     . $form->format_amount(\%myconfig, $balance, 2, 0) . "</td>";
   my $j = 0;
   print qq|
-       <tr class=listrow$j>
+        <tr class=listrow$j>
 |;
 
   map { print "\n$column_data{$_}" } @column_index;
 
   print qq|
-       </tr>
+        </tr>
 |;
 
   my $cleared;
@@ -292,13 +292,13 @@ sub display_form {
     $j++;
     $j %= 2;
     print qq|
-       <tr class=listrow$j>
+        <tr class=listrow$j>
 |;
 
     map { print "\n$column_data{$_}" } @column_index;
 
     print qq|
-       </tr>
+        </tr>
 |;
 
   }
@@ -314,7 +314,7 @@ sub display_form {
     . $form->format_amount(\%myconfig, $totalcredits, 2, "&nbsp;") . "</th>";
 
   print qq|
-       <tr class=listtotal>
+        <tr class=listtotal>
 |;
 
   map { print "\n$column_data{$_}" } @column_index;
@@ -335,15 +335,14 @@ sub display_form {
   if ($fx) {
     $fx       = $form->format_amount(\%myconfig, $fx, 2, 0);
     $exchdiff = qq|
-               <th align=right nowrap>|
-      . $locale->text('Exchangerate Difference') . qq|</th>
-               <td width=10%></td>
-               <td align=right>$fx</td>
+          <th align=right nowrap>| . $locale->text('Exchangerate Difference') . qq|</th>
+          <td width=10%></td>
+          <td align=right>$fx</td>
 |;
   }
 
   print qq|
-       </tr>
+        </tr>
       </table>
     </td>
   </tr>
@@ -351,34 +350,34 @@ sub display_form {
     <td>
       <table width=100%>
         <tr valign=top>
-         <td>
-           <table>
-             <tr>
-               <th align=right nowrap>| . $locale->text('Cleared Balance') . qq|</th>
-               <td width=10%></td>
-               <td align=right>$clearedbalance</td>
-             </tr>
-             <tr>
-               $exchdiff
-             </tr>
-           </table>
-         </td>
-         <td align=right>
-           <table>
-             <tr>
-               <th align=right nowrap>| . $locale->text('Statement Balance') . qq|</th>
-               <td width=10%></td>
-               <td align=right><input name=statementbalance size=11 value=$form->{statementbalance}></td>
-             </tr>
-             <tr>
-               <th align=right nowrap>| . $locale->text('Difference') . qq|</th>
-               <td width=10%></td>
-               <td align=right><input name=null size=11 value=$difference></td>
-               <input type=hidden name=difference value=$difference>
-             </tr>
-           </table>
-         </td>
-       </tr>
+          <td>
+            <table>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Cleared Balance') . qq|</th>
+                <td width=10%></td>
+                <td align=right>$clearedbalance</td>
+              </tr>
+              <tr>
+                $exchdiff
+              </tr>
+            </table>
+          </td>
+          <td align=right>
+            <table>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Statement Balance') . qq|</th>
+                <td width=10%></td>
+                <td align=right><input name=statementbalance size=11 value=$form->{statementbalance}></td>
+              </tr>
+              <tr>
+                <th align=right nowrap>| . $locale->text('Difference') . qq|</th>
+                <td width=10%></td>
+                <td align=right><input name=null size=11 value=$difference></td>
+                <input type=hidden name=difference value=$difference>
+              </tr>
+            </table>
+          </td>
+        </tr>
       </table>
     </td>
   </tr>
index 5099c89..5164b7f 100644 (file)
@@ -14,8 +14,8 @@
 #
 #  Contributors: Antonio Gallardo <agssa@ibw.com.ni>
 #                Benjamin Lee <benjaminlee@consultant.com>
-#               Philip Reetz <p.reetz@linet-services.de>
-#               Udo Spallek
+#                Philip Reetz <p.reetz@linet-services.de>
+#                Udo Spallek
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -160,10 +160,10 @@ sub report {
   }
 
   my $department = qq|
-       <tr>
-         <th align=right nowrap>| . $locale->text('Department') . qq|</th>
-         <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
-       </tr>
+        <tr>
+          <th align=right nowrap>| . $locale->text('Department') . qq|</th>
+          <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
+        </tr>
 | if $form->{selectdepartment};
 
   $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
@@ -279,30 +279,30 @@ sub report {
 
   if ($form->{report} eq "projects") {
     print qq|
-       <tr>
-         <th align=right nowrap>| . $locale->text('Project') . qq|</th>
-         <td colspan=5><input name=projectnumber size=25</td>
-       </tr>
+        <tr>
+          <th align=right nowrap>| . $locale->text('Project') . qq|</th>
+          <td colspan=5><input name=projectnumber size=25</td>
+        </tr>
         <input type=hidden name=nextsub value=generate_projects>
         <tr>
-         <th align=right>| . $locale->text('From') . qq|</th>
+          <th align=right>| . $locale->text('From') . qq|</th>
           <td>$button1</td>
           <td>$button1_2</td>
-         <th align=right>| . $locale->text('Bis') . qq|</th>
+          <th align=right>| . $locale->text('Bis') . qq|</th>
           <td>$button2</td>
           <td>$button2_2</td>
-       </tr>
+        </tr>
       </table>
     </td>
   </tr>
   <tr>
     <td>
       <table>
-       <tr>
-         <th align=right nowrap>| . $locale->text('Include in Report') . qq|</th>
-         <td><input name=l_heading class=checkbox type=checkbox value=Y>&nbsp;| . $locale->text('Heading') . qq|
-         <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;| . $locale->text('Subtotal') . qq|</td>
-       </tr>
+        <tr>
+          <th align=right nowrap>| . $locale->text('Include in Report') . qq|</th>
+          <td><input name=l_heading class=checkbox type=checkbox value=Y>&nbsp;| . $locale->text('Heading') . qq|
+          <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;| . $locale->text('Subtotal') . qq|</td>
+        </tr>
 
 $jsscript
 |;
@@ -310,86 +310,86 @@ $jsscript
 
   if ($form->{report} eq "income_statement") {
     print qq|
-       <tr>
-         <th align=right nowrap>| . $locale->text('Project') . qq|</th>
-         <td colspan=3>$projectnumber</td>
-       </tr>
+        <tr>
+          <th align=right nowrap>| . $locale->text('Project') . qq|</th>
+          <td colspan=3>$projectnumber</td>
+        </tr>
         <input type=hidden name=nextsub value=generate_income_statement>
 </table>
 <table>
-       <tr>
-         <th align=left><input name=reporttype class=radio type=radio value="custom" checked> | . $locale->text('Customized Report') . qq|</th>
-       </tr>
-       <tr>
-         <th colspan=1>| . $locale->text('Year') . qq|</th>
-         <td><input name=year size=11 title="| . $locale->text('YYYY') . qq|" value="$year"></td>
-       </tr>
+        <tr>
+          <th align=left><input name=reporttype class=radio type=radio value="custom" checked> | . $locale->text('Customized Report') . qq|</th>
+        </tr>
+        <tr>
+          <th colspan=1>| . $locale->text('Year') . qq|</th>
+          <td><input name=year size=11 title="| . $locale->text('YYYY') . qq|" value="$year"></td>
+        </tr>
 |;
 
     print qq|
-       <tr>
-               <td align=right> <b> | . $locale->text('Yearly') . qq|</b> </td>
-               <th align=left>| . $locale->text('Quarterly') . qq|</th>
-               <th align=left colspan=3>| . $locale->text('Monthly') . qq|</th>
-       </tr>
-       <tr>
-               <td align=right>&nbsp; <input name=duetyp class=radio type=radio value="13" "checked"></td>
-               <td><input name=duetyp class=radio type=radio value="A" $checked >&nbsp;1. | . $locale->text('Quarter') . qq|</td>
+        <tr>
+                <td align=right> <b> | . $locale->text('Yearly') . qq|</b> </td>
+                <th align=left>| . $locale->text('Quarterly') . qq|</th>
+                <th align=left colspan=3>| . $locale->text('Monthly') . qq|</th>
+        </tr>
+        <tr>
+                <td align=right>&nbsp; <input name=duetyp class=radio type=radio value="13" "checked"></td>
+                <td><input name=duetyp class=radio type=radio value="A" $checked >&nbsp;1. | . $locale->text('Quarter') . qq|</td>
 |;
     $checked = "";
     print qq|
-               <td><input name=duetyp class=radio type=radio value="1" $checked >&nbsp;| . $locale->text('January') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="1" $checked >&nbsp;| . $locale->text('January') . qq|</td>
 |;
     $checked = "";
     print qq|
-               <td><input name=duetyp class=radio type=radio value="5" $checked >&nbsp;| . $locale->text('May') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="9" $checked >&nbsp;| . $locale->text('September') . qq|</td>
-
-       </tr>
-       <tr>
-               <td align= right>&nbsp;</td>
-               <td><input name=duetyp class=radio type=radio value="B" $checked>&nbsp;2. | . $locale->text('Quarter') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="2" $checked >&nbsp;| . $locale->text('February') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="6" $checked >&nbsp;| . $locale->text('June') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="10" $checked >&nbsp;| . $locale->text('October') . qq|</td>
-       </tr>
-       <tr>
-               <td> &nbsp;</td>
-               <td><input name=duetyp class=radio type=radio value="C" $checked>&nbsp;3. | . $locale->text('Quarter') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="3" $checked >&nbsp;| . $locale->text('March') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="7" $checked >&nbsp;| . $locale->text('July') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="11" $checked >&nbsp;| . $locale->text('November') . qq|</td>
-
-       </tr>
-       <tr>
-               <td> &nbsp;</td>
-               <td><input name=duetyp class=radio type=radio value="D" $checked>&nbsp;4. | . $locale->text('Quarter') . qq|&nbsp;</td>
-               <td><input name=duetyp class=radio type=radio value="4" $checked >&nbsp;| . $locale->text('April') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="8" $checked >&nbsp;| . $locale->text('August') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="12" $checked >&nbsp;| . $locale->text('December') . qq|</td>
-
-       </tr>
-       <tr>
-               <td colspan=5><hr size=3 noshade></td>
-       </tr>
-       <tr>
+                <td><input name=duetyp class=radio type=radio value="5" $checked >&nbsp;| . $locale->text('May') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="9" $checked >&nbsp;| . $locale->text('September') . qq|</td>
+
+        </tr>
+        <tr>
+                <td align= right>&nbsp;</td>
+                <td><input name=duetyp class=radio type=radio value="B" $checked>&nbsp;2. | . $locale->text('Quarter') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="2" $checked >&nbsp;| . $locale->text('February') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="6" $checked >&nbsp;| . $locale->text('June') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="10" $checked >&nbsp;| . $locale->text('October') . qq|</td>
+        </tr>
+        <tr>
+                <td> &nbsp;</td>
+                <td><input name=duetyp class=radio type=radio value="C" $checked>&nbsp;3. | . $locale->text('Quarter') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="3" $checked >&nbsp;| . $locale->text('March') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="7" $checked >&nbsp;| . $locale->text('July') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="11" $checked >&nbsp;| . $locale->text('November') . qq|</td>
+
+        </tr>
+        <tr>
+                <td> &nbsp;</td>
+                <td><input name=duetyp class=radio type=radio value="D" $checked>&nbsp;4. | . $locale->text('Quarter') . qq|&nbsp;</td>
+                <td><input name=duetyp class=radio type=radio value="4" $checked >&nbsp;| . $locale->text('April') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="8" $checked >&nbsp;| . $locale->text('August') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="12" $checked >&nbsp;| . $locale->text('December') . qq|</td>
+
+        </tr>
+        <tr>
+                   <td colspan=5><hr size=3 noshade></td>
+        </tr>
+        <tr>
           <th align=left><input name=reporttype class=radio type=radio value="free" $checked> | . $locale->text('Free report period') . qq|</th>
-         <td align=left colspan=4>| . $locale->text('From') . qq|&nbsp;
-             $button1
+          <td align=left colspan=4>| . $locale->text('From') . qq|&nbsp;
+              $button1
               $button1_2&nbsp;
-             | . $locale->text('Bis') . qq|
+              | . $locale->text('Bis') . qq|
               $button2
               $button2_2&nbsp;
           </td>
         </tr>
-       <tr>
-               <td colspan=5><hr size=3 noshade></td>
-       </tr>
-       <tr>
-         <th align=leftt>| . $locale->text('Method') . qq|</th>
-         <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| . $locale->text('Accrual') . qq|
-         &nbsp;<input name=method class=radio type=radio value=cash $cash>| . $locale->text('EUR') . qq|</td>
-       </tr>
+        <tr>
+                   <td colspan=5><hr size=3 noshade></td>
+        </tr>
+        <tr>
+          <th align=leftt>| . $locale->text('Method') . qq|</th>
+          <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| . $locale->text('Accrual') . qq|
+          &nbsp;<input name=method class=radio type=radio value=cash $cash>| . $locale->text('EUR') . qq|</td>
+        </tr>
 
 $jsscript
 |;
@@ -397,87 +397,87 @@ $jsscript
 
   if ($form->{report} eq "bwa") {
     print qq|
-       <tr>
-         <th align=right nowrap>| . $locale->text('Project') . qq|</th>
-         <td colspan=3>$projectnumber</td>
-       </tr>
+        <tr>
+          <th align=right nowrap>| . $locale->text('Project') . qq|</th>
+          <td colspan=3>$projectnumber</td>
+        </tr>
         <input type=hidden name=nextsub value=generate_bwa>
 </table>
 <table>
-       <tr>
-         <th align=left><input name=reporttype class=radio type=radio value="custom" checked> | . $locale->text('Customized Report') . qq|</th>
-       </tr>
-       <tr>
-         <th colspan=1>| . $locale->text('Year') . qq|</th>
-         <td><input name=year size=11 title="| . $locale->text('YYYY') . qq|" value="$year"></td>
-       </tr>
+        <tr>
+          <th align=left><input name=reporttype class=radio type=radio value="custom" checked> | . $locale->text('Customized Report') . qq|</th>
+        </tr>
+        <tr>
+          <th colspan=1>| . $locale->text('Year') . qq|</th>
+          <td><input name=year size=11 title="| . $locale->text('YYYY') . qq|" value="$year"></td>
+        </tr>
 |;
 
     print qq|
-       <tr>
-               <td align=right> <b> | . $locale->text('Yearly') . qq|</b> </td>
-               <th align=left>| . $locale->text('Quarterly') . qq|</th>
-               <th align=left colspan=3>| . $locale->text('Monthly') . qq|</th>
-       </tr>
-       <tr>
-               <td align=right>&nbsp; <input name=duetyp class=radio type=radio value="13"
+        <tr>
+                <td align=right> <b> | . $locale->text('Yearly') . qq|</b> </td>
+                <th align=left>| . $locale->text('Quarterly') . qq|</th>
+                <th align=left colspan=3>| . $locale->text('Monthly') . qq|</th>
+        </tr>
+        <tr>
+                <td align=right>&nbsp; <input name=duetyp class=radio type=radio value="13"
 $checked></td>
-               <td><input name=duetyp class=radio type=radio value="A" $checked >&nbsp;1. | . $locale->text('Quarter') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="A" $checked >&nbsp;1. | . $locale->text('Quarter') . qq|</td>
 |;
     $checked = "checked";
     print qq|
-               <td><input name=duetyp class=radio type=radio value="1" $checked >&nbsp;| . $locale->text('January') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="1" $checked >&nbsp;| . $locale->text('January') . qq|</td>
 |;
     $checked = "";
     print qq|
-               <td><input name=duetyp class=radio type=radio value="5" $checked >&nbsp;| . $locale->text('May') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="9" $checked >&nbsp;| . $locale->text('September') . qq|</td>
-
-       </tr>
-       <tr>
-               <td align= right>&nbsp;</td>
-               <td><input name=duetyp class=radio type=radio value="B" $checked>&nbsp;2. | . $locale->text('Quarter') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="2" $checked >&nbsp;| . $locale->text('February') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="6" $checked >&nbsp;| . $locale->text('June') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="10" $checked >&nbsp;| . $locale->text('October') . qq|</td>
-       </tr>
-       <tr>
-               <td> &nbsp;</td>
-               <td><input name=duetyp class=radio type=radio value="C" $checked>&nbsp;3. | . $locale->text('Quarter') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="3" $checked >&nbsp;| . $locale->text('March') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="7" $checked >&nbsp;| . $locale->text('July') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="11" $checked >&nbsp;| . $locale->text('November') . qq|</td>
-
-       </tr>
-       <tr>
-               <td> &nbsp;</td>
-               <td><input name=duetyp class=radio type=radio value="D" $checked>&nbsp;4. | . $locale->text('Quarter') . qq|&nbsp;</td>
-               <td><input name=duetyp class=radio type=radio value="4" $checked >&nbsp;| . $locale->text('April') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="8" $checked >&nbsp;| . $locale->text('August') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="12" $checked >&nbsp;| . $locale->text('December') . qq|</td>
-
-       </tr>
-       <tr>
-               <td colspan=5><hr size=3 noshade></td>
-       </tr>
-       <tr>
+                <td><input name=duetyp class=radio type=radio value="5" $checked >&nbsp;| . $locale->text('May') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="9" $checked >&nbsp;| . $locale->text('September') . qq|</td>
+
+        </tr>
+        <tr>
+                <td align= right>&nbsp;</td>
+                <td><input name=duetyp class=radio type=radio value="B" $checked>&nbsp;2. | . $locale->text('Quarter') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="2" $checked >&nbsp;| . $locale->text('February') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="6" $checked >&nbsp;| . $locale->text('June') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="10" $checked >&nbsp;| . $locale->text('October') . qq|</td>
+        </tr>
+        <tr>
+                <td> &nbsp;</td>
+                <td><input name=duetyp class=radio type=radio value="C" $checked>&nbsp;3. | . $locale->text('Quarter') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="3" $checked >&nbsp;| . $locale->text('March') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="7" $checked >&nbsp;| . $locale->text('July') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="11" $checked >&nbsp;| . $locale->text('November') . qq|</td>
+
+        </tr>
+        <tr>
+                <td> &nbsp;</td>
+                <td><input name=duetyp class=radio type=radio value="D" $checked>&nbsp;4. | . $locale->text('Quarter') . qq|&nbsp;</td>
+                <td><input name=duetyp class=radio type=radio value="4" $checked >&nbsp;| . $locale->text('April') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="8" $checked >&nbsp;| . $locale->text('August') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="12" $checked >&nbsp;| . $locale->text('December') . qq|</td>
+
+        </tr>
+        <tr>
+                   <td colspan=5><hr size=3 noshade></td>
+        </tr>
+        <tr>
           <th align=left><input name=reporttype class=radio type=radio value="free" $checked> | . $locale->text('Free report period') . qq|</th>
-         <td align=left colspan=4>| . $locale->text('From') . qq|&nbsp;
-             $button1
+          <td align=left colspan=4>| . $locale->text('From') . qq|&nbsp;
+              $button1
               $button1_2&nbsp;
-             | . $locale->text('Bis') . qq|&nbsp;
-             $button2
+              | . $locale->text('Bis') . qq|&nbsp;
+              $button2
               $button2_2
           </td>
         </tr>
-       <tr>
-               <td colspan=5><hr size=3 noshade></td>
-       </tr>
-       <tr>
-         <th align=leftt>| . $locale->text('Method') . qq|</th>
-         <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| . $locale->text('Accrual') . qq|
-         &nbsp;<input name=method class=radio type=radio value=cash $cash>| . $locale->text('EUR') . qq|</td>
-       </tr>
+        <tr>
+                   <td colspan=5><hr size=3 noshade></td>
+        </tr>
+        <tr>
+          <th align=leftt>| . $locale->text('Method') . qq|</th>
+          <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| . $locale->text('Accrual') . qq|
+          &nbsp;<input name=method class=radio type=radio value=cash $cash>| . $locale->text('EUR') . qq|</td>
+        </tr>
         <tr>
          <th align=right colspan=4>| . $locale->text('Decimalplaces') . qq|</th>
              <td><input name=decimalplaces size=3 value="2"></td>
@@ -490,40 +490,40 @@ $jsscript
   if ($form->{report} eq "balance_sheet") {
     print qq|
         <input type=hidden name=nextsub value=generate_balance_sheet>
-       <tr>
-         <th align=right>| . $locale->text('as at') . qq|</th>
-         <td>
+        <tr>
+          <th align=right>| . $locale->text('as at') . qq|</th>
+          <td>
             $button1
             $button1_2
           </td>
-         <th align=right nowrap>| . $locale->text('Compare to') . qq|</th>
-         <td>
+          <th align=right nowrap>| . $locale->text('Compare to') . qq|</th>
+          <td>
           $button2
           $button2_2
           </td>
-       </tr>
-       <tr>
-         <th align=right>| . $locale->text('Decimalplaces') . qq|</th>
-         <td><input name=decimalplaces size=3 value="2"></td>
-       </tr>
+        </tr>
+        <tr>
+          <th align=right>| . $locale->text('Decimalplaces') . qq|</th>
+          <td><input name=decimalplaces size=3 value="2"></td>
+        </tr>
       </table>
     </td>
   </tr>
   <tr>
     <td>
       <table>
-       <tr>
-         <th align=right>| . $locale->text('Method') . qq|</th>
-         <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| . $locale->text('Accrual') . qq|
-         &nbsp;<input name=method class=radio type=radio value=cash $cash>| . $locale->text('EUR') . qq|</td>
-       </tr>
-
-       <tr>
-         <th align=right nowrap>| . $locale->text('Include in Report') . qq|</th>
-         <td><input name=l_heading class=checkbox type=checkbox value=Y>&nbsp;| . $locale->text('Heading') . qq|
-         <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;| . $locale->text('Subtotal') . qq|
-         <input name=l_accno class=checkbox type=checkbox value=Y>&nbsp;| . $locale->text('Account Number') . qq|</td>
-       </tr>
+        <tr>
+          <th align=right>| . $locale->text('Method') . qq|</th>
+          <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| . $locale->text('Accrual') . qq|
+          &nbsp;<input name=method class=radio type=radio value=cash $cash>| . $locale->text('EUR') . qq|</td>
+        </tr>
+
+        <tr>
+          <th align=right nowrap>| . $locale->text('Include in Report') . qq|</th>
+          <td><input name=l_heading class=checkbox type=checkbox value=Y>&nbsp;| . $locale->text('Heading') . qq|
+          <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;| . $locale->text('Subtotal') . qq|
+          <input name=l_accno class=checkbox type=checkbox value=Y>&nbsp;| . $locale->text('Account Number') . qq|</td>
+        </tr>
 
 $jsscript
 |;
@@ -531,86 +531,86 @@ $jsscript
 
   if ($form->{report} eq "trial_balance") {
     print qq|
-       <tr>
-         <th align=right nowrap>| . $locale->text('Project') . qq|</th>
-         <td colspan=3>$projectnumber</td>
-       </tr>
+        <tr>
+          <th align=right nowrap>| . $locale->text('Project') . qq|</th>
+          <td colspan=3>$projectnumber</td>
+        </tr>
         <input type=hidden name=nextsub value=generate_trial_balance>
 </table>
 <table>
-       <tr>
-         <th align=left><input name=reporttype class=radio type=radio value="custom" checked> | . $locale->text('Customized Report') . qq|</th>
-       </tr>
-       <tr>
-         <th colspan=1>| . $locale->text('Year') . qq|</th>
-         <td><input name=year size=11 title="| . $locale->text('YYYY') . qq|" value="$year"></td>
-       </tr>
+        <tr>
+          <th align=left><input name=reporttype class=radio type=radio value="custom" checked> | . $locale->text('Customized Report') . qq|</th>
+        </tr>
+        <tr>
+          <th colspan=1>| . $locale->text('Year') . qq|</th>
+          <td><input name=year size=11 title="| . $locale->text('YYYY') . qq|" value="$year"></td>
+        </tr>
 |;
 
     print qq|
-       <tr>
-               <td align=right> <b> | . $locale->text('Yearly') . qq|</b> </td>
-               <th align=left>| . $locale->text('Quarterly') . qq|</th>
-               <th align=left colspan=3>| . $locale->text('Monthly') . qq|</th>
-       </tr>
-       <tr>
-               <td align=right>&nbsp; <input name=duetyp class=radio type=radio value="13" $checked></td>
-               <td><input name=duetyp class=radio type=radio value="A" $checked >&nbsp;1. | . $locale->text('Quarter') . qq|</td>
+        <tr>
+                <td align=right> <b> | . $locale->text('Yearly') . qq|</b> </td>
+                <th align=left>| . $locale->text('Quarterly') . qq|</th>
+                <th align=left colspan=3>| . $locale->text('Monthly') . qq|</th>
+        </tr>
+        <tr>
+                <td align=right>&nbsp; <input name=duetyp class=radio type=radio value="13" $checked></td>
+                <td><input name=duetyp class=radio type=radio value="A" $checked >&nbsp;1. | . $locale->text('Quarter') . qq|</td>
 |;
     $checked = "checked";
     print qq|
-               <td><input name=duetyp class=radio type=radio value="1" $checked >&nbsp;| . $locale->text('January') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="1" $checked >&nbsp;| . $locale->text('January') . qq|</td>
 |;
     $checked = "";
     print qq|
-               <td><input name=duetyp class=radio type=radio value="5" $checked >&nbsp;| . $locale->text('May') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="9" $checked >&nbsp;| . $locale->text('September') . qq|</td>
-
-       </tr>
-       <tr>
-               <td align= right>&nbsp;</td>
-               <td><input name=duetyp class=radio type=radio value="B" $checked>&nbsp;2. | . $locale->text('Quarter') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="2" $checked >&nbsp;| . $locale->text('February') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="6" $checked >&nbsp;| . $locale->text('June') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="10" $checked >&nbsp;| . $locale->text('October') . qq|</td>
-       </tr>
-       <tr>
-               <td> &nbsp;</td>
-               <td><input name=duetyp class=radio type=radio value="C" $checked>&nbsp;3. | . $locale->text('Quarter') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="3" $checked >&nbsp;| . $locale->text('March') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="7" $checked >&nbsp;| . $locale->text('July') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="11" $checked >&nbsp;| . $locale->text('November') . qq|</td>
-
-       </tr>
-       <tr>
-               <td> &nbsp;</td>
-               <td><input name=duetyp class=radio type=radio value="D" $checked>&nbsp;4. | . $locale->text('Quarter') . qq|&nbsp;</td>
-               <td><input name=duetyp class=radio type=radio value="4" $checked >&nbsp;| . $locale->text('April') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="8" $checked >&nbsp;| . $locale->text('August') . qq|</td>
-               <td><input name=duetyp class=radio type=radio value="12" $checked >&nbsp;| . $locale->text('December') . qq|</td>
-
-       </tr>
-       <tr>
-               <td colspan=5><hr size=3 noshade></td>
-       </tr>
-       <tr>
+                <td><input name=duetyp class=radio type=radio value="5" $checked >&nbsp;| . $locale->text('May') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="9" $checked >&nbsp;| . $locale->text('September') . qq|</td>
+
+        </tr>
+        <tr>
+                <td align= right>&nbsp;</td>
+                <td><input name=duetyp class=radio type=radio value="B" $checked>&nbsp;2. | . $locale->text('Quarter') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="2" $checked >&nbsp;| . $locale->text('February') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="6" $checked >&nbsp;| . $locale->text('June') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="10" $checked >&nbsp;| . $locale->text('October') . qq|</td>
+        </tr>
+        <tr>
+                <td> &nbsp;</td>
+                <td><input name=duetyp class=radio type=radio value="C" $checked>&nbsp;3. | . $locale->text('Quarter') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="3" $checked >&nbsp;| . $locale->text('March') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="7" $checked >&nbsp;| . $locale->text('July') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="11" $checked >&nbsp;| . $locale->text('November') . qq|</td>
+
+        </tr>
+        <tr>
+                <td> &nbsp;</td>
+                <td><input name=duetyp class=radio type=radio value="D" $checked>&nbsp;4. | . $locale->text('Quarter') . qq|&nbsp;</td>
+                <td><input name=duetyp class=radio type=radio value="4" $checked >&nbsp;| . $locale->text('April') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="8" $checked >&nbsp;| . $locale->text('August') . qq|</td>
+                <td><input name=duetyp class=radio type=radio value="12" $checked >&nbsp;| . $locale->text('December') . qq|</td>
+
+        </tr>
+        <tr>
+                   <td colspan=5><hr size=3 noshade></td>
+        </tr>
+        <tr>
           <th align=left><input name=reporttype class=radio type=radio value="free" $checked> | . $locale->text('Free report period') . qq|</th>
-         <td align=left colspan=4>| . $locale->text('From') . qq|&nbsp;
-             $button1
+          <td align=left colspan=4>| . $locale->text('From') . qq|&nbsp;
+              $button1
               $button1_2&nbsp;
-             | . $locale->text('Bis') . qq|&nbsp;
-             $button2
+              | . $locale->text('Bis') . qq|&nbsp;
+              $button2
               $button2_2
           </td>
         </tr>
-       <tr>
-               <td colspan=5><hr size=3 noshade></td>
-       </tr>
-       <tr>
-         <th align=leftt>| . $locale->text('Method') . qq|</th>
-         <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| . $locale->text('Accrual') . qq|
-         &nbsp;<input name=method class=radio type=radio value=cash $cash>| . $locale->text('EUR') . qq|</td>
-       </tr>
+        <tr>
+                   <td colspan=5><hr size=3 noshade></td>
+        </tr>
+        <tr>
+          <th align=leftt>| . $locale->text('Method') . qq|</th>
+          <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| . $locale->text('Accrual') . qq|
+          &nbsp;<input name=method class=radio type=radio value=cash $cash>| . $locale->text('EUR') . qq|</td>
+        </tr>
        <tr>
          <th align=right colspan=4>| . $locale->text('All Accounts') . qq|</th>
              <td><input name=all_accounts type=checkbox value=1></td>
@@ -631,15 +631,15 @@ $jsscript
 
     print qq|
         <input type=hidden name=nextsub value=generate_tax_report>
-       <tr>
-         <th align=right>| . $locale->text('From') . qq|</th>
-         <td><input name=fromdate size=11 title="$myconfig{dateformat}" value=$form->{fromdate}></td>
-         <th align=right>| . $locale->text('Bis') . qq|</th>
-         <td><input name=todate size=11 title="$myconfig{dateformat}"></td>
-       </tr>
-       <tr>
-         <th align=right>| . $locale->text('Report for') . qq|</th>
-         <td colspan=3>
+        <tr>
+          <th align=right>| . $locale->text('From') . qq|</th>
+          <td><input name=fromdate size=11 title="$myconfig{dateformat}" value=$form->{fromdate}></td>
+          <th align=right>| . $locale->text('Bis') . qq|</th>
+          <td><input name=todate size=11 title="$myconfig{dateformat}"></td>
+        </tr>
+        <tr>
+          <th align=right>| . $locale->text('Report for') . qq|</th>
+          <td colspan=3>
 |;
 
     $checked = "checked";
@@ -659,13 +659,13 @@ $jsscript
   <input type=hidden name=db value=$form->{db}>
   <input type=hidden name=sort value=transdate>
 
-         </td>
-       </tr>
-       <tr>
-         <th align=right>| . $locale->text('Method') . qq|</th>
-         <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| . $locale->text('Accrual') . qq|
-         &nbsp;<input name=method class=radio type=radio value=cash $cash>| . $locale->text('EUR') . qq|</td>
-       </tr>
+          </td>
+        </tr>
+        <tr>
+          <th align=right>| . $locale->text('Method') . qq|</th>
+          <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| . $locale->text('Accrual') . qq|
+          &nbsp;<input name=method class=radio type=radio value=cash $cash>| . $locale->text('EUR') . qq|</td>
+        </tr>
       </table>
     </td>
   </tr>
@@ -673,20 +673,20 @@ $jsscript
     <td>
       <table>
         <tr>
-         <th align=right>| . $locale->text('Include in Report') . qq|</th>
-         <td>
-           <table>
-             <tr>
-               <td><input name="l_id" class=checkbox type=checkbox value=Y></td>
-               <td>| . $locale->text('ID') . qq|</td>
-               <td><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
-               <td>| . $locale->text('Invoice') . qq|</td>
-               <td><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
-               <td>| . $locale->text('Date') . qq|</td>
-             </tr>
-             <tr>
-               <td><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
-               <td>|;
+          <th align=right>| . $locale->text('Include in Report') . qq|</th>
+          <td>
+            <table>
+              <tr>
+                <td><input name="l_id" class=checkbox type=checkbox value=Y></td>
+                <td>| . $locale->text('ID') . qq|</td>
+                <td><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
+                <td>| . $locale->text('Invoice') . qq|</td>
+                <td><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
+                <td>| . $locale->text('Date') . qq|</td>
+              </tr>
+              <tr>
+                <td><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
+                <td>|;
 
     if ($form->{db} eq 'ar') {
       print $locale->text('Customer');
@@ -697,19 +697,19 @@ $jsscript
 
     print qq|</td>
                 <td><input name="l_netamount" class=checkbox type=checkbox value=Y checked></td>
-               <td>| . $locale->text('Amount') . qq|</td>
-               <td><input name="l_tax" class=checkbox type=checkbox value=Y checked></td>
-               <td>| . $locale->text('Tax') . qq|</td>
-               <td><input name="l_amount" class=checkbox type=checkbox value=Y></td>
-               <td>| . $locale->text('Total') . qq|</td>
-             </tr>
-             <tr>
-               <td><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
-               <td>| . $locale->text('Subtotal') . qq|</td>
-             </tr>
-           </table>
-         </td>
-       </tr>
+                <td>| . $locale->text('Amount') . qq|</td>
+                <td><input name="l_tax" class=checkbox type=checkbox value=Y checked></td>
+                <td>| . $locale->text('Tax') . qq|</td>
+                <td><input name="l_amount" class=checkbox type=checkbox value=Y></td>
+                <td>| . $locale->text('Total') . qq|</td>
+              </tr>
+              <tr>
+                <td><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
+                <td>| . $locale->text('Subtotal') . qq|</td>
+              </tr>
+            </table>
+          </td>
+        </tr>
 |;
 
   }
@@ -724,34 +724,34 @@ $jsscript
         <input type=hidden name=sort value=transdate>
         <input type=hidden name=report value=$form->{report}>
 
-       <tr>
-         <th align=right>| . $locale->text('From') . qq|</th>
-         <td><input name=fromdate size=11 title="$myconfig{dateformat}" value=$form->{fromdate}></td>
-         <th align=right>| . $locale->text('Bis') . qq|</th>
-         <td><input name=todate size=11 title="$myconfig{dateformat}"></td>
-       </tr>
-       <tr>
-         <th align=right>| . $locale->text('Method') . qq|</th>
-         <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
+        <tr>
+          <th align=right>| . $locale->text('From') . qq|</th>
+          <td><input name=fromdate size=11 title="$myconfig{dateformat}" value=$form->{fromdate}></td>
+          <th align=right>| . $locale->text('Bis') . qq|</th>
+          <td><input name=todate size=11 title="$myconfig{dateformat}"></td>
+        </tr>
+        <tr>
+          <th align=right>| . $locale->text('Method') . qq|</th>
+          <td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
       . $locale->text('Accrual') . qq|
-         &nbsp;<input name=method class=radio type=radio value=cash $cash>|
+          &nbsp;<input name=method class=radio type=radio value=cash $cash>|
       . $locale->text('EUR') . qq|</td>
-       </tr>
-        <tr>
-         <th align=right>| . $locale->text('Include in Report') . qq|</th>
-         <td colspan=3>
-           <table>
-             <tr>
-               <td><input name="l_id" class=checkbox type=checkbox value=Y></td>
-               <td>| . $locale->text('ID') . qq|</td>
-               <td><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
-               <td>| . $locale->text('Invoice') . qq|</td>
-               <td><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
-               <td>| . $locale->text('Date') . qq|</td>
-             </tr>
-             <tr>
-               <td><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
-               <td>|;
+        </tr>
+        <tr>
+          <th align=right>| . $locale->text('Include in Report') . qq|</th>
+          <td colspan=3>
+            <table>
+              <tr>
+                <td><input name="l_id" class=checkbox type=checkbox value=Y></td>
+                <td>| . $locale->text('ID') . qq|</td>
+                <td><input name="l_invnumber" class=checkbox type=checkbox value=Y checked></td>
+                <td>| . $locale->text('Invoice') . qq|</td>
+                <td><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
+                <td>| . $locale->text('Date') . qq|</td>
+              </tr>
+              <tr>
+                <td><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
+                <td>|;
 
     if ($form->{db} eq 'ar') {
       print $locale->text('Customer');
@@ -762,17 +762,17 @@ $jsscript
 
     print qq|</td>
                 <td><input name="l_netamount" class=checkbox type=checkbox value=Y checked></td>
-               <td>| . $locale->text('Amount') . qq|</td>
-               <td><input name="l_amount" class=checkbox type=checkbox value=Y></td>
-               <td>| . $locale->text('Total') . qq|</td>
-             </tr>
-             <tr>
-               <td><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
-               <td>| . $locale->text('Subtotal') . qq|</td>
-             </tr>
-           </table>
-         </td>
-       </tr>
+                <td>| . $locale->text('Amount') . qq|</td>
+                <td><input name="l_amount" class=checkbox type=checkbox value=Y></td>
+                <td>| . $locale->text('Total') . qq|</td>
+              </tr>
+              <tr>
+                <td><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
+                <td>| . $locale->text('Subtotal') . qq|</td>
+              </tr>
+            </table>
+          </td>
+        </tr>
 |;
 
   }
@@ -802,25 +802,25 @@ $jsscript
       : qq|<input name=$form->{vc} size=35>|;
 
     print qq|
-       <tr>
-         <th align=right>| . $locale->text($label) . qq|</th>
-         <td>$vc</td>
-       </tr>
-       <tr>
-         <td align=left colspan=4>| . $locale->text('From') . qq|&nbsp;
-             $button1
+        <tr>
+          <th align=right>| . $locale->text($label) . qq|</th>
+          <td>$vc</td>
+        </tr>
+        <tr>
+          <td align=left colspan=4>| . $locale->text('From') . qq|&nbsp;
+              $button1
               $button1_2&nbsp;
-             | . $locale->text('Bis') . qq|&nbsp;
-             $button2
+              | . $locale->text('Bis') . qq|&nbsp;
+              $button2
               $button2_2
           </td>
-       </tr>
+        </tr>
         <input type=hidden name=type value=statement>
         <input type=hidden name=format value=html>
-       <input type=hidden name=media value=screen>
+        <input type=hidden name=media value=screen>
 
-       <input type=hidden name=nextsub value=$nextsub>
-       <input type=hidden name=action value=$nextsub>
+        <input type=hidden name=nextsub value=$nextsub>
+        <input type=hidden name=action value=$nextsub>
 
 $jsscript
 |;
@@ -845,44 +845,44 @@ $jsscript
     print qq|
         <input type=hidden name=nextsub value=list_payments>
         <tr>
-         <th align=right nowrap>| . $locale->text('Account') . qq|</th>
+          <th align=right nowrap>| . $locale->text('Account') . qq|</th>
           <td colspan=3><select name=account>$selection</select>
-           <input type=hidden name=paymentaccounts value="$paymentaccounts">
-         </td>
-       </tr>
+            <input type=hidden name=paymentaccounts value="$paymentaccounts">
+          </td>
+        </tr>
         <tr>
-         <th align=right>| . $locale->text('Reference') . qq|</th>
+          <th align=right>| . $locale->text('Reference') . qq|</th>
           <td colspan=3><input name=reference></td>
-       </tr>
+        </tr>
         <tr>
-         <th align=right nowrap>| . $locale->text('Source') . qq|</th>
+          <th align=right nowrap>| . $locale->text('Source') . qq|</th>
           <td colspan=3><input name=source></td>
-       </tr>
+        </tr>
         <tr>
-         <th align=right nowrap>| . $locale->text('Memo') . qq|</th>
+          <th align=right nowrap>| . $locale->text('Memo') . qq|</th>
           <td colspan=3><input name=memo size=30></td>
-       </tr>
-       <tr>
-         <th align=right>| . $locale->text('From') . qq|</th>
-         <td>
+        </tr>
+        <tr>
+          <th align=right>| . $locale->text('From') . qq|</th>
+          <td>
             $button1
             $button1_2
           </td>
-         <th align=right>| . $locale->text('Bis') . qq|</th>
-         <td>
+          <th align=right>| . $locale->text('Bis') . qq|</th>
+          <td>
             $button2
             $button2_2
           </td>
-       </tr>
+        </tr>
         <tr>
-         <td align=right><input type=checkbox style=checkbox name=fx_transaction value=1 checked></td>
-         <th align=left colspan=3>| . $locale->text('Include Exchangerate Difference') . qq|</td>
-       </tr>
+          <td align=right><input type=checkbox style=checkbox name=fx_transaction value=1 checked></td>
+          <th align=left colspan=3>| . $locale->text('Include Exchangerate Difference') . qq|</td>
+        </tr>
 
 $jsscript
 
-         <input type=hidden name=db value=$form->{db}>
-         <input type=hidden name=sort value=transdate>
+          <input type=hidden name=db value=$form->{db}>
+          <input type=hidden name=sort value=transdate>
 |;
 
   }
@@ -1819,7 +1819,7 @@ sub e_mail {
   if ($myconfig{role} eq 'admin') {
     $bcc = qq|
           <th align=right nowrap=true>| . $locale->text('Bcc') . qq|</th>
-         <td><input name=bcc size=30 value="$form->{bcc}"></td>
+          <td><input name=bcc size=30 value="$form->{bcc}"></td>
 |;
   }
 
@@ -1843,16 +1843,16 @@ sub e_mail {
     <td>
       <table width=100%>
         <tr>
-         <th align=right nowrap>| . $locale->text('E-mail') . qq|</th>
-         <td><input name=email size=30 value="$form->{email}"></td>
-         <th align=right nowrap>| . $locale->text('Cc') . qq|</th>
-         <td><input name=cc size=30 value="$form->{cc}"></td>
-       </tr>
-       <tr>
-         <th align=right nowrap>| . $locale->text('Subject') . qq|</th>
-         <td><input name=subject size=30 value="$form->{subject}"></td>
-         $bcc
-       </tr>
+          <th align=right nowrap>| . $locale->text('E-mail') . qq|</th>
+          <td><input name=email size=30 value="$form->{email}"></td>
+          <th align=right nowrap>| . $locale->text('Cc') . qq|</th>
+          <td><input name=cc size=30 value="$form->{cc}"></td>
+        </tr>
+        <tr>
+          <th align=right nowrap>| . $locale->text('Subject') . qq|</th>
+          <td><input name=subject size=30 value="$form->{subject}"></td>
+          $bcc
+        </tr>
       </table>
     </td>
   </tr>
@@ -1860,11 +1860,11 @@ sub e_mail {
     <td>
       <table width=100%>
         <tr>
-         <th align=left nowrap>| . $locale->text('Message') . qq|</th>
-       </tr>
-       <tr>
-         <td><textarea name=message rows=15 cols=60 wrap=soft>$form->{message}</textarea></td>
-       </tr>
+          <th align=left nowrap>| . $locale->text('Message') . qq|</th>
+        </tr>
+        <tr>
+          <td><textarea name=message rows=15 cols=60 wrap=soft>$form->{message}</textarea></td>
+        </tr>
       </table>
     </td>
   </tr>
@@ -2070,9 +2070,9 @@ sub print_form {
   # saving the history
   if(!exists $form->{addition} && $form->{id} ne "") {
     $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
-       $form->{addition} = "PRINTED";
-       $form->{what_done} = $form->{type};
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "PRINTED";
+    $form->{what_done} = $form->{type};
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
   $main::lxdebug->leave_sub();
@@ -2223,13 +2223,13 @@ sub generate_tax_report {
   <tr>
     <td>
       <table width=100%>
-       <tr class=listheading>
+        <tr class=listheading>
 |;
 
   map { print "$column_header{$_}\n" } @column_index;
 
   print qq|
-       </tr>
+        </tr>
 |;
 
   # add sort and escape callback
@@ -2276,13 +2276,13 @@ sub generate_tax_report {
     $i++;
     $i %= 2;
     print qq|
-       <tr class=listrow$i>
+        <tr class=listrow$i>
 |;
 
     map { print "$column_data{$_}\n" } @column_index;
 
     print qq|
-       </tr>
+        </tr>
 |;
 
   }
@@ -2295,7 +2295,7 @@ sub generate_tax_report {
 
   print qq|
         </tr>
-       <tr class=listtotal>
+        <tr class=listtotal>
 |;
 
   my $total          = $form->format_amount(\%myconfig, $totalnetamount + $totaltax, 2, "&nbsp;");
@@ -2346,7 +2346,7 @@ sub tax_subtotal {
   $subtotaltax       = 0;
 
   print qq|
-       <tr class=listsubtotal>
+        <tr class=listsubtotal>
 |;
   map { print "\n$column_data{$_}" } @column_index;
 
@@ -2516,21 +2516,18 @@ sub print_options {
 
   my ($media);
   my $type = qq|
-           <option value=statement $form->{PD}{statement}>|
-      . $locale->text('Statement');
+            <option value=statement $form->{PD}{statement}>| . $locale->text('Statement');
 
   if ($form->{media} eq 'email') {
     $media = qq|
-           <option value=attachment $form->{SM}{attachment}>|
-      . $locale->text('Attachment') . qq|
-           <option value=inline $form->{SM}{inline}>| . $locale->text('In-line');
+            <option value=attachment $form->{SM}{attachment}>| . $locale->text('Attachment') . qq|
+            <option value=inline $form->{SM}{inline}>| . $locale->text('In-line');
   } else {
     $media = qq|
-           <option value=screen $form->{OP}{screen}>| . $locale->text('Screen');
+            <option value=screen $form->{OP}{screen}>| . $locale->text('Screen');
     if ($myconfig{printer} && $main::latex_templates) {
       $media .= qq|
-            <option value=printer $form->{OP}{printer}>|
-        . $locale->text('Printer');
+            <option value=printer $form->{OP}{printer}>| . $locale->text('Printer');
     }
   }
 
index 8e94f32..6c05b28 100644 (file)
@@ -170,8 +170,8 @@ sub transfer_or_removal_prepare_contents {
   my @contents  = WH->get_warehouse_report("warehouse_id" => $form->{warehouse_id},
                                            "bin_id"       => $form->{bin_id},
                                            "chargenumber" => $form->{chargenumber},
-                                          "partnumber"   => $form->{partnumber},
-                                          "ean"          => $form->{ean},
+                                           "partnumber"   => $form->{partnumber},
+                                           "ean"          => $form->{ean},
                                            "description"  => $form->{description});
 
   $form->show_generic_error($locale->text("The selected warehouse is empty.")) if (0 == scalar(@contents));
@@ -310,7 +310,7 @@ sub transfer_stock_update_part {
   } elsif (($form->{partnumber} && ($form->{partnumber} ne $form->{old_partnumber})) || $form->{description} || $form->{ean}) {
 
     $form->{no_services}   = 1;
-    $form->{no_assemblies} = 0;        # assemblies duerfen eingelagert werden (z.B. bei retouren)
+    $form->{no_assemblies} = 0; # assemblies duerfen eingelagert werden (z.B. bei retouren)
 
     my $parts = Common->retrieve_parts(\%myconfig, $form, 'description', 1);
 
@@ -424,10 +424,10 @@ sub create_assembly {
     $form->show_generic_error($locale->text('Invalid quantity.'), 'back_button' => 1);
   }
   # TODO Es wäre schön, hier schon die maximale Anzahl der zu fertigenden Erzeugnisse zu haben
-  #else { if ($form->{qty} > $maxcreate) {     #s.o.
-  #        $form->show_generic_error($locale->text('Can not create that quantity with current stock'), 'back_button' => 1);
-  #        $form->show_generic_error('Maximale Stückzahl' . $maxcreate , 'back_button' => 1);
-  #      }
+  #else { if ($form->{qty} > $maxcreate) { #s.o.
+  #     $form->show_generic_error($locale->text('Can not create that quantity with current stock'), 'back_button' => 1);
+  #     $form->show_generic_error('Maximale Stückzahl' . $maxcreate , 'back_button' => 1);
+  #   }
   #  }
 
   if (!$form->{warehouse_id} || !$form->{bin_id}) {
index 93f6213..43d83e1 100644 (file)
@@ -38,11 +38,11 @@ sub query_result {
 
   while (my $row = $sth2->fetchrow_hashref()) {
     if ($main::form->{"gender_$i"} eq "f" ) {
-                       $mchecked = "";
-                       $fchecked = "checked";
+      $mchecked = "";
+      $fchecked = "checked";
     } else {
-                       $mchecked = "checked";
-                       $fchecked = "";
+      $mchecked = "checked";
+      $fchecked = "";
     };
 
     $gender_table .= "<tr><input type=hidden name=\"cp_id_$i\" value=\"$row->{cp_id}\"> <td>$row->{cp_givenname}</td> <td>$row->{cp_name}</td> <td>$row->{cp_title} </td> <td>$row->{cp_greeting} </td><td> <input type=\"radio\" name=\"gender_$i\" value=\"m\" $mchecked> <input type=\"radio\" name=\"gender_$i\" value=\"f\" $fchecked></td></tr>\n";