X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fwebpages%2Fclient_config%2F_warehouse.html;h=30e8a003e86b59559c83094bb6a175c7cbaa2bec;hb=bf0b9c5e0df43050015e079d3f5cb4360b4cfa1f;hp=87ff835891d90410995cf009e0847262c64457c8;hpb=ce8306e07de8e24ffab52feeeb311468f81e1d70;p=kivitendo-erp.git

diff --git a/templates/webpages/client_config/_warehouse.html b/templates/webpages/client_config/_warehouse.html
index 87ff83589..30e8a003e 100644
--- a/templates/webpages/client_config/_warehouse.html
+++ b/templates/webpages/client_config/_warehouse.html
@@ -11,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>
@@ -46,20 +35,53 @@
    <td>[% L.select_tag('defaults.bin_id', [], id='bin_id', with_empty=1) %]</td>
   </tr>
   <tr>
-   <td align="right" nowrap="true">[% LxERP.t8('Default Warehouse with ignoring on hand') %]</td>
+  <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 onhand') %]</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',
                     onchange="warehouse_selected(this.selectedIndex == 0 ? -1 : warehouses[this.selectedIndex - 1].id, -1, 'bin_id_ignore_onhand')") %]
    </td>
    <td>
-    [% LxERP.t8('This is the default bin for ignoring onhand') %]<br>
-    [% LxERP.t8('If the default transfer out always succeed use this bin for negative stock quantity.') %]<br>
+    [% LxERP.t8('This is the default warehouse for ignoring onhand') %]<br>
    </td>
   </tr>
   <tr>
    <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>
+   <td>[% LxERP.t8('If the default transfer out always succeed use this bin for negative stock quantity.') %]</td>
   </tr>
+  <tr><td colspan="3"><hr /></td></tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Transfer out on posting sales invoices?') %]</td>
+   <td>
+    [% L.yes_no_tag('defaults.is_transfer_out', SELF.defaults.is_transfer_out) %]
+   </td>
+   <td>
+   [% 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>