X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/4a7662c8d94e536c8c452b9004229ec527af02ea..4cd645132b98802d2c21288ed557a67224a72cf9:/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 c67ed3788..e7ab1380d 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -56,6 +56,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>
 
@@ -111,11 +116,6 @@
             <td>[% SELF.order.itime_as_date %]</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>
-          </tr>
-
         </table>
 
       </td>
@@ -285,7 +285,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 +315,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"]');
@@ -348,6 +350,10 @@ function update_discount_source(item_id, source, discount_str) {
   kivi.io.close_dialog();
 }
 
+function reformat_number(event) {
+  $(event.target).val(kivi.format_amount(kivi.parse_amount($(event.target).val()), -2));
+}
+
 function recalc_amounts_and_taxes() {
   var data = $('#order_form').serialize();
   data += '&action=Order/recalc_amounts_and_taxes';
@@ -446,6 +452,7 @@ $(function(){
   });
   row_set_keyboard_events($('.row_entry'));
   $('.recalc').change(recalc_amounts_and_taxes);
+  $('.reformat_number').change(reformat_number);
 });
 
 </script>