X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fclient_config%2F_warehouse.html;h=5758acc5392bdd180ec0ab71182092a99c5f7a57;hb=a5de265327b7877bc32e2a5c5b0fd1d01ac3492f;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..5758acc53 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>
@@ -12,6 +10,31 @@
     [% LxERP.t8('Show Transfer via default') %]<br>
    </td>
   </tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Default Transfer with services') %]</td>
+   <td>
+    [% L.yes_no_tag('defaults.transfer_default_services', SELF.defaults.transfer_default_services) %]
+   </td>
+   <td>
+    [% LxERP.t8('Transfer services via default') %]<br>
+   </td>
+  </tr>
+  <tr>
+   <td align="right" nowrap="true">[% LxERP.t8('Default Warehouse') %]</td>
+   <td>
+    [% L.select_tag('defaults.warehouse_id', SELF.all_warehouses, id='warehouse_id', with_empty=1, default=SELF.defaults.warehouse_id, title_key='description',
+                    onchange="warehouse_selected(this.selectedIndex == 0 ? -1 : warehouses[this.selectedIndex - 1].id, -1)") %]
+   </td>
+   <td>
+    [% LxERP.t8('This is the default bin for parts') %]<br>
+    [% LxERP.t8('If configured this bin will be preselected for all new parts. Also this bin will be used as the master default bin, if default transfer out with master bin is activated.') %]<br>
+   </td>
+  </tr>
+  <tr>
+   <td align="right" nowrap="true">[% LxERP.t8('Default Bin') %]</td>
+   <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>
@@ -21,6 +44,7 @@
     [% 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>
@@ -31,37 +55,42 @@
    </td>
   </tr>
 
-  <tr> </tr>
-  <tr>
-   <td align="right" nowrap="true">[% LxERP.t8('Default Warehouse') %]</td>
+ <tr>
+   <td align="right" nowrap="true">[% LxERP.t8('Default Warehouse with ignoring onhand') %]</td>
    <td>
-    [% L.select_tag('defaults.warehouse_id', SELF.all_warehouses, id='warehouse_id', with_empty=1, default=SELF.defaults.warehouse_id, title_key='description',
-                    onchange="warehouse_selected(this.selectedIndex == 0 ? -1 : warehouses[this.selectedIndex - 1].id, -1)") %]
+    [% 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 parts') %]<br>
-    [% LxERP.t8('If configured this bin will be preselected for all new parts. Also this bin will be used as the master default bin, if default transfer out with master bin is activated.') %]<br>
+    [% LxERP.t8('This is the default warehouse for ignoring onhand') %]<br>
    </td>
   </tr>
   <tr>
-   <td align="right" nowrap="true">[% LxERP.t8('Default Bin') %]</td>
-   <td>[% L.select_tag('defaults.bin_id', [], id='bin_id', with_empty=1) %]</td>
+   <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" nowrap="true">[% LxERP.t8('Default Warehouse with ignoring on hand') %]</td>
+   <td align="right">[% LxERP.t8('Transfer out on posting sales invoices?') %]</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')") %]
+    [% L.yes_no_tag('defaults.is_transfer_out', SELF.defaults.is_transfer_out) %]
    </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('Transfer out all items of a sales invoice when posting it. Items are transfered out acording to the settings above.') %]
    </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 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>
    <td align="right">[% LxERP.t8('Show Bestbefore') %]</td>
    <td>