]> wagnertech.de Git - mfinanz.git/commitdiff
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Wed, 25 Jan 2012 12:41:10 +0000 (13:41 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Wed, 25 Jan 2012 12:41:10 +0000 (13:41 +0100)
12 files changed:
SL/AM.pm
bin/mozilla/am.pl
scripts/installation_check.pl
t/006spellcheck.t
templates/webpages/am/audit_control.html [new file with mode: 0644]
templates/webpages/am/buchungsgruppe_header.html [new file with mode: 0644]
templates/webpages/am/buchungsgruppe_list.html [new file with mode: 0644]
templates/webpages/am/form_footer.html [new file with mode: 0644]
templates/webpages/am/language_header.html [new file with mode: 0644]
templates/webpages/am/language_list.html [new file with mode: 0644]
templates/webpages/am/lead_header.html [new file with mode: 0644]
templates/webpages/am/lead_list.html [new file with mode: 0644]

index df8bf23e510f5414a6baf0ffcf5309919264e54f..67c3c2060e2fa7f0922768b49158dbc5891b1af4 100644 (file)
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -547,7 +547,7 @@ sub save_lead {
     $query = qq|UPDATE leads SET
                 lead = ?
                 WHERE id = ?|;
-    puhs(@values, $form->{id});
+    push(@values, $form->{id});
   } else {
     $query = qq|INSERT INTO leads
                 (lead)
@@ -1509,6 +1509,10 @@ sub convert_unit {
   $main::lxdebug->enter_sub(2);
   my ($this, $a, $b, $all_units) = @_;
 
+  if (!$all_units) {
+    $all_units = $this->retrieve_all_units;
+  }
+
   $main::lxdebug->leave_sub(2) and return 0 unless $a && $b;
   $main::lxdebug->leave_sub(2) and return 0 unless $all_units->{$a} && $all_units->{$b};
   $main::lxdebug->leave_sub(2) and return 0 unless $all_units->{$a}{base_unit} eq $all_units->{$b}{base_unit};
index 2dacb6f98245760af9c5100b25384bf59ca5f525..28b1a52285ce0a2f7dd464dc6efb4a42c000d38e 100644 (file)
@@ -366,44 +366,18 @@ sub account_header {
 }
 
 sub form_footer {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  print qq|
-
-<input name=callback type=hidden value="| . H($form->{callback}) . qq|">
-
-<br>|;
-  if ((!$form->{id}) || ($form->{id} && $form->{orphaned}) || (($form->{type} eq "account") && (!$form->{new_chart_valid}))) {
-    print qq|
-<input type=submit class=submit name=action value="|
-    . $locale->text('Save') . qq|">
-|;
-}
-
-  if ($form->{id} && $form->{orphaned}) {
-    print qq|<input type=submit class=submit name=action value="|
-      . $locale->text('Delete') . qq|">|;
-  }
-
-  if ($form->{id} && $form->{type} eq "account") {
-    print qq|
-    <input class=submit type=submit name=action value="|
-      . $locale->text('Save as new') . qq|">|;
-  }
-
-  print qq|
-</form>
-
-</body>
-</html>
-|;
+  $::lxdebug->enter_sub;
+  $::auth->assert('config');
+
+  print $::form->parse_html_template('am/form_footer', {
+    show_save        => !$::form->{id}
+                     || ($::form->{id} && $::form->{orphaned})
+                     || ($::form->{type} eq "account" && !$::form->{new_chart_valid}),
+    show_delete      => $::form->{id} && $::form->{orphaned},
+    show_save_as_new => $::form->{id} && $::form->{type} eq "account",
+  });
 
-  $main::lxdebug->leave_sub();
+  $::lxdebug->leave_sub;
 }
 
 sub save_account {
@@ -644,137 +618,32 @@ sub edit_lead {
 }
 
 sub list_lead {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  AM->lead(\%myconfig, \%$form);
-
-  $form->{callback} = "am.pl?action=list_lead";
-
-  my $callback = $form->escape($form->{callback});
-
-  $form->{title} = $locale->text('Lead');
-
-  my @column_index = qw(description cost profit);
-  my %column_header;
-  $column_header{description} =
-      qq|<th class=listheading width=100%>|
-    . $locale->text('Description')
-    . qq|</th>|;
-
-  $form->header;
-
-  print qq|
-<body>
-
-<table width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr class=listheading>
-|;
-
-  map { print "$column_header{$_}\n" } @column_index;
-
-  print qq|
-  </tr>
-|;
-
-  my ($i, %column_data);
-  foreach my $ref (@{ $form->{ALL} }) {
-
-    $i++;
-    $i %= 2;
-
-    print qq|
-  <tr valign=top class=listrow$i>
-|;
-
-#    $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>
-|;
-  }
-
-  print qq|
-  <tr>
-  <td><hr size=3 noshade></td>
-  </tr>
-</table>
-
-<br>
-<form method=post action=am.pl>
+  $::lxdebug->enter_sub;
+  $::auth->assert('config');
 
-<input name=callback type=hidden value="$form->{callback}">
+  AM->lead(\%::myconfig, $::form);
 
-<input type=hidden name=type value=lead>
+  $::form->{callback} = "am.pl?action=list_lead";
+  $::form->{title}    = $::locale->text('Lead');
 
-<input class=submit type=submit name=action value="|
-    . $locale->text('Add') . qq|">
+  $::form->header;
+  print $::form->parse_html_template('am/lead_list');
 
-  </form>
-
-  </body>
-  </html>
-|;
-
-  $main::lxdebug->leave_sub();
+  $::lxdebug->leave_sub;
 }
 
 sub lead_header {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  $form->{title} = $locale->text("$form->{title} Lead");
+  $::lxdebug->enter_sub;
+  $::auth->assert('config');
 
   # $locale->text('Add Lead')
   # $locale->text('Edit Lead')
+  $::form->{title} = $::locale->text("$::form->{title} Lead");
 
-  $form->{description} =~ s/\"/&quot;/g;
-
-  my $description =
-      qq|<input name=description size=50 value="$form->{lead}">|;
-
-  $form->header;
-
-  print qq|
-<body>
+  $::form->header;
+  print $::form->parse_html_template('am/lead_header');
 
-<form method=post action=am.pl>
-
-<input type=hidden name=id value=$form->{id}>
-<input type=hidden name=type value=lead>
-
-<table width=100%>
-  <tr>
-    <th class=listtop colspan=2>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <th align=right>| . $locale->text('Description') . qq|</th>
-    <td>$description</td>
-  </tr>
-    <td colspan=2><hr size=3 noshade></td>
-  </tr>
-</table>
-|;
-
-  $main::lxdebug->leave_sub();
+  $::lxdebug->leave_sub;
 }
 
 sub save_lead {
@@ -846,228 +715,37 @@ sub edit_language {
 }
 
 sub list_language {
-  $main::lxdebug->enter_sub();
+  $::lxdebug->enter_sub;
+  $::auth->assert('config');
 
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  AM->language(\%myconfig, \%$form);
-
-  $form->{callback} = "am.pl?action=list_language";
-
-  my $callback = $form->escape($form->{callback});
-
-  $form->{title} = $locale->text('Languages');
-
-  my @column_index = qw(description template_code article_code output_numberformat output_dateformat output_longdates);
-  my %column_header;
-  $column_header{description} =
-      qq|<th class=listheading width=60%>|
-    . $locale->text('Description')
-    . qq|</th>|;
-  $column_header{template_code} =
-      qq|<th class=listheading width=10%>|
-    . $locale->text('Template Code')
-    . qq|</th>|;
-  $column_header{article_code} =
-      qq|<th class=listheading>|
-    . $locale->text('Article Code')
-    . qq|</th>|;
-  $column_header{output_numberformat} =
-      qq|<th class=listheading>|
-    . $locale->text('Number Format')
-    . qq|</th>|;
-  $column_header{output_dateformat} =
-      qq|<th class=listheading>|
-    . $locale->text('Date Format')
-    . qq|</th>|;
-  $column_header{output_longdates} =
-      qq|<th class=listheading>|
-    . $locale->text('Long Dates')
-    . qq|</th>|;
-
-  $form->header;
-
-  print qq|
-<body>
-
-<table width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table width=100%>
-        <tr class=listheading>
-|;
-
-  map { print "$column_header{$_}\n" } @column_index;
+  AM->language(\%::myconfig, $::form);
 
-  print qq|
-        </tr>
-|;
+  $::form->{callback} = "am.pl?action=list_language";
+  $::form->{title}   = $::locale->text('Languages');
 
-  my ($i, %column_data);
-  foreach my $ref (@{ $form->{ALL} }) {
+  $::form->header;
 
-    $i++;
-    $i %= 2;
-
-    print qq|
-        <tr valign=top class=listrow$i>
-|;
-
-
-    $column_data{description} =
-      qq|<td><a href="am.pl?action=edit_language&id=$ref->{id}&callback=$callback">$ref->{description}</td>|;
-    $column_data{template_code}           = qq|<td align=right>$ref->{template_code}</td>|;
-    $column_data{article_code} =
-      qq|<td align=right>$ref->{article_code}</td>|;
-    $column_data{output_numberformat} =
-      "<td nowrap>" .
-      ($ref->{output_numberformat} ? $ref->{output_numberformat} :
-       $locale->text("use program settings")) .
-      "</td>";
-    $column_data{output_dateformat} =
-      "<td nowrap>" .
-      ($ref->{output_dateformat} ? $ref->{output_dateformat} :
-       $locale->text("use program settings")) .
-      "</td>";
-    $column_data{output_longdates} =
-      "<td nowrap>" .
-      ($ref->{output_longdates} ? $locale->text("Yes") : $locale->text("No")) .
-      "</td>";
-
-    map { print "$column_data{$_}\n" } @column_index;
-
-    print qq|
-        </tr>
-|;
-  }
-
-  print qq|
-      </table>
-    </td>
-  </tr>
-  <tr>
-  <td><hr size=3 noshade></td>
-  </tr>
-</table>
-
-<br>
-<form method=post action=am.pl>
-
-<input name=callback type=hidden value="$form->{callback}">
-
-<input type=hidden name=type value=language>
+  print $::form->parse_html_template('am/language_list');
 
-<input class=submit type=submit name=action value="|
-    . $locale->text('Add') . qq|">
-
-  </form>
-
-  </body>
-  </html>
-|;
-
-  $main::lxdebug->leave_sub();
+  $::lxdebug->leave_sub;
 }
 
 sub language_header {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  $form->{title}    = $locale->text("$form->{title} Language");
+  $::lxdebug->enter_sub;
+  $::auth->assert('config');
 
   # $locale->text('Add Language')
   # $locale->text('Edit Language')
+  $::form->{title} = $::locale->text("$::form->{title} Language");
 
-  $form->{description} =~ s/\"/&quot;/g;
-  $form->{template_code} =~ s/\"/&quot;/g;
-  $form->{article_code} =~ s/\"/&quot;/g;
-
-
-  $form->header;
-
-  my $numberformat =
-    qq|<option value="">| . $locale->text("use program settings") .
-    qq|</option>|;
-  foreach my $item (('1,000.00', '1000.00', '1.000,00', '1000,00')) {
-    $numberformat .=
-      ($item eq $form->{output_numberformat})
-      ? "<option selected>$item"
-      : "<option>$item"
-      . "</option>";
-  }
-
-  my $dateformat =
-    qq|<option value="">| . $locale->text("use program settings") .
-    qq|</option>|;
-  foreach my $item (qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd)) {
-    $dateformat .=
-      ($item eq $form->{output_dateformat})
-      ? "<option selected>$item"
-      : "<option>$item"
-      . "</option>";
-  }
+  $::form->header;
 
-  print qq|
-<body>
-
-<form method=post action=am.pl>
-
-<input type=hidden name=id value=$form->{id}>
-<input type=hidden name=type value=language>
-
-<table width=100%>
-  <tr>
-    <th class=listtop colspan=2>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <th align=right>| . $locale->text('Language') . qq|</th>
-    <td><input name=description size=30 value="| . $form->quote($form->{description}) . qq|"></td>
-  <tr>
-  <tr>
-    <th align=right>| . $locale->text('Template Code') . qq|</th>
-    <td><input name=template_code size=5 value="| . $form->quote($form->{template_code}) . qq|"></td>
-  </tr>
-  <tr>
-    <th align=right>| . $locale->text('Article Code') . qq|</th>
-    <td><input name=article_code size=10 value="| . $form->quote($form->{article_code}) . qq|"></td>
-  </tr>
-  <tr>
-    <th align=right>| . $locale->text('Number Format') . qq|</th>
-    <td><select name="output_numberformat">$numberformat</select></td>
-  </tr>
-  <tr>
-    <th align=right>| . $locale->text('Date Format') . qq|</th>
-    <td><select name="output_dateformat">$dateformat</select></td>
-  </tr>
-  <tr>
-    <th align=right>| . $locale->text('Long Dates') . qq|</th>
-    <td><input type="radio" name="output_longdates" value="1"| .
-    ($form->{output_longdates} ? " checked" : "") .
-    qq|>| . $locale->text("Yes") .
-    qq|<input type="radio" name="output_longdates" value="0"| .
-    ($form->{output_longdates} ? "" : " checked") .
-    qq|>| . $locale->text("No") .
-    qq|</td>
-  </tr>
-  <td colspan=2><hr size=3 noshade></td>
-  </tr>
-</table>
-|;
+  print $::form->parse_html_template('am/language_header', {
+    numberformats => [ '1,000.00', '1000.00', '1.000,00', '1000,00' ],
+    dateformats => [ qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd) ],
+  });
 
-  $main::lxdebug->leave_sub();
+  $::lxdebug->leave_sub;
 }
 
 sub save_language {
@@ -1152,330 +830,56 @@ sub edit_buchungsgruppe {
 }
 
 sub list_buchungsgruppe {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
+  $::lxdebug->enter_sub;
+  $::auth->assert('config');
 
-  AM->buchungsgruppe(\%myconfig, \%$form);
-
-  $form->{callback} = "am.pl?action=list_buchungsgruppe";
-
-  my $callback = $form->escape($form->{callback});
-
-  $form->{title} = $locale->text('Buchungsgruppen');
-
-  my @column_index = qw(up down description inventory_accno
-                     income_accno_0 expense_accno_0
-                     income_accno_1 expense_accno_1
-                     income_accno_2 expense_accno_2
-                     income_accno_3 expense_accno_3 );
-  my %column_header;
-  $column_header{up} =
-      qq|<th class="listheading" width="16">|
-    . qq|<img src="image/up.png" alt="| . $locale->text("up") . qq|">|
-    . qq|</th>|;
-  $column_header{down} =
-      qq|<th class="listheading" width="16">|
-    . qq|<img src="image/down.png" alt="| . $locale->text("down") . qq|">|
-    . qq|</th>|;
-  $column_header{description} =
-      qq|<th class="listheading" width="40%">|
-    . $locale->text('Description')
-    . qq|</th>|;
-  $column_header{inventory_accno} =
-      qq|<th class=listheading>|
-    . $locale->text('Bestandskonto')
-    . qq|</th>|;
-  $column_header{income_accno_0} =
-      qq|<th class=listheading>|
-    . $locale->text('National Revenues')
-    . qq|</th>|;
-  $column_header{expense_accno_0} =
-      qq|<th class=listheading>|
-    . $locale->text('National Expenses')
-    . qq|</th>|;
-  $column_header{income_accno_1} =
-      qq|<th class=listheading>|
-    . $locale->text('Revenues EU with UStId')
-    . qq|</th>|;
-  $column_header{expense_accno_1} =
-      qq|<th class=listheading>|
-    . $locale->text('Expenses EU with UStId')
-    . qq|</th>|;
-  $column_header{income_accno_2} =
-      qq|<th class=listheading>|
-    . $locale->text('Revenues EU without UStId')
-    . qq|</th>|;
-  $column_header{expense_accno_2} =
-      qq|<th class=listheading>|
-    . $locale->text('Expenses EU without UStId')
-    . qq|</th>|;
-  $column_header{income_accno_3} =
-      qq|<th class=listheading>|
-    . $locale->text('Foreign Revenues')
-    . qq|</th>|;
-  $column_header{expense_accno_3} =
-      qq|<th class=listheading>|
-    . $locale->text('Foreign Expenses')
-    . qq|</th>|;
-  $form->header;
-
-  print qq|
-<body>
-
-<table width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table width=100%>
-        <tr class=listheading>
-|;
-
-  map { print "$column_header{$_}\n" } @column_index;
-
-  print qq|
-        </tr>
-|;
-
-  my $swap_link = qq|am.pl?action=swap_buchungsgruppen&|;
-
-  my $row = 0;
-  my ($i, %column_data);
-  foreach my $ref (@{ $form->{ALL} }) {
-
-    $i++;
-    $i %= 2;
-
-    print qq|
-        <tr valign=top class=listrow$i>
-|;
-
-    if ($row) {
-      my $pref = $form->{ALL}->[$row - 1];
-      $column_data{up} =
-        qq|<td align="center" valign="center" width="16">| .
-        qq|<a href="${swap_link}id1=$ref->{id}&id2=$pref->{id}">| .
-        qq|<img border="0" src="image/up.png" alt="| . $locale->text("up") . qq|">| .
-        qq|</a></td>|;
-    } else {
-      $column_data{up} = qq|<td width="16">&nbsp;</td>|;
-    }
+  AM->buchungsgruppe(\%::myconfig, $::form);
 
-    if ($row == (scalar(@{ $form->{ALL} }) - 1)) {
-      $column_data{down} = qq|<td width="16">&nbsp;</td>|;
-    } else {
-      my $nref = $form->{ALL}->[$row + 1];
-      $column_data{down} =
-        qq|<td align="center" valign="center" width="16">| .
-        qq|<a href="${swap_link}id1=$ref->{id}&id2=$nref->{id}">| .
-        qq|<img border="0" src="image/down.png" alt="| . $locale->text("down") . qq|">| .
-        qq|</a></td>|;
-    }
-
-    $column_data{description} = qq|<td><a href="am.pl?action=edit_buchungsgruppe&id=$ref->{id}&callback=$callback">$ref->{description}</td>|;
-    $column_data{inventory_accno}           = qq|<td align=right>$ref->{inventory_accno}</td>|;
-    $column_data{income_accno_0} =
-      qq|<td align=right>$ref->{income_accno_0}</td>|;
-    $column_data{expense_accno_0}           = qq|<td align=right>$ref->{expense_accno_0}</td>|;
-    $column_data{income_accno_1} =
-      qq|<td align=right>$ref->{income_accno_1}</td>|;
-    $column_data{expense_accno_1}           = qq|<td align=right>$ref->{expense_accno_1}</td>|;
-    $column_data{income_accno_2} =
-      qq|<td align=right>$ref->{income_accno_2}</td>|;
-    $column_data{expense_accno_2}           = qq|<td align=right>$ref->{expense_accno_2}</td>|;
-    $column_data{income_accno_3} =
-      qq|<td align=right>$ref->{income_accno_3}</td>|;
-    $column_data{expense_accno_3}           = qq|<td align=right>$ref->{expense_accno_3}</td>|;
-
-    map { print "$column_data{$_}\n" } @column_index;
-
-    print qq|
-        </tr>
-|;
-
-    $row++;
-  }
-
-  print qq|
-      </table>
-    </td>
-  </tr>
-  <tr>
-  <td><hr size=3 noshade></td>
-  </tr>
-</table>
-
-<br>
-<form method=post action=am.pl>
+  $::form->{callback} = "am.pl?action=list_buchungsgruppe";
+  $::form->{title}    = $::locale->text('Buchungsgruppen');
+  $::form->header;
 
-<input name=callback type=hidden value="$form->{callback}">
-
-<input type=hidden name=type value=buchungsgruppe>
-
-<input class=submit type=submit name=action value="|
-    . $locale->text('Add') . qq|">
-
-  </form>
-
-  </body>
-  </html>
-|;
+  print $::form->parse_html_template('am/buchungsgruppe_list', {
+    swap_link => qq|am.pl?action=swap_buchungsgruppen&|,
+  });
 
-  $main::lxdebug->leave_sub();
+  $::lxdebug->leave_sub;
 }
 
 sub buchungsgruppe_header {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  $form->{title}    = $locale->text("$form->{title} Buchungsgruppe");
+  $::lxdebug->enter_sub;
+  $::auth->assert('config');
 
   # $locale->text('Add Accounting Group')
   # $locale->text('Edit Accounting Group')
+  $::form->{title}    = $::locale->text("$::form->{title} Buchungsgruppe");
 
   my ($acc_inventory, $acc_income, $acc_expense) = ({}, {}, {});
   my %acc_type_map = (
-    "IC" => $acc_inventory,
-    "IC_income" => $acc_income,
-    "IC_sale" => $acc_income,
-    "IC_expense" => $acc_expense,
-    "IC_cogs" => $acc_expense,
-    );
+    IC         => $acc_inventory,
+    IC_income  => $acc_income,
+    IC_sale    => $acc_income,
+    IC_expense => $acc_expense,
+    IC_cogs    => $acc_expense,
+  );
 
-  foreach my $key (keys(%acc_type_map)) {
-    foreach my $ref (@{ $form->{IC_links}{$key} }) {
-      $acc_type_map{$key}->{$ref->{"id"}} = $ref;
+  for my $key (keys %acc_type_map) {
+    for my $ref (@{ $::form->{IC_links}{$key} }) {
+      $acc_type_map{$key}{$ref->{id}} = $ref;
     }
   }
 
-  foreach my $type (qw(IC IC_income IC_expense)) {
-    $form->{"select$type"} =
-      join("",
-           map({ "<option value=$_->{id} $_->{selected}>" .
-                   "$_->{accno}--" . H($_->{description}) . "</option>" }
-               sort({ $a->{"accno"} cmp $b->{"accno"} }
-                    values(%{$acc_type_map{$type}}))));
-  }
-
-  if ($form->{id}) {
-    $form->{selectIC} =~ s/selected//g;
-    $form->{selectIC} =~ s/ value=\Q$form->{inventory_accno_id}\E/  value=$form->{inventory_accno_id} selected/;
-    $form->{selectIC_income} =~ s/selected//g;
-    $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_0}\E/  value=$form->{income_accno_id_0} selected/;
-    $form->{selectIC_expense} =~ s/selected//g;
-    $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_0}\E/  value=$form->{expense_accno_id_0} selected/;
-  }
-
-  my $linkaccounts;
-  if ( $::instance_conf->get_inventory_system eq 'perpetual' ) { # was !$::lx_office_conf{system}->{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>|;
-  } elsif ( $::instance_conf->get_inventory_system eq 'periodic' ) {
-    # don't allow choice of inventory accno and don't show that line
-    $linkaccounts = qq|
-                <input type=hidden name=inventory_accno_id value=$form->{inventory_accno_id}>|;
-  };
-
-
-  $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>|;
-  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>|;
-
-  if ($form->{id}) {
-    $form->{selectIC_income} =~ s/selected//g;
-    $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_2}\E/  value=$form->{income_accno_id_2} selected/;
-    $form->{selectIC_expense} =~ s/selected//g;
-    $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>|;
-
-  if ($form->{id}) {
-    $form->{selectIC_income} =~ s/selected//g;
-    $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_3}\E/  value=$form->{income_accno_id_3} selected/;
-    $form->{selectIC_expense} =~ s/selected//g;
-    $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>
-|;
+  my %sorted_accounts = map {
+    $_ => [ sort { $a->{accno} cmp $b->{accno} } values %{ $acc_type_map{$_} } ],
+  } keys %acc_type_map;
 
+  $::form->header;
+  print $::form->parse_html_template('am/buchungsgruppe_header', {
+    accounts      => \%sorted_accounts,
+    account_label => sub { "$_[0]{accno}--$_[0]{description}" },
+  });
 
-  $form->header;
-
-  print qq|
-<body>
-
-<form method=post action=am.pl>
-
-<input type=hidden name=id value=$form->{id}>
-<input type=hidden name=type value=buchungsgruppe>
-
-<table width=100%>
-  <tr>
-    <th class=listtop colspan=2>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <th align=right>| . $locale->text('Buchungsgruppe') . qq|</th>
-    <td><input name=description size=30 value="| . $form->quote($form->{description}) . qq|"></td>
-  <tr>
-  $linkaccounts
-  <td colspan=2><hr size=3 noshade></td>
-  </tr>
-</table>
-|;
-
-  $main::lxdebug->leave_sub();
+  $::lxdebug->leave_sub;
 }
 
 sub save_buchungsgruppe {
@@ -1720,55 +1124,17 @@ sub save_preferences {
 }
 
 sub audit_control {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $main::auth->assert('config');
-
-  $form->{title} = $locale->text('Audit Control');
-
-  AM->closedto(\%myconfig, \%$form);
-
-  $form->header;
-
-  print qq|
-<body>
+  $::lxdebug->enter_sub;
+  $::auth->assert('config');
 
-<form method=post action=am.pl>
+  $::form->{title} = $::locale->text('Audit Control');
 
-<table width=100%>
-  <tr><th class=listtop>$form->{title}</th></tr>
-  <tr height="5"></tr>
-  <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>
-      </table>
-    </td>
-  </tr>
-</table>
+  AM->closedto(\%::myconfig, $::form);
 
-<hr size=3 noshade>
+  $::form->header;
+  print $::form->parse_html_template('am/audit_control');
 
-<br>
-<input type=hidden name=nextsub value=doclose>
-
-<input type=submit class=submit name=action value="|
-    . $locale->text('Continue') . qq|">
-
-</form>
-
-</body>
-</html>
-|;
-
-  $main::lxdebug->leave_sub();
+  $::lxdebug->leave_sub;
 }
 
 sub doclose {
index c132310ec58a54edb5b6aa45ff2a43b163abdce3..03b0ae57445b72a9736795e830e72b6e25eefbe0 100755 (executable)
@@ -194,10 +194,7 @@ sub print_result {
 
 sub print_line {
   my ($text, $res, $color) = @_;
-  print $text, " ", ('.' x (78 - length($text) - length($res)));
-  print mycolor($res, $color);
-  print "\n";
-  return;
+  print $text, " ", ('.' x (78 - length($text) - length($res))), " ", mycolor($res, $color), $/;
 }
 
 sub print_header {
index c4766710e387231e436b4d2825b4aed550b444c0..600460c666988da6b4d9fc1b16e6e18d23d97fc6 100644 (file)
@@ -40,6 +40,7 @@ existant
 paramater
 varsion
 fomr
+puhs
 );
 
 $testcount = scalar(@Support::Files::testitems);
diff --git a/templates/webpages/am/audit_control.html b/templates/webpages/am/audit_control.html
new file mode 100644 (file)
index 0000000..1675eab
--- /dev/null
@@ -0,0 +1,27 @@
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE T8 %]
+[%- USE L %]
+<body>
+
+<h1>[% title | html %]</h1>
+
+<form method=post action=am.pl>
+
+<table>
+  <tr>
+    <th>[% 'Close Books up to' | $T8 %]</th>
+    <td>[% L.date_tag('closedto', closedto) %]</td>
+  </tr>
+</table>
+
+<hr size=3 noshade>
+
+<br>
+<input type=hidden name=nextsub value=doclose>
+<input type=submit class=submit name=action value="[% 'Continue' | $T8 %]">
+
+</form>
+
+</body>
+</html>
diff --git a/templates/webpages/am/buchungsgruppe_header.html b/templates/webpages/am/buchungsgruppe_header.html
new file mode 100644 (file)
index 0000000..59c3110
--- /dev/null
@@ -0,0 +1,63 @@
+[%- USE HTML %]
+[%- USE L %]
+[%- USE LxERP %]
+[%- USE T8 %]
+<body>
+
+<h1>[% title | html %]</h1>
+
+<form method=post action=am.pl>
+
+<input type=hidden name=id value='[% id %]'>
+<input type=hidden name=type value=buchungsgruppe>
+
+<table width=100%>
+  <tr>
+    <th align=right>[% 'Buchungsgruppe' | $T8 %]</th>
+    <td><input name=description size=30 value="[% description | html %]"></td>
+  </tr>
+[%- IF INSTANCE_CONF.get_inventory_system == 'perpetual' %]
+  <tr>
+   <th align=right>[% 'Inventory' | $T8 %]</th>
+   <td>[% L.select_tag('inventory_accno_id', L.options_for_select(accounts.IC, title_sub=\account_label, default=invetory_accno_id)) %]</td>
+  </tr>
+[%- ELSE %]
+  <tr style='display:none'>
+    <td>[% L.hidden_tag('inventory_accno_id', inventory_accno_id) %]</td>
+  </tr>
+[%- END %]
+  <tr>
+    <th align=right>[% 'National Revenues' | $T8 %]</th>
+    <td>[% L.select_tag('income_accno_id_0', L.options_for_select(accounts.IC_income, title_sub=\account_label, default=income_accno_id_0)) %]</td>
+  </tr>
+  <tr>
+    <th align=right>[% 'National Expenses' | $T8 %]</th>
+    <td>[% L.select_tag('expense_accno_id_0', L.options_for_select(accounts.IC_expense, title_sub=\account_label, default=expense_accno_id_0)) %]</td>
+  </tr>
+  <tr>
+    <th align=right>[% 'Revenues EU with UStId' | $T8 %]</th>
+    <td>[% L.select_tag('income_accno_id_1', L.options_for_select(accounts.IC_income, title_sub=\account_label, default=income_accno_id_1)) %]</td>
+  </tr>
+  <tr>
+    <th align=right>[% 'Expenses EU with UStId' | $T8 %]</th>
+    <td>[% L.select_tag('expense_accno_id_1', L.options_for_select(accounts.IC_expense, title_sub=\account_label, default=expense_accno_id_1)) %]</td>
+  </tr>
+  <tr>
+    <th align=right>[% 'Revenues EU without UStId' | $T8 %]</th>
+    <td>[% L.select_tag('income_accno_id_2', L.options_for_select(accounts.IC_income, title_sub=\account_label, default=income_accno_id_2)) %]</td>
+  </tr>
+  <tr>
+    <th align=right>[% 'Expenses EU without UStId' | $T8 %]</th>
+    <td>[% L.select_tag('expense_accno_id_2', L.options_for_select(accounts.IC_expense, title_sub=\account_label, default=expense_accno_id_2)) %]</td>
+  </tr>
+  <tr>
+    <th align=right>[% 'Foreign Revenues' | $T8 %]</th>
+    <td>[% L.select_tag('income_accno_id_3', L.options_for_select(accounts.IC_income, title_sub=\account_label, default=income_accno_id_3)) %]</td>
+  </tr>
+  <tr>
+    <th align=right>[% 'Foreign Expenses' | $T8 %]</th>
+    <td>[% L.select_tag('expense_accno_id_3', L.options_for_select(accounts.IC_expense, title_sub=\account_label, default=expense_accno_id_3)) %]</td>
+  </tr>
+  <td colspan=2><hr size=3 noshade></td>
+  </tr>
+</table>
diff --git a/templates/webpages/am/buchungsgruppe_list.html b/templates/webpages/am/buchungsgruppe_list.html
new file mode 100644 (file)
index 0000000..bc4a8a2
--- /dev/null
@@ -0,0 +1,66 @@
+[%- USE HTML %]
+[%- USE L %]
+[%- USE LxERP %]
+[%- USE T8 %]
+<body>
+
+<h1>[% title | html %]</h1>
+
+<table width=100%>
+  <tr>
+  </tr>
+  <tr height="5"></tr>
+  <tr>
+    <td>
+      <table width=100%>
+        <tr class=listheading>
+         <th class="listheading" width="16"><img src="image/up.png" alt="[% 'up' | $T8 %]"></th>
+         <th class="listheading" width="16"><img src="image/down.png" alt="[% 'down' | $T8 %]"></th>
+         <th class="listheading" width="40%">[% 'Description' | $T8 %]</th>
+         <th class=listheading>[% 'Bestandskonto' | $T8 %]</th>
+         <th class=listheading>[% 'National Revenues' | $T8 %]</th>
+         <th class=listheading>[% 'National Expenses' | $T8 %]</th>
+         <th class=listheading>[% 'Revenues EU with UStId' | $T8 %]</th>
+         <th class=listheading>[% 'Expenses EU with UStId' | $T8 %]</th>
+         <th class=listheading>[% 'Revenues EU without UStId' | $T8 %]</th>
+         <th class=listheading>[% 'Expenses EU without UStId' | $T8 %]</th>
+         <th class=listheading>[% 'Foreign Revenues' | $T8 %]</th>
+         <th class=listheading>[% 'Foreign Expenses' | $T8 %]</th>
+        </tr>
+[%- FOREACH row IN ALL %]
+        <tr valign=top class=listrow[% loop.count % 2 %]>
+          <td align="center" valign="center">[% IF !loop.first %]<a href="[% swap_link %]id1=[% row.id %]&id2=[% loop.prev.id %]"><img border="0" src="image/up.png" alt="[% 'up' | $T8 %]"></a>[% ELSE %]&nbsp;[% END %]</td>
+          <td align="center" valign="center">[% IF !loop.last %]<a href="[% swap_link %]id1=[% row.id %]&id2=[% loop.next.id %]"><img border="0" src="image/down.png" alt="[% 'down' | $T8 %]"></a>[% ELSE %]&nbsp;[% END %]</td>
+          <td><a href="am.pl?action=edit_buchungsgruppe&id=[%row.id %]&callback=[% callback | html %]">[% row.description | html %]</a></td>
+          <td align=right>[% row.inventory_accno | html %]</td>
+          <td align=right>[% row.income_accno_0  | html %]</td>
+          <td align=right>[% row.expense_accno_0 | html %]</td>
+          <td align=right>[% row.income_accno_1  | html %]</td>
+          <td align=right>[% row.expense_accno_1 | html %]</td>
+          <td align=right>[% row.income_accno_2  | html %]</td>
+          <td align=right>[% row.expense_accno_2 | html %]</td>
+          <td align=right>[% row.income_accno_3  | html %]</td>
+          <td align=right>[% row.expense_accno_3 | html %]</td>
+        </tr>
+[%- END %]
+      </table>
+    </td>
+  </tr>
+  <tr>
+  <td><hr size=3 noshade></td>
+  </tr>
+</table>
+
+<br>
+<form method=post action=am.pl>
+
+<input name=callback type=hidden value="[% callback | html %]">
+
+<input type=hidden name=type value=buchungsgruppe>
+
+<input class=submit type=submit name=action value="[% 'Add' | $T8 %]">
+
+  </form>
+
+  </body>
+  </html>
diff --git a/templates/webpages/am/form_footer.html b/templates/webpages/am/form_footer.html
new file mode 100644 (file)
index 0000000..99bfdf3
--- /dev/null
@@ -0,0 +1,15 @@
+[%- USE T8 %]
+[%- USE L %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[% L.hidden_tag('callback', callback) %]
+
+<br>
+[%- IF show_save %][% L.submit_tag('action', LxERP.t8('Save')) %][% END %]
+[%- IF show_delete %][% L.submit_tag('action', LxERP.t8('Delete')) %][% END %]
+[%- IF show_save_as_new %][% L.submit_tag('action', LxERP.t8('Save as new')) %][% END %]
+
+</form>
+
+</body>
+</html>
diff --git a/templates/webpages/am/language_header.html b/templates/webpages/am/language_header.html
new file mode 100644 (file)
index 0000000..c17b14e
--- /dev/null
@@ -0,0 +1,44 @@
+[%- USE L %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE T8 %]
+<body>
+
+<form method=post action=am.pl>
+
+<input type=hidden name=id value='[% id %]'>
+<input type=hidden name=type value=language>
+
+<table width=100%>
+  <tr>
+    <th class=listtop colspan=2>[% title | html %]</th>
+  </tr>
+  <tr height="5"></tr>
+  <tr>
+    <th align=right>[% 'Language' | $T8 %]</th>
+    <td><input name=description size=30 value="[% description | html %]"></td>
+  <tr>
+  <tr>
+    <th align=right>[% 'Template Code' | $T8 %]</th>
+    <td><input name=template_code size=5 value="[% template_code | html %]"></td>
+  </tr>
+  <tr>
+    <th align=right>[% 'Article Code' | $T8 %]</th>
+    <td><input name=article_code size=10 value="[% article_code | html %]"></td>
+  </tr>
+  <tr>
+    <th align=right>[% 'Number Format' | $T8 %]</th>
+    <td><select name="output_numberformat">[% L.options_for_select(numberformats, default=output_numberformat, with_empty=1, empty_title=LxERP.t8('use program settings')) %]</select></td>
+  </tr>
+  <tr>
+    <th align=right>[% 'Date Format' | $T8 %]</th>
+    <td><select name="output_dateformat">[% L.options_for_select(dateformats, default=output_dateformat, with_empty=1, empty_title=LxERP.t8('use program settings')) %]</select></td>
+  </tr>
+  <tr>
+    <th align=right>[% 'Long Dates' | $T8 %]</th>
+    <td>[% L.radio_button_tag('output_longdates', checked=output_longdates, label=LxERP.t8('Yes')) %]
+        [% L.radio_button_tag('output_longdates', checked=!output_longdates, label=LxERP.t8('No')) %]</td>
+  </tr>
+  <td colspan=2><hr size=3 noshade></td>
+  </tr>
+</table>
diff --git a/templates/webpages/am/language_list.html b/templates/webpages/am/language_list.html
new file mode 100644 (file)
index 0000000..a49d18e
--- /dev/null
@@ -0,0 +1,52 @@
+[%- USE HTML %]
+[%- USE L %]
+[%- USE LxERP %]
+[%- USE T8 %]
+<body>
+
+<h1>[% title | html %]</h1>
+
+<table width=100%>
+  <tr>
+  </tr>
+  <tr height="5"></tr>
+  <tr>
+    <td>
+      <table width=100%>
+        <tr class=listheading>
+          <th class=listheading>[% 'Description' | $T8 %]</th>
+          <th class=listheading>[% 'Template Code' | $T8 %]</th>
+          <th class=listheading>[% 'Article Code' | $T8 %]</th>
+          <th class=listheading>[% 'Number Format' | $T8 %]</th>
+          <th class=listheading>[% 'Date Format' | $T8 %]</th>
+          <th class=listheading>[% 'Long Dates' | $T8 %]</th>
+        </tr>
+[%- FOREACH row = ALL %]
+        <tr valign=top class=listrow[% loop.count % 2 %]>
+         <td><a href="am.pl?action=edit_language&id=[% row.id | html %]&callback=[% callback | html %]">[% row.description %]</a></td>
+         <td align=right>[% row.template_code | html %]</td>
+         <td align=right>[% row.article_code | html %]</td>
+         <td nowrap>[% row.output_numberformat ? row.output_numberformat : LxERP.t8('use program settings') | html %]</td>
+         <td nowrap>[% row.output_dateformat   ? row.output_dateformat   : LxERP.t8('use program settings') | html %]</td>
+         <td nowrap>[% row.output_longdates    ? LxERP.t8('Yes')         : LxERP.t8('No') %]</td>
+[%- END %]
+       </tr>
+      </table>
+    </td>
+  </tr>
+  <tr>
+  <td><hr size=3 noshade></td>
+  </tr>
+</table>
+
+<br>
+<form method=post action=am.pl>
+
+<input name=callback type=hidden value="[% callback | html %]">
+<input type=hidden name=type value=language>
+<input class=submit type=submit name=action value="[% 'Add' | $T8 %]">
+
+  </form>
+
+  </body>
+  </html>
diff --git a/templates/webpages/am/lead_header.html b/templates/webpages/am/lead_header.html
new file mode 100644 (file)
index 0000000..2287eb6
--- /dev/null
@@ -0,0 +1,21 @@
+[%- USE HTML %]
+[%- USE T8 %]
+<body>
+
+<form method=post action=am.pl>
+
+<input type=hidden name=id value='[% id | html %]'>
+<input type=hidden name=type value=lead>
+
+<table width=100%>
+  <tr>
+    <th class=listtop colspan=2>[% title | html %]</th>
+  </tr>
+  <tr height="5"></tr>
+  <tr>
+    <th align=right>[% 'Description' | $T8 %]</th>
+    <td><input name=description size=50 value="[% lead | html %]"></td>
+  </tr>
+    <td colspan=2><hr size=3 noshade></td>
+  </tr>
+</table>
diff --git a/templates/webpages/am/lead_list.html b/templates/webpages/am/lead_list.html
new file mode 100644 (file)
index 0000000..2e2010e
--- /dev/null
@@ -0,0 +1,35 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE L %]
+<body>
+
+<table width=100%>
+  <tr>
+    <th class=listtop>[% title | html %]</th>
+  </tr>
+  <tr height="5"></tr>
+  <tr class=listheading>
+    <th class=listheading width=100%>[% 'Description' | $T8 %]</th>
+  </tr>
+[%- FOREACH row = ALL  %]
+  <tr valign=top class=listrow[% loop.count % 2 %]>
+    <td><a href="am.pl?action=edit_lead&id=[% row.id | html %]&callback=[% callback | html %]">[% row.lead | html %]</a></td>
+  </tr>
+[%- END %]
+  <tr>
+  <td><hr size=3 noshade></td>
+  </tr>
+</table>
+
+<br>
+<form method=post action=am.pl>
+
+<input name=callback type=hidden value="[% callback | html %]">
+<input type=hidden name=type value=lead>
+<input class=submit type=submit name=action value="[% 'Add' | $T8 %]">
+
+  </form>
+
+  </body>
+  </html>