Test updated

[mfinanz.git] / templates / webpages / client_config / _warehouse.html

diff --git a/templates/webpages/client_config/_warehouse.html b/templates/webpages/client_config/_warehouse.html
index f30fc7808711ce3141bbef3201b51c5cb1e20738..60199fc7e4e384404b0d1a2aaafff55fcc6aa4a3 100644 (file)
--- a/templates/webpages/client_config/_warehouse.html
+++ b/templates/webpages/client_config/_warehouse.html
@@ -89,16 +89,6 @@
    [% 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>
    [% 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>
   <tr><td colspan="3"><hr /></td></tr>
   <tr>
   <tr>


@@ -121,8 +111,7 @@
    <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>
    <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 class="listheading" colspan="4">[% LxERP.t8("Produce Assembly Configuration") %]</td></tr>

   <tr>
    <td align="right">[% LxERP.t8('Assembly creation warehouse dependent') %]</td>
    <td>
   <tr>
    <td align="right">[% LxERP.t8('Assembly creation warehouse dependent') %]</td>
    <td>


@@ -132,6 +121,16 @@
     [% LxERP.t8('Produce assembly only if all parts are in the same warehouse') %]
    </td>
   </tr>
     [% 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>
   <tr>
    <td align="right">[% LxERP.t8('Sales Orders Services are deliverable') %]</td>
    <td>