X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Forder%2Ftabs%2Fbasic_data.html;h=ea9710ba4993e79a137923ae65779d98cd25e561;hb=e00e4846bca73f9856d19e41805264b9ecb18af2;hp=905288bf692e186b7f576c71db09ab0642acabcb;hpb=46691b527d6514102f1a460a4ff55576a67653c3;p=kivitendo-erp.git
diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html
index 905288bf6..ea9710ba4 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -76,6 +76,16 @@
title_key='safe_name') %]
+ [% IF SELF.cv == 'customer' %]
+
+ [% 'Salesman' | $T8 %] |
+ [% L.select_tag('order.employee_id',
+ SELF.all_employees,
+ default=(SELF.order.salesman_id ? SELF.order.salesman_id : SELF.current_employee_id),
+ title_key='safe_name') %] |
+
+ [% END %]
+
[% 'Order Number' | $T8 %] |
[% L.input_tag('order.ordnumber', SELF.order.ordnumber, size = 11) %] |
@@ -107,29 +117,34 @@
-
-
-
- |
- |
- |
- [%- 'Part' | $T8 %] |
- [%- 'Qty' | $T8 %] |
- [%- 'Price Factor' | $T8 %] |
- [%- 'Unit' | $T8 %] |
- [%- 'Price' | $T8 %] |
- [%- 'Discount' | $T8 %] |
- [%- 'Extended' | $T8 %] |
-
-
-
-
- [%- FOREACH item = SELF.order.items_sorted %]
- [%- PROCESS order/tabs/_row.html ITEM=item %]
- [%- END %]
-
-
+
+
|
@@ -179,6 +194,8 @@ function reload_cv_dependend_selections() {
}
function add_item() {
+ if ($('#add_item_parts_id').val() == '') return;
+
var data = $('#order_form').serialize();
data += '&action=Order/add_item';
data += '&type=' + $('#type').val();
@@ -193,29 +210,6 @@ function delete_order_item_row(clicked) {
recalc_amounts_and_taxes()
}
-function set_item_values(event) {
- var cv_id = $('#order_[%- cv_id %]').val();
- var parts_id = $(event.target).val();
- var row = $(event.target).parents("tr").first();
-
- var item_id_dom = $(row).find('[name="order.orderitems[+].id"]');
- var qty_dom = $(row).find('[id^="order_orderitems"][id$="qty_as_number"]');
- var unit_dom = $(row).find('[id^="order_orderitems"][id$="unit"]');
- var sellprice_dom = $(row).find('[id^="order_orderitems"][id$="sellprice_as_number"]');
- var discount_dom = $(row).find('[id^="order_orderitems"][id$="discount_as_percent"]');
-
- var data = $('#order_form').serialize();
- data += '&action=Order/set_item_values';
- data += '&type=' + $('#type').val();
- data += '&item_id=' + item_id_dom.val();
- data += '&qty_dom_id=' + qty_dom.attr("id");
- data += '&unit_dom_id=' + unit_dom.attr("id");
- data += '&sellprice_dom_id=' + sellprice_dom.attr("id");
- data += '&discount_dom_id=' + discount_dom.attr("id");
-
- $.post("controller.pl", data, kivi.eval_json_result);
-}
-
function recalc_amounts_and_taxes() {
var data = $('#order_form').serialize();
data += '&action=Order/recalc_amounts_and_taxes';
@@ -224,13 +218,21 @@ function recalc_amounts_and_taxes() {
$.post("controller.pl", data, kivi.eval_json_result);
}
-function display_linetotal(item_id, amount) {
- $('#item_' + item_id).parents("tr").first().find('[name="linetotal"]').html(amount);
+function row_table_scroll_down() {
+ $('#row_table_scroll_id').scrollTop($('#row_table_scroll_id')[0].scrollHeight);
}
-
$(function(){
$('#order_[%- cv_id %]').change(reload_cv_dependend_selections);
- $('[id^="order_orderitems"][id$="parts_id"]').change(set_item_values);
+ $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_sellprice_as_number').val(kivi.format_amount(o.sellprice, -2)) });
+ $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_description').val(o.description) });
+ $('.add_item_input').keydown(function(event) {
+ if(event.keyCode == 13) {
+ event.preventDefault();
+ add_item();
+ return false;
+ }
+ });
});
+