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

diff --git a/templates/webpages/client_config/_warehouse.html b/templates/webpages/client_config/_warehouse.html
index 18df06d37..3cc28efa0 100644
--- a/templates/webpages/client_config/_warehouse.html
+++ b/templates/webpages/client_config/_warehouse.html
@@ -56,21 +56,20 @@
   </tr>
 
  <tr>
-   <td align="right" nowrap="true">[% LxERP.t8('Default Warehouse with ignoring on hand') %]</td>
+   <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>
@@ -81,7 +80,25 @@
    [% 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">[% LxERP.t8('Match Sales Invoice Serial numbers with inventory charge numbers?') %]</td>
+   <td>
+    [% L.yes_no_tag('defaults.sales_serial_eq_charge', SELF.defaults.sales_serial_eq_charge) %]
+   </td>
+   <td>
+   [% 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>
@@ -99,25 +116,5 @@
     [% 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>