DeliveryOrder: price_source feature entfernt

diff --git a/js/kivi.DeliveryOrder.js b/js/kivi.DeliveryOrder.js
index ea6e14ba505336cac8e49b8c4a8159ef753ebf5d..c28033f9869547e3c026ac624432e58eb4dbdf09 100644 (file)
--- a/js/kivi.DeliveryOrder.js
+++ b/js/kivi.DeliveryOrder.js
@@ -516,74 +516,6 @@ namespace('kivi.Order', function(ns) {
     $.post("controller.pl", data, kivi.eval_json_result);
   };
 
     $.post("controller.pl", data, kivi.eval_json_result);
   };
 

-  ns.update_price_source = function(item_id, source, descr, price_str, price_editable) {
-    var row        = $('#item_' + item_id).parents("tbody").first();
-    var source_elt = $(row).find('[name="order.orderitems[].active_price_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_price"]');
-    var not_editable_div_elt = $(row).find('[name="not_editable_price"]');
-    if (price_editable == 1 && source === '') {
-      // editable
-      $(editable_div_elt).show();
-      $(not_editable_div_elt).hide();
-      $(editable_div_elt).find(':input').prop("disabled", false);
-      $(not_editable_div_elt).find(':input').prop("disabled", true);
-    } else {
-      // not editable
-      $(editable_div_elt).hide();
-      $(not_editable_div_elt).show();
-      $(editable_div_elt).find(':input').prop("disabled", true);
-      $(not_editable_div_elt).find(':input').prop("disabled", false);
-    }
-
-    if (price_str) {
-      var price_elt = $(row).find('[name="order.orderitems[].sellprice_as_number"]');
-      var html_elt  = $(row).find('[name="sellprice_text"]');
-      price_elt.val(price_str);
-      html_elt.html(price_str);
-    }
-
-    kivi.io.close_dialog();
-  };
-
-  ns.update_discount_source = function(item_id, source, descr, discount_str, price_editable) {
-    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"]');
-    var not_editable_div_elt = $(row).find('[name="not_editable_discount"]');
-    if (price_editable == 1 && source === '') {
-      // editable
-      $(editable_div_elt).show();
-      $(not_editable_div_elt).hide();
-      $(editable_div_elt).find(':input').prop("disabled", false);
-      $(not_editable_div_elt).find(':input').prop("disabled", true);
-    } else {
-      // not editable
-      $(editable_div_elt).hide();
-      $(not_editable_div_elt).show();
-      $(editable_div_elt).find(':input').prop("disabled", true);
-      $(not_editable_div_elt).find(':input').prop("disabled", false);
-    }
-
-    if (discount_str) {
-      var discount_elt = $(row).find('[name="order.orderitems[].discount_as_percent"]');
-      var html_elt     = $(row).find('[name="discount_text"]');
-      discount_elt.val(discount_str);
-      html_elt.html(discount_str);
-    }
-
-    kivi.io.close_dialog();
-  };
-

   ns.show_vc_details_dialog = function() {
     if (!ns.check_cv()) return;
     var vc;
   ns.show_vc_details_dialog = function() {
     if (!ns.check_cv()) return;
     var vc;

diff --git a/templates/webpages/delivery_order/tabs/_price_sources_dialog.html b/templates/webpages/delivery_order/tabs/_price_sources_dialog.html
deleted file mode 100644 (file)
index 02f1fd3..0000000
--- a/templates/webpages/delivery_order/tabs/_price_sources_dialog.html
+++ /dev/null
@@ -1,106 +0,0 @@
-[%- USE T8 %]
-[%- USE HTML %]
-[%- USE L %]
-[%- USE LxERP %]
-[% SET best_price = price_source.best_price %]
-[% SET best_discount = price_source.best_discount %]
-[% SET price_editable = 0 %]
-[% IF (FORM.type == "sales_order" || FORM.type == "sales_quotation") %]
-  [% SET price_editable = AUTH.assert('sales_edit_prices', 1) %]
-[% END %]
-[% IF (FORM.type == "purchase_order" || FORM.type == "request_quotation") %]
-  [% SET price_editable = AUTH.assert('purchase_edit_prices', 1) %]
-[% END %]
-[% SET exfactor = price_source.record.exchangerate ? 1 / price_source.record.exchangerate : 1 %]
-[% SET exnoshow = price_source.record.currency_id==INSTANCE_CONF.get_currency_id %]
-[% SET places   = exnoshow ? -2 : 5 %]
-  <h2>[% 'Prices' | $T8 %]</h2>
-
-  <table>
-   <tr class='listheading'>
-    <th></th>
-    <th>[% 'Price Source' | $T8 %]</th>
-    <th>[% 'Price' | $T8 %]</th>
-    <th [%- IF exnoshow -%]style='display:none'[%- END %]>
-      [% 'Price' | $T8 -%]/[%- price_source.record.currency.name %]
-    </th>
-    <th>[% 'Best Price' | $T8 %]</th>
-    <th>[% 'Details' | $T8 %]</th>
-   </tr>
-   <tr class='listrow'>
-[%- IF price_source.record_item.active_price_source %]
-    <td>[% L.button_tag('kivi.Order.update_price_source(\'' _ FORM.item_id _ '\', \'\', \'' _ LxERP.t8('None (PriceSource)') _ '\', \'\', ' _ price_editable _ ')', LxERP.t8('Select')) %]</td>
-[%- ELSE %]
-    <td><b>[% 'Selected' | $T8 %]</b></td>
-[%- END %]
-    <td>[% 'None (PriceSource)' | $T8 %]</td>
-    <td>-</td>
-    <td [%- IF exnoshow -%]style='display:none'[%- END %]>-</td>
-    <td></td>
-    <td></td>
-   </tr>
-   [%- FOREACH price IN price_source.available_prices %]
-    <tr class='listrow'>
-[%- IF price_source.record_item.active_price_source != price.source %]
-     <td>[% L.button_tag('kivi.Order.update_price_source(\'' _ FORM.item_id _ '\', \'' _ price.source _ '\', \'' _ price.source_description _ '\', \'' _ LxERP.format_amount(price.price * exfactor, places) _ '\', ' _ price_editable _ ')', LxERP.t8('Select')) %]</td>
-[%- ELSIF price_source.record_item.sellprice * 1 != price.price * 1 %]
-     <td>[% L.button_tag('kivi.Order.update_price_source(\'' _ FORM.item_id _ '\', \'' _ price.source _ '\', \'' _ price.source_description _ '\', \'' _ LxERP.format_amount(price.price * exfactor, places) _ '\', ' _ price_editable _ ')', LxERP.t8('Update Price')) %]</td>
-[%- ELSE %]
-    <td><b>[% 'Selected' | $T8 %]</b></td>
-[% END %]
-     <td>[% price.source_description | html %]</td>
-     <td>[% price.price_as_number %]</td>
-     <td [%- IF exnoshow -%]style='display:none'[%- END %]>
-       [% LxERP.format_amount(price.price * exfactor, places) %]
-     </td>
-[% IF price.source == best_price.source %]
-     <td align='center'>&#x2022;</td>
-[% ELSE %]
-     <td></td>
-[% END %]
-     <td>[% price.description | html %]</td>
-    </tr>
-   [%- END %]
-  </table>
-
-  <h2>[% 'Discounts' | $T8 %]</h2>
-
-  <table>
-   <tr class='listheading'>
-    <th></th>
-    <th>[% 'Price Source' | $T8 %]</th>
-    <th>[% 'Discount' | $T8 %]</th>
-    <th>[% 'Best Discount' | $T8 %]</th>
-    <th>[% 'Details' | $T8 %]</th>
-   </tr>
-   <tr class='listrow'>
-[%- IF price_source.record_item.active_discount_source %]
-    <td>[% L.button_tag('kivi.Order.update_discount_source(\'' _ FORM.item_id _ '\', \'\', \'' _ LxERP.t8('None (PriceSource Discount)') _ '\', \'\', ' _ price_editable _ ')', LxERP.t8('Select')) %]</td>
-[%- ELSE %]
-    <td><b>[% 'Selected' | $T8 %]</b></td>
-[%- END %]
-    <td>[% 'None (PriceSource Discount)' | $T8 %]</td>
-    <td>-</td>
-    <td></td>
-    <td></td>
-   </tr>
-   [%- FOREACH price IN price_source.available_discounts %]
-    <tr class='listrow'>
-[%- IF price_source.record_item.active_discount_source != price.source %]
-     <td>[% L.button_tag('kivi.Order.update_discount_source(\'' _ FORM.item_id _ '\', \'' _ price.source _ '\', \'' _ price.source_description _ '\', \'' _ price.discount_as_percent _ '\', ' _ price_editable _ ')', LxERP.t8('Select')) %]</td>
-[%- ELSIF price_source.record_item.discount * 1 != price.discount * 1 %]
-     <td>[% L.button_tag('kivi.Order.update_discount_source(\'' _ FORM.item_id _ '\', \'' _ price.source _ '\', \'' _ price.source_description _ '\', \'' _ price.discount_as_percent  _ '\', ' _ price_editable _ ')', LxERP.t8('Update Discount')) %]</td>
-[%- ELSE %]
-    <td><b>[% 'Selected' | $T8 %]</b></td>
-[% END %]
-     <td>[% price.source_description | html %]</td>
-     <td>[% price.discount_as_percent %] %</td>
-[% IF price.source == best_discount.source %]
-     <td align='center'>&#x2022;</td>
-[% ELSE %]
-     <td></td>
-[% END %]
-     <td>[% price.description | html %]</td>
-    </tr>
-   [%- END %]
-  </table>

diff --git a/templates/webpages/delivery_order/tabs/_row.html b/templates/webpages/delivery_order/tabs/_row.html
index 60d6cf18a3d23b48503cbd0c206aed39d85d7278..6483647264466fc70c4452d94505b36e8f5d3e59 100644 (file)
--- a/templates/webpages/delivery_order/tabs/_row.html
+++ b/templates/webpages/delivery_order/tabs/_row.html
@@ -92,11 +92,6 @@
                       value_key = 'name',
                       class = 'unitselect') %]
     </td>
                       value_key = 'name',
                       class = 'unitselect') %]
     </td>

