X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fclient_config%2F_warehouse.html;h=60199fc7e4e384404b0d1a2aaafff55fcc6aa4a3;hb=08460123f185fc145d4d87ae150b6b5f051d119a;hp=b169219a18de4bbb740024d94077daefe283cd3d;hpb=033138109231a9737da9b2f0ee7cb5d20413ddbf;p=kivitendo-erp.git

diff --git a/templates/webpages/client_config/_warehouse.html b/templates/webpages/client_config/_warehouse.html
index b169219a1..60199fc7e 100644
--- a/templates/webpages/client_config/_warehouse.html
+++ b/templates/webpages/client_config/_warehouse.html
@@ -89,16 +89,6 @@
    [% LxERP.t8('If one or more space separated serial numbers are assigned in a sales invoice, match the charge number of the inventory item. Assumes that Serial Number and Charge Number have 1:1 relation. Otherwise throw a error message for the default sales invoice transfer.') %]
    </td>
   </tr>
-
-  <tr>
-   <td align="right">[% LxERP.t8('Use default warehouse for assembly transfer') %]</td>
-   <td>
-    [% L.yes_no_tag('defaults.transfer_default_warehouse_for_assembly', SELF.defaults.transfer_default_warehouse_for_assembly) %]
-   </td>
-   <td>
-    [% LxERP.t8('Transfer of assemblies uses the assembly\'s default warehouse instead of the destination warehouse.') %]<br>
-   </td>
-  </tr>
   <tr><td colspan="3"><hr /></td></tr>
   <tr>
   <tr>
@@ -121,8 +111,7 @@
    <td>[% L.input_tag('defaults.undo_transfer_interval', LxERP.format_amount(SELF.defaults.undo_transfer_interval, 0), style=style) %]</td>
    <td>[% LxERP.t8('Defines the interval where undoing transfers from a delivery order are allowed.') %]</td>
   </tr>
-  <tr><td colspan="3"><hr /></td></tr>
-  <tr>
+  <tr><td class="listheading" colspan="4">[% LxERP.t8("Produce Assembly Configuration") %]</td></tr>
   <tr>
    <td align="right">[% LxERP.t8('Assembly creation warehouse dependent') %]</td>
    <td>
@@ -133,14 +122,15 @@
    </td>
   </tr>
   <tr>
-   <td align="right">[% LxERP.t8('Create all sub-assemblies') %]</td>
+   <td align="right">[% LxERP.t8('Assembly creation transfers services') %]</td>
    <td>
-    [% L.yes_no_tag('defaults.produce_assembly_multiple_levels', SELF.defaults.produce_assembly_multiple_levels) %]
+    [% L.yes_no_tag('defaults.produce_assembly_transfer_service', SELF.defaults.produce_assembly_transfer_service) %]
    </td>
    <td>
-    [% LxERP.t8('Produce assembly and ALL sublevels of assemblies in one step.') %]
+    [% LxERP.t8('Produce assembly consumes services if assigned as a assembly item') %]
    </td>
   </tr>
+  <tr><td class="listheading" colspan="4">[% LxERP.t8("Services in Delivery Orders") %]</td></tr>
   <tr>
    <td align="right">[% LxERP.t8('Sales Orders Services are deliverable') %]</td>
    <td>
@@ -159,5 +149,11 @@
     [% 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>