Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp

diff --git a/templates/webpages/dunning/show_invoices_de.html b/templates/webpages/dunning/show_invoices_de.html
index 6d5d9a1ad420b1daabbd347862a46aafedc172c9..89fb48f06a06727575ceaef79ef0b31529ea7d04 100644 (file)
--- a/templates/webpages/dunning/show_invoices_de.html
+++ b/templates/webpages/dunning/show_invoices_de.html
@@ -51,7 +51,10 @@
      <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>

diff --git a/templates/webpages/dunning/show_invoices_master.html b/templates/webpages/dunning/show_invoices_master.html
index cc48a459b8fe62e617acfcdc2b245df102685f41..583954e7fe45b038080d8a8933352786e91e1455 100644 (file)
--- a/templates/webpages/dunning/show_invoices_master.html
+++ b/templates/webpages/dunning/show_invoices_master.html
@@ -53,7 +53,10 @@
      <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>

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>