Merge branch 'dev'

src/QUI/ERP/Accounting/ArticleList.Mail.html

@@ -27,7 +27,11 @@
                 {foreach $Article->getCustomFields() as $field}
                 <li class="articles-body-article-data-fields-field">
                     <span>{$field.title}:</span>
+                    {if isset($field.custom_calc)}
                     <span>{$field.custom_calc.valueText}</span>
+                    {else}
+                    <span>{$field.valueText}</span>
+                    {/if}
                 </li>
                 {/foreach}
             </ul>

src/QUI/ERP/Accounting/ArticleView.html

@@ -25,6 +25,8 @@
                 <span>{$field.title}:</span>
                 {if isset($field.custom_calc) && isset($field.custom_calc.valueText)}
                 <span>{$field.custom_calc.valueText}</span>
+                {elseif isset($field['userInput'])}
+                <span>{$field['userInput']}</span>
                 {/if}
             </li>
             {/foreach}

src/QUI/ERP/Accounting/ArticleView.php

@@ -94,20 +94,14 @@ public function getCustomFields(): array
                 continue;
             }
 
-            if (!isset($field['custom_calc']['valueText'])) {
-                continue;
-            }
-
-            if (!isset($field['custom_calc']['value'])) {
-                continue;
-            }
-
-            if (\is_string($field['custom_calc']['valueText'])) {
-                // nothing
-            } elseif (isset($field['custom_calc']['valueText'][$current])) {
-                $field['custom_calc']['valueText'] = $field['custom_calc']['valueText'][$current];
-            } else {
-                $field['custom_calc']['valueText'] = '';
+            if (isset($field['custom_calc']['valueText'])) {
+                if (!\is_string($field['custom_calc']['valueText'])) {
+                    if (isset($field['custom_calc']['valueText'][$current])) {
+                        $field['custom_calc']['valueText'] = $field['custom_calc']['valueText'][$current];
+                    } else {
+                        $field['custom_calc']['valueText'] = '';
+                    }
+                }
             }
 
             $customFields[] = $field;

src/QUI/ERP/Accounting/ArticleViewText.html

@@ -21,6 +21,8 @@
                 <span>{$field.title}:</span>
                 {if isset($field.custom_calc) && isset($field.custom_calc.valueText)}
                 <span>{$field.custom_calc.valueText}</span>
+                {else}
+                <span>{$field.valueText}</span>
                 {/if}
             </li>
             {/foreach}