projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SL:Webdav:File.pm->store: ungeänderte Dokumente nicht doppelt speichern.
[kivitendo-erp.git]
/
templates
/
webpages
/
ap
/
form_header.html
diff --git
a/templates/webpages/ap/form_header.html
b/templates/webpages/ap/form_header.html
index
a332733
..
e3bc2e9
100644
(file)
--- a/
templates/webpages/ap/form_header.html
+++ b/
templates/webpages/ap/form_header.html
@@
-18,7
+18,7
@@
<input type="hidden" name="forex" value="[% forex | html %]">
<input type="hidden" name="lastmtime" value="[% HTML.escape(lastmtime) %]">
<input type="hidden" name="forex" value="[% forex | html %]">
<input type="hidden" name="lastmtime" value="[% HTML.escape(lastmtime) %]">
-<input type="hidden" name="id" value="[% id | html %]">
+<input
id="id"
type="hidden" name="id" value="[% id | html %]">
<input type="hidden" name="sort" value="[% sort | html %]">
<input type="hidden" name="closedto" value="[% closedto | html %]">
<input type="hidden" name="locked" value="[% locked | html %]">
<input type="hidden" name="sort" value="[% sort | html %]">
<input type="hidden" name="closedto" value="[% closedto | html %]">
<input type="hidden" name="locked" value="[% locked | html %]">
@@
-63,7
+63,7
@@
<li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
[%- END %]
[%- IF id AND INSTANCE_CONF.get_doc_storage %]
<li><a href="#ui-tabs-webdav">[% 'WebDAV' | $T8 %]</a></li>
[%- END %]
[%- IF id AND INSTANCE_CONF.get_doc_storage %]
- <li><a href="
controller.pl?action=File/list&file_type=document&object_type=purchase_invoice&object_id=[% HTML.url(id) %]
">[% 'Documents' | $T8 %]</a></li>
+ <li><a href="
#ui-tabs-docs
">[% 'Documents' | $T8 %]</a></li>
<li><a href="controller.pl?action=File/list&file_type=attachment&object_type=purchase_invoice&object_id=[% HTML.url(id) %]">[% 'Attachments' | $T8 %]</a></li>
[%- END %]
[%- IF id %]
<li><a href="controller.pl?action=File/list&file_type=attachment&object_type=purchase_invoice&object_id=[% HTML.url(id) %]">[% 'Attachments' | $T8 %]</a></li>
[%- END %]
[%- IF id %]
@@
-74,6
+74,10
@@
[%- END %]
</ul>
[%- END %]
</ul>
+[%- IF id AND INSTANCE_CONF.get_doc_storage %]
+ <div id="ui-tabs-docs"></div>
+[%- END %]
+
<div id="ui-tabs-basic-data">
<table width="100%">
<tr valign="top">
<div id="ui-tabs-basic-data">
<table width="100%">
<tr valign="top">
@@
-85,7
+89,7
@@
<tr>
<th align="right" nowrap>[% 'Vendor' | $T8 %]</th>
<td colspan="3">
<tr>
<th align="right" nowrap>[% 'Vendor' | $T8 %]</th>
<td colspan="3">
- [% P.customer_vendor.picker("vendor_id", vendor_id, type="vendor", style="width: 3
0
0px", onchange="\$('#update_button').click()") %]
+ [% P.customer_vendor.picker("vendor_id", vendor_id, type="vendor", style="width: 3
3
0px", onchange="\$('#update_button').click()") %]
[% L.button_tag("show_vc_details('vendor')", LxERP.t8('Details (one letter abbreviation)')) %]
[% L.hidden_tag("previous_vendor_id", vendor_id) %]
</td>
[% L.button_tag("show_vc_details('vendor')", LxERP.t8('Details (one letter abbreviation)')) %]
[% L.hidden_tag("previous_vendor_id", vendor_id) %]
</td>
@@
-130,10
+134,14
@@
[% IF ALL_DEPARTMENTS %]
<tr>
<th align="right" nowrap>[% 'Department' | $T8 %]</th>
[% IF ALL_DEPARTMENTS %]
<tr>
<th align="right" nowrap>[% 'Department' | $T8 %]</th>
- <td colspan=3>[% L.select_tag('department_id', ALL_DEPARTMENTS, default = department_id, title_key = 'description', with_empty = 1) %]</td>
+ <td colspan=3>[% L.select_tag('department_id', ALL_DEPARTMENTS, default = department_id, title_key = 'description', with_empty = 1
, style = "width:334px"
) %]</td>
</tr>
[% END %]
</tr>
[% END %]
+ <tr>
+ <th align="right">[% 'Transaction description' | $T8 %]</th>
+ <td colspan="3">[% L.input_tag("transaction_description", transaction_description, style="width:330px", "data-validate"=INSTANCE_CONF.get_require_transaction_description_ps ? 'required' : '') %]</td>
+ </tr>
<tr>
<td align="right"><input name="taxincluded" class="checkbox" type="checkbox" value="1" [% IF ( taxincluded ) %]checked[% END %]></td>
<th align=left nowrap>[% 'Tax Included' | $T8 %]</th>
<tr>
<td align="right"><input name="taxincluded" class="checkbox" type="checkbox" value="1" [% IF ( taxincluded ) %]checked[% END %]></td>
<th align=left nowrap>[% 'Tax Included' | $T8 %]</th>
@@
-157,7
+165,7
@@
</tr>
<tr>
<th align="right" nowrap>[% 'Invoice Date' | $T8 %]</th>
</tr>
<tr>
<th align="right" nowrap>[% 'Invoice Date' | $T8 %]</th>
- <td>[% L.date_tag('transdate', transdate) %]</td>
+ <td>[% L.date_tag('transdate', transdate
, onchange='kivi.SalesPurchase.set_duedate_on_reference_date_change("transdate")'
) %]</td>
</tr>
<tr>
<th align="right" nowrap>[% 'Due Date' | $T8 %]</th>
</tr>
<tr>
<th align="right" nowrap>[% 'Due Date' | $T8 %]</th>
@@
-207,7
+215,14
@@
<input name="amount_[% i %]" size="10" value="[% temp = "amount_"_ i %][% $temp | html %]">
</td>
<td>
<input name="amount_[% i %]" size="10" value="[% temp = "amount_"_ i %][% $temp | html %]">
</td>
<td>
- [% temp = "tax_"_ i %][% $temp | html %]
+ [% temp_r = "tax_reverse_"_ i %]
+ [% IF ($temp_r) %]
+ [% $temp_r | html %]
+
+ [% temp_c = "tax_charge_"_ i %][% $temp_c | html %]
+ [% ELSE %]
+ [% temp = "tax_"_ i %][% $temp | html %]
+ [% END %]
</td>
<td>
[% temp = 'selected_taxchart_'_ i %]
</td>
<td>
[% temp = 'selected_taxchart_'_ i %]
@@
-242,6
+257,7
@@
<tr>
<th align="left">[% 'Notes' | $T8 %]</th>
<th align="left">[% 'Internal Notes' | $T8 %]</th>
<tr>
<th align="left">[% 'Notes' | $T8 %]</th>
<th align="left">[% 'Internal Notes' | $T8 %]</th>
+ <th align="left">[% 'Payment Terms' | $T8 %]</th>
</tr>
<tr valign="top">
<td>
</tr>
<tr valign="top">
<td>
@@
-250,6
+266,9
@@
<td>
[% L.textarea_tag("intnotes", intnotes, wrap="soft", rows=textarea_rows, cols=50, readonly=readonly) %]
</td>
<td>
[% L.textarea_tag("intnotes", intnotes, wrap="soft", rows=textarea_rows, cols=50, readonly=readonly) %]
</td>
+ <td>
+ [% L.select_tag('payment_id', payment_terms, default=payment_id, title_key='description', with_empty=1, style="width: 250px", onchange="kivi.SalesPurchase.set_duedate_on_reference_date_change('transdate')") %]
+ </td>
<tr>
</table>
</td>
<tr>
</table>
</td>
@@
-393,5
+412,5
@@
<hr size="3" noshade>
<script type='text/javascript'>
<hr size="3" noshade>
<script type='text/javascript'>
- $('#ap_set_to_paid_missing').click(function(){ $('input[id^="payment_paid_"]:last').val(
'[% LxERP.format_amount(paid_missing, 2) %]'
) });
+ $('#ap_set_to_paid_missing').click(function(){ $('input[id^="payment_paid_"]:last').val(
"[% LxERP.format_amount(paid_missing, 2) %]"
) });
</script>
</script>