X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/b47574cb2bdd79d3c172f67d94d3eada4bd3f981..3df0bf0644d42357ee0baf9f5b05efbbfc8d0135:/templates/webpages/order/tabs/basic_data.html
diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html
index d10995416..32880cf6e 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -38,7 +38,7 @@
| [% 'Steuersatz' | $T8 %] |
- [% L.select_tag('order.taxzone_id', SELF.all_taxzones, default=SELF.order.taxzone_id, title_key='description', style='width: 300px') %] |
+ [% L.select_tag('order.taxzone_id', SELF.all_taxzones, default=SELF.order.taxzone_id, title_key='description', style='width: 300px', class='recalc') %] |
@@ -56,6 +56,11 @@
| [% L.input_tag('order.transaction_description', SELF.order.transaction_description, style='width: 300px') %] |
+
+ | [% 'Project Number' | $T8 %] |
+ [% L.project_picker('order.globalproject_id', SELF.order.globalproject_id, style='width: 300px') %] |
+
+
@@ -112,13 +117,13 @@
- | [% 'Insert Date' | $T8 %] |
- [% SELF.order.itime_as_date %] |
+ [% 'Reqdate' | $T8 %] |
+ [% L.date_tag('order.reqdate', SELF.order.reqdate) %] |
- | [% 'Project Number' | $T8 %] |
- [%- L.select_tag('order.globalproject_id', SELF.all_projects, default=SELF.order.globalproject_id, title_key='projectnumber', with_empty = 1) %] |
+ [% 'Insert Date' | $T8 %] |
+ [% SELF.order.itime_as_date %] |
@@ -145,6 +150,7 @@
[%- 'Qty' | $T8 %] |
[%- 'Price Factor' | $T8 %] |
[%- 'Unit' | $T8 %] |
+ [%- 'Price Source' | $T8 %] |
[%- 'Price' | $T8 %] |
[%- 'Discount' | $T8 %] |
[%- 'Extended' | $T8 %] |
@@ -152,7 +158,7 @@
[%- FOREACH item = SELF.order.items_sorted %]
- [%- PROCESS order/tabs/_row.html ITEM=item %]
+ [%- PROCESS order/tabs/_row.html ITEM=item ID=item.id %]
[%- END %]
@@ -168,6 +174,23 @@
+
+
+
+ | [% 'Notes' | $T8 %] |
+ [% 'Internal Notes' | $T8 %] |
+
+
+ |
+ [% L.textarea_tag('order.notes', SELF.order.notes, wrap="soft", style="width: 350px; height: 150px", class="texteditor") %]
+ |
+
+ [% L.textarea_tag('order.intnotes', SELF.order.intnotes, wrap="soft", style="width: 350px; height: 150px") %]
+ |
+
+
+ |
+
@@ -193,16 +216,21 @@
- [%- IF NOT taxincluded %]
-
+
+ |
+
+ [% L.yes_no_tag('order.taxincluded', SELF.order.taxincluded, class='recalc') %]
+ |
+
+
+
| [%- 'Subtotal' | $T8 %] |
[%- L.div_tag(SELF.order.netamount_as_number, id='netamount_id') %]
|
- [%- END %]
[%- FOREACH tax = SELF.taxes %]
- [%- PROCESS order/tabs/_tax_row.html TAX=tax %]
+ [%- PROCESS order/tabs/_tax_row.html TAX=tax TAXINCLUDED=SELF.order.taxincluded %]
[%- END %]
| [%- 'Total' | $T8 %] |
@@ -227,10 +255,10 @@
| | |