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

diff --git a/SL/DN.pm b/SL/DN.pm
index 0e378d69db07330d42f1516ab07ab59f5a2c639c..5cf42b543870268df5b12b42c3e8514613286635 100644 (file)
--- a/SL/DN.pm
+++ b/SL/DN.pm
@@ -469,6 +469,7 @@ sub get_invoices {
     qq|SELECT
          a.id, a.ordnumber, a.transdate, a.invnumber, a.amount,
          ct.name AS customername, a.customer_id, a.duedate,
+         a.amount - a.paid AS open_amount,
 
          cfg.dunning_description, cfg.dunning_level,
 

diff --git a/SL/Form.pm b/SL/Form.pm
index 8d1772061fa3c5f5862b528584121eac4a8bf467..c1cc2abb13ed4d37116124438ec306a56d4573b2 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -2576,7 +2576,7 @@ sub all_vc {
   my ($count) = selectrow_query($self, $dbh, $query);
 
   # build selection list
-  if ($count < $myconfig->{vclimit}) {
+  if ($count <= $myconfig->{vclimit}) {
     $query = qq|SELECT id, name, salesman_id
                 FROM $table WHERE NOT obsolete
                 ORDER BY name|;

diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl
index cf85bf5153756aa2d97addd9cbac311d6c13b6f1..845d2cd64bb063af2aaa4b0ce49c827496b34096 100644 (file)
--- a/bin/mozilla/dn.pl
+++ b/bin/mozilla/dn.pl
@@ -132,7 +132,7 @@ sub show_invoices {
     if ($row->{next_dunning_config_id}) {
       map { $_->{SELECTED} = $_->{id} == $row->{next_dunning_config_id} } @{ $row->{DUNNING_CONFIG } };
     }
-    map { $row->{$_} = $form->format_amount(\%myconfig, $row->{$_} * 1, -2) } qw(amount fee interest);
+    map { $row->{$_} = $form->format_amount(\%myconfig, $row->{$_} * 1, -2) } qw(amount open_amount fee interest);
   }
 
   $form->get_lists('printers'  => 'printers',

diff --git a/doc/changelog b/doc/changelog
index 0a867e45d729e659acda01fa167bbcb767a2bab6..b52032fa46a98d26308cf23f4e22619ea2b5bd12 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -186,7 +186,7 @@
   1110 1118 1125 1127 1130 1133 1135 1136 1138 1144 1146 1147 1150 1151 1155
   1164 1170 1173 1177 1186 1188 1190 1191 1195 1197 1198 1199 1200 1201 1209
   1213 1243 1248 1250 1262 1286 1287 1289 1290 1291 1294 1299 1331 1334 1336
-  1339 1340 1341 1342 1343 1350 1399
+  1339 1340 1341 1342 1343 1350 1352 1399
 
 
 2009-06-02 - Version 2.6.0

diff --git a/locale/de/all b/locale/de/all
index 2406b5413725b470f30aab4f6518192feb261183..4d3e0395953ddb1a58ea69ab0eb289f3cd1d718e 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1098,6 +1098,7 @@ $self->{texts} = {
   'One or more Perl modules missing' => 'Ein oder mehr Perl-Module fehlen',
   'Only due follow-ups'         => 'Nur fällige Wiedervorlagen',
   'Open'                        => 'Offen',
+  'Open Amount'                 => 'Offener Betrag',
   'Open amount'                 => 'offener Betrag',
   'OpenDocument/OASIS'          => 'OpenDocument/OASIS',
   'Openings'                    => 'Öffnungszeiten',

diff --git a/locale/de/rundungsfehler_korrigieren_BUG1328 b/locale/de/rundungsfehler_korrigieren_BUG1328
new file mode 100644 (file)
index 0000000..eb6fbd1
--- /dev/null
+++ b/locale/de/rundungsfehler_korrigieren_BUG1328
@@ -0,0 +1,13 @@
+#!/usr/bin/perl
+
+$self->{texts} = {
+  'Database update error:'      => 'Fehler beim Datenbankupgrade:',
+};
+
+$self->{subs} = {
+  'do_query'                    => 'do_query',
+  'do_update'                   => 'do_update',
+  'mydberror'                   => 'mydberror',
+};
+
+1;

diff --git a/templates/webpages/dunning/show_invoices_de.html b/templates/webpages/dunning/show_invoices_de.html
index 6d5d9a1ad420b1daabbd347862a46aafedc172c9..5dbb0d5174fb84d00b52d3660fb15d250dce455a 100644 (file)
--- a/templates/webpages/dunning/show_invoices_de.html
+++ b/templates/webpages/dunning/show_invoices_de.html
@@ -27,6 +27,7 @@
    <th class="listheading">Rechnungsdatum</th>
    <th class="listheading">Rg. Fälligkeit</th>
    <th class="listheading">Betrag</th>
+   <th class="listheading">Offener Betrag</th>
    <th class="listheading">Zahlbar bis</th>
    <th class="listheading">Kumulierte Gebühren</th>
    <th class="listheading">Zinsen</th>
@@ -51,10 +52,14 @@
      <td><input type="checkbox" name="active_[% loop.count %]" value="1" [% IF row.active %]checked[% END %]></td>
      <td><input type="checkbox" name="email_[% loop.count %]" value="1" [% IF row.email %]checked[% END %]></td>
      <td><input type="hidden" name="customername_[% loop.count %]" size="6" value="[% HTML.escape(row.customername) %]">[% HTML.escape(row.customername) %]</td>
-     <td><input type="hidden" name="invnumber_[% loop.count %]" size="6" value="[% HTML.escape(row.invnumber) %]">[% HTML.escape(row.invnumber) %]</td>
+     <td>
+      <input type="hidden" name="invnumber_[% loop.count %]" size="6" value="[% HTML.escape(row.invnumber) %]">
+      <a href="is.pl?action=edit&type=invoice&id=[% row.id | url %]">[% HTML.escape(row.invnumber) %]</a>
+     </td>
      <td><input type="hidden" name="invdate_[% loop.count %]" size="6" value="[% HTML.escape(row.transdate) %]">[% HTML.escape(row.transdate) %]</td>
      <td><input type="hidden" name="inv_duedate_[% loop.count %]" size="6" value="[% HTML.escape(row.duedate) %]">[% HTML.escape(row.duedate) %]</td>
      <td align="right"><input type="hidden" name="amount_[% loop.count %]" size="6" value="[% HTML.escape(row.amount) %]">[% HTML.escape(row.amount) %]</td>
+     <td align="right"><input type="hidden" name="open_amount_[% loop.count %]" size="6" value="[% HTML.escape(row.open_amount) %]">[% HTML.escape(row.open_amount) %]</td>
      <td>[% HTML.escape(row.next_duedate) %]</td>
      <td align="right"><input type="hidden" name="fee_[% loop.count %]" size="6" value="[% HTML.escape(row.fee) %]">[% HTML.escape(row.fee) %]</td>
      <td align="right"><input type="hidden" name="interest_[% loop.count %]" size="6" value="[% HTML.escape(row.interest) %]">[% HTML.escape(row.interest) %]</td>

diff --git a/templates/webpages/dunning/show_invoices_master.html b/templates/webpages/dunning/show_invoices_master.html
index cc48a459b8fe62e617acfcdc2b245df102685f41..cdb8c2d4689010d30ef3fd92db06c55e7a3472e1 100644 (file)
--- a/templates/webpages/dunning/show_invoices_master.html
+++ b/templates/webpages/dunning/show_invoices_master.html
@@ -29,6 +29,7 @@
    <th class="listheading"><translate>Invdate</translate></th>
    <th class="listheading"><translate>Inv. Duedate</translate></th>
    <th class="listheading"><translate>Amount</translate></th>
+   <th class="listheading"><translate>Open Amount</translate></th>
    <th class="listheading"><translate>Dunning Duedate</translate></th>
    <th class="listheading"><translate>Total Fees</translate></th>
    <th class="listheading"><translate>Interest</translate></th>
@@ -53,10 +54,14 @@
      <td><input type="checkbox" name="active_[% loop.count %]" value="1" [% IF row.active %]checked[% END %]></td>
      <td><input type="checkbox" name="email_[% loop.count %]" value="1" [% IF row.email %]checked[% END %]></td>
      <td><input type="hidden" name="customername_[% loop.count %]" size="6" value="[% HTML.escape(row.customername) %]">[% HTML.escape(row.customername) %]</td>
-     <td><input type="hidden" name="invnumber_[% loop.count %]" size="6" value="[% HTML.escape(row.invnumber) %]">[% HTML.escape(row.invnumber) %]</td>
+     <td>
+      <input type="hidden" name="invnumber_[% loop.count %]" size="6" value="[% HTML.escape(row.invnumber) %]">
+      <a href="is.pl?action=edit&type=invoice&id=[% row.id | url %]">[% HTML.escape(row.invnumber) %]</a>
+     </td>
      <td><input type="hidden" name="invdate_[% loop.count %]" size="6" value="[% HTML.escape(row.transdate) %]">[% HTML.escape(row.transdate) %]</td>
      <td><input type="hidden" name="inv_duedate_[% loop.count %]" size="6" value="[% HTML.escape(row.duedate) %]">[% HTML.escape(row.duedate) %]</td>
      <td align="right"><input type="hidden" name="amount_[% loop.count %]" size="6" value="[% HTML.escape(row.amount) %]">[% HTML.escape(row.amount) %]</td>
+     <td align="right"><input type="hidden" name="open_amount_[% loop.count %]" size="6" value="[% HTML.escape(row.open_amount) %]">[% HTML.escape(row.open_amount) %]</td>
      <td>[% HTML.escape(row.next_duedate) %]</td>
      <td align="right"><input type="hidden" name="fee_[% loop.count %]" size="6" value="[% HTML.escape(row.fee) %]">[% HTML.escape(row.fee) %]</td>
      <td align="right"><input type="hidden" name="interest_[% loop.count %]" size="6" value="[% HTML.escape(row.interest) %]">[% HTML.escape(row.interest) %]</td>

diff --git a/templates/webpages/wh/removal_parts_selection_de.html b/templates/webpages/wh/removal_parts_selection_de.html
index 4b771e3190e7fe2e1f056343408f1c149c0cb15b..f3a21edc080a5ece39c5a4f147e2c64c1bc86dfc 100644 (file)
--- a/templates/webpages/wh/removal_parts_selection_de.html
+++ b/templates/webpages/wh/removal_parts_selection_de.html
@@ -22,7 +22,7 @@
 
     <tr>
      <td>Optionaler Kommentar:</td>
-     <td><input name="comment" size="20"></td>
+     <td><input name="comment" size="60"></td>
     </tr>
    </table>
   </p>

diff --git a/templates/webpages/wh/removal_parts_selection_master.html b/templates/webpages/wh/removal_parts_selection_master.html
index 0d4ae59d29bfd78096275b9d1cb81c0ce901cc22..d8e1a446117714849bd4200c911d5de749cbf5f5 100644 (file)
--- a/templates/webpages/wh/removal_parts_selection_master.html
+++ b/templates/webpages/wh/removal_parts_selection_master.html
@@ -22,7 +22,7 @@
 
     <tr>
      <td><translate>Optional comment</translate>:</td>
-     <td><input name="comment" size="20"></td>
+     <td><input name="comment" size="60"></td>
     </tr>
    </table>
   </p>

diff --git a/templates/webpages/wh/warehouse_selection_stock_de.html b/templates/webpages/wh/warehouse_selection_stock_de.html
index d9ce5cba60e13dc92cd141b0a6f0d658840553ec..9a41c8e396c452368ccbeaaa4bae3b50d5033114 100644 (file)
--- a/templates/webpages/wh/warehouse_selection_stock_de.html
+++ b/templates/webpages/wh/warehouse_selection_stock_de.html
@@ -121,7 +121,7 @@
 
     <tr>
      <th align="right" nowrap>Optionaler Kommentar</th>
-     <td><input name="comment" size="30" value="[% HTML.escape(comment) %]"></td>
+     <td><input name="comment" size="60" value="[% HTML.escape(comment) %]"></td>
     </tr>
 
    </table>

diff --git a/templates/webpages/wh/warehouse_selection_stock_master.html b/templates/webpages/wh/warehouse_selection_stock_master.html
index 2558429add0d36394c02887f84f79e47b0b5c5b5..33bcd76b79e970dfd901be5ff21755cf0afb8d98 100644 (file)
--- a/templates/webpages/wh/warehouse_selection_stock_master.html
+++ b/templates/webpages/wh/warehouse_selection_stock_master.html
@@ -121,7 +121,7 @@
 
     <tr>
      <th align="right" nowrap><translate>Optional comment</translate></th>
-     <td><input name="comment" size="30" value="[% HTML.escape(comment) %]"></td>
+     <td><input name="comment" size="60" value="[% HTML.escape(comment) %]"></td>
     </tr>
 
    </table>