fix: conflict solved

composer.json

@@ -2,7 +2,6 @@
   "name": "quiqqer\/erp",
   "type": "quiqqer-application",
   "description": "",
-  "version": "dev-master",
   "license": [
     "GPL-3.0+",
     "PCSG QEL-1.0"
@@ -27,9 +26,9 @@
     "quiqqer\/translator": "1.*|dev-master|dev-dev",
     "quiqqer\/employee": "1.*|dev-master|dev-dev",
     "quiqqer\/customer": "1.*|dev-master|dev-dev",
-    "quiqqer/qui-php": "1.*|>=0.11|dev-master|dev-dev",
-    "quiqqer/smarty3": ">=1.7|dev-master|dev-dev",
-    "quiqqer/frontend-users": "1.*|dev-master|dev-dev"
+    "quiqqer\/qui-php": "1.*|>=0.11|dev-master|dev-dev",
+    "quiqqer\/smarty3": ">=1.7|dev-master|dev-dev",
+    "quiqqer\/frontend-users": "1.*|dev-master|dev-dev"
   },
   "autoload": {
     "psr-4": {

src/QUI/ERP/Accounting/ArticleList.html

 {if $showHeader}
 <!-- articles -->
 <h1 class="articles-header">
-    {locale group="quiqqer/erp" var="article.list.articles.title"}
+    {locale group="quiqqer/erp" var="article.list.articles.title" Locale=$Locale}
 </h1>
 {/if}
 
@@ -10,19 +10,19 @@
     <thead>
     <tr class="articles-article-header">
         <th class="articles-article-header-pos">
-            {locale group="quiqqer/erp" var="article.list.articles.header.pos"}
+            {locale group="quiqqer/erp" var="article.list.articles.header.pos" Locale=$Locale}
         </th>
         <th class="articles-article-header-information">
-            {locale group="quiqqer/erp" var="article.list.articles.header.description"}
+            {locale group="quiqqer/erp" var="article.list.articles.header.description" Locale=$Locale}
         </th>
         <th class="articles-article-header-quantity">
-            {locale group="quiqqer/erp" var="article.list.articles.header.quantity"}
+            {locale group="quiqqer/erp" var="article.list.articles.header.quantity" Locale=$Locale}
         </th>
         <th class="articles-article-header-unitprice">
-            {locale group="quiqqer/erp" var="article.list.articles.header.unitprice"}
+            {locale group="quiqqer/erp" var="article.list.articles.header.unitprice" Locale=$Locale}
         </th>
         <th class="articles-article-header-price">
-            {locale group="quiqqer/erp" var="article.list.articles.header.price"}
+            {locale group="quiqqer/erp" var="article.list.articles.header.price" Locale=$Locale}
         </th>
     </tr>
     </thead>
@@ -39,12 +39,12 @@
     <tr class="articles-sum-row-subsum">
         <td class="articles-sum-row-firstCell">
             <span class="articles-sum-row-subsum-text">
-                {locale group="quiqqer/erp" var="article.list.articles.subtotal"}
+                {locale group="quiqqer/erp" var="article.list.articles.subtotal" Locale=$Locale}
             </span>
         </td>
         <td style="width: 140px" class="articles-sum-row-sndCell">
             <span class="articles-sum-row-subsum-value">
-                {$calculations.subSum}
+                {$calculations.subSum Locale=$Locale}
             </span>
         </td>
     </tr>
@@ -80,7 +80,7 @@
     <tr class="articles-sum-row-sum">
         <td class="articles-sum-row-firstCell">
             <span class="articles-sum-row-sum-text">
-                {locale group="quiqqer/erp" var="article.list.articles.sumtotal"}
+                {locale group="quiqqer/erp" var="article.list.articles.sumtotal" Locale=$Locale}
             </span>
         </td>
         <td class="articles-sum-row-sndCell">
@@ -89,4 +89,4 @@
             </span>
         </td>
     </tr>
-</table>
\ No newline at end of file
+</table>

src/QUI/ERP/Accounting/ArticleListUnique.php

@@ -39,6 +39,11 @@ class ArticleListUnique implements \IteratorAggregate
      */
     protected $PriceFactors = false;
 
+    /**
+     * @var null
+     */
+    protected $Locale = null;
+
     /**
      * ArticleList constructor.
      *
@@ -47,6 +52,8 @@ class ArticleListUnique implements \IteratorAggregate
      */
     public function __construct($attributes = [])
     {
+        $this->Locale = QUI::getLocale();
+
         $needles = ['articles', 'calculations'];
 
         foreach ($needles as $needle) {
@@ -108,6 +115,16 @@ public function __construct($attributes = [])
         }
     }
 
+    /**
+     * Set locale
+     *
+     * @param QUI\Locale $Locale
+     */
+    public function setLocale(QUI\Locale $Locale)
+    {
+        $this->Locale = $Locale;
+    }
+
     /**
      * Creates a list from a stored representation
      *
@@ -268,7 +285,8 @@ public function toHTML($template = false)
             'this'         => $this,
             'articles'     => $articles,
             'calculations' => $this->calculations,
-            'vatArray'     => $vatArray
+            'vatArray'     => $vatArray,
+            'Locale'       => $this->Locale
         ]);
 
         if ($template && \file_exists($template)) {