Das Bearbeiten der Einstellungen, die in der Tabelle "defaults" gespeichert werden...

diff --git a/SL/AM.pm b/SL/AM.pm
index fa6e128ea7d57424c86df0c702fa30cf3ccc0b3b..4eddb74bdf628aedfb674f656cc46e5db72f03dd 100644 (file)
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -1474,68 +1474,83 @@ sub save_template {
   return $error;
 }
 
   return $error;
 }
 

-sub save_preferences {
+sub save_defaults {

   $main::lxdebug->enter_sub();
 
   $main::lxdebug->enter_sub();
 

-  my ($self, $myconfig, $form, $memberfile, $userspath, $webdav) = @_;
+  my $self     = shift;
+  my %params   = @_;

 
 

-  map { ($form->{$_}) = split(/--/, $form->{$_}) }
-    qw(inventory_accno income_accno expense_accno fxgain_accno fxloss_accno);
+  my $myconfig = \%main::myconfig;
+  my $form     = $main::form;

 
 

-  my @a;
-  $form->{curr} =~ s/ //g;
-  map { push(@a, uc pack "A3", $_) if $_ } split(/:/, $form->{curr});
-  $form->{curr} = join ':', @a;
+  my $dbh      = $params{dbh} || $form->get_standard_dbh($myconfig);

 
 

-  # connect to database
-  my $dbh = $form->dbconnect_noauto($myconfig);
+  my %accnos;
+  map { ($accnos{$_}) = split(m/--/, $form->{$_}) } qw(inventory_accno income_accno expense_accno fxgain_accno fxloss_accno);
+
+  $form->{curr}  =~ s/ //g;
+  my @currencies =  grep { $_ ne '' } split m/:/, $form->{curr};
+  my $currency   =  join ':', @currencies;

 
   # these defaults are database wide
 
   # these defaults are database wide

-  # user specific variables are in myconfig
-  # save defaults
+

   my $query =
   my $query =

-    qq|UPDATE defaults SET | .
-    qq|inventory_accno_id = (SELECT c.id FROM chart c WHERE c.accno = ?), | .
-    qq|income_accno_id = (SELECT c.id FROM chart c WHERE c.accno = ?), | .
-    qq|expense_accno_id = (SELECT c.id FROM chart c WHERE c.accno = ?), | .
-    qq|fxgain_accno_id = (SELECT c.id FROM chart c WHERE c.accno = ?), | .
-    qq|fxloss_accno_id = (SELECT c.id FROM chart c WHERE c.accno = ?), | .
-    qq|invnumber = ?, | .
-    qq|cnnumber  = ?, | .
-    qq|sonumber = ?, | .
-    qq|ponumber = ?, | .
-    qq|sqnumber = ?, | .
-    qq|rfqnumber = ?, | .
-    qq|customernumber = ?, | .
-    qq|vendornumber = ?, | .
-    qq|articlenumber = ?, | .
-    qq|servicenumber = ?, | .
-    qq|yearend = ?, | .
-    qq|curr = ?, | .
-    qq|businessnumber = ?|;
-  my @values = ($form->{inventory_accno}, $form->{income_accno},
-                $form->{expense_accno},
-                $form->{fxgain_accno}, $form->{fxloss_accno},
-                $form->{invnumber}, $form->{cnnumber},
-                $form->{sonumber}, $form->{ponumber},
-                $form->{sqnumber}, $form->{rfqnumber},
-                $form->{customernumber}, $form->{vendornumber},
-                $form->{articlenumber}, $form->{servicenumber},
-                $form->{yearend}, $form->{curr},
+    qq|UPDATE defaults SET
+        inventory_accno_id = (SELECT c.id FROM chart c WHERE c.accno = ?),
+        income_accno_id    = (SELECT c.id FROM chart c WHERE c.accno = ?),
+        expense_accno_id   = (SELECT c.id FROM chart c WHERE c.accno = ?),
+        fxgain_accno_id    = (SELECT c.id FROM chart c WHERE c.accno = ?),
+        fxloss_accno_id    = (SELECT c.id FROM chart c WHERE c.accno = ?),
+        invnumber          = ?,
+        cnnumber           = ?,
+        sonumber           = ?,
+        ponumber           = ?,
+        sqnumber           = ?,
+        rfqnumber          = ?,
+        customernumber     = ?,
+        vendornumber       = ?,
+        articlenumber      = ?,
+        servicenumber      = ?,
+        yearend            = ?,
+        curr               = ?,
+        businessnumber     = ?|;
+  my @values = ($accnos{inventory_accno}, $accnos{income_accno}, $accnos{expense_accno},
+                $accnos{fxgain_accno},    $accnos{fxloss_accno},
+                $form->{invnumber},       $form->{cnnumber},
+                $form->{sonumber},        $form->{ponumber},
+                $form->{sqnumber},        $form->{rfqnumber},
+                $form->{customernumber},  $form->{vendornumber},
+                $form->{articlenumber},   $form->{servicenumber},
+                $form->{yearend},         $currency,

                 $form->{businessnumber});
   do_query($form, $dbh, $query, @values);
 
                 $form->{businessnumber});
   do_query($form, $dbh, $query, @values);
 

+  $dbh->commit();
+
+  $main::lxdebug->leave_sub();
+}
+
+
+sub save_preferences {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form, $memberfile, $userspath, $webdav) = @_;
+
+  my $dbh = $form->get_standard_dbh($myconfig);
+
+  my ($currency, $businessnumber) = selectrow_query($form, $dbh, qq|SELECT curr, businessnumber FROM defaults|);
+

   # update name
   # update name

-  $query = qq|UPDATE employee
-              SET name = ?
-              WHERE login = ?|;
+  my $query = qq|UPDATE employee SET name = ? WHERE login = ?|;

   do_query($form, $dbh, $query, $form->{name}, $form->{login});
 
   do_query($form, $dbh, $query, $form->{name}, $form->{login});
 

-  my $rc = $dbh->commit;
-  $dbh->disconnect;
+  my $rc = $dbh->commit();

 
   # save first currency in myconfig
 
   # save first currency in myconfig

-  $form->{currency} = substr($form->{curr}, 0, 3);
+  $currency               =~ s/:.*//;
+  $form->{currency}       =  $currency;
+
+  $form->{businessnumber} =  $businessnumber;

 
   $myconfig = new User "$memberfile", "$form->{login}";
 
 
   $myconfig = new User "$memberfile", "$form->{login}";
 

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 89dd4f29f073793dffa32f8665e2a0c32a19cf53..fbb5cfd3e46ebeb67d6cde08a0b1347dc754825a 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -2302,6 +2302,46 @@ sub swap_payment_terms {
   $lxdebug->leave_sub();
 }
 
   $lxdebug->leave_sub();
 }
 

