X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fwebpages%2Fclient_config%2F_warehouse.html;h=3cc28efa07c765e9c240402045b59a1f1e548e83;hb=4af0680de7454195d92003613a03dc3eca4d94d2;hp=b8854d16199492f2b6eb74ad075338c1e8601f1c;hpb=b8f55e8877f21109656935d04f772099baa6f26f;p=kivitendo-erp.git

diff --git a/templates/webpages/client_config/_warehouse.html b/templates/webpages/client_config/_warehouse.html
index b8854d161..3cc28efa0 100644
--- a/templates/webpages/client_config/_warehouse.html
+++ b/templates/webpages/client_config/_warehouse.html
@@ -80,40 +80,40 @@
    [% LxERP.t8('Transfer out all items of a sales invoice when posting it. Items are transfered out acording to the settings above.') %]
    </td>
   </tr>
-  <tr><td colspan="3"><hr /></td></tr>
-  <tr>
   <tr>
-   <td align="right">[% LxERP.t8('Show Bestbefore') %]</td>
+   <td align="right">[% LxERP.t8('Match Sales Invoice Serial numbers with inventory charge numbers?') %]</td>
    <td>
-    [% L.yes_no_tag('defaults.show_bestbefore', SELF.defaults.show_bestbefore) %]
+    [% L.yes_no_tag('defaults.sales_serial_eq_charge', SELF.defaults.sales_serial_eq_charge) %]
    </td>
    <td>
-    [% LxERP.t8('Show fields used for the best before date?') %]<br>
-    [% LxERP.t8('ATTENTION! If you enabled this feature you can not simply turn it off again without taking care that best_before fields are emptied in the database.') %]<br>
-    [% LxERP.t8('This can be done with the following query:') %]<br>
-    <br>
-    UPDATE inventory SET bestbefore = NULL; <br>
-    <br>
-    [% LxERP.t8('Any stock contents containing a best before date will be impossible to stock out otherwise.') %]
+   [% 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 colspan="3"><hr /></td></tr>
+
   <tr>
-   <td align="right">[% LxERP.t8('Show Value of Goods for Delivery Plan') %]</td>
+   <td align="right">[% LxERP.t8('Use default warehouse for assembly transfer') %]</td>
    <td>
-    [% L.yes_no_tag('defaults.delivery_plan_show_value_of_goods', SELF.defaults.delivery_plan_show_value_of_goods) %]
+    [% L.yes_no_tag('defaults.transfer_default_warehouse_for_assembly', SELF.defaults.transfer_default_warehouse_for_assembly) %]
    </td>
    <td>
-   [% LxERP.t8('Calculate the value of goods for delivery plan (WARNING:  Experimental (not taxincluded safe!)') %]
+    [% LxERP.t8('Transfer of assemblies uses the assembly\'s default warehouse instead of the destination warehouse.') %]<br>
    </td>
   </tr>
- <tr>
-  <td align="right">[% LxERP.t8('Delivery Plan check for transferred delivery orders') %]</td>
+  <tr><td colspan="3"><hr /></td></tr>
+  <tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Show Bestbefore') %]</td>
    <td>
-    [% L.yes_no_tag('defaults.delivery_plan_calculate_transferred_do', SELF.defaults.delivery_plan_calculate_transferred_do) %]
+    [% L.yes_no_tag('defaults.show_bestbefore', SELF.defaults.show_bestbefore) %]
    </td>
    <td>
-   [% LxERP.t8('The default delivery plan only checks if all delivery orders have been created not if the goods are transferred. This feature will check if all the goods are transferred. Caveat: Only the state of the delivery orders are checked not partial transferred delivery orders (in technical terms: the table inventory is not checked') %]
+    [% LxERP.t8('Show fields used for the best before date?') %]<br>
+    [% LxERP.t8('ATTENTION! If you enabled this feature you can not simply turn it off again without taking care that best_before fields are emptied in the database.') %]<br>
+    [% LxERP.t8('This can be done with the following query:') %]<br>
+    <br>
+    UPDATE inventory SET bestbefore = NULL; <br>
+    <br>
+    [% LxERP.t8('Any stock contents containing a best before date will be impossible to stock out otherwise.') %]
    </td>
   </tr>
  </table>