X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/26dab9db585be7fbd8d754ff886cc8faedef32d6..fa04f8138cc6447:/templates/webpages/client_config/_warehouse.html

diff --git a/templates/webpages/client_config/_warehouse.html b/templates/webpages/client_config/_warehouse.html
index 106d5a780..f32a544de 100644
--- a/templates/webpages/client_config/_warehouse.html
+++ b/templates/webpages/client_config/_warehouse.html
@@ -80,13 +80,23 @@
    [% 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 use the default warehous not the destination warehouse.') %]<br>
+    [% 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>
@@ -106,5 +116,39 @@
     [% 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 colspan="3"><hr /></td></tr>
+  <tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Assembly creation warehouse dependant') %]</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('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>
  </table>
 </div>