projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master'
[kivitendo-erp.git]
/
templates
/
webpages
/
is
/
form_footer.html
diff --git
a/templates/webpages/is/form_footer.html
b/templates/webpages/is/form_footer.html
index
3a86b2a
..
deccd79
100644
(file)
--- a/
templates/webpages/is/form_footer.html
+++ b/
templates/webpages/is/form_footer.html
@@
-28,9
+28,7
@@
label_key = 'description',
show_empty = 1
allow_textbox = 0 -%]
label_key = 'description',
show_empty = 1
allow_textbox = 0 -%]
- <script type='text/javascript'>$('#payment_id').change(function(){
- if (this.value) set_duedate(['payment_id__' + this.value, 'invdate__' + invdate.value],['duedate'])})
- </script>
+ <script type='text/javascript'>$('#payment_id').change(function(){ if (this.value) set_duedate()})</script>
</td>
</tr>
[%- IF id && follow_ups.size %]
</td>
</tr>
[%- IF id && follow_ups.size %]
@@
-62,7
+60,8
@@
</td>
<td align="right">
[%- IF taxaccounts %]
</td>
<td align="right">
[%- IF taxaccounts %]
- <input name="taxincluded" class="checkbox" type="checkbox" [% IF taxincluded %]checked[% END %]>
+ <input type="hidden" name="taxincluded_changed_by_user" id="taxincluded_changed_by_user" value="[% taxincluded_changed_by_user ? '1' : '0' %]">
+ <input name="taxincluded" onclick="document.getElementById('taxincluded_changed_by_user').value = '1';" class="checkbox" type="checkbox" [% IF taxincluded %]checked[% END %]>
<b>[% 'Tax Included' | $T8 %]</b>
<br>
<br>
<b>[% 'Tax Included' | $T8 %]</b>
<br>
<br>
@@
-131,7
+130,7
@@
<input class="submit" type="submit" name="action" value="[% 'Storno' | $T8 %]">
[% END %]
<input class="submit" type="submit" name="action" value="[% 'Post Payment' | $T8 %]">
<input class="submit" type="submit" name="action" value="[% 'Storno' | $T8 %]">
[% END %]
<input class="submit" type="submit" name="action" value="[% 'Post Payment' | $T8 %]">
- <input class="submit" type="submit" name="action" value="[% 'Use As
Template
' | $T8 %]">
+ <input class="submit" type="submit" name="action" value="[% 'Use As
New
' | $T8 %]">
[% IF id && !is_type_credit_note %]
<input class="submit" type="submit" name="action" value="[% 'Credit Note' | $T8 %]">
[% IF id && !is_type_credit_note %]
<input class="submit" type="submit" name="action" value="[% 'Credit Note' | $T8 %]">
@@
-140,11
+139,7
@@
<input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
<input class="submit" type="submit" name="action" value="[% 'Post' | $T8 %]">
[% END %]
<input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
<input class="submit" type="submit" name="action" value="[% 'Post' | $T8 %]">
[% END %]
-
- [%- UNLESS locked %]
- <input class="submit" type="submit" name="action" value="[% 'Order' | $T8 %]">
- [%- END %]
-
+ <input class="submit" type="submit" name="action" value="[% 'Order' | $T8 %]">
<input type="button" class="submit" onclick="follow_up_window()" value="[% 'Follow-Up' | $T8 %]">
[% ELSE # no id %]
<input type="button" class="submit" onclick="follow_up_window()" value="[% 'Follow-Up' | $T8 %]">
[% ELSE # no id %]
@@
-162,8
+157,9
@@
[% IF id %]
[%#- button for saving history %]
<input type="button" class="submit" onclick="set_history_window([% id | html %]);" name="history" id="history" value="[% 'history' | $T8 %]">
[% IF id %]
[%#- button for saving history %]
<input type="button" class="submit" onclick="set_history_window([% id | html %]);" name="history" id="history" value="[% 'history' | $T8 %]">
-
- <input type="submit" class="submit" name="action" value="[% 'mark as paid' | $T8 %]">
+ [% IF INSTANCE_CONF.get_is_show_mark_as_paid %]
+ <input type="submit" class="submit" name="action" value="[% 'mark as paid' | $T8 %]">
+ [% END %]
[% END %]
<input type="hidden" name="rowcount" value="[% rowcount %]">
[% END %]
<input type="hidden" name="rowcount" value="[% rowcount %]">
@@
-173,7
+169,3
@@
<input type="hidden" name="customer_discount" value="[% customer_discount %]">
<input type="hidden" name="gldate" value="[% gldate %]">
</form>
<input type="hidden" name="customer_discount" value="[% customer_discount %]">
<input type="hidden" name="gldate" value="[% gldate %]">
</form>
-
-</body>
-
-</html>