Merge branch 'b-3.6.1' into mebil

[kivitendo-erp.git] / templates / webpages / client_config / _warehouse.html

diff --git a/templates/webpages/client_config/_warehouse.html b/templates/webpages/client_config/_warehouse.html
index 3f83a92..60199fc 100644 (file)
--- a/templates/webpages/client_config/_warehouse.html
+++ b/templates/webpages/client_config/_warehouse.html
@@ -19,9 +19,7 @@
     [% 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',
@@ -58,19 +56,38 @@
   </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>
+   <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 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>
@@ -89,5 +106,54 @@
     [% LxERP.t8('Any stock contents containing a best before date will be impossible to stock out otherwise.') %]
    </td>
   </tr>
+  <tr>
+   <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.produce_assembly_same_warehouse', SELF.defaults.produce_assembly_same_warehouse) %]
+   </td>
+   <td>
+    [% LxERP.t8('Produce assembly only if all parts are in the same warehouse') %]
+   </td>
+  </tr>
+  <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.purchase_delivery_order_check_service', SELF.defaults.purchase_delivery_order_check_service) %]
+   </td>
+   <td>
+    [% 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>