X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/c5c169f6fc8961c617903e2700af1ae451335ec0..a54bd67ad73ba2ba6fbb8a2bdce288af39676a67:/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 ea37fafbe..c25ec72ce 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -41,6 +41,15 @@
             <td>[% L.select_tag('order.taxzone_id', SELF.all_taxzones, default=SELF.order.taxzone_id, title_key='description', style='width: 300px', class='recalc') %]</td>
           </tr>
 
+[%- IF SELF.all_departments.size %]
+          <tr>
+            <th align="right">[% 'Department' | $T8 %]</th>
+            <td>
+              [% L.select_tag('order.department_id', SELF.all_departments, default=SELF.order.department_id, title_key='description', with_empty=1, style='width:300px') %]
+            </td>
+          </tr>
+[%- END %]
+
           <tr>
             <th align="right">[% 'Shipping Point' | $T8 %]</th>
             <td>[% L.input_tag('order.shippingpoint', SELF.order.shippingpoint, style='width: 300px') %]</td>
@@ -56,6 +65,11 @@
             <td>[% L.input_tag('order.transaction_description', SELF.order.transaction_description, style='width: 300px') %]</td>
           </tr>
 
+          <tr>
+            <th align="right">[% 'Project Number' | $T8 %]</th>
+            <td>[% L.project_picker('order.globalproject_id', SELF.order.globalproject_id, style='width: 300px') %]</td>
+          </tr>
+
         </table>
       </td>
 
@@ -107,13 +121,13 @@
           </tr>
 
           <tr>
-            <th width="70%" align="right" nowrap>[% 'Insert Date' | $T8 %]</th>
-            <td>[% SELF.order.itime_as_date %]</td>
+            <th width="70%" align="right" nowrap>[% 'Reqdate' | $T8 %]</th>
+            <td>[% L.date_tag('order.reqdate', SELF.order.reqdate) %]</td>
           </tr>
 
           <tr>
-            <th width="70%" align="right" nowrap>[% 'Project Number' | $T8 %]</th>
-            <td>[%- L.select_tag('order.globalproject_id', SELF.all_projects, default=SELF.order.globalproject_id, title_key='projectnumber', with_empty = 1) %]</td>
+            <th width="70%" align="right" nowrap>[% 'Insert Date' | $T8 %]</th>
+            <td>[% SELF.order.itime_as_date %]</td>
           </tr>
 
         </table>
@@ -124,6 +138,8 @@
 
   [%- PROCESS order/tabs/_item_input.html %]
 
+  [% L.button_tag('show_multi_items_dialog()', LxERP.t8('Add multiple parts')) %]</td>
+
   <table width="100%">
     <tr>
       <td>
@@ -262,6 +278,31 @@ function add_item() {
   $.post("controller.pl", data, kivi.eval_json_result);
 }
 
+function show_multi_items_dialog() {
+  if (!check_cv()) return;
+
+  var data = 'type=' + $('#type').val();
+  data += 'type=' + $('#type').val();
+  kivi.popup_dialog({
+    url: 'controller.pl?action=Order/show_multi_items_dialog',
+    data: $.extend({},
+                   { 'type': $('#type').val(),
+                     'callback': 'Order/add_multi_items',
+                     'callback_data_id': 'order_form' }),
+    id: 'jq_multi_items_dialog',
+    dialog: {
+      title: kivi.t8('Add multiple items'),
+      width:  800,
+      height: 500
+    }
+  });
+  return true;
+}
+
+function close_multi_items_dialog() {
+  $('#jq_multi_items_dialog').dialog('close');
+};
+
 function delete_order_item_row(clicked) {
   var row = $(clicked).parents("tbody").first();
   $(row).remove();
@@ -285,7 +326,7 @@ function update_price_source(item_id, source, descr, price_str) {
   var source_elt = $(row).find('[name="order.orderitems[].active_price_source"]');
   var button_elt = $(row).find('[name="price_chooser_button"]');
 
-  button_elt.val(descr);
+  button_elt.val(button_elt.val().replace(/.*\|/, descr + " |"));
   source_elt.val(source);
 
   var editable_div_elt = $(row).find('[name="editable_price"]');
@@ -315,10 +356,12 @@ function update_price_source(item_id, source, descr, price_str) {
   kivi.io.close_dialog();
 }
 
-function update_discount_source(item_id, source, discount_str) {
+function update_discount_source(item_id, source, descr, discount_str) {
   var row = $('#item_' + item_id).parents("tbody").first();
   var source_elt = $(row).find('[name="order.orderitems[].active_discount_source"]');
+  var button_elt = $(row).find('[name="price_chooser_button"]');
 
+  button_elt.val(button_elt.val().replace(/\|.*/, "| " + descr));
   source_elt.val(source);
 
   var editable_div_elt = $(row).find('[name="editable_discount"]');