-    <td>
-      [%- L.button_tag("kivi.Order.price_chooser_item_row(this)",
-                       ITEM.active_price_source.source_description _ ' | ' _ ITEM.active_discount_source.source_description,
-                       name = "price_chooser_button") %]
-    </td>

     [% SET RIGHT_TO_EDIT_PRICES = 0 %]
     [% IF (SELF.type == "sales_order" || SELF.type == "sales_quotation") %]
       [% SET RIGHT_TO_EDIT_PRICES = AUTH.assert('sales_edit_prices', 1) %]
     [% SET RIGHT_TO_EDIT_PRICES = 0 %]
     [% IF (SELF.type == "sales_order" || SELF.type == "sales_quotation") %]
       [% SET RIGHT_TO_EDIT_PRICES = AUTH.assert('sales_edit_prices', 1) %]


@@ -105,8 +100,7 @@
       [% SET RIGHT_TO_EDIT_PRICES = AUTH.assert('purchase_edit_prices', 1) %]
     [% END %]
     <td>
       [% SET RIGHT_TO_EDIT_PRICES = AUTH.assert('purchase_edit_prices', 1) %]
     [% END %]
     <td>

-      [%- L.hidden_tag("order.orderitems[].active_price_source", ITEM.active_price_source.source) %]
-      [%- SET EDIT_PRICE = (RIGHT_TO_EDIT_PRICES && ITEM.active_price_source.source == '') %]
+      [%- SET EDIT_PRICE = (RIGHT_TO_EDIT_PRICES) %]

       <div name="editable_price" [%- IF !EDIT_PRICE %]style="display:none"[%- END %] class="numeric">
         [%- L.input_tag("order.orderitems[].sellprice_as_number",
                         ITEM.sellprice_as_number,
       <div name="editable_price" [%- IF !EDIT_PRICE %]style="display:none"[%- END %] class="numeric">
         [%- L.input_tag("order.orderitems[].sellprice_as_number",
                         ITEM.sellprice_as_number,


@@ -122,8 +116,7 @@
       </div>
     </td>
     <td>
       </div>
     </td>
     <td>

-      [%- L.hidden_tag("order.orderitems[].active_discount_source", ITEM.active_discount_source.source) %]
-      [%- SET EDIT_DISCOUNT = (RIGHT_TO_EDIT_PRICES && ITEM.active_discount_source.source == '') %]
+      [%- SET EDIT_DISCOUNT = (RIGHT_TO_EDIT_PRICES) %]

       <div name="editable_discount" [%- IF !EDIT_DISCOUNT %]style="display:none"[%- END %] class="numeric">
         [%- L.input_tag("order.orderitems[].discount_as_percent",
                         ITEM.discount_as_percent,
       <div name="editable_discount" [%- IF !EDIT_DISCOUNT %]style="display:none"[%- END %] class="numeric">
         [%- L.input_tag("order.orderitems[].discount_as_percent",
                         ITEM.discount_as_percent,