Merge branch 'dev' of https://dev.quiqqer.com/quiqqer/erp into dev

src/QUI/ERP/Accounting/ArticleList.css

@@ -46,6 +46,15 @@ table.articles-article {
     vertical-align: top;
 }
 
+.articles-article-quantity {
+    text-align: right;
+}
+
+.articles-article-quantityUnit {
+    text-align: left;
+    width: 35px;
+}
+
 .articles-article-information-title {
     font-size: 14px;
     font-weight: bold;
@@ -103,4 +112,4 @@ table.articles-article {
 
 .articles-sum-row-sum-value {
     border-bottom: 3px double #999999;
-}
\ No newline at end of file
+}

src/QUI/ERP/Accounting/ArticleList.html

@@ -21,7 +21,7 @@
         <th class="articles-article-header-vat">
             {locale group="quiqqer/erp" var="article.list.articles.header.vat" Locale=$Locale}
         </th>
-        <th class="articles-article-header-quantity">
+        <th class="articles-article-header-quantity" colspan="2">
             {locale group="quiqqer/erp" var="article.list.articles.header.quantity" Locale=$Locale}
         </th>
         <th class="articles-article-header-unitprice">

src/QUI/ERP/Accounting/ArticleView.html

@@ -37,6 +37,8 @@
         data-label="{locale group='quiqqer/erp' var='article.list.articles.header.quantity'}"
     >
         {$this->getAttribute('quantity')}
+    </td>
+    <td class="articles-article-quantityUnit">
         {$this->getAttribute('quantityUnit')}
     </td>
     {/if}

src/QUI/ERP/Address.html

@@ -12,15 +12,15 @@
             </div>
             {/if}
 
+            <div class="name">{$salutation} {$firstname} {$lastname}</div>
+
             {if !empty($contactPerson)}
             <div class="contact-person">
                 {locale group="quiqqer/erp" var="attention.abbreviation"} {$contactPerson}
             </div>
             {/if}
-
-            <div class="salutation">{$salutation} {$firstname} {$lastname}</div>
         {else}
-            <div class="salutation">{$salutation} {$firstname} {$lastname}</div>
+            <div class="name">{$salutation} {$firstname} {$lastname}</div>
 
             {if !empty($suffix)}
             <div class="suffix">