X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fclient_config%2F_warehouse.html;h=9d2e0c30ba0fe700297754c1d993ab2648c5a780;hb=b98b8e3f73a399d2d4df7be4962b56bd4ad8c82b;hp=79fc7a2759eacb7b55282d802bb559c00ee0977d;hpb=368f144b970a4b307a50d82bb398e704d65eec43;p=kivitendo-erp.git

diff --git a/templates/webpages/client_config/_warehouse.html b/templates/webpages/client_config/_warehouse.html
index 79fc7a275..9d2e0c30b 100644
--- a/templates/webpages/client_config/_warehouse.html
+++ b/templates/webpages/client_config/_warehouse.html
@@ -1,7 +1,5 @@
 [%- USE HTML -%][%- USE LxERP -%][%- USE L -%]
 <div id="warehouse">
- <div class='listheading'>[% LxERP.t8('Warehouse') %]</div>
-
  <table>
   <tr>
    <td align="right">[% LxERP.t8('Default Transfer') %]</td>
@@ -13,25 +11,14 @@
    </td>
   </tr>
   <tr>
-   <td align="right">[% LxERP.t8('Default Transfer with Master Bin') %]</td>
-   <td>
-    [% L.yes_no_tag('defaults.transfer_default_use_master_default_bin', SELF.defaults.transfer_default_use_master_default_bin) %]
-   </td>
-   <td>
-    [% LxERP.t8('Use master default bin for Default Transfer, if no default bin for the part is configured') %]<br>
-   </td>
-  </tr>
-  <tr>
-   <td align="right">[% LxERP.t8('Default Transfer Out with negative inventory') %]</td>
+   <td align="right">[% LxERP.t8('Default Transfer with services') %]</td>
    <td>
-    [% L.yes_no_tag('defaults.transfer_default_ignore_onhand', SELF.defaults.transfer_default_ignore_onhand) %]
+    [% L.yes_no_tag('defaults.transfer_default_services', SELF.defaults.transfer_default_services) %]
    </td>
    <td>
-    [% LxERP.t8('Default Transfer Out always succeed. The current part onhand is ignored and the inventory can have negative stocks (not recommended).') %]<br>
+    [% LxERP.t8('Transfer services via default') %]<br>
    </td>
   </tr>
-
-  <tr> </tr>
   <tr>
    <td align="right" nowrap="true">[% LxERP.t8('Default Warehouse') %]</td>
    <td>
@@ -48,6 +35,27 @@
    <td>[% L.select_tag('defaults.bin_id', [], id='bin_id', with_empty=1) %]</td>
   </tr>
   <tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Default Transfer with Master Bin') %]</td>
+   <td>
+    [% L.yes_no_tag('defaults.transfer_default_use_master_default_bin', SELF.defaults.transfer_default_use_master_default_bin) %]
+   </td>
+   <td>
+    [% LxERP.t8('Use master default bin for Default Transfer, if no default bin for the part is configured') %]<br>
+   </td>
+  </tr>
+  <tr><td colspan="3"><hr /></td></tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Default Transfer Out with negative inventory') %]</td>
+   <td>
+    [% L.yes_no_tag('defaults.transfer_default_ignore_onhand', SELF.defaults.transfer_default_ignore_onhand) %]
+   </td>
+   <td>
+    [% LxERP.t8('Default Transfer Out always succeed. The current part onhand is ignored and the inventory can have negative stocks (not recommended).') %]<br>
+   </td>
+  </tr>
+
+ <tr>
    <td align="right" nowrap="true">[% LxERP.t8('Default Warehouse with ignoring on hand') %]</td>
    <td>
     [% L.select_tag('defaults.warehouse_id_ignore_onhand', SELF.all_warehouses, id='warehouse_id_ignore_onhand', with_empty=1, default=SELF.defaults.warehouse_id_ignore_onhand, title_key='description',
@@ -62,6 +70,8 @@
    <td align="right" nowrap="true">[% LxERP.t8('Default Bin with ignoring onhand') %]</td>
    <td>[% L.select_tag('defaults.bin_id_ignore_onhand', [], id='bin_id_ignore_onhand', with_empty=1) %]</td>
   </tr>
+  <tr><td colspan="3"><hr /></td></tr>
+  <tr>
   <tr>
    <td align="right">[% LxERP.t8('Show Bestbefore') %]</td>
    <td>
@@ -77,5 +87,24 @@
     [% LxERP.t8('Any stock contents containing a best before date will be impossible to stock out otherwise.') %]
    </td>
   </tr>
+  <tr><td colspan="3"><hr /></td></tr>
+<tr>
+   <td align="right">[% LxERP.t8('Show Value of Goods for Delivery Plan') %]</td>
+   <td>
+    [% L.yes_no_tag('defaults.delivery_plan_show_value_of_goods', SELF.defaults.delivery_plan_show_value_of_goods) %]
+   </td>
+   <td>
+   [% LxERP.t8('Calculate the value of goods for delivery plan (WARNING:  Experimental (not taxincluded safe!)') %]
+   </td>
+  </tr>
+ <tr>
+  <td align="right">[% LxERP.t8('Delivery Plan check for transferred delivery orders') %]</td>
+   <td>
+    [% L.yes_no_tag('defaults.delivery_plan_calculate_transferred_do', SELF.defaults.delivery_plan_calculate_transferred_do) %]
+   </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') %]
+   </td>
+  </tr>
  </table>
 </div>