+sub edit_defaults {
+  $lxdebug->enter_sub();
+
+  # get defaults for account numbers and last numbers
+  AM->defaultaccounts(\%myconfig, \%$form);
+
+  map { $form->{"defaults_${_}"} = $form->{defaults}->{$_} } keys %{ $form->{defaults} };
+
+  foreach $key (keys %{ $form->{IC} }) {
+    foreach $accno (sort keys %{ $form->{IC}->{$key} }) {
+      my $array = "ACCNOS_" . uc($key);
+      $form->{$array} ||= [];
+
+      my $value = "${accno}--" . $form->{IC}->{$key}->{$accno}->{description};
+      push @{ $form->{$array} }, {
+        'name'     => $value,
+        'value'    => $value,
+        'selected' => $form->{IC}->{$key}->{$accno}->{id} == $form->{defaults}->{$key},
+      };
+    }
+  }
+
+  $form->{title} = $locale->text('Ranges of numbers and default accounts');
+
+  $form->header();
+  print $form->parse_html_template('am/edit_defaults');
+
+  $lxdebug->leave_sub();
+}
+
+sub save_defaults {
+  $lxdebug->enter_sub();
+
+  AM->save_defaults();
+
+  $form->redirect($locale->text('Defaults saved.'));
+
+  $lxdebug->leave_sub();
+}
+

 sub _build_cfg_options {
   my $idx   = shift;
   my $array = uc($idx) . 'S';
 sub _build_cfg_options {
   my $idx   = shift;
   my $array = uc($idx) . 'S';


@@ -2319,11 +2359,6 @@ sub _build_cfg_options {
 sub config {
   $lxdebug->enter_sub();
 
 sub config {
   $lxdebug->enter_sub();
 

-  # get defaults for account numbers and last numbers
-  AM->defaultaccounts(\%myconfig, \%$form);
-
-  map { $form->{"defaults_${_}"} = $form->{defaults}->{$_} } keys %{ $form->{defaults} };
-

   _build_cfg_options('dateformat', qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd));
   _build_cfg_options('numberformat', qw(1,000.00 1000.00 1.000,00 1000,00));
 
   _build_cfg_options('dateformat', qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd));
   _build_cfg_options('numberformat', qw(1,000.00 1000.00 1.000,00 1000,00));
 


@@ -2392,20 +2427,6 @@ sub config {
     };
   }
 
     };
   }
 

