X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fclient_config%2F_warehouse.html;h=60199fc7e4e384404b0d1a2aaafff55fcc6aa4a3;hb=079c91d5a281f1bbf4c93681e3ccab4208271a0e;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..60199fc7e 100644
--- a/templates/webpages/client_config/_warehouse.html
+++ b/templates/webpages/client_config/_warehouse.html
@@ -80,6 +80,15 @@
    [% 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 colspan="3"><hr /></td></tr>
   <tr>
   <tr>
@@ -97,24 +106,54 @@
     [% 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 align="right">[% LxERP.t8('Undo Transfer Interval') %]</td>
+   <td>[% L.input_tag('defaults.undo_transfer_interval', LxERP.format_amount(SELF.defaults.undo_transfer_interval, 0), style=style) %]</td>
+   <td>[% LxERP.t8('Defines the interval where undoing transfers from a delivery order are allowed.') %]</td>
+  </tr>
+  <tr><td class="listheading" colspan="4">[% LxERP.t8("Produce Assembly Configuration") %]</td></tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Assembly creation warehouse dependent') %]</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.produce_assembly_same_warehouse', SELF.defaults.produce_assembly_same_warehouse) %]
    </td>
    <td>
-   [% LxERP.t8('Calculate the value of goods for delivery plan (WARNING:  Experimental (not taxincluded safe!)') %]
+    [% LxERP.t8('Produce assembly only if all parts are in the same warehouse') %]
    </td>
   </tr>
- <tr>
-  <td align="right">[% LxERP.t8('Delivery Plan check for transferred delivery orders') %]</td>
+  <tr>
+   <td align="right">[% LxERP.t8('Assembly creation transfers services') %]</td>
+   <td>
+    [% L.yes_no_tag('defaults.produce_assembly_transfer_service', SELF.defaults.produce_assembly_transfer_service) %]
+   </td>
+   <td>
+    [% LxERP.t8('Produce assembly consumes services if assigned as a assembly item') %]
+   </td>
+  </tr>
+  <tr><td class="listheading" colspan="4">[% LxERP.t8("Services in Delivery Orders") %]</td></tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Sales Orders Services are deliverable') %]</td>
+   <td>
+    [% L.yes_no_tag('defaults.sales_delivery_order_check_service', SELF.defaults.sales_delivery_order_check_service) %]
+   </td>
+   <td>
+    [% LxERP.t8('Ignore services for the sales orders state of delivery') %]
+   </td>
+  </tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Purchase Orders Services are deliverable') %]</td>
    <td>
-    [% L.yes_no_tag('defaults.delivery_plan_calculate_transferred_do', SELF.defaults.delivery_plan_calculate_transferred_do) %]
+    [% L.yes_no_tag('defaults.purchase_delivery_order_check_service', SELF.defaults.purchase_delivery_order_check_service) %]
    </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('Ignore services for the purchase orders state of delivery') %]
    </td>
   </tr>
+ <tr><td class="listheading" colspan="4">[% LxERP.t8("Shipped Quantity Algorithm") %]</td></tr>
+ <tr>
+  <td align="right">[% LxERP.t8('Require stock out to consider a delivery order position delivered?') %]</td>
+  <td>[% L.yes_no_tag('defaults.shipped_qty_require_stock_out', SELF.defaults.shipped_qty_require_stock_out) %]</td>
+  <td>[% LxERP.t8('If yes, delivery order positions are considered "delivered" only if they have been stocked out of the inventory. Otherwise saving the delivery order is considered delivered.') %]</td>
+ </tr>
  </table>
 </div>