projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
main => main.css
[kivitendo-erp.git]
/
templates
/
webpages
/
oe
/
form_footer.html
diff --git
a/templates/webpages/oe/form_footer.html
b/templates/webpages/oe/form_footer.html
index
b0ba7fe
..
ddf4a53
100644
(file)
--- a/
templates/webpages/oe/form_footer.html
+++ b/
templates/webpages/oe/form_footer.html
@@
-53,22
+53,27
@@
<tr>
<th align="left">[% 'Ertrag' | $T8 %]</th>
<tr>
<th align="left">[% 'Ertrag' | $T8 %]</th>
- <td align="right">[% LxERP.format_amount(marge_total, 2) %]</td>
+ <td align="right">
+ [% LxERP.format_amount(marge_total, 2) %]
+ <input type="hidden" name="marge_total" value="[% HTML.escape(marge_total) %]">
+ </td>
</tr>
<tr>
<th align="left">[% 'Ertrag prozentual' | $T8 %]</th>
</tr>
<tr>
<th align="left">[% 'Ertrag prozentual' | $T8 %]</th>
- <td align="right">[% LxERP.format_amount(marge_percent, 2) %]</td>
+ <td align="right">
+ [% LxERP.format_amount(marge_percent, 2) %]
+ <input type="hidden" name="marge_percent" value="[% HTML.escape(marge_percent) %]">
+ </td>
<td>%</td>
</tr>
<td>%</td>
</tr>
-
- <input type="hidden" name="marge_total" value="[% HTML.escape(marge_total) %]">
- <input type="hidden" name="marge_percent" value="[% HTML.escape(marge_percent) %]">
</table>
</td>
[%- END %]
<td align="right">
</table>
</td>
[%- END %]
<td align="right">
+
[%- IF taxaccounts %]
[%- IF taxaccounts %]
- <input name="taxincluded" class="checkbox" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b>[% 'Tax Included' | $T8 %]</b><br><br>
+ <input type="hidden" name="taxincluded_changed_by_user" id="taxincluded_changed_by_user" value="[% taxincluded_changed_by_user ? '1' : '0' %]">
+ <input name="taxincluded" class="checkbox" onclick="document.getElementById('taxincluded_changed_by_user').value = '1';" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b>[% 'Tax Included' | $T8 %]</b><br><br>
[%- END %]
<table>
[%- IF NOT taxincluded %]
[%- END %]
<table>
[%- IF NOT taxincluded %]
@@
-80,7
+85,10
@@
[% tax %]
<tr>
<th align="right">[% 'Total' | $T8 %]</th>
[% tax %]
<tr>
<th align="right">[% 'Total' | $T8 %]</th>
- <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
+ <td align="right">[% LxERP.format_amount(invtotal, 2) %]
+ <input type="hidden" name="oldinvtotal" value="[% HTML.escape(oldinvtotal) %]">
+ <input type="hidden" name="oldtotalpaid" value="[% HTML.escape(totalpaid) %]">
+ </td>
</tr>
</table>
</td>
</tr>
</table>
</td>
@@
-88,8
+96,6
@@
</table>
</td>
</tr>
</table>
</td>
</tr>
- <input type="hidden" name="oldinvtotal" value="[% HTML.escape(oldinvtotal) %]">
- <input type="hidden" name="oldtotalpaid" value="[% HTML.escape(totalpaid) %]">
<tr>
<td><hr size="3" noshade></td>
</tr>
<tr>
<td><hr size="3" noshade></td>
</tr>
@@
-172,7
+178,7
@@
<input type="hidden" name="action" value="dispatcher">
<input type="hidden" name="saved_xyznumber" value="[% HTML.escape(saved_xyznumber) %]">
<input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
<input type="hidden" name="action" value="dispatcher">
<input type="hidden" name="saved_xyznumber" value="[% HTML.escape(saved_xyznumber) %]">
<input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
-<input type="hidden" name="callback" value="[% callback %]">
+<input type="hidden" name="callback" value="[% callback
| html
%]">
[% IF vc == 'customer' %]
<input type="hidden" name="customer_discount" value="[% HTML.escape(customer_discount) %]">
[% ELSE %]
[% IF vc == 'customer' %]
<input type="hidden" name="customer_discount" value="[% HTML.escape(customer_discount) %]">
[% ELSE %]
@@
-180,6
+186,3
@@
[% END %]
</form>
[% END %]
</form>
-
-</body>
-</html>