Merge branch 'master' of github.com:kivitendo/kivitendo-erp

diff --git a/sql/Pg-upgrade2/add_fkey_tax_id_to_acc_trans.sql b/sql/Pg-upgrade2/add_fkey_tax_id_to_acc_trans.sql
index 4d9da7a..804d23a 100644 (file)
--- a/sql/Pg-upgrade2/add_fkey_tax_id_to_acc_trans.sql
+++ b/sql/Pg-upgrade2/add_fkey_tax_id_to_acc_trans.sql
@@ -1,5 +1,6 @@
 -- @tag: add_fkey_tax_id_to_acc_trans
 -- @description: Setzt einen Fremdschlüssel zu der Tabellenspalte tax_id in der acc_trans
 -- @depends: release_3_0_0 add_tax_id_to_acc_trans
+-- @charset: utf-8
 
 ALTER TABLE acc_trans ADD FOREIGN KEY (tax_id) REFERENCES tax(id);

diff --git a/templates/webpages/ic/form_header.html b/templates/webpages/ic/form_header.html
index d3344a5..658979a 100644 (file)
--- a/templates/webpages/ic/form_header.html
+++ b/templates/webpages/ic/form_header.html
@@ -222,6 +222,7 @@
             [% HTML.escape(defaults.weightunit) %]
            </td>
           </tr>
+        [%- END %]
           <tr>
            <th align="right" nowrap>[% 'On Hand' | $T8 %]</th>
            <th align="left" nowrap class="plus[% IF onhand > 0 %]1[% ELSE %]0[% END %]">&nbsp;[% LxERP.format_amount(onhand) %]</th>
@@ -244,7 +245,6 @@
            <th align="right" nowrap="true">[% 'Default Bin' | $T8 %]</th>
            <td><select id="bin_id" name="bin_id"></select></td>
           </tr>
-        [%- END %]
           <tr>
            <th align="right" nowrap="true">[% 'Verrechnungseinheit' | $T8 %]</th>
            <td><input name="ve" size="10" value="[% HTML.escape(ve) %]"></td>