ShippedQty: Verwaiste Option fill_up aus Mandantenkonfig entfernt

diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm
index 1486d213e3265ba33eb511ce1b53394dd76b51b5..d49ce4505d9ea5a8768261124545793f84100ac9 100644 (file)
--- a/SL/DB/MetaSetup/Default.pm
+++ b/SL/DB/MetaSetup/Default.pm
@@ -161,8 +161,6 @@ __PACKAGE__->meta->columns(
   sepa_set_skonto_date_as_default_exec_date => { type => 'boolean', default => 'false' },
   sepa_set_skonto_date_buffer_in_days       => { type => 'integer', default => '0' },
   servicenumber                             => { type => 'text' },
   sepa_set_skonto_date_as_default_exec_date => { type => 'boolean', default => 'false' },
   sepa_set_skonto_date_buffer_in_days       => { type => 'integer', default => '0' },
   servicenumber                             => { type => 'text' },

-  shipped_qty_fill_up                       => { type => 'boolean', default => 'true', not_null => 1 },
-  shipped_qty_item_identity_fields          => { type => 'array', default => '{parts_id}', not_null => 1 },

   shipped_qty_require_stock_out             => { type => 'boolean', default => 'false', not_null => 1 },
   show_bestbefore                           => { type => 'boolean', default => 'false' },
   show_longdescription_select_item          => { type => 'boolean', default => 'false' },
   shipped_qty_require_stock_out             => { type => 'boolean', default => 'false', not_null => 1 },
   show_bestbefore                           => { type => 'boolean', default => 'false' },
   show_longdescription_select_item          => { type => 'boolean', default => 'false' },

diff --git a/sql/Pg-upgrade2/drop_shipped_qty_config.sql b/sql/Pg-upgrade2/drop_shipped_qty_config.sql
new file mode 100644 (file)
index 0000000..a71a029
--- /dev/null
+++ b/sql/Pg-upgrade2/drop_shipped_qty_config.sql
@@ -0,0 +1,8 @@
+-- @tag: drop_shipped_qty_config
+-- @description: Verwaiste Optionen löschen
+-- @depends: release_3_5_7
+
+ALTER TABLE defaults DROP COLUMN shipped_qty_fill_up;
+ALTER TABLE defaults DROP COLUMN shipped_qty_item_identity_fields;
+
+

diff --git a/templates/webpages/client_config/_features.html b/templates/webpages/client_config/_features.html
index c5278adcd27cdef28240aa6d260f168f048649e5..fe22a7d3cb8bc6d05cd0e081f7fc2a0a8a9e3fcf 100644 (file)
--- a/templates/webpages/client_config/_features.html
+++ b/templates/webpages/client_config/_features.html
@@ -390,26 +390,6 @@
    <td align="right">[% LxERP.t8('Assortment') %]</td>
    <td>[% L.yes_no_tag('defaults.feature_experimental_assortment', SELF.defaults.feature_experimental_assortment) %]</td>
   </tr>
    <td align="right">[% LxERP.t8('Assortment') %]</td>
    <td>[% L.yes_no_tag('defaults.feature_experimental_assortment', SELF.defaults.feature_experimental_assortment) %]</td>
   </tr>

-
- <tr><td class="listheading" colspan="4">[% LxERP.t8("Shipped Quantity Algorithm") %]</td></tr>
- <tr>
-  <td align="right">[% LxERP.t8('Require stock out to consider a delivery order position delivered?') %]</td>
-  <td>[% L.yes_no_tag('defaults.shipped_qty_require_stock_out', SELF.defaults.shipped_qty_require_stock_out) %]</td>
-  <td>[% LxERP.t8('If yes, delivery order positions are considered "delivered" only if they have been stocked out of the inventory. Otherwise saving the delivery order is considered delivered.') %]</td>
- </tr>
- <tr>
-  <td align="right">[% LxERP.t8('Use fill up when calculating shipped quantities?') %]</td>
-  <td>[% L.yes_no_tag('defaults.shipped_qty_fill_up', SELF.defaults.shipped_qty_fill_up) %]</td>
-  <td>[% LxERP.t8('Linked positions will always be reconciled first. If this is set to yes, unlinked positions will be reconciled in a second step. This is necessary in very old databases (with open delivery orders from before 3.4.0) and in businesses where delivery orders are frequently amended. Usually the direct links are faster and more accurate. Defaults to true for historical reasons only.') %]</td>
- </tr>
- <tr>
-  <td align="right">[% LxERP.t8('Position identity fields for fill up?') %]</td>
-  <td>
-    [% L.select_tag("defaults.shipped_qty_item_identity_fields[]", SELF.available_shipped_qty_item_identity_fields, id="defaults_shipped_qty_item_identity_fields", multiple=1, default=SELF.defaults.shipped_qty_item_identity_fields) %]
-    [% L.multiselect2side("defaults_shipped_qty_item_identity_fields", labelsx=LxERP.t8("Available identity fields"), labeldx=LxERP.t8("Selected identity fields")) %]</td>
-  <td>[% LxERP.t8('Only applies if the previous is set to true. When filling up unlinked positions, consider them matches if ALL of these fields match. For example, in a business with variants that are defined by a special description, description needs to be part of the identity. If delivering several similar order positions by delivery date is common, reqdate should be included in the identity. Serialnumber is useful when the serialnumber in the order and delivery order has to match.') %]</td>
- </tr>
-

  <tr><td class="listheading" colspan="4">[% 'Displayable Name Preferences' | $T8 %]</td></tr>
  [% FOREACH module=SELF.displayable_name_specs_by_module.keys.sort %]
  [%- SET spec=SELF.displayable_name_specs_by_module.$module -%]
  <tr><td class="listheading" colspan="4">[% 'Displayable Name Preferences' | $T8 %]</td></tr>
  [% FOREACH module=SELF.displayable_name_specs_by_module.keys.sort %]
  [%- SET spec=SELF.displayable_name_specs_by_module.$module -%]

diff --git a/templates/webpages/client_config/_warehouse.html b/templates/webpages/client_config/_warehouse.html
index 081f5a1a21fbfb90c4421d23476a61192bb4693b..f30fc7808711ce3141bbef3201b51c5cb1e20738 100644 (file)
--- a/templates/webpages/client_config/_warehouse.html
+++ b/templates/webpages/client_config/_warehouse.html
@@ -150,5 +150,11 @@
     [% LxERP.t8('Ignore services for the purchase orders state of delivery') %]
    </td>
   </tr>
     [% LxERP.t8('Ignore services for the purchase orders state of delivery') %]
    </td>
   </tr>

+ <tr><td class="listheading" colspan="4">[% LxERP.t8("Shipped Quantity Algorithm") %]</td></tr>
+ <tr>
+  <td align="right">[% LxERP.t8('Require stock out to consider a delivery order position delivered?') %]</td>
+  <td>[% L.yes_no_tag('defaults.shipped_qty_require_stock_out', SELF.defaults.shipped_qty_require_stock_out) %]</td>
+  <td>[% LxERP.t8('If yes, delivery order positions are considered "delivered" only if they have been stocked out of the inventory. Otherwise saving the delivery order is considered delivered.') %]</td>
+ </tr>

  </table>
 </div>
  </table>
 </div>