projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bei Zahlungsausgang heutiges Datum vorbelegen
[kivitendo-erp.git]
/
templates
/
webpages
/
is
/
form_header.html
diff --git
a/templates/webpages/is/form_header.html
b/templates/webpages/is/form_header.html
index
8c5c9f8
..
ca11fb1
100644
(file)
--- a/
templates/webpages/is/form_header.html
+++ b/
templates/webpages/is/form_header.html
@@
-27,7
+27,7
@@
[%- PROCESS 'common/flash.html' %]
[%- INCLUDE 'generic/set_longdescription.html' %]
[%- PROCESS 'common/flash.html' %]
[%- INCLUDE 'generic/set_longdescription.html' %]
-<div class="tabwidget">
+<div
id="is_tabs"
class="tabwidget">
<ul>
<li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
[%- IF INSTANCE_CONF.get_webdav %]
<ul>
<li><a href="#ui-tabs-basic-data">[% 'Basic Data' | $T8 %]</a></li>
[%- IF INSTANCE_CONF.get_webdav %]
@@
-35,6
+35,7
@@
[%- END %]
[%- IF id %]
<li><a href="controller.pl?action=RecordLinks/ajax_list&object_model=Invoice&object_id=[% HTML.url(id) %]">[% 'Linked Records' | $T8 %]</a></li>
[%- END %]
[%- IF id %]
<li><a href="controller.pl?action=RecordLinks/ajax_list&object_model=Invoice&object_id=[% HTML.url(id) %]">[% 'Linked Records' | $T8 %]</a></li>
+ <li><a href="[% 'controller.pl?action=AccTrans/list_transactions&trans_id=' _ HTML.url(id) | html %]">[% LxERP.t8('Transactions') %]</a></li>
[%- END %]
</ul>
[%- END %]
</ul>
@@
-77,7
+78,8
@@
<tr>
<th align="right">[% 'Shipping Address' | $T8 %]</th>
<td>
<tr>
<th align="right">[% 'Shipping Address' | $T8 %]</th>
<td>
- [% L.select_tag('shipto_id', ALL_SHIPTO, default = shipto_id, value_key = 'shipto_id', title_key = 'displayable_id', with_empty = 1, style='width: 250px', onChange = "document.getElementById('update_button').click();") %]
+ [% shiptos = [ [ "", LxERP.t8("No/individual shipping address") ] ] ;
+ L.select_tag('shipto_id', shiptos.import(ALL_SHIPTO), default=shipto_id, value_key='shipto_id', title_key='displayable_id', style='width: 250px') %]
</td>
</tr>
[%- END %]
</td>
</tr>
[%- END %]
@@
-112,7
+114,7
@@
<tr>
<th align="right">[% 'Steuersatz' | $T8 %]</th>
<td>
<tr>
<th align="right">[% 'Steuersatz' | $T8 %]</th>
<td>
- [% L.select_tag('taxzone_id',
ALL_TAXZONES
, default = taxzone_id, title_key = 'description', disabled = (id ? 1 : 0), style='width: 250px', onchange = "document.getElementById('update_button').click();") %]
+ [% L.select_tag('taxzone_id',
( id ? ALL_TAXZONES : ALL_ACTIVE_TAXZONES)
, default = taxzone_id, title_key = 'description', disabled = (id ? 1 : 0), style='width: 250px', onchange = "document.getElementById('update_button').click();") %]
[%- IF id %]
<input type='hidden' name='taxzone_id' value='[% taxzone_id %]'>
[%- END %]
[%- IF id %]
<input type='hidden' name='taxzone_id' value='[% taxzone_id %]'>
[%- END %]
@@
-160,7
+162,7
@@
</tr>
<tr>
<th align="right">[% 'Transaction description' | $T8 %]</th>
</tr>
<tr>
<th align="right">[% 'Transaction description' | $T8 %]</th>
- <td colspan="3"><input size='35' name="transaction_description" value="[% HTML.escape(transaction_description) %]"></td>
+ <td colspan="3"><input size='35' name="transaction_description"
id="transaction_description"
value="[% HTML.escape(transaction_description) %]"></td>
</tr>
</table>
</td>
</tr>
</table>
</td>
@@
-192,7
+194,7
@@
</tr>
<tr>
<th align="right">[% 'Credit Note Date' | $T8 %]</th>
</tr>
<tr>
<th align="right">[% 'Credit Note Date' | $T8 %]</th>
- <td>[% L.date_tag('invdate', invdate, onchange='
set_duedate(
)') %]</td>
+ <td>[% L.date_tag('invdate', invdate, onchange='
kivi.SalesPurchase.set_duedate_on_reference_date_change("invdate"
)') %]</td>
</tr>
[%- ELSE %]
<tr>
</tr>
[%- ELSE %]
<tr>
@@
-201,11
+203,14
@@
</tr>
<tr>
<th align="right">[% 'Invoice Date' | $T8 %]</th>
</tr>
<tr>
<th align="right">[% 'Invoice Date' | $T8 %]</th>
- <td>[% L.date_tag('invdate', invdate, onchange='
set_duedate(
)') %]</td>
+ <td>[% L.date_tag('invdate', invdate, onchange='
kivi.SalesPurchase.set_duedate_on_reference_date_change("invdate"
)') %]</td>
</tr>
<tr>
<th align="right">[% 'Due Date' | $T8 %]</th>
</tr>
<tr>
<th align="right">[% 'Due Date' | $T8 %]</th>
- <td>[% L.date_tag('duedate', duedate) %]</td>
+ <td>
+ <span id="duedate_container"[% IF payment_terms_obj.auto_calculation %] style="display:none"[% END %]>[% L.date_tag('duedate', duedate) %]</span>
+ <span id="duedate_fixed"[% IF !payment_terms_obj.auto_calculation %] style="display:none"[% END %]>[% HTML.escape(duedate) %]</span>
+ </td>
</tr>
<tr>
<th align="right" nowrap>[% 'Delivery Order Number' | $T8 %]</th>
</tr>
<tr>
<th align="right" nowrap>[% 'Delivery Order Number' | $T8 %]</th>
@@
-269,17
+274,6
@@
[% ELSE %]
[% END %]
});
[% ELSE %]
[% END %]
});
- function set_duedate() {
- $.ajax({
- url: 'is.pl?action=set_duedate',
- data: {
- invdate: $('#invdate').val(),
- payment_id: $('#payment_id').val(),
- },
- dataType: 'text',
- success: function (data) { $('#duedate').val(data); }
- })
- }
//-->
</script>
<table width="100%">
//-->
</script>
<table width="100%">