-  foreach $key (keys %{ $form->{IC} }) {
-    foreach $accno (sort keys %{ $form->{IC}->{$key} }) {
-      my $array = "ACCNOS_" . uc($key);
-      $form->{$array} ||= [];
-
-      my $value = "${accno}--" . $form->{IC}->{$key}->{$accno}->{description};
-      push @{ $form->{$array} }, {
-        'name'     => $value,
-        'value'    => $value,
-        'selected' => $form->{IC}->{$key}->{$accno}->{id} == $form->{defaults}->{$key},
-      };
-    }
-  }
-

   $form->{STYLESHEETS} = [];
   foreach $item (qw(lx-office-erp.css Win2000.css)) {
     push @{ $form->{STYLESHEETS} }, {
   $form->{STYLESHEETS} = [];
   foreach $item (qw(lx-office-erp.css Win2000.css)) {
     push @{ $form->{STYLESHEETS} }, {

diff --git a/locale/de/all b/locale/de/all
index c030de56e949ba87e2d9ab028e05e7d944bb4778..0ba69fe6b43111da588794de9262323d3f6e0960 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -309,6 +309,7 @@ aktualisieren wollen?',
   'Credit Tax Account'          => 'Umsatzsteuerkonto',
   'Credit note (one letter abbreviation)' => 'G',
   'Curr'                        => 'Währung',
   'Credit Tax Account'          => 'Umsatzsteuerkonto',
   'Credit note (one letter abbreviation)' => 'G',
   'Curr'                        => 'Währung',

+  'Currencies'                  => 'Währungen',

   'Currency'                    => 'Währung',
   'Current'                     => 'Betrag',
   'Current / Next Level'        => 'Aktuelles / Nächstes Mahnlevel',
   'Currency'                    => 'Währung',
   'Current'                     => 'Betrag',
   'Current / Next Level'        => 'Aktuelles / Nächstes Mahnlevel',


@@ -361,9 +362,11 @@ aktualisieren wollen?',
   'December'                    => 'Dezember',
   'Decimalplaces'               => 'Dezimalstellen',
   'Decrease'                    => 'Verringern',
   'December'                    => 'Dezember',
   'Decimalplaces'               => 'Dezimalstellen',
   'Decrease'                    => 'Verringern',

+  'Default Accounts'            => 'Standardkonten',

   'Default output medium'       => 'Standardausgabekanal',
   'Default printer'             => 'Standarddrucker',
   'Default template format'     => 'Standardvorlagenformat',
   'Default output medium'       => 'Standardausgabekanal',
   'Default printer'             => 'Standarddrucker',
   'Default template format'     => 'Standardvorlagenformat',

+  'Defaults saved.'             => 'Die Standardeinstellungen wurden gespeichert.',

   'Delete'                      => 'Löschen',
   'Delete Account'              => 'Konto löschen',
   'Delete Dataset'              => 'Datenbank löschen',
   'Delete'                      => 'Löschen',
   'Delete Account'              => 'Konto löschen',
   'Delete Dataset'              => 'Datenbank löschen',


@@ -643,7 +646,6 @@ aktualisieren wollen?',
   'Last Credit Note Number'     => 'Letzte Gutschriftnummer',
   'Last Customer Number'        => 'Letzte Kundennummer',
   'Last Invoice Number'         => 'Letzte Rechnungsnummer',
   'Last Credit Note Number'     => 'Letzte Gutschriftnummer',
   'Last Customer Number'        => 'Letzte Kundennummer',
   'Last Invoice Number'         => 'Letzte Rechnungsnummer',

-  'Last Numbers & Default Accounts' => 'Laufende Zähler und Standardkonten',

   'Last Purchase Order Number'  => 'Letzte Lieferantenautragsnummer',
   'Last RFQ Number'             => 'Letzte Anfragenummer',
   'Last Sales Order Number'     => 'Letzte Auftragsnummer',
   'Last Purchase Order Number'  => 'Letzte Lieferantenautragsnummer',
   'Last RFQ Number'             => 'Letzte Anfragenummer',
   'Last Sales Order Number'     => 'Letzte Auftragsnummer',


@@ -710,6 +712,7 @@ aktualisieren wollen?',
   'Method'                      => 'Verfahren',
   'Microfiche'                  => 'Mikrofilm',
   'Minimum Amount'              => 'Mindestbetrag',
   'Method'                      => 'Verfahren',
   'Microfiche'                  => 'Mikrofilm',
   'Minimum Amount'              => 'Mindestbetrag',

+  'Miscellaneous'               => 'Verschiedenes',

   'Missing \'description\' field.' => 'Fehlendes Feld \'description\'.',
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',
   'Missing Method!'             => 'Fehlender Voranmeldungszeitraum',
   'Missing \'description\' field.' => 'Fehlendes Feld \'description\'.',
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',
   'Missing Method!'             => 'Fehlender Voranmeldungszeitraum',


@@ -949,6 +952,8 @@ aktualisieren wollen?',
   'RFQ Number'                  => 'Anfragenummer',
   'RFQs'                        => 'Preisanfragen',
   'ROP'                         => 'Mindestlagerbestand',
   'RFQ Number'                  => 'Anfragenummer',
   'RFQs'                        => 'Preisanfragen',
   'ROP'                         => 'Mindestlagerbestand',

+  'Ranges of numbers'           => 'Nummernkreise',
+  'Ranges of numbers and default accounts' => 'Nummernkreise und Standardkonten',

   'Receipt'                     => 'Zahlungseingang',
   'Receipt posted!'             => 'Beleg gebucht!',
   'Receipts'                    => 'Zahlungseingänge',
   'Receipt'                     => 'Zahlungseingang',
   'Receipt posted!'             => 'Beleg gebucht!',
   'Receipts'                    => 'Zahlungseingänge',

diff --git a/locale/de/am b/locale/de/am
index 14faf014b15f2f6c087409a08c4bcb7bbf427e86..9fe7ed913c7b3a927c68d98eaa0941361cf56f31 100644 (file)
--- a/locale/de/am
+++ b/locale/de/am
@@ -92,6 +92,7 @@ $self->{texts} = {
   'Dataset upgrade'             => 'Datenbankaktualisierung',
   'Date'                        => 'Datum',
   'Date Format'                 => 'Datumsformat',
   'Dataset upgrade'             => 'Datenbankaktualisierung',
   'Date'                        => 'Datum',
   'Date Format'                 => 'Datumsformat',

+  'Defaults saved.'             => 'Die Standardeinstellungen wurden gespeichert.',

   'Delete'                      => 'Löschen',
   'Delete Account'              => 'Konto löschen',
   'Department deleted!'         => 'Abteilung gelöscht.',
   'Delete'                      => 'Löschen',
   'Delete Account'              => 'Konto löschen',
   'Department deleted!'         => 'Abteilung gelöscht.',


@@ -199,6 +200,7 @@ $self->{texts} = {
   'Queue'                       => 'Warteschlange',
   'Quotation'                   => 'Angebot',
   'RFQ'                         => 'Anfrage',
   'Queue'                       => 'Warteschlange',
   'Quotation'                   => 'Angebot',
   'RFQ'                         => 'Anfrage',

+  'Ranges of numbers and default accounts' => 'Nummernkreise und Standardkonten',

   'Revenue'                     => 'Erlöskonto',
   'Revenues EU with UStId'      => 'Erlöse EU m. UStId',
   'Revenues EU without UStId'   => 'Erlöse EU o. UStId',
   'Revenue'                     => 'Erlöskonto',
   'Revenues EU with UStId'      => 'Erlöse EU m. UStId',
   'Revenues EU without UStId'   => 'Erlöse EU o. UStId',


@@ -336,6 +338,7 @@ $self->{subs} = {
   'edit_account'                => 'edit_account',
   'edit_buchungsgruppe'         => 'edit_buchungsgruppe',
   'edit_business'               => 'edit_business',
   'edit_account'                => 'edit_account',
   'edit_buchungsgruppe'         => 'edit_buchungsgruppe',
   'edit_business'               => 'edit_business',

+  'edit_defaults'               => 'edit_defaults',

   'edit_department'             => 'edit_department',
   'edit_language'               => 'edit_language',
   'edit_lead'                   => 'edit_lead',
   'edit_department'             => 'edit_department',
   'edit_language'               => 'edit_language',
   'edit_lead'                   => 'edit_lead',


@@ -371,6 +374,7 @@ $self->{subs} = {
   'save_account'                => 'save_account',
   'save_buchungsgruppe'         => 'save_buchungsgruppe',
   'save_business'               => 'save_business',
   'save_account'                => 'save_account',
   'save_buchungsgruppe'         => 'save_buchungsgruppe',
   'save_business'               => 'save_business',

+  'save_defaults'               => 'save_defaults',

   'save_department'             => 'save_department',
   'save_language'               => 'save_language',
   'save_lead'                   => 'save_lead',
   'save_department'             => 'save_department',
   'save_language'               => 'save_language',
   'save_lead'                   => 'save_lead',

diff --git a/locale/de/menu b/locale/de/menu
index 1ea504ff986ced4b7420297cc9974eac0f2d4c53..203f8c23f57506170f5c6846ee731effb1893eed 100644 (file)
--- a/locale/de/menu
+++ b/locale/de/menu
@@ -91,6 +91,7 @@ $self->{texts} = {
   'Purchase Orders'             => 'Lieferantenaufträge',
   'Quotations'                  => 'Angebote',
   'RFQs'                        => 'Preisanfragen',
   'Purchase Orders'             => 'Lieferantenaufträge',
   'Quotations'                  => 'Angebote',
   'RFQs'                        => 'Preisanfragen',

+  'Ranges of numbers and default accounts' => 'Nummernkreise und Standardkonten',

   'Receipt'                     => 'Zahlungseingang',
   'Receipts'                    => 'Zahlungseingänge',
   'Reconciliation'              => 'Kontenabgleich',
   'Receipt'                     => 'Zahlungseingang',
   'Receipts'                    => 'Zahlungseingänge',
   'Reconciliation'              => 'Kontenabgleich',

diff --git a/locale/de/menunew b/locale/de/menunew
index 7a8d0fdbb4c3aebf6775a71d738092f093db3388..e10739839da747d8f785d438417a80b51ca97d49 100644 (file)
--- a/locale/de/menunew
+++ b/locale/de/menunew
@@ -90,6 +90,7 @@ $self->{texts} = {
   'Purchase Orders'             => 'Lieferantenaufträge',
   'Quotations'                  => 'Angebote',
   'RFQs'                        => 'Preisanfragen',
   'Purchase Orders'             => 'Lieferantenaufträge',
   'Quotations'                  => 'Angebote',
   'RFQs'                        => 'Preisanfragen',

+  'Ranges of numbers and default accounts' => 'Nummernkreise und Standardkonten',

   'Receipt'                     => 'Zahlungseingang',
   'Receipts'                    => 'Zahlungseingänge',
   'Reconciliation'              => 'Kontenabgleich',
   'Receipt'                     => 'Zahlungseingang',
   'Receipts'                    => 'Zahlungseingänge',
   'Reconciliation'              => 'Kontenabgleich',

diff --git a/menu.ini b/menu.ini
index f74685013857e7ec92e5ea7c5bd9649621665566..66f112623b3e745f4f81e89c0f17cd587b6ee3dc 100644 (file)
--- a/menu.ini
+++ b/menu.ini
@@ -342,6 +342,11 @@ type=receipt
 
 
 [System]
 
 
 [System]

+
+[System--Ranges of numbers and default accounts]
+module=am.pl
+action=edit_defaults
+

 [System--UStVa Einstellungen]
 module=ustva.pl
 action=config_step1
 [System--UStVa Einstellungen]
 module=ustva.pl
 action=config_step1

diff --git a/templates/webpages/am/config_de.html b/templates/webpages/am/config_de.html
index 052204cda0ff7d0ca6a05b8c8f8186ac7d3553f2..3bf622af5e75c7bcff29da77df8c17c4ddfb26b8 100644 (file)
--- a/templates/webpages/am/config_de.html
+++ b/templates/webpages/am/config_de.html
@@ -167,137 +167,6 @@
      <th align="right">Anzahl Kopien</th>
      <td><input name="copies" size="10" value="[% HTML.escape(myconfig_copies) %]"></td>
     </tr>
      <th align="right">Anzahl Kopien</th>
      <td><input name="copies" size="10" value="[% HTML.escape(myconfig_copies) %]"></td>
     </tr>

-
-
-    <tr class="listheading">
-     <th colspan="2">&nbsp;</th>
-    </tr>
-
-    <tr>
-     <th align="right">Firmennummer</th>
-     <td><input name="businessnumber" size="25" value="[% HTML.escape(myconfig_businessnumber) %]"></td>
-    </tr>
-    <tr>
-     <th align="right">Jahresende (mm/dd)</th>
-     <td><input name="yearend" size="5" value="[% HTML.escape(defaults_yearend) %]"></td>
-    </tr>
-
-    <tr class="listheading">
-     <th colspan="2">Laufende Zähler und Standardkonten</th>
-    </tr>
-
-    <tr>
-     <td colspan="2">
-      <table width="100%">
-       <tr>
-        <th align="right" nowrap>Warenbestand</th>
-        <td>
-         <select name="inventory_accno">
-          [%- FOREACH row = ACCNOS_IC %]
-          <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-          [%- END %]
-         </select>
-        </td>
-       </tr>
-
-       <tr>
-        <th align="right" nowrap>Erlöskonto</th>
-        <td>
-         <select name="income_accno">
-          [%- FOREACH row = ACCNOS_IC_INCOME %]
-          <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-          [%- END %]
-         </select>
-        </td>
-       </tr>
-
-       <tr>
-        <th align="right" nowrap>Aufwandskonto</th>
-        <td>
-         <select name="expense_accno">
-          [%- FOREACH row = ACCNOS_IC_EXPENSE %]
-          <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-          [%- END %]
-         </select>
-        </td>
-       </tr>
-
-       <tr>
-        <th align="right" nowrap>Wechselkurserträge</th>
-        <td>
-         <select name="fxgain_accno">
-          [%- FOREACH row = ACCNOS_FX_GAIN %]
-          <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-          [%- END %]
-         </select>
-        </td>
-       </tr>
-
-       <tr>
-        <th align="right" nowrap>Wechselkursaufwendungen</th>
-        <td>
-         <select name="fxloss_accno">
-          [%- FOREACH row = ACCNOS_FX_LOSS %]
-          <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-          [%- END %]
-         </select>
-        </td>
-       </tr>
-
-       <tr>
-        <td colspan="2">
-         Geben Sie Ihre und weitere Währungen mit bis zu drei Buchstaben pro Währung und Währungen durch Doppelpunkte getrennt ein (z.B. EUR:USD:CAD)<br>
-         <input name="curr" size="40" value="[% HTML.escape(defaults_curr) %]">
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-
-    <tr>
-     <td colspan="2">
-      <table width="100"%>
-       <tr>
-        <th align="right" nowrap>Letzte Rechnungsnummer</th>
-        <td><input name="invnumber" size="10" value="[% HTML.escape(defaults_invnumber) %]"></td>
-        <th align="right" nowrap>Letzte Kundennummer</th>
-        <td><input name="customernumber" size="10" value="[% HTML.escape(defaults_customernumber) %]"></td>
-       </tr>
-
-       <tr>
-        <th align="right" nowrap>Letzte Gutschriftnummer</th>
-        <td><input name="cnnumber" size="10" value="[% HTML.escape(defaults_cnnumber) %]"></td>
-        <th align="right" nowrap>Letzte Lieferantennummer</th>
-        <td><input name="vendornumber" size="10" value="[% HTML.escape(defaults_vendornumber) %]"></td>
-       </tr>
-
-       <tr>
-        <th align="right" nowrap>Letzte Auftragsnummer</th>
-        <td><input name="sonumber" size="10" value="[% HTML.escape(defaults_sonumber) %]"></td>
-       </tr>
-
-       <tr>
-        <th align="right" nowrap>Letzte Lieferantenautragsnummer</th>
-        <td><input name="ponumber" size="10" value="[% HTML.escape(defaults_ponumber) %]"></td>
-        <th align="right" nowrap>Letzte Artikelnummer</th>
-        <td><input name="articlenumber" size="10" value="[% HTML.escape(defaults_articlenumber) %]"></td>
-       </tr>
-
-       <tr>
-        <th align="right" nowrap>Letzte Angebotsnummer</th>
-        <td><input name="sqnumber" size="10" value="[% HTML.escape(defaults_sqnumber) %]"></td>
-        <th align="right" nowrap>Letzte Dienstleistungsnr.</th>
-        <td><input name="servicenumber" size="10" value="[% HTML.escape(defaults_servicenumber) %]"></td>
-       </tr>
-
-       <tr>
-        <th align="right" nowrap>Letzte Anfragenummer</th>
-        <td><input name="rfqnumber" size="10" value="[% HTML.escape(defaults_rfqnumber) %]"></td>
-       </tr>
-
-      </table>
-     </td>
-    </tr>

    </table>
   </p>
 
    </table>
   </p>
 

diff --git a/templates/webpages/am/config_master.html b/templates/webpages/am/config_master.html
index 547e5349198c631c9b24d54594fa9f30f74a50b8..775bcaf30f0b7e7514b2b48c8fe7a06a03ec9dfc 100644 (file)
--- a/templates/webpages/am/config_master.html
+++ b/templates/webpages/am/config_master.html
@@ -167,137 +167,6 @@
      <th align="right"><translate>Number of copies</translate></th>
      <td><input name="copies" size="10" value="[% HTML.escape(myconfig_copies) %]"></td>
     </tr>
      <th align="right"><translate>Number of copies</translate></th>
      <td><input name="copies" size="10" value="[% HTML.escape(myconfig_copies) %]"></td>
     </tr>

-
-
-    <tr class="listheading">
-     <th colspan="2">&nbsp;</th>
-    </tr>
-
-    <tr>
-     <th align="right"><translate>Business Number</translate></th>
-     <td><input name="businessnumber" size="25" value="[% HTML.escape(myconfig_businessnumber) %]"></td>
-    </tr>
-    <tr>
-     <th align="right"><translate>Year End</translate> (mm/dd)</th>
-     <td><input name="yearend" size="5" value="[% HTML.escape(defaults_yearend) %]"></td>
-    </tr>
-
-    <tr class="listheading">
-     <th colspan="2"><translate>Last Numbers & Default Accounts</translate></th>
-    </tr>
-
-    <tr>
-     <td colspan="2">
-      <table width="100%">
-       <tr>
-        <th align="right" nowrap><translate>Inventory Account</translate></th>
-        <td>
-         <select name="inventory_accno">
-          [%- FOREACH row = ACCNOS_IC %]
-          <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-          [%- END %]
-         </select>
-        </td>
-       </tr>
-
-       <tr>
-        <th align="right" nowrap><translate>Revenue Account</translate></th>
-        <td>
-         <select name="income_accno">
-          [%- FOREACH row = ACCNOS_IC_INCOME %]
-          <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-          [%- END %]
-         </select>
-        </td>
-       </tr>
-
-       <tr>
-        <th align="right" nowrap><translate>Expense Account</translate></th>
-        <td>
-         <select name="expense_accno">
-          [%- FOREACH row = ACCNOS_IC_EXPENSE %]
-          <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-          [%- END %]
-         </select>
-        </td>
-       </tr>
-
-       <tr>
-        <th align="right" nowrap><translate>Foreign Exchange Gain</translate></th>
-        <td>
-         <select name="fxgain_accno">
-          [%- FOREACH row = ACCNOS_FX_GAIN %]
-          <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-          [%- END %]
-         </select>
-        </td>
-       </tr>
-
-       <tr>
-        <th align="right" nowrap><translate>Foreign Exchange Loss</translate></th>
-        <td>
-         <select name="fxloss_accno">
-          [%- FOREACH row = ACCNOS_FX_LOSS %]
-          <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
-          [%- END %]
-         </select>
-        </td>
-       </tr>
-
-       <tr>
-        <td colspan="2">
-         <translate>Enter up to 3 letters separated by a colon (i.e CAD:USD:EUR) for your native and foreign currencies</translate><br>
-         <input name="curr" size="40" value="[% HTML.escape(defaults_curr) %]">
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-
-    <tr>
-     <td colspan="2">
-      <table width="100"%>
-       <tr>
-        <th align="right" nowrap><translate>Last Invoice Number</translate></th>
-        <td><input name="invnumber" size="10" value="[% HTML.escape(defaults_invnumber) %]"></td>
-        <th align="right" nowrap><translate>Last Customer Number</translate></th>
-        <td><input name="customernumber" size="10" value="[% HTML.escape(defaults_customernumber) %]"></td>
-       </tr>
-
-       <tr>
-        <th align="right" nowrap><translate>Last Credit Note Number</translate></th>
-        <td><input name="cnnumber" size="10" value="[% HTML.escape(defaults_cnnumber) %]"></td>
-        <th align="right" nowrap><translate>Last Vendor Number</translate></th>
-        <td><input name="vendornumber" size="10" value="[% HTML.escape(defaults_vendornumber) %]"></td>
-       </tr>
-
-       <tr>
-        <th align="right" nowrap><translate>Last Sales Order Number</translate></th>
-        <td><input name="sonumber" size="10" value="[% HTML.escape(defaults_sonumber) %]"></td>
-       </tr>
-
-       <tr>
-        <th align="right" nowrap><translate>Last Purchase Order Number</translate></th>
-        <td><input name="ponumber" size="10" value="[% HTML.escape(defaults_ponumber) %]"></td>
-        <th align="right" nowrap><translate>Last Article Number</translate></th>
-        <td><input name="articlenumber" size="10" value="[% HTML.escape(defaults_articlenumber) %]"></td>
-       </tr>
-
-       <tr>
-        <th align="right" nowrap><translate>Last Sales Quotation Number</translate></th>
-        <td><input name="sqnumber" size="10" value="[% HTML.escape(defaults_sqnumber) %]"></td>
-        <th align="right" nowrap><translate>Last Service Number</translate></th>
-        <td><input name="servicenumber" size="10" value="[% HTML.escape(defaults_servicenumber) %]"></td>
-       </tr>
-
-       <tr>
-        <th align="right" nowrap><translate>Last RFQ Number</translate></th>
-        <td><input name="rfqnumber" size="10" value="[% HTML.escape(defaults_rfqnumber) %]"></td>
-       </tr>
-
-      </table>
-     </td>
-    </tr>

    </table>
   </p>
 
    </table>
   </p>
 

diff --git a/templates/webpages/am/edit_defaults_de.html b/templates/webpages/am/edit_defaults_de.html
new file mode 100644 (file)
index 0000000..f664230
--- /dev/null
+++ b/templates/webpages/am/edit_defaults_de.html
@@ -0,0 +1,148 @@
+[% USE HTML %]<body>
+
+ <div class="listtop">[% title %]</div>
+
+ <form method="post" action="am.pl"name="Form">
+
+  <input type="hidden" name="type" value="defaults">
+  <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+  <input type="hidden" name="password" value="[% HTML.escape(password) %]">
+
+  <p>
+   <table>
+    <tr class="listheading">
+     <th colspan="4">Nummernkreise</th>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>Letzte Rechnungsnummer</th>
+     <td><input name="invnumber" size="10" value="[% HTML.escape(defaults_invnumber) %]"></td>
+     <th align="right" nowrap>Letzte Kundennummer</th>
+     <td><input name="customernumber" size="10" value="[% HTML.escape(defaults_customernumber) %]"></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>Letzte Gutschriftnummer</th>
+     <td><input name="cnnumber" size="10" value="[% HTML.escape(defaults_cnnumber) %]"></td>
+     <th align="right" nowrap>Letzte Lieferantennummer</th>
+     <td><input name="vendornumber" size="10" value="[% HTML.escape(defaults_vendornumber) %]"></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>Letzte Auftragsnummer</th>
+     <td><input name="sonumber" size="10" value="[% HTML.escape(defaults_sonumber) %]"></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>Letzte Lieferantenautragsnummer</th>
+     <td><input name="ponumber" size="10" value="[% HTML.escape(defaults_ponumber) %]"></td>
+     <th align="right" nowrap>Letzte Artikelnummer</th>
+     <td><input name="articlenumber" size="10" value="[% HTML.escape(defaults_articlenumber) %]"></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>Letzte Angebotsnummer</th>
+     <td><input name="sqnumber" size="10" value="[% HTML.escape(defaults_sqnumber) %]"></td>
+     <th align="right" nowrap>Letzte Dienstleistungsnr.</th>
+     <td><input name="servicenumber" size="10" value="[% HTML.escape(defaults_servicenumber) %]"></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>Letzte Anfragenummer</th>
+     <td><input name="rfqnumber" size="10" value="[% HTML.escape(defaults_rfqnumber) %]"></td>
+    </tr>
+
+    <tr class="listheading">
+     <th colspan="4">Standardkonten</th>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>Warenbestand</th>
+     <td colspan="3">
+      <select name="inventory_accno">
+       [%- FOREACH row = ACCNOS_IC %]
+       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>Erlöskonto</th>
+     <td colspan="3">
+      <select name="income_accno">
+       [%- FOREACH row = ACCNOS_IC_INCOME %]
+       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>Aufwandskonto</th>
+     <td colspan="3">
+      <select name="expense_accno">
+       [%- FOREACH row = ACCNOS_IC_EXPENSE %]
+       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>Wechselkurserträge</th>
+     <td colspan="3">
+      <select name="fxgain_accno">
+       [%- FOREACH row = ACCNOS_FX_GAIN %]
+       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap>Wechselkursaufwendungen</th>
+     <td colspan="3">
+      <select name="fxloss_accno">
+       [%- FOREACH row = ACCNOS_FX_LOSS %]
+       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr class="listheading">
+     <th colspan="4">Verschiedenes</th>
+    </tr>
+
+    <tr>
+     <th align="right">Firmennummer</th>
+     <td colspan="3"><input name="businessnumber" size="25" value="[% HTML.escape(defaults_businessnumber) %]"></td>
+    </tr>
+
+    <tr>
+     <th align="right">Jahresende (mm/dd)</th>
+     <td colspan="3"><input name="yearend" size="5" value="[% HTML.escape(defaults_yearend) %]"></td>
+    </tr>
+
+    <tr>
+     <th align="right">W&auml;hrungen <sup>(1)</sup></th>
+     <td colspan="3"><input name="curr" size="20" value="[% HTML.escape(defaults_curr) %]"></td>
+    </tr>
+
+   </table>
+  </p>
+
+  <hr height="3" noshade>
+
+  <p><input type="submit" class="submit" name="action" value="Speichern"></p>
+
+  <hr height="3" noshade>
+
+  <p>
+   (1) Geben Sie Ihre und weitere Währungen mit bis zu drei Buchstaben pro Währung und Währungen durch Doppelpunkte getrennt ein (z.B. EUR:USD:CAD)
+  </p>
+ </form>
+
+</body>
+</html>

diff --git a/templates/webpages/am/edit_defaults_master.html b/templates/webpages/am/edit_defaults_master.html
new file mode 100644 (file)
index 0000000..3d61244
--- /dev/null
+++ b/templates/webpages/am/edit_defaults_master.html
@@ -0,0 +1,148 @@
+[% USE HTML %]<body>
+
+ <div class="listtop">[% title %]</div>
+
+ <form method="post" action="am.pl"name="Form">
+
+  <input type="hidden" name="type" value="defaults">
+  <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+  <input type="hidden" name="password" value="[% HTML.escape(password) %]">
+
+  <p>
+   <table>
+    <tr class="listheading">
+     <th colspan="4"><translate>Ranges of numbers</translate></th>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap><translate>Last Invoice Number</translate></th>
+     <td><input name="invnumber" size="10" value="[% HTML.escape(defaults_invnumber) %]"></td>
+     <th align="right" nowrap><translate>Last Customer Number</translate></th>
+     <td><input name="customernumber" size="10" value="[% HTML.escape(defaults_customernumber) %]"></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap><translate>Last Credit Note Number</translate></th>
+     <td><input name="cnnumber" size="10" value="[% HTML.escape(defaults_cnnumber) %]"></td>
+     <th align="right" nowrap><translate>Last Vendor Number</translate></th>
+     <td><input name="vendornumber" size="10" value="[% HTML.escape(defaults_vendornumber) %]"></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap><translate>Last Sales Order Number</translate></th>
+     <td><input name="sonumber" size="10" value="[% HTML.escape(defaults_sonumber) %]"></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap><translate>Last Purchase Order Number</translate></th>
+     <td><input name="ponumber" size="10" value="[% HTML.escape(defaults_ponumber) %]"></td>
+     <th align="right" nowrap><translate>Last Article Number</translate></th>
+     <td><input name="articlenumber" size="10" value="[% HTML.escape(defaults_articlenumber) %]"></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap><translate>Last Sales Quotation Number</translate></th>
+     <td><input name="sqnumber" size="10" value="[% HTML.escape(defaults_sqnumber) %]"></td>
+     <th align="right" nowrap><translate>Last Service Number</translate></th>
+     <td><input name="servicenumber" size="10" value="[% HTML.escape(defaults_servicenumber) %]"></td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap><translate>Last RFQ Number</translate></th>
+     <td><input name="rfqnumber" size="10" value="[% HTML.escape(defaults_rfqnumber) %]"></td>
+    </tr>
+
+    <tr class="listheading">
+     <th colspan="4"><translate>Default Accounts</translate></th>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap><translate>Inventory Account</translate></th>
+     <td colspan="3">
+      <select name="inventory_accno">
+       [%- FOREACH row = ACCNOS_IC %]
+       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap><translate>Revenue Account</translate></th>
+     <td colspan="3">
+      <select name="income_accno">
+       [%- FOREACH row = ACCNOS_IC_INCOME %]
+       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap><translate>Expense Account</translate></th>
+     <td colspan="3">
+      <select name="expense_accno">
+       [%- FOREACH row = ACCNOS_IC_EXPENSE %]
+       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap><translate>Foreign Exchange Gain</translate></th>
+     <td colspan="3">
+      <select name="fxgain_accno">
+       [%- FOREACH row = ACCNOS_FX_GAIN %]
+       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr>
+     <th align="right" nowrap><translate>Foreign Exchange Loss</translate></th>
+     <td colspan="3">
+      <select name="fxloss_accno">
+       [%- FOREACH row = ACCNOS_FX_LOSS %]
+       <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
+       [%- END %]
+      </select>
+     </td>
+    </tr>
+
+    <tr class="listheading">
+     <th colspan="4"><translate>Miscellaneous</translate></th>
+    </tr>
+
+    <tr>
+     <th align="right"><translate>Business Number</translate></th>
+     <td colspan="3"><input name="businessnumber" size="25" value="[% HTML.escape(defaults_businessnumber) %]"></td>
+    </tr>
+
+    <tr>
+     <th align="right"><translate>Year End</translate> (mm/dd)</th>
+     <td colspan="3"><input name="yearend" size="5" value="[% HTML.escape(defaults_yearend) %]"></td>
+    </tr>
+
+    <tr>
+     <th align="right"><translate>Currencies</translate> <sup>(1)</sup></th>
+     <td colspan="3"><input name="curr" size="20" value="[% HTML.escape(defaults_curr) %]"></td>
+    </tr>
+
+   </table>
+  </p>
+
+  <hr height="3" noshade>
+
+  <p><input type="submit" class="submit" name="action" value="<translate>Save</translate>"></p>
+
+  <hr height="3" noshade>
+
+  <p>
+   (1) <translate>Enter up to 3 letters separated by a colon (i.e CAD:USD:EUR) for your native and foreign currencies</translate>
+  </p>
+ </form>
+
+</body>
+</html>